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

Jim Park's Unicode NSIS merging - Step 2 : merge TCHARs changes into trunk

Browse source 
Compiler output is identical before & after this step

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6037 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
wizou 2010-03-26 17:18:17 +00:00
commit cdf7735a77
206 changed files with 8437 additions and 6403 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Include/FileFunc.nsh
View file

@ -910,7 +910,7 @@ RefreshShellIcons
StrCpy $6 1073741824
FileFunc_DriveSpace_getspace:
System::Call 'kernel32::GetDiskFreeSpaceExA(t, *l, *l, *l)i(r0,.r2,.r3,.)'
System::Call 'kernel32::GetDiskFreeSpaceEx(t, *l, *l, *l)i(r0,.r2,.r3,.)'
StrCmp $5 T 0 +3
StrCpy $0 $3
@ -970,7 +970,7 @@ RefreshShellIcons
System::Alloc 1024
Pop $2
System::Call 'kernel32::GetLogicalDriveStringsA(i,i) i(1024, r2)'
System::Call 'kernel32::GetLogicalDriveStrings(i,i) i(1024, r2)'
StrCmp $0 ALL FileFunc_GetDrives_drivestring
StrCmp $0 '' 0 FileFunc_GetDrives_typeset
@ -1007,10 +1007,10 @@ RefreshShellIcons
StrCpy $3 $2
FileFunc_GetDrives_enumok:
System::Call 'kernel32::lstrlenA(t) i(i r3) .r4'
System::Call 'kernel32::lstrlen(t) i(i r3) .r4'
StrCmp $4$0 '0ALL' FileFunc_GetDrives_enumex
StrCmp $4 0 FileFunc_GetDrives_typeset
System::Call 'kernel32::GetDriveTypeA(t) i(i r3) .r5'
System::Call 'kernel32::GetDriveType(t) i(i r3) .r5'
StrCmp $0 ALL +2
StrCmp $5 $6 FileFunc_GetDrives_letter FileFunc_GetDrives_enumnext
@ -1111,7 +1111,7 @@ RefreshShellIcons
FileFunc_GetTime_getfile:
IfFileExists $0 0 FileFunc_GetTime_error
System::Call '*(i,l,l,l,i,i,i,i,&t260,&t14) i .r6'
System::Call 'kernel32::FindFirstFileA(t,i)i(r0,r6) .r2'
System::Call 'kernel32::FindFirstFile(t,i)i(r0,r6) .r2'
System::Call 'kernel32::FindClose(i)i(r2)'
FileFunc_GetTime_gettime:
@ -1401,8 +1401,8 @@ RefreshShellIcons
Push $0
Push $1
Push $2
System::Call 'kernel32::GetModuleFileNameA(i 0, t .r0, i 1024)'
System::Call 'kernel32::GetLongPathNameA(t r0, t .r1, i 1024)i .r2'
System::Call 'kernel32::GetModuleFileName(i 0, t .r0, i 1024)'
System::Call 'kernel32::GetLongPathName(t r0, t .r1, i 1024)i .r2'
StrCmp $2 error +2
StrCpy $0 $1
Pop $2
@ -1429,7 +1429,7 @@ RefreshShellIcons
Push $1
Push $2
StrCpy $0 $EXEDIR
System::Call 'kernel32::GetLongPathNameA(t r0, t .r1, i 1024)i .r2'
System::Call 'kernel32::GetLongPathName(t r0, t .r1, i 1024)i .r2'
StrCmp $2 error +2
StrCpy $0 $1
Pop $2

2
Include/LogicLib.nsh
View file

@ -155,7 +155,7 @@
; Extra string tests (cannot do these case-sensitively - I tried and lstrcmp still ignored the case)
!macro _StrCmpI _a _b _e _l _m
!insertmacro _LOGICLIB_TEMP
System::Call `kernel32::lstrcmpiA(ts, ts) i.s` `${_a}` `${_b}`
System::Call `kernel32::lstrcmpi(ts, ts) i.s` `${_a}` `${_b}`
Pop $_LOGICLIB_TEMP
IntCmp $_LOGICLIB_TEMP 0 `${_e}` `${_l}` `${_m}`
!macroend

6
Include/StrFunc.nsh
View file

@ -411,7 +411,7 @@ o-----------------------------------------------------------------------------o
System::Call 'kernel32::GlobalLock(i r2) i.r3'
;Step 4: Copy the text to locked clipboard buffer
System::Call 'kernel32::lstrcpyA(i r3, t r0)'
System::Call 'kernel32::lstrcpy(i r3, t r0)'
;Step 5: Unlock the handle again
System::Call 'kernel32::GlobalUnlock(i r2)'
@ -455,7 +455,7 @@ o-----------------------------------------------------------------------------o
System::Call 'kernel32::GlobalLock(i r2) i.r3'
;Step 7: Copy the text to locked clipboard buffer
System::Call 'kernel32::lstrcpyA(i r3, t r0)'
System::Call 'kernel32::lstrcpy(i r3, t r0)'
;Step 8: Unlock the handle again
System::Call 'kernel32::GlobalUnlock(i r2)'
@ -1192,7 +1192,7 @@ o-----------------------------------------------------------------------------o
; variable because it won't be used anymore
${If} $6 == 1
System::Call `kernel32::lstrcmpA(ts, ts) i.s` `$R3` `$1`
System::Call `kernel32::lstrcmp(ts, ts) i.s` `$R3` `$1`
Pop $R3
${If} $R3 = 0
StrCpy $R3 1 ; Continue

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