From 36eb33134d7611734bece6eec48b59b09f29677f Mon Sep 17 00:00:00 2001 From: joostverburg Date: Fri, 1 Nov 2002 16:02:26 +0000 Subject: [PATCH] UpgradeDLL fixes git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1525 212acab6-be3b-0410-9dea-997c60f758d6 --- Docs/src/usefulfunc.but | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Docs/src/usefulfunc.but b/Docs/src/usefulfunc.but index 44dc1ca6..f5023781 100644 --- a/Docs/src/usefulfunc.but +++ b/Docs/src/usefulfunc.but @@ -369,15 +369,15 @@ \c ;------------------------ \c ;Check file and version \c -\c IfFileExists "${DESTFILE}" "" copy_${LOCALFILE} +\c IfFileExists "${DESTFILE}" "" "copy_${LOCALFILE}" \c \c ClearErrors \c GetDLLVersionLocal "${LOCALFILE}" $R0 $R1 \c GetDLLVersion "${DESTFILE}" $R2 $R3 -\c IfErrors upgrade_${LOCALFILE} +\c IfErrors "upgrade_${LOCALFILE}" \c -\c IntCmpU $R0 $R2 "" done_${LOCALFILE} upgrade_${LOCALFILE} -\c IntCmpU $R1 $R3 done_${LOCALFILE} done_${LOCALFILE} upgrade_${LOCALFILE} +\c IntCmpU $R0 $R2 "" "done_${LOCALFILE}" "upgrade_${LOCALFILE}" +\c IntCmpU $R1 $R3 "done_${LOCALFILE}" "done_${LOCALFILE}" "upgrade_${LOCALFILE}" \c \c ;------------------------ \c ;Let's upgrade the DLL! @@ -396,7 +396,7 @@ \c ClearErrors \c StrCpy $R0 "${DESTFILE}" \c Call ":file_${LOCALFILE}" -\c IfErrors "" noreboot_${LOCALFILE} +\c IfErrors "" "noreboot_${LOCALFILE}" \c \c ;------------------------ \c ;DLL is in use. Copy it to a temp file and Rename it on reboot. @@ -412,7 +412,7 @@ \c WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\RunOnce" "Register ${DESTFILE}" '"$SYSDIR\regsvr32.exe" /s "${DESTFILE}"' \c !endif \c -\c Goto done_${LOCALFILE} +\c Goto "done_${LOCALFILE}" \c \c ;------------------------ \c ;DLL does not exist - just extract @@ -442,7 +442,7 @@ \c ;------------------------ \c ;End \c -\c Goto end_${LOCALFILE} +\c Goto "end_${LOCALFILE}" \c \c ;------------------------ \c ;Called to extract the DLL @@ -451,7 +451,7 @@ \c File /oname=$R0 "${LOCALFILE}" \c Return \c -\c end_${LOCALFILE}: +\c "end_${LOCALFILE}:" \c \c !macroend