wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Missed file from the checkin of Bug 368587 - avoid the second UAC prompt for helper.exe on software update by launching it directly from the elevated updater.exe process. r=bsmedberg, a=mconnor

Browse Source
This commit is contained in:
rob_strong@exchangecode.com 2007-07-31 11:51:58 -07:00
parent 7d387acfa1
commit 47b3d68a91
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
browser/installer/windows/nsis/uninstaller.nsi
View File

@ -62,9 +62,13 @@ Var TmpVal
!include WordFunc.nsh
!include MUI.nsh
!insertmacro FileJoin
!insertmacro GetOptions
!insertmacro GetParameters
!insertmacro LineFind
!insertmacro StrFilter
!insertmacro TextCompare
!insertmacro TrimNewLines
!insertmacro WordFind
!insertmacro WordReplace
@ -86,8 +90,10 @@ VIAddVersionKey "FileDescription" "${BrandShortName} Helper"
!insertmacro CleanVirtualStore
!insertmacro RegCleanMain
!insertmacro RegCleanUninstall
!insertmacro UpdateUninstallLog
!insertmacro WriteRegStr2
!insertmacro WriteRegDWORD2
!insertmacro un.RegCleanMain
!insertmacro un.RegCleanUninstall
!insertmacro un.CleanVirtualStore
@ -231,7 +237,7 @@ Section "Uninstall"
${If} ${FileExists} "$INSTDIR\uninstall\uninstall.log"
; Copy the uninstall log file to a temporary file
GetTempFileName $TmpVal
CopyFiles "$INSTDIR\uninstall\uninstall.log" "$TmpVal"
CopyFiles /SILENT /FILESONLY "$INSTDIR\uninstall\uninstall.log" "$TmpVal"
; Unregister DLL's
${un.LineFind} "$TmpVal" "/NUL" "1:-1" "un.UnRegDLLsCallback"
@ -478,7 +484,7 @@ Function .onInit
${If} ${FileExists} "$R3"
Delete "$INSTDIR\uninstall\*wizard*"
Delete "$INSTDIR\uninstall\uninstall.log"
CopyFiles /SILENT "$R3" "$INSTDIR\uninstall\"
CopyFiles /SILENT /FILESONLY "$R3" "$INSTDIR\uninstall\"
Push $R3
${GetParentDir}
Pop $R4
@ -486,6 +492,8 @@ Function .onInit
RmDir "$R4"
${EndIf}
${EndUnless}
${Else}
${UpdateUninstallLog}
${EndUnless}
StrCpy $R1 "true"
${EndUnless}