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

extract the common artificial function code to a macro

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5778 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2008-11-20 22:54:05 +00:00
parent 76f8534004
commit 0f977a9c4f
1 changed files with 21 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

53
Include/WinVer.nsh
View file

@ -94,13 +94,26 @@
!define WINVER_2003 0x502
!define WINVER_VISTA 0x600
!macro CallArtificialFunction NAME
Call :.${NAME}
!ifndef ${NAME}_DEFINED
Goto ${NAME}_DONE
!define ${NAME}_DEFINED
.${NAME}:
!insertmacro ${NAME}
Return
${NAME}_DONE:
!endif
!macroend
!define CallArtificialFunction `!insertmacro CallArtificialFunction`
!macro __GetWinVer
!insertmacro _LOGICLIB_TEMP
System::Call kernel32::GetVersion()i.s
Pop $_LOGICLIB_TEMP
!macroend
!macro __ParseWinVer_
!macro __ParseWinVer
!insertmacro __GetWinVer
Push $0
IntOp $0 $_LOGICLIB_TEMP & 0xff
@ -111,18 +124,6 @@
Pop $0
!macroend
!macro __ParseWinVer
Call :.__ParseWinVer
!ifndef __ParseWinVer_DEFINED
Goto __ParseWinVer_DONE
!define __ParseWinVer_DEFINED
.__ParseWinVer:
!insertmacro __ParseWinVer_
Return
__ParseWinVer_DONE:
!endif
!macroend
!macro _IsNT _a _b _t _f
!insertmacro __GetWinVer
IntOp $_LOGICLIB_TEMP $_LOGICLIB_TEMP & 0x80000000
@ -150,17 +151,17 @@
!macroend
!macro _WinVerAtLeast _a _b _t _f
!insertmacro __ParseWinVer
${CallArtificialFunction} __ParseWinVer
!insertmacro _>= $_LOGICLIB_TEMP `${_b}` `${_t}` `${_f}`
!macroend
!macro _WinVerIs _a _b _t _f
!insertmacro __ParseWinVer
${CallArtificialFunction} __ParseWinVer
!insertmacro _= $_LOGICLIB_TEMP `${_b}` `${_t}` `${_f}`
!macroend
!macro _WinVerAtMost _a _b _t _f
!insertmacro __ParseWinVer
${CallArtificialFunction} __ParseWinVer
!insertmacro _<= $_LOGICLIB_TEMP `${_b}` `${_t}` `${_f}`
!macroend
@ -169,7 +170,7 @@
!insertmacro __WinVer_DefineOSTests AtMost
!macro __GetWinServicePack_
!macro __GetWinServicePack
!insertmacro _LOGICLIB_TEMP
Push $0
@ -220,33 +221,21 @@ Label_WinVer_ServicePack_End_${LOGICLIB_COUNTER}:
!macroend
!macro __GetWinServicePack
Call :.__GetWinServicePack
!ifndef __GetWinServicePack_DEFINED
Goto __GetWinServicePack_DONE
!define __GetWinServicePack_DEFINED
.__GetWinServicePack:
!insertmacro __GetWinServicePack_
Return
__GetWinServicePack_DONE:
!endif
!macroend
!define AtLeastServicePack `"" AtLeastServicePack`
!macro _AtLeastServicePack _a _b _t _f
!insertmacro __GetWinServicePack
${CallArtificialFunction} __GetWinServicePack
!insertmacro _>= $_LOGICLIB_TEMP `${_b}` `${_t}` `${_f}`
!macroend
!define AtMostServicePack `"" AtMostServicePack`
!macro _AtMostServicePack _a _b _t _f
!insertmacro __GetWinServicePack
${CallArtificialFunction} __GetWinServicePack
!insertmacro _<= $_LOGICLIB_TEMP `${_b}` `${_t}` `${_f}`
!macroend
!define IsServicePack `"" IsServicePack`
!macro _IsServicePack _a _b _t _f
!insertmacro __GetWinServicePack
${CallArtificialFunction} __GetWinServicePack
!insertmacro _= $_LOGICLIB_TEMP `${_b}` `${_t}` `${_f}`
!macroend