Bug 1323325 - Find the correct updates directory to remove in 64-bit installers; r=rstrong
authorMatt Howell <mhowell@mozilla.com>
Tue, 13 Dec 2016 16:21:46 -0800
changeset 325878 48245c85b93541d02bc3c637dba1cf457322e086
parent 325834 79c7322f34ec0d577f280f0a7b13c26ff14d9e16
child 325879 07469b58a0853b2ff5c5b027c8d4747a142b4543
push idunknown
push userunknown
push dateunknown
reviewersrstrong
bugs1323325
milestone53.0a1
Bug 1323325 - Find the correct updates directory to remove in 64-bit installers; r=rstrong MozReview-Commit-ID: 14fPGOOYPRE
toolkit/mozapps/installer/windows/nsis/common.nsh
--- a/toolkit/mozapps/installer/windows/nsis/common.nsh
+++ b/toolkit/mozapps/installer/windows/nsis/common.nsh
@@ -3256,17 +3256,21 @@
       Push $R3
       Push $R2
       Push $R1
       Push $R0
 
       ${${_MOZFUNC_UN}GetLongPath} "$INSTDIR" $R6
       StrLen $R4 "$R6"
 
+!ifdef HAVE_64BIT_BUILD
+      ${${_MOZFUNC_UN}GetLongPath} "$PROGRAMFILES64" $R5
+!else
       ${${_MOZFUNC_UN}GetLongPath} "$PROGRAMFILES" $R5
+!endif
       StrLen $R3 "$R5"
 
       ${If} $R7 != "" ; _OLD_REL_PATH was passed
       ${AndIf} $R6 != "" ; We have the install dir path
       ${AndIf} $R5 != "" ; We the program files path
       ${AndIf} $R4 > $R3 ; The length of $INSTDIR > the length of $PROGRAMFILES
 
         ; Copy from the start of $INSTDIR the length of $PROGRAMFILES
@@ -7798,9 +7802,8 @@
 
   ; Convert from milliseconds to seconds
   System::Int64Op $0 / 1000
   Pop $0
 
   Pop $1
   Exch $0 ; return elapsed seconds
 !macroend
-