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

test service pack inequality as well

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5799 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2008-11-29 13:21:34 +00:00
parent d01c264c5e
commit c8d0cfb4ea
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Source/Tests/winver.nsi
View file

@ -232,13 +232,18 @@ Var OSVERSIONINFOEX_INIT
# test service pack equality
${IfNot} ${IsServicePack} ${SP}
IntOp $0 ${SP} - 1
IntOp $1 ${SP} + 1
!insertmacro _WinVer_GetServicePackLevel $0
${IfNot} ${IsServicePack} ${SP}
${OrIf} ${IsServicePack} $0
${OrIf} ${IsServicePack} $1
!insertmacro _WinVer_GetServicePackLevel
DetailPrint "Service pack detection failed for ${NAME}"
DetailPrint " Expected: ${SP}"
DetailPrint " Got: $0"
DetailPrint " Got: $_LOGICLIB_TEMP"
StrCpy $R0 "FAILURE"
@ -246,9 +251,6 @@ Var OSVERSIONINFOEX_INIT
# test service pack comparison
IntOp $0 ${SP} - 1
IntOp $1 ${SP} + 1
${IfNot} ${AtLeastServicePack} ${SP}
${OrIfNot} ${AtLeastServicePack} $0
${OrIfNot} ${AtMostServicePack} ${SP}