Issue #1594 - restore UAC elevation in the uninstaller.

Effectively backs out BZ 1333789 which was uplifted to
Firefox before we forked for UXP.
Resolves #1594

1 files changed, 7 insertions, 28 deletions

diff --git a/toolkit/mozapps/installer/windows/nsis/common.nsh b/toolkit/mozapps/installer/windows/nsis/common.nsh
index 57a25df9d..ed15a09f5 100755
--- a/toolkit/mozapps/installer/windows/nsis/common.nsh
+++ b/toolkit/mozapps/installer/windows/nsis/common.nsh
@@ -5120,6 +5120,9 @@
 
       ${GetParameters} $R8
 
+      ; Require elevation if the user can elevate
+      ${ElevateUAC}
+
       ${If} $R8 != ""
         ; Default install type
         StrCpy $InstallType ${INSTALLTYPE_BASIC}
@@ -5172,28 +5175,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}
 
@@ -5225,20 +5214,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