fixing bug 67067 - unable-to-create-directory dialog is titleless. r=curt, sr=dmose, a=asa

xpinstall/packager/win_gre/install.it

@@ -35,7 +35,8 @@ ACCEPT_=&Accept
 DECLINE_=&Decline
 PROGRAMFOLDER_=&Program Folder:
 EXISTINGFOLDERS_=E&xisting Folders:
-SETUPMESSAGE=Setup has finished copying files to your computer.  Before you can use the program, you must restart Windows or your computer. Choose one of the following options and click OK to finish setup.
+SETUPMESSAGE=Setup has finished copying files to your computer.  Before you can use $ProductNameInternal$, you must restart Windows or your computer. Choose one of the following options and click OK to finish setup.
+RESTART=Restart
 YESRESTART=Yes, I want to restart my computer now.
 NORESTART=No, I will restart my computer later.
 ADDITIONALCOMPONENTS_=&Additional Components:
@@ -77,6 +78,7 @@ DLG_DISK_SPACE_CHECK_TITLE=Disk space check
 DLG_DISK_SPACE_CHECK_CRUTIAL_MSG=Setup has detected insufficient disk space to continue with installation on %s for the path: %sRequired: %sAvailable: %sClick Retry if more disk space has been made available, or click Cancel to cancel Setup.
 DLG_DISK_SPACE_CHECK_MSG=Setup has detected insufficient disk space to continue with installation process on %s for the path: %sRequired: %sAvailable: %sClick OK to go back and choose a different destination path.
 ERROR_CREATE_DIRECTORY=Could not create folder: %sMake sure you have access to create the folder.
+ERROR_MESSAGE_TITLE=$ProductNameInternal$ Setup Error
 STR_FILE_NUMBER=File count:
 STR_FILENAME=Filename:
 MSG_SMARTUPDATE_START=Preparing Install, please wait...

xpinstall/packager/win_mfcembed/install.it

@@ -35,7 +35,8 @@ ACCEPT_=&Accept
 DECLINE_=&Decline
 PROGRAMFOLDER_=&Program Folder:
 EXISTINGFOLDERS_=E&xisting Folders:
-SETUPMESSAGE=Setup has finished copying files to your computer.  Before you can use the program, you must restart Windows or your computer. Choose one of the following options and click OK to finish setup.
+SETUPMESSAGE=Setup has finished copying files to your computer.  Before you can use $ProductNameInternal$, you must restart Windows or your computer. Choose one of the following options and click OK to finish setup.
+RESTART=Restart
 YESRESTART=Yes, I want to restart my computer now.
 NORESTART=No, I will restart my computer later.
 ADDITIONALCOMPONENTS_=&Additional Components:
@@ -77,6 +78,7 @@ DLG_DISK_SPACE_CHECK_TITLE=Disk space check
 DLG_DISK_SPACE_CHECK_CRUTIAL_MSG=Setup has detected insufficient disk space to continue with installation on %s for the path: %sRequired: %sAvailable: %sClick Retry if more disk space has been made available, or click Cancel to cancel Setup.
 DLG_DISK_SPACE_CHECK_MSG=Setup has detected insufficient disk space to continue with installation process on %s for the path: %sRequired: %sAvailable: %sClick OK to go back and choose a different destination path.
 ERROR_CREATE_DIRECTORY=Could not create folder: %sMake sure you have access to create the folder.
+ERROR_MESSAGE_TITLE=$ProductNameInternal$ Setup Error
 STR_FILE_NUMBER=File count:
 STR_FILENAME=Filename:
 MSG_SMARTUPDATE_START=Preparing Install, please wait...

xpinstall/packager/windows/install.it

@@ -35,7 +35,8 @@ ACCEPT_=&Accept
 DECLINE_=&Decline
 PROGRAMFOLDER_=&Program Folder:
 EXISTINGFOLDERS_=E&xisting Folders:
-SETUPMESSAGE=Setup has finished copying files to your computer.  Before you can use the program, you must restart Windows or your computer. Choose one of the following options and click OK to finish setup.
+SETUPMESSAGE=Setup has finished copying files to your computer.  Before you can use $ProductNameInternal$, you must restart Windows or your computer. Choose one of the following options and click OK to finish setup.
+RESTART=Restart
 YESRESTART=Yes, I want to restart my computer now.
 NORESTART=No, I will restart my computer later.
 ADDITIONALCOMPONENTS_=&Additional Components:
@@ -77,6 +78,7 @@ DLG_DISK_SPACE_CHECK_TITLE=Disk space check
 DLG_DISK_SPACE_CHECK_CRUTIAL_MSG=Setup has detected insufficient disk space to continue with installation on %s for the path: %sRequired: %sAvailable: %sClick Retry if more disk space has been made available, or click Cancel to cancel Setup.
 DLG_DISK_SPACE_CHECK_MSG=Setup has detected insufficient disk space to continue with installation process on %s for the path: %sRequired: %sAvailable: %sClick OK to go back and choose a different destination path.
 ERROR_CREATE_DIRECTORY=Could not create folder: %sMake sure you have access to create the folder.
+ERROR_MESSAGE_TITLE=$ProductNameInternal$ Setup Error
 STR_FILE_NUMBER=File count:
 STR_FILENAME=Filename:
 MSG_SMARTUPDATE_START=Preparing Install, please wait...

xpinstall/wizard/windows/setup/dialogs.c

@@ -490,6 +490,7 @@ LRESULT CALLBACK BrowseHookProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
               if(CreateDirectoriesAll(szBuf, ADD_TO_UNINSTALL_LOG) == FALSE)
               {
                 char szECreateDirectory[MAX_BUF];
+                char szEMessageTitle[MAX_BUF];
 
                 lstrcpy(szBufTemp, "\n\n");
                 lstrcat(szBufTemp, sgProduct.szPath);
@@ -499,7 +500,9 @@ LRESULT CALLBACK BrowseHookProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
                 if(GetPrivateProfileString("Messages", "ERROR_CREATE_DIRECTORY", "", szECreateDirectory, sizeof(szECreateDirectory), szFileIniInstall))
                   wsprintf(szBuf, szECreateDirectory, szBufTemp);
 
-                MessageBox(hDlg, szBuf, "", MB_OK | MB_ICONERROR);
+                GetPrivateProfileString("Messages", "ERROR_MESSAGE_TITLE", "", szEMessageTitle, sizeof(szEMessageTitle), szFileIniInstall);
+
+                MessageBox(hDlg, szBuf, szEMessageTitle, MB_OK | MB_ICONERROR);
                 break;
               }
 
@@ -858,6 +861,7 @@ LRESULT CALLBACK DlgProcSetupType(HWND hDlg, UINT msg, WPARAM wParam, LONG lPara
               if(CreateDirectoriesAll(szBuf, ADD_TO_UNINSTALL_LOG) == FALSE)
               {
                 char szECreateDirectory[MAX_BUF];
+                char szEMessageTitle[MAX_BUF];
 
                 lstrcpy(szBufTemp, "\n\n");
                 lstrcat(szBufTemp, sgProduct.szPath);
@@ -867,7 +871,9 @@ LRESULT CALLBACK DlgProcSetupType(HWND hDlg, UINT msg, WPARAM wParam, LONG lPara
                 if(GetPrivateProfileString("Messages", "ERROR_CREATE_DIRECTORY", "", szECreateDirectory, sizeof(szECreateDirectory), szFileIniInstall))
                   wsprintf(szBuf, szECreateDirectory, szBufTemp);
 
-                MessageBox(hDlg, szBuf, "", MB_OK | MB_ICONERROR);
+                GetPrivateProfileString("Messages", "ERROR_MESSAGE_TITLE", "", szEMessageTitle, sizeof(szEMessageTitle), szFileIniInstall);
+
+                MessageBox(hDlg, szBuf, szEMessageTitle, MB_OK | MB_ICONERROR);
                 break;
               }
 
@@ -2422,6 +2428,7 @@ LRESULT CALLBACK DlgProcReboot(HWND hDlg, UINT msg, WPARAM wParam, LONG lParam)
 
       RepositionWindow(hDlg, NO_BANNER_IMAGE);
 
+      SetWindowText(hDlg, sgInstallGui.szRestart);
       SetDlgItemText(hDlg, 202, sgInstallGui.szSetupMessage);
       SetDlgItemText(hDlg, IDC_RADIO_YES, sgInstallGui.szYesRestart);
       SetDlgItemText(hDlg, IDC_RADIO_NO, sgInstallGui.szNoRestart);

xpinstall/wizard/windows/setup/extra.c

@@ -6916,6 +6916,7 @@ HRESULT ParseInstallIni()
   GetPrivateProfileString("General", "PROGRAMFOLDER_", "", sgInstallGui.szProgramFolder_, sizeof(sgInstallGui.szProgramFolder_), szFileIniInstall);
   GetPrivateProfileString("General", "EXISTINGFOLDERS_", "", sgInstallGui.szExistingFolder_, sizeof(sgInstallGui.szExistingFolder_), szFileIniInstall);
   GetPrivateProfileString("General", "SETUPMESSAGE", "", sgInstallGui.szSetupMessage, sizeof(sgInstallGui.szSetupMessage), szFileIniInstall);
+  GetPrivateProfileString("General", "RESTART", "", sgInstallGui.szRestart, sizeof(sgInstallGui.szRestart), szFileIniInstall);
   GetPrivateProfileString("General", "YESRESTART", "", sgInstallGui.szYesRestart, sizeof(sgInstallGui.szYesRestart), szFileIniInstall);
   GetPrivateProfileString("General", "NORESTART", "", sgInstallGui.szNoRestart, sizeof(sgInstallGui.szNoRestart), szFileIniInstall);
   GetPrivateProfileString("General", "ADDITIONALCOMPONENTS_", "", sgInstallGui.szAdditionalComponents_, sizeof(sgInstallGui.szAdditionalComponents_), szFileIniInstall);

xpinstall/wizard/windows/setup/setup.h

@@ -570,6 +570,7 @@ typedef struct dlgInstall
     char szProgramFolder_[MAX_BUF];
     char szExistingFolder_[MAX_BUF];
     char szSetupMessage[MAX_BUF];
+    char szRestart[MAX_BUF];
     char szYesRestart[MAX_BUF];
     char szNoRestart[MAX_BUF];
     char szAdditionalComponents_[MAX_BUF];