Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29108
Modified Files:
Tag: b0_22_2
installer-SecPOPFile-body.nsh
Log Message:
On Vista targets the ARP entry is now stored in HKCU instead of HKLM.
Remove any matching HKLM entry to allow the UAC plugin to do its stuff.
Index: installer-SecPOPFile-body.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/installer-SecPOPFile-body.nsh,v
retrieving revision 1.3.2.12
retrieving revision 1.3.2.13
diff -C2 -d -r1.3.2.12 -r1.3.2.13
*** installer-SecPOPFile-body.nsh 10 Nov 2007 13:43:08 -0000 1.3.2.12
--- installer-SecPOPFile-body.nsh 13 Nov 2007 22:56:00 -0000 1.3.2.13
***************
*** 435,439 ****
SetShellVarContext current
! ; Create entry in the Control Panel's "Add/Remove Programs" list
ClearErrors
--- 435,442 ----
SetShellVarContext current
! ; Create an entry in the Control Panel's "Add/Remove Programs" list. The installer runs with
! ; admin rights so normally HKLM is used but on Vista HKCU is used in order to avoid problems
! ; with UAC (if HKLM is used then Vista elevates the uninstaller _before_ the UAC plugin gets
! ; a chance!)
ClearErrors
***************
*** 441,445 ****
IfErrors use_HKLM
StrCpy ${L_TEMP} ${L_RESULT} 1
! StrCmp ${L_TEMP} '6' create_arp_entry
use_HKLM:
--- 444,456 ----
IfErrors use_HKLM
StrCpy ${L_TEMP} ${L_RESULT} 1
! IntCmp ${L_TEMP} 5 use_HKLM use_HKLM
! ReadRegStr ${L_RESULT} HKLM \
! "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}" "UninstallString"
! StrCmp ${L_RESULT} "$G_ROOTDIR\uninstall.exe" delete_HKLM_entry
! StrCmp ${L_RESULT} '"$G_ROOTDIR\uninstall.exe" /UNINSTALL' 0 create_arp_entry
!
! delete_HKLM_entry:
! DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${C_PFI_PRODUCT}"
! Goto create_arp_entry
use_HKLM:
|
