Ongoing updates...

2003-11-05 07:01:42 +00:00 · 2003-11-05 07:01:42 +00:00 · 4ab85ade8c
--- a/browser/installer/windows/config.it
+++ b/browser/installer/windows/config.it
@ -610,56 +610,56 @@ Description Short=Cross Platform COM
 ;*** LOCALIZE ME BABY ***
 Description Long=Cross Platform COM
 Archive=xpcom.xpi
-FileCount=$FileCount$
 $InstallSize$:xpcom
 $InstallSizeSystem$
 $InstallSizeArchive$:xpcom.xpi
 Attributes=SELECTED|INVISIBLE
+FileCount=$FileCount$

 [Component Browser]
 Description Short=$ProductName$ Browser
 ;*** LOCALIZE ME BABY ***
 Description Long=The $ProductName$ Browser
 Archive=browser.xpi
-FileCount=$FileCount$
 $InstallSize$:browser
 $InstallSizeSystem$
 $InstallSizeArchive$:browser.xpi
 Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE|MAIN_COMPONENT
 Force Upgrade File0=[SETUP PATH]\$MainExeFile$
+FileCount=$FileCount$

 [Component ABE]
 Description Short=Additional Browsing Enhancements
 ;*** LOCALIZE ME BABY ***
 Description Long=Additional tools including mouse-gesture navigation, a site navigation bar and other enhanced functionality. 
 Archive=abe.xpi
-FileCount=$FileCount$
 $InstallSize$:abe
 $InstallSizeArchive$:abe.xpi
 Attributes=SELECTED|VISIBLE
+FileCount=$FileCount$

 [Component ADT]
 Description Short=Developer Tools
 ;*** LOCALIZE ME BABY ***
 Description Long=Tools for web developers including an error console, the Document Inspector and a JavaScript Debugger. 
 Archive=adt.xpi
-FileCount=$FileCount$
 $InstallSize$:adt
 $InstallSizeArchive$:adt.xpi
 Attributes=FORCE_UPGRADE|VISIBLE
 Force Upgrade File0=[SETUP PATH]\chrome\venkman.jar
 Force Upgrade File1=[SETUP PATH]\chrome\inspector.jar
+FileCount=$FileCount$

 [Component Uninstaller]
 Description Short=$CompanyName$ Uninstaller
 ;*** LOCALIZE ME BABY ***
 Description Long=Uninstaller for $ProductName$
 Archive=$UninstallFileZip$
-FileCount=$FileCount$
 $InstallSize$:$UninstallFileZip$
 $InstallSizeSystem$
 $InstallSizeArchive$:$UninstallFileZip$
 Attributes=SELECTED|INVISIBLE|DOWNLOAD_ONLY
+FileCount=$FileCount$

 ;Since the uninstaller program is going to be installed into the Windows folder,
 ;Setup.exe needs to know to calculate the disk space required for the Windows folder.
@ -672,12 +672,12 @@ Description Short=US English Defaults
 ;*** LOCALIZE ME BABY ***
 Description Long=US English Default Profile Data
 Archive=deflenus.xpi
-FileCount=$FileCount$
 $InstallSize$:deflenus
 $InstallSizeSystem$
 $InstallSizeArchive$:deflenus.xpi
 Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE
 Force Upgrade File0=[SETUP PATH]\defaults\profile\bookmarks.html
+FileCount=$FileCount$

 [Component En US lang pack]
 ;*** LOCALIZE ME BABY ***
@ -685,12 +685,12 @@ Description Short=English (US) Language Pack
 ;*** LOCALIZE ME BABY ***
 Description Long=English (US) Language Pack
 Archive=langenus.xpi
-FileCount=$FileCount$
 $InstallSize$:langenus
 $InstallSizeSystem$
 $InstallSizeArchive$:langenus.xpi
 Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE
 Force Upgrade File0=[SETUP PATH]\chrome\en-US.jar
+FileCount=$FileCount$

 [Component US region pack]
 ;*** LOCALIZE ME BABY ***
@ -698,24 +698,24 @@ Description Short=US Region Pack
 ;*** LOCALIZE ME BABY ***
 Description Long=Regional content for US users
 Archive=regus.xpi
-FileCount=$FileCount$
 $InstallSize$:regus
 $InstallSizeSystem$
 $InstallSizeArchive$:regus.xpi
 Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE
 Force Upgrade File0=[SETUP PATH]\chrome\US.jar
+FileCount=$FileCount$

 [Component QFA]
 Description Short=Quality Feedback Agent
 ;*** LOCALIZE ME BABY ***
 Description Long=for reporting $ProductName$ crash information
 Archive=talkback.xpi
-FileCount=$FileCount$
 Install Size=870
 Install Size System=1
 Install Size Archive=248
 Attributes=SELECTED|FORCE_UPGRADE
 Force Upgrade File0=[SETUP PATH]\components\fullsoft.dll
+FileCount=$FileCount$

 ; This is to randomly set the default checkbox for this component.
 ; This particular value will set the checkbox checked [number]% of the time.
--- a/toolkit/mozapps/installer/windows/wizard/setup/dialogs.c
+++ b/toolkit/mozapps/installer/windows/wizard/setup/dialogs.c
@ -1524,9 +1524,9 @@ LRESULT CALLBACK DlgProcDownloading(HWND hDlg, UINT msg, WPARAM wParam, LONG lPa

 LRESULT CALLBACK DlgProcInstalling(HWND hDlg, UINT msg, WPARAM wParam, LONG lParam)
 {
-  HWND ctrl; 
  LPNMHDR notifyMessage;
  static BOOL initialized = FALSE; 
+  static int count = 0;
  
  switch(msg) {
  case WM_INITDIALOG:
@ -1536,13 +1536,10 @@ LRESULT CALLBACK DlgProcInstalling(HWND hDlg, UINT msg, WPARAM wParam, LONG lPar
    SetDlgItemText(hDlg, IDC_STATUS0, diInstalling.szStatusFile);
    SetDlgItemText(hDlg, IDC_STATUS3, diInstalling.szStatusComponent);

-    ctrl = GetDlgItem(hDlg, IDC_PROGRESS_FILE);
-    SendMessage(ctrl, PBM_SETRANGE, 0, 100); 
-    SendMessage(ctrl, PBM_SETSTEP, 1, 0); 
+    break;

-    ctrl = GetDlgItem(hDlg, IDC_PROGRESS_ARCHIVE);
-    SendMessage(ctrl, PBM_SETRANGE, 0, 100); 
-    SendMessage(ctrl, PBM_SETSTEP, 1, 0); 
+  case PBM_SETPOS:
+    ++count;

    break;

--- a/toolkit/mozapps/installer/windows/wizard/setup/extra.c
+++ b/toolkit/mozapps/installer/windows/wizard/setup/extra.c
@ -3147,15 +3147,9 @@ HRESULT ProcessXpinstallEngine()
  if(!IsInstallerProductGRE())
    rv = ProcessGre(&gGre);

-  if(*siCFXpcomFile.szMessage != '\0')
-    ShowMessage(siCFXpcomFile.szMessage, TRUE);
-
  if((WIZ_OK == rv) && (siCFXpcomFile.bStatus == STATUS_ENABLED))
    rv = ProcessXpcomFile();

-  if(*siCFXpcomFile.szMessage != '\0')
-    ShowMessage(siCFXpcomFile.szMessage, FALSE);
-
  return(rv);
 }

@ -5582,6 +5576,10 @@ void InitSiComponents(char *szFileIni)
        GetPrivateProfileString(szComponentSection, "Attributes", "", szBuf, sizeof(szBuf), szFileIni);
        siCTemp->dwAttributes = ParseComponentAttributes(szBuf, 0, FALSE);

+        /* get the component's file count */
+        GetPrivateProfileString(szComponentSection, "FileCount", "", szBuf, sizeof(szBuf), szFileIni);
+        siCTemp->iFileCount = atoi(szBuf);
+
        /* get the random percentage value and select or deselect the component (by default) for
         * installation */
        GetPrivateProfileString(szComponentSection, "Random Install Percentage", "", szBuf, sizeof(szBuf), szFileIni);
--- a/toolkit/mozapps/installer/windows/wizard/setup/xpi.c
+++ b/toolkit/mozapps/installer/windows/wizard/setup/xpi.c
@ -46,10 +46,8 @@ static SetDllPathProc   pfnSetDllPath = NULL;

 static long             lFileCounter;
 static long             lBarberCounter;
-static BOOL             bBarberBar;
-static DWORD            dwBarberDirection;
-static DWORD            dwCurrentArchive;
-static DWORD            dwTotalArchives;
+static DWORD            dwCurrentFile;
+static DWORD            dwTotalFiles;
 char                    szStrProcessingFile[MAX_BUF];
 char                    szStrCopyingFile[MAX_BUF];
 char                    szStrInstalling[MAX_BUF];
@ -147,19 +145,18 @@ HRESULT DeInitializeXPIStub()

 void GetTotalArchivesToInstall(void)
 {
-  DWORD     dwIndex0;
+  DWORD i = 0;
  siC *siCObject = NULL;

-  dwIndex0        = 0;
-  dwTotalArchives = 0;
-  siCObject = SiCNodeGetObject(dwIndex0, TRUE, AC_ALL);
-  while(siCObject)
-  {
-    if((siCObject->dwAttributes & SIC_SELECTED) && !(siCObject->dwAttributes & SIC_LAUNCHAPP))
-      ++dwTotalArchives;
+  dwTotalFiles = 0;
  
-    ++dwIndex0;
-    siCObject = SiCNodeGetObject(dwIndex0, TRUE, AC_ALL);
+  siCObject = SiCNodeGetObject(i, TRUE, AC_ALL);
+  while (siCObject) {
+    if ((siCObject->dwAttributes & SIC_SELECTED) && 
+        !(siCObject->dwAttributes & SIC_LAUNCHAPP))
+      dwTotalFiles += siCObject->iFileCount;
+
+    siCObject = SiCNodeGetObject(++i, TRUE, AC_ALL);
  }
 }

@ -193,9 +190,10 @@ char *GetErrorString(DWORD dwError, char *szErrorString, DWORD dwErrorStringSize

 HRESULT SmartUpdateJars(HWND aWizardPanel)
 {
-  DWORD     dwIndex0;
+  DWORD     i = 0;
  siC       *siCObject = NULL;
  HRESULT   hrResult;
+  HWND      ctrl;
  char      szBuf[MAX_BUF];
  char      szEXpiInstall[MAX_BUF];
  char      szArchive[MAX_BUF];
@ -256,13 +254,12 @@ HRESULT SmartUpdateJars(HWND aWizardPanel)

    GetTotalArchivesToInstall();

-    dwIndex0          = 0;
-    dwCurrentArchive  = 0;
-    dwTotalArchives   = (dwTotalArchives * 2) + 1;
-    bBarberBar        = FALSE;
-    siCObject         = SiCNodeGetObject(dwIndex0, TRUE, AC_ALL);
-    while(siCObject)
-    {
+    ctrl = GetDlgItem(dlgInfo.hWndDlg, IDC_PROGRESS_ARCHIVE);
+    SendMessage(ctrl, PBM_SETRANGE, 0, dwTotalFiles); 
+
+    dwCurrentFile = 0;
+    siCObject = SiCNodeGetObject(i, TRUE, AC_ALL);
+    while (siCObject) {
      if(siCObject->dwAttributes & SIC_SELECTED)
        /* Since the archive is selected, we need to process the file ops here */
         ProcessFileOps(T_PRE_ARCHIVE, siCObject->szReferenceName);
@ -274,7 +271,6 @@ HRESULT SmartUpdateJars(HWND aWizardPanel)
      {
        lFileCounter      = 0;
        lBarberCounter    = 0;
-        dwBarberDirection = BDIR_RIGHT;
 			  dlgInfo.nFileBars = 0;

        // We need to send this message otherwise the progress bars will paint
@ -308,14 +304,6 @@ HRESULT SmartUpdateJars(HWND aWizardPanel)
          }
        }

-        if(dwCurrentArchive == 0)
-        {
-          ++dwCurrentArchive;
-
-          UpdateArchiveInstallProgress((int)(((double)dwCurrentArchive/(double)dwTotalArchives)*(double)100));
-          UpdateGREInstallProgress((int)(((double)dwCurrentArchive/(double)dwTotalArchives)*(double)100));
-        }
-
        wsprintf(szBuf, szStrInstalling, siCObject->szDescriptionShort);
        SetDlgItemText(dlgInfo.hWndDlg, IDC_STATUS0, szBuf);
        LogISXPInstallComponent(siCObject->szDescriptionShort);
@ -356,11 +344,6 @@ HRESULT SmartUpdateJars(HWND aWizardPanel)
          break;
        }

-        ++dwCurrentArchive;
-        UpdateArchiveInstallProgress((int)(((double)(dwCurrentArchive)/(double)dwTotalArchives)*(double)100));
-        UpdateGREInstallProgress((int)(((double)(dwCurrentArchive)/(double)dwTotalArchives)*(double)100));
-
-        ProcessWindowsMessages();
        LogISXPInstallComponentResult(hrResult);

        if((hrResult != WIZ_OK) &&
@ -376,8 +359,7 @@ HRESULT SmartUpdateJars(HWND aWizardPanel)
        /* Since the archive is selected, we need to do the file ops here */
         ProcessFileOps(T_POST_ARCHIVE, siCObject->szReferenceName);

-      ++dwIndex0;
-      siCObject = SiCNodeGetObject(dwIndex0, TRUE, AC_ALL);
+      siCObject = SiCNodeGetObject(++i, TRUE, AC_ALL);
    } /* while(siCObject) */

    //report 100% progress status for successful installs
@ -385,10 +367,6 @@ HRESULT SmartUpdateJars(HWND aWizardPanel)
    LogMSXPInstallStatus(NULL, hrResult);
    pfnXpiExit();
  }
-  else
-  {
-    ShowMessage(szMsgSmartUpdateStart, FALSE);
-  }

  DeInitializeXPIStub();
  LogISXPInstall(W_END);
@ -405,17 +383,23 @@ void cbXPIProgress(const char* msg, PRInt32 val, PRInt32 max)
  char szFilename[MAX_BUF];
  char szStrProcessingFileBuf[MAX_BUF];
  char szStrCopyingFileBuf[MAX_BUF];
+  char szMsg[MAX_BUF];

  if(sgProduct.mode != SILENT)
  {
    ParsePath((char *)msg, szFilename, sizeof(szFilename), FALSE, PP_FILENAME_ONLY);
+    ParsePath((char *)msg, szMsg, sizeof(szMsg), FALSE, PP_ROOT_ONLY);

    dlgInfo.nFileBars = 0;
-    ++dwCurrentArchive;
-#if 0
-    UpdateArchiveInstallProgress((int)(((double)(dwCurrentArchive)/(double)dwTotalArchives)*(double)100));
-    UpdateGREInstallProgress((int)(((double)(dwCurrentArchive)/(double)dwTotalArchives)*(double)100));
-#endif
+    
+    // Holy jesus, I hate the motherfucking installer. 
+    if ((!strncmp(msg, "Installing: ", 12) ||
+         !strncmp(msg, "Replacing: ", 11)) 
+         && (max != 0 && val <= max))
+      ++dwCurrentFile;
+
+    UpdateArchiveInstallProgress((int)dwCurrentFile);
+    UpdateGREInstallProgress((int)dwCurrentFile);
  }

  ProcessWindowsMessages();
@ -432,9 +416,7 @@ static void UpdateArchiveInstallProgress(int aValue)
 {
  HWND progressBar;

-  if (sgProduct.mode != SILENT) {
-    progressBar = GetDlgItem(dlgInfo.hWndDlg, IDC_PROGRESS_ARCHIVE);
-    SendMessage(progressBar, PBM_SETPOS, aValue, 0);
-  }
+  if (sgProduct.mode != SILENT) 
+    SendMessage(dlgInfo.hWndDlg, PBM_SETPOS, aValue, 0);
 }