fixed bug #1064540 - warning 'label "installlib.remove_..." not used'
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3761 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
6cb87b55ba
commit
69a4f35f35
1 changed files with 4 additions and 4 deletions
|
@ -521,7 +521,7 @@ Example:
|
||||||
!ifdef UNINSTALLLIB_SHARED_SHARED
|
!ifdef UNINSTALLLIB_SHARED_SHARED
|
||||||
|
|
||||||
ReadRegDword $R0 HKLM Software\Microsoft\Windows\CurrentVersion\SharedDLLs $R1
|
ReadRegDword $R0 HKLM Software\Microsoft\Windows\CurrentVersion\SharedDLLs $R1
|
||||||
StrCmp $R0 "" uninstalllib.remove_${UNINSTALLLIB_UNIQUE}
|
StrCmp $R0 "" uninstalllib.shareddlldone_${UNINSTALLLIB_UNIQUE}
|
||||||
|
|
||||||
IntOp $R0 $R0 - 1
|
IntOp $R0 $R0 - 1
|
||||||
IntCmp $R0 0 uninstalllib.shareddllremove_${UNINSTALLLIB_UNIQUE} \
|
IntCmp $R0 0 uninstalllib.shareddllremove_${UNINSTALLLIB_UNIQUE} \
|
||||||
|
@ -530,20 +530,20 @@ Example:
|
||||||
uninstalllib.shareddllremove_${UNINSTALLLIB_UNIQUE}:
|
uninstalllib.shareddllremove_${UNINSTALLLIB_UNIQUE}:
|
||||||
DeleteRegValue HKLM Software\Microsoft\Windows\CurrentVersion\SharedDLLs $R1
|
DeleteRegValue HKLM Software\Microsoft\Windows\CurrentVersion\SharedDLLs $R1
|
||||||
!ifndef UNINSTALLLIB_SHARED_SHAREDNOREMOVE
|
!ifndef UNINSTALLLIB_SHARED_SHAREDNOREMOVE
|
||||||
Goto uninstalllib.remove_${UNINSTALLLIB_UNIQUE}
|
Goto uninstalllib.shareddlldone_${UNINSTALLLIB_UNIQUE}
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
uninstalllib.shareddllinuse_${UNINSTALLLIB_UNIQUE}:
|
uninstalllib.shareddllinuse_${UNINSTALLLIB_UNIQUE}:
|
||||||
WriteRegDWORD HKLM Software\Microsoft\Windows\CurrentVersion\SharedDLLs $R1 $R0
|
WriteRegDWORD HKLM Software\Microsoft\Windows\CurrentVersion\SharedDLLs $R1 $R0
|
||||||
Goto uninstalllib.done_${UNINSTALLLIB_UNIQUE}
|
Goto uninstalllib.done_${UNINSTALLLIB_UNIQUE}
|
||||||
|
|
||||||
|
uninstalllib.shareddlldone_${UNINSTALLLIB_UNIQUE}:
|
||||||
|
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
;------------------------
|
;------------------------
|
||||||
;Remove
|
;Remove
|
||||||
|
|
||||||
uninstalllib.remove_${UNINSTALLLIB_UNIQUE}:
|
|
||||||
|
|
||||||
!ifndef UNINSTALLLIB_UNINSTALL_NOREMOVE
|
!ifndef UNINSTALLLIB_UNINSTALL_NOREMOVE
|
||||||
|
|
||||||
;------------------------
|
;------------------------
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue