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

Jim Park's Unicode NSIS merging - Step 1 : switch to TCHARs where relevant.

Browse source 
Compiler output is identical before & after this step

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/branches/wizou@6036 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
wizou 2010-03-24 17:22:56 +00:00
parent 4e48722b63
commit 752d7d239a
209 changed files with 9698 additions and 7658 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Include/WinVer.nsh
View file

@ -151,8 +151,13 @@
# some definitions from header files
!define OSVERSIONINFOA_SIZE 148
!define OSVERSIONINFOEXA_SIZE 156
!ifdef NSIS_UNICODE
!define OSVERSIONINFO_SIZE 276 ; OSVERSIONINFOW
!define OSVERSIONINFOEX_SIZE 284 ; OSVERSIONINFOEXW
!else
!define OSVERSIONINFO_SIZE 148 ; OSVERSIONINFOA
!define OSVERSIONINFOEX_SIZE 156 ; OSVERSIONINFOEXA
!endif
!define VER_PLATFORM_WIN32_NT 2
!define VER_NT_WORKSTATION 1
@ -206,15 +211,15 @@
Push $R0 ;temp
# allocate memory
System::Alloc ${OSVERSIONINFOEXA_SIZE}
System::Alloc ${OSVERSIONINFOEX_SIZE}
Pop $0
# use OSVERSIONINFOEX
!insertmacro __WinVer_Call_GetVersionEx ${OSVERSIONINFOEXA_SIZE}
!insertmacro __WinVer_Call_GetVersionEx ${OSVERSIONINFOEX_SIZE}
IntCmp $3 0 "" _winver_ex _winver_ex
# OSVERSIONINFOEX not allowed (Win9x or NT4 w/SP < 6), use OSVERSIONINFO
!insertmacro __WinVer_Call_GetVersionEx ${OSVERSIONINFOA_SIZE}
!insertmacro __WinVer_Call_GetVersionEx ${OSVERSIONINFO_SIZE}
_winver_ex:
# get results from struct
@ -266,7 +271,7 @@
_winver_nt: # nt
IntCmp $R0 ${OSVERSIONINFOEXA_SIZE} "" _winver_sp_noex _winver_sp_noex
IntCmp $R0 ${OSVERSIONINFOEX_SIZE} "" _winver_sp_noex _winver_sp_noex
# discard szCSDVersion
Pop $0