From b84d41e582c63f3cac77023f29ff61d84019d363 Mon Sep 17 00:00:00 2001
From: anders_k <anders_k@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Tue, 8 Nov 2011 23:18:12 +0000
Subject: [PATCH] nsDialogs: Bugfix for __NSD_LoadAndSetImage $R0 as parameter
 conflict

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6164 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/nsDialogs/nsDialogs.nsh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Contrib/nsDialogs/nsDialogs.nsh b/Contrib/nsDialogs/nsDialogs.nsh
index e59a72f4..f8bee3ef 100644
--- a/Contrib/nsDialogs/nsDialogs.nsh
+++ b/Contrib/nsDialogs/nsDialogs.nsh
@@ -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