dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

applied patch #2095363 - Patch for bug #2070708 (WinVer.nsh, service pack macros)

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5719 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2008-09-14 19:39:19 +00:00
parent a3c11ff2fa
commit 0215951357
1 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Include/WinVer.nsh
View file

@ -169,32 +169,34 @@
; $1 = malloc(sizeof(OSVERSIONINFOEXA)) ; $1 = malloc(sizeof(OSVERSIONINFOEXA))
System::Alloc 156 System::Alloc 156
Pop $1 Pop $1
${If} $1 <> 0 StrCmp $1 0 Label_WinVer_ServicePack_End_${LOGICLIB_COUNTER}
; ($1)->dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA) ; ($1)->dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA)
System::Call /NOUNLOAD '*$1(&i4 156)' System::Call /NOUNLOAD '*$1(&i4 156)'
; GetVersionEx($1) ; GetVersionEx($1)
System::Call /NOUNLOAD 'kernel32::GetVersionEx(i r1) i.r0' System::Call /NOUNLOAD 'kernel32::GetVersionEx(i r1) i.r0'
${If} $0 <> 0 StrCmp $0 0 Label_WinVer_ServicePack_GetVersion_${LOGICLIB_COUNTER}
; $2 = ($1)->wServicePackMajor ; $2 = ($1)->wServicePackMajor
System::Call /NOUNLOAD '*$1(&t148, &i2.r2)' System::Call /NOUNLOAD '*$1(&t148, &i2.r2)'
${Else} Goto Label_WinVer_ServicePack_End_${LOGICLIB_COUNTER}
Label_WinVer_ServicePack_GetVersion_${LOGICLIB_COUNTER}:
; ($1)->dwOSVersionInfoSize = sizeof(OSVERSIONINFOA) ; ($1)->dwOSVersionInfoSize = sizeof(OSVERSIONINFOA)
System::Call /NOUNLOAD '*$1(&i4 148)' System::Call /NOUNLOAD '*$1(&i4 148)'
; GetVersionEx($1) ; GetVersionEx($1)
System::Call /NOUNLOAD 'kernel32::GetVersionEx(i r1) i.r0' System::Call /NOUNLOAD 'kernel32::GetVersionEx(i r1) i.r0'
${If} $0 <> 0 StrCmp $0 0 Label_WinVer_ServicePack_End_${LOGICLIB_COUNTER}
; $2 = ($1)->szCSDVersion ; $2 = ($1)->szCSDVersion
System::Call /NOUNLOAD '*$1(&t20, &t128.r2)' System::Call /NOUNLOAD '*$1(&t20, &t128.r2)'
StrCpy $0 $2 13 StrCpy $0 $2 13
${If} $0 == "Service Pack " StrCmp $0 "Service Pack " 0 +3
StrCpy $2 $2 "" 13 StrCpy $2 $2 "" 13
${Else} Goto +2
StrCpy $2 0 StrCpy $2 0
${EndIf}
${EndIf} Label_WinVer_ServicePack_End_${LOGICLIB_COUNTER}:
${EndIf} ; free($1)
System::Free $1 StrCmp $1 0 +2
${EndIf} System::Free $1
StrCpy $_LOGICLIB_TEMP $2 StrCpy $_LOGICLIB_TEMP $2
@ -202,6 +204,8 @@
Pop $1 Pop $1
Pop $0 Pop $0
!insertmacro _IncreaseCounter
!macroend !macroend
!define AtLeastServicePack `"" AtLeastServicePack` !define AtLeastServicePack `"" AtLeastServicePack`