Bug 229706. Commit mkaply's fix for Windows installer's silent mode.

toolkit/mozapps/installer/windows/wizard/setup/dialogs.c

@@ -229,7 +229,45 @@ void InitSequence(HINSTANCE hInstance)
 #endif
 
   // Start the Wizard.
-  PropertySheet(&psh);
+  if (psh.nPages > 0) {
+    PropertySheet(&psh);
+  } else {
+    // Silent install
+
+    InstallFiles(NULL);
+
+    gbIgnoreRunAppX = TRUE;
+    // Apply settings and close. 
+    if (sgProduct.bInstallFiles)
+      UpdateJSProxyInfo();
+
+    /* POST_SMARTUPDATE process file manipulation functions */
+    ProcessFileOpsForAll(T_POST_SMARTUPDATE);
+
+    if (sgProduct.bInstallFiles) {
+      /* PRE_LAUNCHAPP process file manipulation functions */
+      ProcessFileOpsForAll(T_PRE_LAUNCHAPP);
+
+      LaunchApps();
+
+      // Refresh system icons if necessary
+      if (gSystemInfo.bRefreshIcons)
+        RefreshIcons();
+
+      UnsetSetupState(); // clear setup state
+      ClearWinRegUninstallFileDeletion();
+      if (!gbIgnoreProgramFolderX)
+        ProcessProgramFolderShowCmd();
+
+      CleanupArgsRegistry();
+      CleanupPreviousVersionRegKeys();
+
+      /* POST_LAUNCHAPP process file manipulation functions */
+      ProcessFileOpsForAll(T_POST_LAUNCHAPP);
+      /* DEPEND_REBOOT process file manipulation functions */
+      ProcessFileOpsForAll(T_DEPEND_REBOOT);
+    }
+  }
 
   DeleteObject(sgInstallGui.welcomeTitleFont);
 }

toolkit/mozapps/installer/windows/wizard/setup/extra.c

@@ -7696,6 +7696,7 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
       diWelcome.bShowDialog                     = FALSE;
       diLicense.bShowDialog                     = FALSE;
       diSetupType.bShowDialog                   = FALSE;
+      diSelectInstallPath.bShowDialog           = FALSE;
       diSelectComponents.bShowDialog            = FALSE;
       diSelectAdditionalComponents.bShowDialog  = FALSE;
       diWindowsIntegration.bShowDialog          = FALSE;
@@ -7705,9 +7706,17 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
       diAdvancedSettings.bShowDialog            = FALSE;
       diStartInstall.bShowDialog                = FALSE;
       diDownload.bShowDialog                    = FALSE;
+      diDownloading.bShowDialog                 = FALSE;
+      diInstallSuccessful.bShowDialog           = FALSE;
+      diInstallSuccessful.bLaunchAppChecked     = FALSE;
+      diInstallSuccessful.bResetHomepageChecked = FALSE;
       break;
   }
 
+  if (sgProduct.mode == SILENT)
+      diInstalling.bShowDialog                  = FALSE;
+  
+
   InitSiComponents(szFileIniConfig);
   InitSiteSelector(szFileIniConfig);
   InitErrorMessageStream(szFileIniConfig);