fixed check for DONE label requirement
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4200 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
4ce644648a
commit
3ed2036d85
1 changed files with 11 additions and 1 deletions
|
@ -546,6 +546,8 @@ Var __INSTALLLLIB_SESSIONGUID
|
|||
|
||||
!ifdef UNINSTALLLIB_SHARED_SHARED
|
||||
|
||||
!define UNINSTALLLIB_DONE_LABEL
|
||||
|
||||
ReadRegDword $R0 HKLM Software\Microsoft\Windows\CurrentVersion\SharedDLLs $R1
|
||||
StrCmp $R0 "" "uninstalllib.shareddlldone_${UNINSTALLLIB_UNIQUE}"
|
||||
|
||||
|
@ -577,6 +579,12 @@ Var __INSTALLLLIB_SESSIONGUID
|
|||
|
||||
!ifdef UNINSTALLLIB_UNINSTALL_REBOOT_PROTECTED | UNINSTALLLIB_UNINSTALL_NOREBOOT_PROTECTED
|
||||
|
||||
!ifndef UNINSTALLLIB_DONE_LABEL
|
||||
|
||||
!define UNINSTALLLIB_DONE_LABEL
|
||||
|
||||
!endif
|
||||
|
||||
System::Call "sfc::SfcIsFileProtected(i 0, w $R1) i.R0"
|
||||
|
||||
StrCmp $R0 "error" "uninstalllib.notprotected_${UNINSTALLLIB_UNIQUE}"
|
||||
|
@ -633,7 +641,9 @@ Var __INSTALLLLIB_SESSIONGUID
|
|||
;------------------------
|
||||
;Done
|
||||
|
||||
!ifdef UNINSTALLLIB_SHARED_SHARED | !UNINSTALLLIB_UNINSTALL_NOREMOVE
|
||||
!ifdef UNINSTALLLIB_DONE_LABEL
|
||||
|
||||
!undef UNINSTALLLIB_DONE_LABEL
|
||||
|
||||
"uninstalllib.done_${UNINSTALLLIB_UNIQUE}:"
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue