Bug 1338583 - Disable 64-bit as default for new installs. r=rstrong, a=lizzard
authorMatt Howell <mhowell@mozilla.com>
Tue, 14 Feb 2017 13:06:48 -0800
changeset 359290 d63931f550626341049889b560f34461143a26ba
parent 359289 afb767a9810a31772c855dd84571f2c598e4a288
child 359291 43628ac1889b370b04f6776f3c32e7ad32af5b4d
push id10759
push userryanvm@gmail.com
push dateFri, 17 Feb 2017 21:13:52 +0000
treeherdermozilla-aurora@1f51ffd2298e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrstrong, lizzard
bugs1338583
milestone53.0a2
Bug 1338583 - Disable 64-bit as default for new installs. r=rstrong, a=lizzard MozReview-Commit-ID: 68BAL9XZbgG
browser/installer/windows/nsis/stub.nsi
--- a/browser/installer/windows/nsis/stub.nsi
+++ b/browser/installer/windows/nsis/stub.nsi
@@ -339,21 +339,22 @@ Function .onInit
 
   ; SSE2 CPU support
   ${If} "$R7" == "0"
     MessageBox MB_OKCANCEL|MB_ICONSTOP "$(WARN_MIN_SUPPORTED_CPU_MSG)" IDCANCEL +2
     ExecShell "open" "${URLSystemRequirements}"
     Quit
   ${EndIf}
 
-  ${If} ${RunningX64}
-    StrCpy $INSTDIR "${DefaultInstDir64bit}"
-  ${Else}
+  ; Bug 1338583: disable 64-bit as default until Flash issues are resolved
+  ;${If} ${RunningX64}
+  ;  StrCpy $INSTDIR "${DefaultInstDir64bit}"
+  ;${Else}
     StrCpy $INSTDIR "${DefaultInstDir32bit}"
-  ${EndIf}
+  ;${EndIf}
 
   ; Require elevation if the user can elevate
   ${ElevateUAC}
 
 ; The commands inside this ifndef are needed prior to NSIS 3.0a2 and can be
 ; removed after we require NSIS 3.0a2 or greater.
 !ifndef NSIS_PACKEDVERSION
   ${If} ${AtLeastWinVista}
@@ -456,21 +457,22 @@ Function .onInit
   StrCpy $CheckboxShortcuts "1"
   StrCpy $CheckboxSendPing "1"
 !ifdef MOZ_MAINTENANCE_SERVICE
   StrCpy $CheckboxInstallMaintSvc "1"
 !else
   StrCpy $CheckboxInstallMaintSvc "0"
 !endif
   StrCpy $WasOptionsButtonClicked "0"
-  ${If} ${RunningX64}
-    StrCpy $DroplistArch "$(VERSION_64BIT)"
-  ${Else}
+  ; Bug 1338583: disable 64-bit as default until Flash issues are resolved
+  ;${If} ${RunningX64}
+    ;StrCpy $DroplistArch "$(VERSION_64BIT)"
+  ;${Else}
     StrCpy $DroplistArch "$(VERSION_32BIT)"
-  ${EndIf}
+  ;${EndIf}
 
   StrCpy $0 ""
 !ifdef FONT_FILE1
   ${If} ${FileExists} "$FONTS\${FONT_FILE1}"
     StrCpy $0 "${FONT_NAME1}"
   ${EndIf}
 !endif
 
@@ -1158,17 +1160,18 @@ Function createOptions
     Pop $DroplistArch
     ${NSD_CB_AddString} $DroplistArch "$(VERSION_32BIT)"
     ${NSD_CB_AddString} $DroplistArch "$(VERSION_64BIT)"
     ${NSD_OnChange} $DroplistArch OnChange_DroplistArch
     ; The uxtheme must be disabled in order to override the system colors.
     System::Call 'uxtheme::SetWindowTheme(i $DroplistArch, w " ", w " ")'
     SetCtlColors $DroplistArch ${COMMON_TEXT_COLOR_NORMAL} ${COMMON_BKGRD_COLOR}
     SendMessage $DroplistArch ${WM_SETFONT} $FontNormal 0
-    ${NSD_CB_SelectString} $DroplistArch "$(VERSION_64BIT)"
+    ; Bug 1338583: disable 64-bit as default until Flash issues are resolved
+    ${NSD_CB_SelectString} $DroplistArch "$(VERSION_32BIT)"
   ${EndIf}
 
   GetDlgItem $0 $HWNDPARENT 1 ; Install button
   ${If} ${FileExists} "$INSTDIR\${FileMainEXE}"
     SendMessage $0 ${WM_SETTEXT} 0 "STR:$(UPGRADE_BUTTON)"
   ${Else}
     SendMessage $0 ${WM_SETTEXT} 0 "STR:$(INSTALL_BUTTON)"
   ${EndIf}