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

TCHAR cannot be used in RegTool because it must be able to run on Win9x.

Browse source 
RegTool now implements A and W functions in the same binary. Bitness mixing is still problematic.


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6858 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2017-05-12 00:19:23 +00:00
parent c401748d95
commit d80b364e1d
6 changed files with 445 additions and 383 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Include/Library.nsh
View file

@ -121,6 +121,16 @@
;------------------------
;Setup RegTool
!ifdef NSIS_MAKENSIS64
!if "${NSIS_PTR_SIZE}" < 8
!error "Incompatible RegTool bitness, compile with 32-bit NSIS!" ; 64-bit RegTool on 32-bit Windows
!endif
!else
!if "${NSIS_PTR_SIZE}" > 4
!warning "Incompatible RegTool bitness!" ; 32-bit RegTool will probably fail to register 64-bit library
!endif
!endif
ReadRegStr $R3 HKLM "Software\Microsoft\Windows\CurrentVersion\RunOnce" "${REGTOOL_KEY}"
StrCpy $R3 $R3 -4 1
IfFileExists $R3 +3

10
Include/UpgradeDLL.nsh
View file

@ -67,6 +67,16 @@ Example:
;------------------------
;Setup RegTool
!ifdef NSIS_MAKENSIS64
!if "${NSIS_PTR_SIZE}" < 8
!error "Incompatible RegTool bitness, compile with 32-bit NSIS!" ; 64-bit RegTool on 32-bit Windows
!endif
!else
!if "${NSIS_PTR_SIZE}" > 4
!warning "Incompatible RegTool bitness!" ; 32-bit RegTool will probably fail to register 64-bit library
!endif
!endif
ReadRegStr $R3 HKLM "Software\Microsoft\Windows\CurrentVersion\RunOnce" "NSIS.Library.RegTool.v3"
StrCpy $R3 $R3 -4 1
IfFileExists $R3 +3