UpgradeDLL fixes

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1525 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
joostverburg 2002-11-01 16:02:26 +00:00
parent 197d629406
commit 36eb33134d

View file

@ -369,15 +369,15 @@
\c ;------------------------ \c ;------------------------
\c ;Check file and version \c ;Check file and version
\c \c
\c IfFileExists "${DESTFILE}" "" copy_${LOCALFILE} \c IfFileExists "${DESTFILE}" "" "copy_${LOCALFILE}"
\c \c
\c ClearErrors \c ClearErrors
\c GetDLLVersionLocal "${LOCALFILE}" $R0 $R1 \c GetDLLVersionLocal "${LOCALFILE}" $R0 $R1
\c GetDLLVersion "${DESTFILE}" $R2 $R3 \c GetDLLVersion "${DESTFILE}" $R2 $R3
\c IfErrors upgrade_${LOCALFILE} \c IfErrors "upgrade_${LOCALFILE}"
\c \c
\c IntCmpU $R0 $R2 "" done_${LOCALFILE} upgrade_${LOCALFILE} \c IntCmpU $R0 $R2 "" "done_${LOCALFILE}" "upgrade_${LOCALFILE}"
\c IntCmpU $R1 $R3 done_${LOCALFILE} done_${LOCALFILE} upgrade_${LOCALFILE} \c IntCmpU $R1 $R3 "done_${LOCALFILE}" "done_${LOCALFILE}" "upgrade_${LOCALFILE}"
\c \c
\c ;------------------------ \c ;------------------------
\c ;Let's upgrade the DLL! \c ;Let's upgrade the DLL!
@ -396,7 +396,7 @@
\c ClearErrors \c ClearErrors
\c StrCpy $R0 "${DESTFILE}" \c StrCpy $R0 "${DESTFILE}"
\c Call ":file_${LOCALFILE}" \c Call ":file_${LOCALFILE}"
\c IfErrors "" noreboot_${LOCALFILE} \c IfErrors "" "noreboot_${LOCALFILE}"
\c \c
\c ;------------------------ \c ;------------------------
\c ;DLL is in use. Copy it to a temp file and Rename it on reboot. \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 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\RunOnce" "Register ${DESTFILE}" '"$SYSDIR\regsvr32.exe" /s "${DESTFILE}"'
\c !endif \c !endif
\c \c
\c Goto done_${LOCALFILE} \c Goto "done_${LOCALFILE}"
\c \c
\c ;------------------------ \c ;------------------------
\c ;DLL does not exist - just extract \c ;DLL does not exist - just extract
@ -442,7 +442,7 @@
\c ;------------------------ \c ;------------------------
\c ;End \c ;End
\c \c
\c Goto end_${LOCALFILE} \c Goto "end_${LOCALFILE}"
\c \c
\c ;------------------------ \c ;------------------------
\c ;Called to extract the DLL \c ;Called to extract the DLL
@ -451,7 +451,7 @@
\c File /oname=$R0 "${LOCALFILE}" \c File /oname=$R0 "${LOCALFILE}"
\c Return \c Return
\c \c
\c end_${LOCALFILE}: \c "end_${LOCALFILE}:"
\c \c
\c !macroend \c !macroend