Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17646
Modified Files:
Tag: b0_22_2
installer-SecPOPFile-body.nsh
Log Message:
Change the way in which the uninstall information is stored in the
registry. This new approach makes it less likely that Vista will
prevent the UAC plugin from functioning properly when a 'standard'
account is used to launch the uninstaller to modify (or uninstall)
POPFile.
Index: installer-SecPOPFile-body.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/installer-SecPOPFile-body.nsh,v
retrieving revision 1.3.2.9
retrieving revision 1.3.2.10
diff -C2 -d -r1.3.2.9 -r1.3.2.10
*** installer-SecPOPFile-body.nsh 21 Sep 2007 01:18:53 -0000 1.3.2.9
--- installer-SecPOPFile-body.nsh 14 Oct 2007 17:20:33 -0000 1.3.2.10
***************
*** 468,494 ****
; Create entry in the Control Panel's "Add/Remove Programs" list
- StrCmp $G_WINUSERTYPE "Admin" use_HKLM
-
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
"DisplayName" "${C_PFI_PRODUCT} ${C_PFI_VERSION}"
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
! "UninstallString" "$G_ROOTDIR\uninstall.exe"
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
"InstallLocation" "$G_ROOTDIR"
WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
! "NoModify" "1"
WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
"NoRepair" "1"
- Goto end_section
! use_HKLM:
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
"DisplayName" "${C_PFI_PRODUCT} ${C_PFI_VERSION}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
! "UninstallString" "$G_ROOTDIR\uninstall.exe"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
"InstallLocation" "$G_ROOTDIR"
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
! "NoModify" "1"
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
"NoRepair" "1"
--- 468,500 ----
; Create entry in the Control Panel's "Add/Remove Programs" list
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
"DisplayName" "${C_PFI_PRODUCT} ${C_PFI_VERSION}"
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
! "UninstallString" '"$G_ROOTDIR\uninstall.exe" /UNINSTALL'
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
"InstallLocation" "$G_ROOTDIR"
WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
! "NoModify" "0"
! WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
! "ModifyPath" '"$G_ROOTDIR\uninstall.exe" /MODIFY'
! WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
! "NoElevateOnModify" "1"
WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
"NoRepair" "1"
! StrCmp $G_WINUSERTYPE "Admin" 0 end_section
!
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
"DisplayName" "${C_PFI_PRODUCT} ${C_PFI_VERSION}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
! "UninstallString" '"$G_ROOTDIR\uninstall.exe" /UNINSTALL'
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
"InstallLocation" "$G_ROOTDIR"
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
! "NoModify" "0"
! WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
! "ModifyPath" '"$G_ROOTDIR\uninstall.exe" /MODIFY'
! WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
! "NoElevateOnModify" "1"
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" \
"NoRepair" "1"
|
