mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-03-13 20:39:57 +01:00
Merge pull request #320 from TheOneRing/fix_winver
Try to fix WinVer.nsh for nsis2
This commit is contained in:
commit
9a61278ee3
@ -160,7 +160,10 @@
|
||||
# use this to make all nt > 9x
|
||||
|
||||
!ifdef WINVER_NT4_OVER_W95
|
||||
!define /redef /math WINVER_NT4 ${WINVER_NT4} | ${_WINVER_VERXBIT}
|
||||
!define __WINVERTMP ${WINVER_NT4}
|
||||
!undef WINVER_NT4
|
||||
!define /math WINVER_NT4 ${__WINVERTMP} | ${_WINVER_VERXBIT}
|
||||
!undef __WINVERTMP
|
||||
!endif
|
||||
|
||||
# some definitions from header files
|
||||
@ -221,14 +224,6 @@
|
||||
Push $3 ;bld
|
||||
Push $R0 ;temp
|
||||
|
||||
# a plugin call will lock the Unicode mode, it is now safe to set the struct size
|
||||
!ifdef NSIS_UNICODE
|
||||
!define /redef OSVERSIONINFO_SIZE ${OSVERSIONINFOW_SIZE}
|
||||
!define /redef OSVERSIONINFOEX_SIZE ${OSVERSIONINFOEXW_SIZE}
|
||||
!else
|
||||
!define /redef OSVERSIONINFO_SIZE ${OSVERSIONINFOA_SIZE}
|
||||
!define /redef OSVERSIONINFOEX_SIZE ${OSVERSIONINFOEXA_SIZE}
|
||||
!endif
|
||||
|
||||
# allocate memory
|
||||
System::Call '*(&i${OSVERSIONINFOEX_SIZE})p.r0'
|
||||
|
Loading…
x
Reference in New Issue
Block a user