mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fixing bug #51928 - Disk space check doesn't return you to dir selection dialog. 

and another fix that helps with fixing bugscape bug #2069 - Need appropriate strings for new UI dialogs.
r=sgehani.

affects only windows platforms.
This commit is contained in:
ssu%netscape.com 2000-09-13 05:35:13 +00:00
Родитель 8e94cbc664
Коммит 04153b91bd
4 изменённых файлов: 24 добавлений и 28 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
xpinstall/wizard/windows/setup/dialogs.c
Просмотреть файл

@ -1777,7 +1777,6 @@ LRESULT CALLBACK DlgProcDownloadOptions(HWND hDlg, UINT msg, WPARAM wParam, LONG
SetWindowText(hDlg, diDownloadOptions.szTitle); SetWindowText(hDlg, diDownloadOptions.szTitle);
SetDlgItemText(hDlg, IDC_MESSAGE0, diDownloadOptions.szMessage0); SetDlgItemText(hDlg, IDC_MESSAGE0, diDownloadOptions.szMessage0);
SetDlgItemText(hDlg, IDC_MESSAGE1, diDownloadOptions.szMessage1); SetDlgItemText(hDlg, IDC_MESSAGE1, diDownloadOptions.szMessage1);
SetDlgItemText(hDlg, IDC_MESSAGE2, diDownloadOptions.szMessage2);
GetSaveInstallerPath(szBuf, sizeof(szBuf)); GetSaveInstallerPath(szBuf, sizeof(szBuf));
SetDlgItemText(hDlg, IDC_EDIT_LOCAL_INSTALLER_PATH, szBuf); SetDlgItemText(hDlg, IDC_EDIT_LOCAL_INSTALLER_PATH, szBuf);
@ -2432,7 +2431,7 @@ void DlgSequenceNext()
if(hrValue == IDOK) if(hrValue == IDOK)
{ {
/* show previous visible window */ /* show previous visible window */
dwWizardState = DLG_ADVANCED_SETTINGS; dwWizardState = DLG_SELECT_COMPONENTS;
DlgSequencePrev(); DlgSequencePrev();
break; break;
} }

23
xpinstall/wizard/windows/setup/extra.c
Просмотреть файл

@ -1757,8 +1757,6 @@ HRESULT InitDlgDownloadOptions(diDO *diDialog)
return(1); return(1);
if((diDialog->szMessage1 = NS_GlobalAlloc(MAX_BUF)) == NULL) if((diDialog->szMessage1 = NS_GlobalAlloc(MAX_BUF)) == NULL)
return(1); return(1);
if((diDialog->szMessage2 = NS_GlobalAlloc(MAX_BUF)) == NULL)
return(1);
return(0); return(0);
} }
@ -1768,7 +1766,6 @@ void DeInitDlgDownloadOptions(diDO *diDialog)
FreeMemory(&(diDialog->szTitle)); FreeMemory(&(diDialog->szTitle));
FreeMemory(&(diDialog->szMessage0)); FreeMemory(&(diDialog->szMessage0));
FreeMemory(&(diDialog->szMessage1)); FreeMemory(&(diDialog->szMessage1));
FreeMemory(&(diDialog->szMessage2));
} }
HRESULT InitDlgAdvancedSettings(diAS *diDialog) HRESULT InitDlgAdvancedSettings(diAS *diDialog)
@ -2714,6 +2711,7 @@ ULONGLONG GetDiskSpaceAvailable(LPSTR szPath)
HRESULT ErrorMsgDiskSpace(ULONGLONG ullDSAvailable, ULONGLONG ullDSRequired, LPSTR szPath, BOOL bCrutialMsg) HRESULT ErrorMsgDiskSpace(ULONGLONG ullDSAvailable, ULONGLONG ullDSRequired, LPSTR szPath, BOOL bCrutialMsg)
{ {
char szBuf0[MAX_BUF];
char szBuf1[MAX_BUF]; char szBuf1[MAX_BUF];
char szBuf2[MAX_BUF]; char szBuf2[MAX_BUF];
char szBuf3[MAX_BUF]; char szBuf3[MAX_BUF];
@ -2736,19 +2734,21 @@ HRESULT ErrorMsgDiskSpace(ULONGLONG ullDSAvailable, ULONGLONG ullDSRequired, LPS
} }
else else
{ {
dwDlgType = MB_OKCANCEL; dwDlgType = MB_OK;
if(NS_LoadString(hSetupRscInst, IDS_DLG_DISK_SPACE_CHECK_MSG, szDlgDiskSpaceCheckMsg, MAX_BUF) != WIZ_OK) if(NS_LoadString(hSetupRscInst, IDS_DLG_DISK_SPACE_CHECK_MSG, szDlgDiskSpaceCheckMsg, MAX_BUF) != WIZ_OK)
exit(1); exit(1);
} }
ParsePath(szPath, szBufRootPath, sizeof(szBufRootPath), PP_ROOT_ONLY); ParsePath(szPath, szBufRootPath, sizeof(szBufRootPath), PP_ROOT_ONLY);
RemoveBackSlash(szBufRootPath); RemoveBackSlash(szBufRootPath);
lstrcpy(szBuf0, szPath);
RemoveBackSlash(szBuf0);
_ui64toa(ullDSAvailable, szDSAvailable, 10); _ui64toa(ullDSAvailable, szDSAvailable, 10);
_ui64toa(ullDSRequired, szDSRequired, 10); _ui64toa(ullDSRequired, szDSRequired, 10);
lstrcpy(szBuf1, "\n\n "); lstrcpy(szBuf1, "\n\n ");
lstrcat(szBuf1, szPath); lstrcat(szBuf1, szBuf0);
lstrcat(szBuf1, "\n\n "); lstrcat(szBuf1, "\n\n ");
lstrcpy(szBuf2, szDSRequired); lstrcpy(szBuf2, szDSRequired);
lstrcat(szBuf2, " K\n "); lstrcat(szBuf2, " K\n ");
@ -2841,18 +2841,18 @@ HRESULT InitComponentDiskSpaceInfo(dsN **dsnComponentDSRequirement)
if(siCObject->dwAttributes & SIC_SELECTED) if(siCObject->dwAttributes & SIC_SELECTED)
{ {
if(*(siCObject->szDestinationPath) == '\0') if(*(siCObject->szDestinationPath) == '\0')
ParsePath(sgProduct.szPath, szBuf, sizeof(szBuf), PP_ROOT_ONLY); lstrcpy(szBuf, sgProduct.szPath);
else else
ParsePath(siCObject->szDestinationPath, szBuf, sizeof(szBuf), PP_ROOT_ONLY); lstrcpy(szBuf, siCObject->szDestinationPath);
AppendBackSlash(szBuf, sizeof(szBuf)); AppendBackSlash(szBuf, sizeof(szBuf));
UpdatePathDiskSpaceRequired(szBuf, siCObject->ullInstallSize, dsnComponentDSRequirement); UpdatePathDiskSpaceRequired(szBuf, siCObject->ullInstallSize, dsnComponentDSRequirement);
if(*szBufSysPath != '\0') if(*szSysPath != '\0')
UpdatePathDiskSpaceRequired(szBufSysPath, siCObject->ullInstallSizeSystem, dsnComponentDSRequirement); UpdatePathDiskSpaceRequired(szSysPath, siCObject->ullInstallSizeSystem, dsnComponentDSRequirement);
if(*szBufTempPath != '\0') if(*szTempDir != '\0')
UpdatePathDiskSpaceRequired(szBufTempPath, siCObject->ullInstallSizeArchive, dsnComponentDSRequirement); UpdatePathDiskSpaceRequired(szTempDir, siCObject->ullInstallSizeArchive, dsnComponentDSRequirement);
} }
++dwIndex0; ++dwIndex0;
@ -4298,7 +4298,6 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
GetPrivateProfileString("Dialog Download Options", "Title", "", diDownloadOptions.szTitle, MAX_BUF, szFileIniConfig); GetPrivateProfileString("Dialog Download Options", "Title", "", diDownloadOptions.szTitle, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Download Options", "Message0", "", diDownloadOptions.szMessage0, MAX_BUF, szFileIniConfig); GetPrivateProfileString("Dialog Download Options", "Message0", "", diDownloadOptions.szMessage0, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Download Options", "Message1", "", diDownloadOptions.szMessage1, MAX_BUF, szFileIniConfig); GetPrivateProfileString("Dialog Download Options", "Message1", "", diDownloadOptions.szMessage1, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Download Options", "Message2", "", diDownloadOptions.szMessage2, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Download Options", "Save Installer", "", szBuf, MAX_BUF, szFileIniConfig); GetPrivateProfileString("Dialog Download Options", "Save Installer", "", szBuf, MAX_BUF, szFileIniConfig);
if(lstrcmpi(szBuf, "TRUE") == 0) if(lstrcmpi(szBuf, "TRUE") == 0)
diDownloadOptions.bSaveInstaller = TRUE; diDownloadOptions.bSaveInstaller = TRUE;

1
xpinstall/wizard/windows/setup/setup.h
Просмотреть файл

@ -243,7 +243,6 @@ typedef struct dlgDownloadOptions
LPSTR szTitle; LPSTR szTitle;
LPSTR szMessage0; LPSTR szMessage0;
LPSTR szMessage1; LPSTR szMessage1;
LPSTR szMessage2;
BOOL bSaveInstaller; BOOL bSaveInstaller;
} diDO; } diDO;

25
xpinstall/wizard/windows/setuprsc/setuprsc.rc
Просмотреть файл

@ -248,22 +248,22 @@ BEGIN
CONTROL "",IDC_GAUGE_ARCHIVE,"GaugeArchive",0x0,9,21,175,11 CONTROL "",IDC_GAUGE_ARCHIVE,"GaugeArchive",0x0,9,21,175,11
END END
DLG_ADVANCED_SETTINGS DIALOG DISCARDABLE 51, 56, 315, 205 DLG_ADVANCED_SETTINGS DIALOGEX 51, 56, 315, 205
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif"
BEGIN BEGIN
EDITTEXT IDC_EDIT_PROXY_SERVER,147,65,152,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_PROXY_SERVER,147,57,152,12,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_PROXY_PORT,147,82,152,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_PROXY_PORT,147,74,152,12,ES_AUTOHSCROLL
DEFPUSHBUTTON "&Ok",IDWIZNEXT,188,186,53,14 DEFPUSHBUTTON "&Ok",IDWIZNEXT,188,186,53,14
PUSHBUTTON "&Cancel",IDCANCEL,252,186,53,14 PUSHBUTTON "&Cancel",IDCANCEL,252,186,53,14
CONTROL 108,IDC_STATIC,"Static",SS_BITMAP,11,11,80,160, CONTROL 108,IDC_STATIC,"Static",SS_BITMAP,11,11,80,160,
WS_EX_CLIENTEDGE WS_EX_CLIENTEDGE
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,11,179,295,1, CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,11,179,295,1,
WS_EX_STATICEDGE WS_EX_STATICEDGE
RTEXT "Server:",IDC_STATIC,108,67,35,9 RTEXT "Server:",IDC_STATIC,108,59,35,9
RTEXT "Port:",IDC_STATIC,108,83,35,9 RTEXT "Port:",IDC_STATIC,108,75,35,9
GROUPBOX "Proxy Settings:",IDC_STATIC,101,52,206,51 GROUPBOX "Proxy Settings:",IDC_STATIC,101,44,206,51
LTEXT "",IDC_MESSAGE0,101,11,204,37,NOT WS_GROUP LTEXT "",IDC_MESSAGE0,101,11,204,29,NOT WS_GROUP
END END
DLG_SELECT_ADDITIONAL_COMPONENTS DIALOG DISCARDABLE 51, 56, 315, 205 DLG_SELECT_ADDITIONAL_COMPONENTS DIALOG DISCARDABLE 51, 56, 315, 205
@ -305,11 +305,11 @@ BEGIN
DEFPUSHBUTTON "&Back",IDWIZBACK,162,139,53,14 DEFPUSHBUTTON "&Back",IDWIZBACK,162,139,53,14
END END
DLG_DOWNLOAD_OPTIONS DIALOG DISCARDABLE 51, 56, 315, 205 DLG_DOWNLOAD_OPTIONS DIALOGEX 51, 56, 315, 205
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif"
BEGIN BEGIN
LTEXT "",IDC_MESSAGE2,101,91,204,33,NOT WS_GROUP LTEXT "",IDC_MESSAGE1,101,90,204,33,NOT WS_GROUP
CONTROL "Save installer files locally", CONTROL "Save installer files locally",
IDC_CHECK_SAVE_INSTALLER_FILES,"Button",BS_AUTOCHECKBOX | IDC_CHECK_SAVE_INSTALLER_FILES,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,101,127,204,9 WS_TABSTOP,101,127,204,9
@ -323,10 +323,9 @@ BEGIN
CONTROL 108,-1,"Static",SS_BITMAP,11,11,80,160,WS_EX_CLIENTEDGE CONTROL 108,-1,"Static",SS_BITMAP,11,11,80,160,WS_EX_CLIENTEDGE
CONTROL "",-1,"Static",SS_ETCHEDHORZ,11,179,295,1, CONTROL "",-1,"Static",SS_ETCHEDHORZ,11,179,295,1,
WS_EX_STATICEDGE WS_EX_STATICEDGE
COMBOBOX IDC_LIST_SITE_SELECTOR,101,66,206,124,CBS_DROPDOWNLIST | COMBOBOX IDC_LIST_SITE_SELECTOR,101,45,206,124,CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
LTEXT "",IDC_MESSAGE1,101,36,204,25,NOT WS_GROUP LTEXT "",IDC_MESSAGE0,101,15,204,25,NOT WS_GROUP
LTEXT "",IDC_MESSAGE0,101,11,204,16,NOT WS_GROUP
END END
@ -403,7 +402,7 @@ BEGIN
IDS_DLG_DISK_SPACE_CHECK_CRUTIAL_MSG IDS_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." "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."
IDS_DLG_DISK_SPACE_CHECK_MSG IDS_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, or click Cancel to cancel Setup." "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."
IDS_ERROR_CREATE_DIRECTORY IDS_ERROR_CREATE_DIRECTORY
"Could not create folder: %sMake sure you have access to create the folder." "Could not create folder: %sMake sure you have access to create the folder."
IDS_STR_FILE_NUMBER "File count:" IDS_STR_FILE_NUMBER "File count:"