wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-07 16:28:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #1594 - restore UAC elevation in the uninstaller.

Browse source 
Effectively backs out BZ 1333789 which was uplifted to
Firefox before we forked for UXP.
Resolves #1594
This commit is contained in:
Moonchild 2020-06-14 21:43:38 +00:00 • committed by Roy Tam
commit 478eed8da0
1 changed files with 7 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

35
toolkit/mozapps/installer/windows/nsis/common.nsh
View file

@ -5151,6 +5151,9 @@
${GetParameters} $R8
; Require elevation if the user can elevate
${ElevateUAC}
${If} $R8 != ""
; Default install type
StrCpy $InstallType ${INSTALLTYPE_BASIC}
@ -5203,28 +5206,14 @@
FileClose $R5
Delete $R6
${If} ${Errors}
; Attempt to elevate and then try again.
${ElevateUAC}
GetTempFileName $R6 "$INSTDIR"
FileOpen $R5 "$R6" w
FileWrite $R5 "Write Access Test"
FileClose $R5
Delete $R6
${If} ${Errors}
; Nothing initialized so no need to call OnEndCommon
Quit
${EndIf}
; Nothing initialized so no need to call OnEndCommon
Quit
${EndIf}
${Else}
CreateDirectory "$INSTDIR"
${If} ${Errors}
; Attempt to elevate and then try again.
${ElevateUAC}
CreateDirectory "$INSTDIR"
${If} ${Errors}
; Nothing initialized so no need to call OnEndCommon
Quit
${EndIf}
; Nothing initialized so no need to call OnEndCommon
Quit
${EndIf}
${EndIf}
@ -5256,20 +5245,10 @@
${EndIf}
!endif
${EndIf}
${Else}
; If this isn't an INI install, we need to try to elevate now.
; We'll check the user's permission level later on to determine the
; default install path (which will be the real install path for /S).
; If an INI file is used, we try to elevate down that path when needed.
${ElevateUAC}
${EndUnless}
${EndIf}
ClearErrors
${IfNot} ${Silent}
${ElevateUAC}
${EndIf}
Pop $R5
Pop $R6
Pop $R7