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

nsDialogs: Bugfix for __NSD_LoadAndSetImage $R0 as parameter conflict

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6164 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2011-11-08 23:18:12 +00:00
parent 1a6e32bce9
commit b84d41e582
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Contrib/nsDialogs/nsDialogs.nsh
View file

@ -520,15 +520,16 @@ Header file for creating custom installer pages with nsDialogs
Push $0
Push $R0
Push "${IMAGE}" # in case ${IMAGE} is $R0
StrCpy $R0 ${CONTROL} # in case ${CONTROL} is $0
!if "${_LIHINSTMODE}" == "exeresource"
System::Call 'kernel32::GetModuleHandle(i0) i.r0'
!undef _LIHINSTSRC
!define _LIHINSTSRC r0
!undef _LIHINSTSRC # If (internal?) _* macro params starts using $0,
!define _LIHINSTSRC r0 # _LIHINSTSRC can be changed to s
System::Call 'kernel32::GetModuleHandle(i0)i.${_LIHINSTSRC}'
!endif
System::Call 'user32::LoadImage(i ${_LIHINSTSRC}, ts, i ${_IMGTYPE}, i0, i0, i${_LIFLAGS}) i.r0' "${IMAGE}"
System::Call 'user32::LoadImage(i ${_LIHINSTSRC}, ts, i ${_IMGTYPE}, i0, i0, i${_LIFLAGS}) i.r0'
SendMessage $R0 ${STM_SETIMAGE} ${_IMGTYPE} $0
Pop $R0