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

fixing bug 42904 - Windows install has localizable resources in binary files 

affects windows platforms only.

I'm checking in for yxia@netscape.com (Ying-Lin Xia)

r=ssu,dveditz
sr=mscott
This commit is contained in:
ssu%netscape.com 2001-05-03 21:47:18 +00:00
Родитель f83a422f16
Коммит 5b64d93535
19 изменённых файлов: 840 добавлений и 461 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
xpinstall/packager/windows/.cvsignore
Просмотреть файл

@ -22,3 +22,4 @@ talkback.js
talkback.template
regus.js
regus.template
install.ini

102
xpinstall/packager/windows/install.it Normal file
Просмотреть файл

@ -0,0 +1,102 @@
[General]
OK_=&OK
OK=OK
CANCEL=Cancel
CANCEL_=&Cancel
NEXT_=&Next >
BACK_=< &Back
PROXYSETTINGS=Proxy Settings:
PROXYSETTINGS_=&Proxy Settings
SERVER=Server:
PORT=Port:
USERID=User id:
PASSWORD=Password:
SELECTDIRECTORY=Select a directory
DIRECTORIES_=&Directories:
DRIVES_=Dri&ves:
STATUS=Status:
FILE=File:
URL=Url:
ACCEPT_=&Accept
NO_=&No
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.
YESRESTART=Yes, I want to restart my computer now.
NORESTART=No, I will restart my computer later.
ADDITIONALCOMPONENTS_=&Additional Components:
DESCRIPTION=Description
TOTALDOWNLOADSIZE=Total download size:
SPACEAVAILABLE=Space Available:
COMPONENTS_=C&omponents:
DESTINATIONDIRECTORY=Destination Directory
BROWSE_=B&rowse...
CURRENTSETTINGS=Current Settings:
INSTALL_=&Install
DELETE_=&Delete
README=Re&ad Me
EXTRACTING=Extracting...
[Messages]
ERROR_DIALOG_CREATE=Could not create %s dialog.
ERROR_FAILED=%s failed.
ERROR_FILE_NOT_FOUND=File not found: %s
ERROR_GET_SYSTEM_DIRECTORY_FAILED=GetSystemDirectory() failed.
ERROR_GET_WINDOWS_DIRECTORY_FAILED =GetWindowsDirectory() failed.
DLGQUITTITLE=Exit Setup
DLGQUITMSG=Setup is not complete. If you quit the Setup program now, the program will not be installed. You may run the Setup program at a later time to complete the installation. Are you sure you want to cancel Setup?
DLG_REBOOT_TITLE=Restarting Windows
ERROR_GETPROCADDRESS=GetProcAddress() of %s failed.
ERROR_WRITEPRIVATEPROFILESTRING=WritePrivateProfileString() failed for file %s
MSG_RETRIEVE_CONFIGINI=Please wait while Setup is attempting to retrieve Config.ini, required by Setup, from the Web...
ERROR_CREATE_TEMP_DIR=Setup was unable to create the TEMP directory: %s
DLGBROWSETITLE=Select a directory
ERROR_DETERMINING_DISK_SPACE=Could not determine available disk space for: %s
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.
STR_FILE_NUMBER=File count:
STR_FILENAME=Filename:
MSG_SMARTUPDATE_START=Preparing Install, please wait...
MSG_CONFIGURING=Configuring %s, please wait...
ERROR_XPI_INSTALL=Error occurred during installation
ERROR_SETUP_REQUIREMENT=Windows95 or greater Operating System is required! Exiting setup...
DLG_EXTRACTING_TITLE=Install Progress
STR_PROCESSINGFILE=Preparing file: %s
STR_INSTALLING=Currently installing %s
STR_COPYINGFILE=Copying file: %s
MB_WARNING_STR=Warning
MB_MESSAGE_STR=Message
MSG_CREATE_DIRECTORY=The following directory does not exist:%sWould you like to create it?
STR_CREATE_DIRECTORY=Create Directory?
ERROR_PROGRAM_FOLDER_NAME=Invalid Program folder name entered.
CB_DEFAULT=Default
ERROR_DESTINATION_PATH=Invalid path entered.
STR_SETUP_TYPE=Setup Type:
STR_SELECTED_COMPONENTS=Selected Components:
STR_DESTINATION_DIRECTORY=Destination Directory:
STR_PROGRAM_FOLDER=Program Folder:
STR_DELETING_DESTINATION_DIR=Deleting destination directory to be able to upgrade, please wait...
STR_SETUP=Setup
STR_DOWNLOAD_SITE=Download Site:
STR_SAVE_INSTALLER_FILES=Save downloaded and Setup program files to:
MSG_INIT_SETUP=Initializing Setup, please wait...
STR_MESSAGEBOX_TITLE=%s Setup
ERROR_GETVERSION=GetVersionEx() failed!
STATUS_EXTRACTING=Extracting %s
STATUS_LAUNCHING_SETUP=Launching Setup...
ERROR_FILE_WRITE=Unable to write file %s
TITLE=Installation
ERROR_OUT_OF_MEMORY=Out of memory!
ERROR_DLL_LOAD=Could not load %s
ERROR_STRING_LOAD=Could not load string resource ID %d
ERROR_STRING_NULL=Null pointer encountered.
ERROR_GLOBALALLOC=Memory allocation error.

14
xpinstall/packager/windows/makeall.pl
Просмотреть файл

@ -154,9 +154,13 @@ if(MakeConfigFile())
RemoveLocalTmpStage();
# Copy the setup files to the dist setup directory.
if(system("copy redirect.ini $inDistPath"))
if(system("copy install.ini $inDistPath"))
{
die "\n Error: copy redirect.ini $inDistPath\n";
die "\n Error: copy install.ini $inDistPath\n";
}
if(system("copy install.ini $inDistPath\\setup"))
{
die "\n Error: copy install.ini $inDistPath\\setup\n";
}
if(system("copy config.ini $inDistPath"))
{
@ -360,10 +364,10 @@ sub MakeConfigFile
return(1);
}
# Make redirect.ini file
if(system("perl makecfgini.pl redirect.it $inDefaultVersion $gLocalTmpStage $inDistPath\\xpi $inRedirIniURL $inXpiURL"))
# Make install.ini file
if(system("perl makecfgini.pl install.it $inDefaultVersion $gLocalTmpStage $inDistPath\\xpi $inRedirIniURL $inXpiURL"))
{
print "\n Error: perl makecfgini.pl redirect.it $inDefaultVersion $gLocalTmpStage $inDistPath\\xpi $inRedirIniURL $inXpiURL\n";
print "\n Error: perl makecfgini.pl install.it $inDefaultVersion $gLocalTmpStage $inDistPath\\xpi $inRedirIniURL $inXpiURL\n";
return(1);
}
return(0);

28
xpinstall/packager/windows/uninstall.it
Просмотреть файл

@ -62,6 +62,16 @@ Show Dialog=TRUE
Title=$ProductName$ Uninstaller
Message0=This will uninstall %s from your system. Click Uninstall to begin uninstallation.
Uninstall=&Uninstall
Cancel=&Cancel
Message1=Uninstall has detected that the following shared file is no longer used by any programs. If any programs still require the shared file and it is removed, those programs may no longer function. Are you sure you want to remove this shared file?
Message2=Leaving this file will not harm your system. If you are not sure, it is recommended that the shared file be not removed from the system.
FileName=File name:
No=&No
NoToAll=N&o to all
Yes=&Yes
YesToAll=Y&es to all
;[Check Instance0]
;Class Name=MozillaWindowClass
;Window Name=
@ -87,3 +97,21 @@ ftp=TRUE
http=TRUE
https=TRUE
[Messages]
ERROR_DLL_LOAD=Could not load %s
ERROR_STRING_LOAD=Could not load string resource ID %d
ERROR_STRING_NULL=Null pointer encountered.
ERROR_GLOBALALLOC=Memory allocation error.
ERROR_FAILED=%s failed.
ERROR_DIALOG_CREATE=Could not create %s dialog.
DLGQUITTITLE=Question
DLGQUITMSG=Are you sure you want to cancel?
ERROR_GET_SYSTEM_DIRECTORY_FAILED=GetSystemDirectory() failed.
ERROR_GET_WINDOWS_DIRECTORY_FAILED=GetWindowsDirectory() failed.
ERROR_CREATE_TEMP_DIR=Setup was unable to create the TEMP directory: %s
ERROR_SETUP_REQUIREMENT=Windows95 or greater Operating System is required! Exiting setup...
MB_WARNING_STR=Warning
ERROR_UNINSTALL_LOG_FOLDER=Uninstall log folder not found:%s
MB_MESSAGE_STR=Message
DLG_REMOVE_FILE_TITLE=Remove File?

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

@ -46,9 +46,9 @@ BOOL AskCancelDlg(HWND hDlg)
if((sgProduct.dwMode != SILENT) && (sgProduct.dwMode != AUTO))
{
if(NS_LoadString(hSetupRscInst, IDS_DLGQUITTITLE, szDlgQuitTitle, MAX_BUF) != WIZ_OK)
if(!GetPrivateProfileString("Messages", "DLGQUITTITLE", "", szDlgQuitTitle, sizeof(szDlgQuitTitle), szFileIniInstall))
PostQuitMessage(1);
else if(NS_LoadString(hSetupRscInst, IDS_DLGQUITMSG, szDlgQuitMsg, MAX_BUF) != WIZ_OK)
else if(!GetPrivateProfileString("Messages", "DLGQUITMSG", "", szDlgQuitMsg, sizeof(szDlgQuitMsg), szFileIniInstall))
PostQuitMessage(1);
else if(MessageBox(hDlg, szDlgQuitMsg, szDlgQuitTitle, MB_YESNO | MB_ICONQUESTION | MB_DEFBUTTON2 | MB_APPLMODAL | MB_SETFOREGROUND) == IDYES)
{
@ -104,6 +104,13 @@ LRESULT CALLBACK DlgProcWelcome(HWND hDlg, UINT msg, WPARAM wParam, LONG lParam)
0,
SWP_NOSIZE);
SetDlgItemText(hDlg, IDWIZNEXT, sgInstallGui.szNext_);
SetDlgItemText(hDlg, IDCANCEL, sgInstallGui.szCancel_);
SendDlgItemMessage (hDlg, IDC_STATIC0, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_STATIC1, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_STATIC2, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDWIZNEXT, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDCANCEL, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
break;
case WM_COMMAND:
@ -175,6 +182,15 @@ LRESULT CALLBACK DlgProcLicense(HWND hDlg, UINT msg, WPARAM wParam, LONG lParam)
0,
SWP_NOSIZE);
SetDlgItemText(hDlg, IDWIZBACK, sgInstallGui.szBack_);
SetDlgItemText(hDlg, IDWIZNEXT, sgInstallGui.szAccept_);
SetDlgItemText(hDlg, IDCANCEL, sgInstallGui.szNo_);
SendDlgItemMessage (hDlg, IDC_MESSAGE0, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_MESSAGE1, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_EDIT_LICENSE, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDWIZBACK, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDWIZNEXT, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDCANCEL, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
break;
case WM_COMMAND:
@ -241,6 +257,20 @@ LRESULT CALLBACK BrowseHookProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
OldListBoxWndProc = SubclassWindow(hwndLBFolders, (WNDPROC)ListBoxBrowseWndProc);
gdwIndexLastSelected = SendDlgItemMessage(hDlg, 1121, LB_GETCURSEL, 0, (LPARAM)0);
SetWindowText(hDlg, sgInstallGui.szSelectDirectory);
SetDlgItemText(hDlg, 1092, sgInstallGui.szDirectories_);
SetDlgItemText(hDlg, 1091, sgInstallGui.szDrives_);
SetDlgItemText(hDlg, 1, sgInstallGui.szOk);
SetDlgItemText(hDlg, IDCANCEL, sgInstallGui.szCancel);
SendDlgItemMessage (hDlg, DLG_BROWSE_DIR, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, 1092, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, 1091, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, 1, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDCANCEL, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_EDIT_DESTINATION, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, 1121, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, 1137, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
break;
case WM_COMMAND:
@ -284,7 +314,7 @@ LRESULT CALLBACK BrowseHookProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
{
char szEDestinationPath[MAX_BUF];
NS_LoadString(hSetupRscInst, IDS_ERROR_DESTINATION_PATH, szEDestinationPath, MAX_BUF);
GetPrivateProfileString("Messages", "ERROR_DESTINATION_PATH", "", szEDestinationPath, sizeof(szEDestinationPath), szFileIniInstall);
MessageBox(hDlg, szEDestinationPath, NULL, MB_OK | MB_ICONEXCLAMATION);
break;
}
@ -297,8 +327,8 @@ LRESULT CALLBACK BrowseHookProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
char szBufTemp[MAX_BUF];
char szBufTemp2[MAX_BUF];
NS_LoadString(hSetupRscInst, IDS_STR_CREATE_DIRECTORY, szStrCreateDirectory, MAX_BUF);
if(NS_LoadString(hSetupRscInst, IDS_MSG_CREATE_DIRECTORY, szMsgCreateDirectory, MAX_BUF) == WIZ_OK)
GetPrivateProfileString("Messages", "STR_CREATE_DIRECTORY", "", szStrCreateDirectory, sizeof(szStrCreateDirectory), szFileIniInstall);
if(GetPrivateProfileString("Messages", "MSG_CREATE_DIRECTORY", "", szMsgCreateDirectory, sizeof(szMsgCreateDirectory), szFileIniInstall))
{
lstrcpy(szBufTemp, "\n\n");
lstrcat(szBufTemp, szBuf);
@ -320,7 +350,7 @@ LRESULT CALLBACK BrowseHookProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
RemoveBackSlash(szBufTemp);
lstrcat(szBufTemp, "\n\n");
if(NS_LoadString(hSetupRscInst, IDS_ERROR_CREATE_DIRECTORY, szECreateDirectory, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "ERROR_CREATE_DIRECTORY", "", szECreateDirectory, sizeof(szECreateDirectory), szFileIniInstall))
wsprintf(szBuf, szECreateDirectory, szBufTemp);
MessageBox(hDlg, szBuf, "", MB_OK | MB_ICONERROR);
@ -371,7 +401,7 @@ BOOL BrowseForDirectory(HWND hDlg, char *szCurrDir)
GetCurrentDirectory(MAX_BUF, szCDir);
ZeroMemory(szDlgBrowseTitle, sizeof(szDlgBrowseTitle));
NS_LoadString(hSetupRscInst, IDS_DLGBROWSETITLE, szDlgBrowseTitle, MAX_BUF);
GetPrivateProfileString("Messages", "DLGBROWSETITLE", "", szDlgBrowseTitle, sizeof(szDlgBrowseTitle), szFileIniInstall);
lstrcpy(szSearchPathBuf, szCurrDir);
if((*szSearchPathBuf != '\0') && ((lstrlen(szSearchPathBuf) != 1) || (*szSearchPathBuf != '\\')))
@ -601,6 +631,29 @@ LRESULT CALLBACK DlgProcSetupType(HWND hDlg, UINT msg, WPARAM wParam, LONG lPara
else
ShowWindow(hReadme, SW_SHOW);
SetDlgItemText(hDlg, IDC_STATIC, sgInstallGui.szDestinationDirectory);
SetDlgItemText(hDlg, IDC_BUTTON_BROWSE, sgInstallGui.szBrowse_);
SetDlgItemText(hDlg, IDWIZBACK, sgInstallGui.szBack_);
SetDlgItemText(hDlg, IDWIZNEXT, sgInstallGui.szNext_);
SetDlgItemText(hDlg, IDCANCEL, sgInstallGui.szCancel_);
SetDlgItemText(hDlg, IDC_README, sgInstallGui.szReadme_);
SendDlgItemMessage (hDlg, IDC_STATIC_MSG0, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_RADIO_ST0, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_RADIO_ST1, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_RADIO_ST2, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_RADIO_ST3, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_STATIC_ST0_DESCRIPTION, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_STATIC_ST1_DESCRIPTION, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_STATIC_ST2_DESCRIPTION, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_STATIC_ST3_DESCRIPTION, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_STATIC, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_EDIT_DESTINATION, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_BUTTON_BROWSE, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDWIZBACK, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDWIZNEXT, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDCANCEL, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_README, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
if(sgProduct.bLockPath)
EnableWindow(GetDlgItem(hDlg, IDC_BUTTON_BROWSE), FALSE);
else
@ -648,8 +701,8 @@ LRESULT CALLBACK DlgProcSetupType(HWND hDlg, UINT msg, WPARAM wParam, LONG lPara
char szMsgCreateDirectory[MAX_BUF];
char szStrCreateDirectory[MAX_BUF];
NS_LoadString(hSetupRscInst, IDS_STR_CREATE_DIRECTORY, szStrCreateDirectory, MAX_BUF);
if(NS_LoadString(hSetupRscInst, IDS_MSG_CREATE_DIRECTORY, szMsgCreateDirectory, MAX_BUF) == WIZ_OK)
GetPrivateProfileString("Messages", "STR_CREATE_DIRECTORY", "", szStrCreateDirectory, sizeof(szStrCreateDirectory), szFileIniInstall);
if(GetPrivateProfileString("Messages", "MSG_CREATE_DIRECTORY", "", szMsgCreateDirectory, sizeof(szMsgCreateDirectory), szFileIniInstall))
{
lstrcpy(szBufTemp, "\n\n");
lstrcat(szBufTemp, szBuf);
@ -671,7 +724,7 @@ LRESULT CALLBACK DlgProcSetupType(HWND hDlg, UINT msg, WPARAM wParam, LONG lPara
RemoveBackSlash(szBufTemp);
lstrcat(szBufTemp, "\n\n");
if(NS_LoadString(hSetupRscInst, IDS_ERROR_CREATE_DIRECTORY, szECreateDirectory, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "ERROR_CREATE_DIRECTORY", "", szECreateDirectory, sizeof(szECreateDirectory), szFileIniInstall))
wsprintf(szBuf, szECreateDirectory, szBufTemp);
MessageBox(hDlg, szBuf, "", MB_OK | MB_ICONERROR);
@ -989,6 +1042,26 @@ LRESULT CALLBACK DlgProcSelectComponents(HWND hDlg, UINT msg, WPARAM wParam, LON
lstrcat(szBuf, " KB");
SetDlgItemText(hDlg, IDC_SPACE_AVAILABLE, szBuf);
SetDlgItemText(hDlg, IDC_STATIC1, sgInstallGui.szComponents_);
SetDlgItemText(hDlg, IDC_STATIC2, sgInstallGui.szDescription);
SetDlgItemText(hDlg, IDC_STATIC3, sgInstallGui.szTotalDownloadSize);
SetDlgItemText(hDlg, IDC_STATIC4, sgInstallGui.szSpaceAvailable);
SetDlgItemText(hDlg, IDWIZBACK, sgInstallGui.szBack_);
SetDlgItemText(hDlg, IDWIZNEXT, sgInstallGui.szNext_);
SetDlgItemText(hDlg, IDCANCEL, sgInstallGui.szCancel_);
SendDlgItemMessage (hDlg, IDC_STATIC1, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_STATIC2, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_STATIC3, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_STATIC4, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDWIZBACK, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDWIZNEXT, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDCANCEL, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_MESSAGE0, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_LIST_COMPONENTS, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_STATIC_DESCRIPTION, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_DOWNLOAD_SIZE, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_SPACE_AVAILABLE, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
gdwACFlag = AC_COMPONENTS;
OldListBoxWndProc = SubclassWindow(hwndLBComponents, (WNDPROC)NewListBoxWndProc);
break;
@ -1173,6 +1246,26 @@ LRESULT CALLBACK DlgProcSelectAdditionalComponents(HWND hDlg, UINT msg, WPARAM w
lstrcat(szBuf, " KB");
SetDlgItemText(hDlg, IDC_SPACE_AVAILABLE, szBuf);
SetDlgItemText(hDlg, IDC_STATIC1, sgInstallGui.szAdditionalComponents_);
SetDlgItemText(hDlg, IDC_STATIC2, sgInstallGui.szDescription);
SetDlgItemText(hDlg, IDC_STATIC3, sgInstallGui.szTotalDownloadSize);
SetDlgItemText(hDlg, IDC_STATIC4, sgInstallGui.szSpaceAvailable);
SetDlgItemText(hDlg, IDWIZBACK, sgInstallGui.szBack_);
SetDlgItemText(hDlg, IDWIZNEXT, sgInstallGui.szNext_);
SetDlgItemText(hDlg, IDCANCEL, sgInstallGui.szCancel_);
SendDlgItemMessage (hDlg, IDC_STATIC1, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_STATIC2, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_STATIC3, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_STATIC4, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDWIZBACK, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDWIZNEXT, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDCANCEL, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_MESSAGE0, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_LIST_COMPONENTS, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_STATIC_DESCRIPTION, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_DOWNLOAD_SIZE, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_SPACE_AVAILABLE, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
gdwACFlag = AC_ADDITIONAL_COMPONENTS;
OldListBoxWndProc = SubclassWindow(hwndLBComponents, (WNDPROC)NewListBoxWndProc);
break;
@ -1359,6 +1452,18 @@ LRESULT CALLBACK DlgProcWindowsIntegration(HWND hDlg, UINT msg, WPARAM wParam, L
0,
SWP_NOSIZE);
SetDlgItemText(hDlg, IDWIZBACK, sgInstallGui.szBack_);
SetDlgItemText(hDlg, IDWIZNEXT, sgInstallGui.szNext_);
SetDlgItemText(hDlg, IDCANCEL, sgInstallGui.szCancel_);
SendDlgItemMessage (hDlg, IDWIZBACK, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDWIZNEXT, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDCANCEL, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_MESSAGE0, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_CHECK0, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_CHECK1, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_CHECK2, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_CHECK3, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_MESSAGE1, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
break;
case WM_COMMAND:
@ -1467,6 +1572,19 @@ LRESULT CALLBACK DlgProcProgramFolder(HWND hDlg, UINT msg, WPARAM wParam, LONG l
0,
SWP_NOSIZE);
SetDlgItemText(hDlg, IDC_STATIC1, sgInstallGui.szProgramFolder_);
SetDlgItemText(hDlg, IDC_STATIC2, sgInstallGui.szExistingFolder_);
SetDlgItemText(hDlg, IDWIZBACK, sgInstallGui.szBack_);
SetDlgItemText(hDlg, IDWIZNEXT, sgInstallGui.szNext_);
SetDlgItemText(hDlg, IDCANCEL, sgInstallGui.szCancel_);
SendDlgItemMessage (hDlg, IDC_STATIC1, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_STATIC2, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDWIZBACK, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDWIZNEXT, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDCANCEL, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_MESSAGE0, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_EDIT_PROGRAM_FOLDER, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_LIST, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
break;
case WM_COMMAND:
@ -1478,7 +1596,7 @@ LRESULT CALLBACK DlgProcProgramFolder(HWND hDlg, UINT msg, WPARAM wParam, LONG l
{
char szEProgramFolderName[MAX_BUF];
NS_LoadString(hSetupRscInst, IDS_ERROR_PROGRAM_FOLDER_NAME, szEProgramFolderName, MAX_BUF);
GetPrivateProfileString("Messages", "ERROR_PROGRAM_FOLDER_NAME", "", szEProgramFolderName, sizeof(szEProgramFolderName), szFileIniInstall);
MessageBox(hDlg, szEProgramFolderName, NULL, MB_OK | MB_ICONEXCLAMATION);
break;
}
@ -1538,6 +1656,25 @@ LRESULT CALLBACK DlgProcAdvancedSettings(HWND hDlg, UINT msg, WPARAM wParam, LON
0,
SWP_NOSIZE);
SetDlgItemText(hDlg, IDC_STATIC, sgInstallGui.szProxySettings);
SetDlgItemText(hDlg, IDC_STATIC1, sgInstallGui.szServer);
SetDlgItemText(hDlg, IDC_STATIC2, sgInstallGui.szPort);
SetDlgItemText(hDlg, IDC_STATIC3, sgInstallGui.szUserId);
SetDlgItemText(hDlg, IDC_STATIC4, sgInstallGui.szPassword);
SetDlgItemText(hDlg, IDWIZNEXT, sgInstallGui.szOk_);
SetDlgItemText(hDlg, IDCANCEL, sgInstallGui.szCancel_);
SendDlgItemMessage (hDlg, IDC_STATIC, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_STATIC1, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_STATIC2, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_STATIC3, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_STATIC4, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDWIZNEXT, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDCANCEL, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_MESSAGE0, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_EDIT_PROXY_SERVER, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_EDIT_PROXY_PORT, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_EDIT_PROXY_USER, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_EDIT_PROXY_PASSWD, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
break;
case WM_COMMAND:
@ -1620,6 +1757,22 @@ LRESULT CALLBACK DlgProcDownloadOptions(HWND hDlg, UINT msg, WPARAM wParam, LONG
GetSaveInstallerPath(szBuf, sizeof(szBuf));
SetDlgItemText(hDlg, IDC_EDIT_LOCAL_INSTALLER_PATH, szBuf);
SetDlgItemText(hDlg, IDC_BUTTON_PROXY_SETTINGS, sgInstallGui.szProxySettings_);
SetDlgItemText(hDlg, IDWIZBACK, sgInstallGui.szBack_);
SetDlgItemText(hDlg, IDWIZNEXT, sgInstallGui.szNext_);
SetDlgItemText(hDlg, IDCANCEL, sgInstallGui.szCancel_);
SendDlgItemMessage (hDlg, IDC_BUTTON_PROXY_SETTINGS, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDWIZBACK, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDWIZNEXT, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDCANCEL, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_MESSAGE0, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_LIST_SITE_SELECTOR, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_MESSAGE1, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_CHECK_SAVE_INSTALLER_FILES, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_EDIT_LOCAL_INSTALLER_PATH, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_USE_FTP, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_USE_HTTP, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
if(GetClientRect(hDlg, &rDlg))
SetWindowPos(hDlg,
HWND_TOP,
@ -1641,7 +1794,7 @@ LRESULT CALLBACK DlgProcDownloadOptions(HWND hDlg, UINT msg, WPARAM wParam, LONG
if((szSiteSelectorDescription == NULL) || (*szSiteSelectorDescription == '\0'))
{
if((NS_LoadString(hSetupRscInst, IDS_CB_DEFAULT, szCBDefault, MAX_BUF) == WIZ_OK) &&
if(GetPrivateProfileString("Messages", "CB_DEFAULT", "", szCBDefault, sizeof(szCBDefault), szFileIniInstall) &&
((iIndex = SendMessage(hwndCBSiteSelector, CB_SELECTSTRING, -1, (LPARAM)szCBDefault)) != CB_ERR))
SendMessage(hwndCBSiteSelector, CB_SETCURSEL, (WPARAM)iIndex, 0);
else
@ -1756,7 +1909,7 @@ LPSTR GetStartInstallMessage()
dwBufSize = 0;
/* setup type */
if(NS_LoadString(hSetupRscInst, IDS_STR_SETUP_TYPE, szBuf, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "STR_SETUP_TYPE", "", szBuf, sizeof(szBuf), szFileIniInstall))
dwBufSize += lstrlen(szBuf) + 2; // the extra 2 bytes is for the \r\n characters
dwBufSize += 4; // take into account 4 indentation spaces
@ -1781,7 +1934,7 @@ LPSTR GetStartInstallMessage()
dwBufSize += 2; // the extra 2 bytes is for the \r\n characters
/* selected components */
if(NS_LoadString(hSetupRscInst, IDS_STR_SELECTED_COMPONENTS, szBuf, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "STR_SELECTED_COMPONENTS", "", szBuf, sizeof(szBuf), szFileIniInstall))
dwBufSize += lstrlen(szBuf) + 2; // the extra 2 bytes is for the \r\n characters
dwIndex0 = 0;
@ -1813,7 +1966,7 @@ LPSTR GetStartInstallMessage()
dwBufSize += 2; // the extra 2 bytes is for the \r\n characters
/* destination path */
if(NS_LoadString(hSetupRscInst, IDS_STR_DESTINATION_DIRECTORY, szBuf, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "STR_DESTINATION_DIRECTORY", "", szBuf, sizeof(szBuf), szFileIniInstall))
dwBufSize += lstrlen(szBuf) + 2; // the extra 2 bytes is for the \r\n characters
dwBufSize += 4; // take into account 4 indentation spaces
@ -1821,7 +1974,7 @@ LPSTR GetStartInstallMessage()
dwBufSize += 2; // the extra 2 bytes is for the \r\n characters
/* program folder */
if(NS_LoadString(hSetupRscInst, IDS_STR_PROGRAM_FOLDER, szBuf, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "STR_PROGRAM_FOLDER", "", szBuf, sizeof(szBuf), szFileIniInstall))
dwBufSize += lstrlen(szBuf) + 2; // the extra 2 bytes is for the \r\n characters
dwBufSize += 4; // take into account 4 indentation spaces
@ -1832,7 +1985,7 @@ LPSTR GetStartInstallMessage()
dwBufSize += 2; // the extra 2 bytes is for the \r\n characters
/* site selector info */
if(NS_LoadString(hSetupRscInst, IDS_STR_DOWNLOAD_SITE, szBuf, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "STR_DOWNLOAD_SITE", "", szBuf, sizeof(szBuf), szFileIniInstall))
dwBufSize += lstrlen(szBuf) + 2; // the extra 2 bytes is for the \r\n characters
dwBufSize += 4; // take into account 4 indentation spaces
@ -1843,7 +1996,7 @@ LPSTR GetStartInstallMessage()
dwBufSize += 2; // the extra 2 bytes is for the \r\n characters
/* site selector info */
if(NS_LoadString(hSetupRscInst, IDS_STR_SAVE_INSTALLER_FILES, szBuf, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "STR_SAVE_INSTALLER_FILES", "", szBuf, sizeof(szBuf), szFileIniInstall))
dwBufSize += lstrlen(szBuf) + 2; // the extra 2 bytes is for the \r\n characters
GetSaveInstallerPath(szBuf, sizeof(szBuf));
@ -1865,7 +2018,7 @@ LPSTR GetStartInstallMessage()
ZeroMemory(szMessageBuf, dwBufSize);
/* Setup Type */
if(NS_LoadString(hSetupRscInst, IDS_STR_SETUP_TYPE, szBuf, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "STR_SETUP_TYPE", "", szBuf, sizeof(szBuf), szFileIniInstall))
{
lstrcat(szMessageBuf, szBuf);
lstrcat(szMessageBuf, "\r\n");
@ -1893,7 +2046,7 @@ LPSTR GetStartInstallMessage()
lstrcat(szMessageBuf, "\r\n\r\n");
/* Selected Components */
if(NS_LoadString(hSetupRscInst, IDS_STR_SELECTED_COMPONENTS, szBuf, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "STR_SELECTED_COMPONENTS", "", szBuf, sizeof(szBuf), szFileIniInstall))
{
lstrcat(szMessageBuf, szBuf);
lstrcat(szMessageBuf, "\r\n");
@ -1928,7 +2081,7 @@ LPSTR GetStartInstallMessage()
lstrcat(szMessageBuf, "\r\n");
/* destination directory */
if(NS_LoadString(hSetupRscInst, IDS_STR_DESTINATION_DIRECTORY, szBuf, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "STR_DESTINATION_DIRECTORY", "", szBuf, sizeof(szBuf), szFileIniInstall))
{
lstrcat(szMessageBuf, szBuf);
lstrcat(szMessageBuf, "\r\n");
@ -1938,7 +2091,7 @@ LPSTR GetStartInstallMessage()
lstrcat(szMessageBuf, "\r\n\r\n");
/* program folder */
if(NS_LoadString(hSetupRscInst, IDS_STR_PROGRAM_FOLDER, szBuf, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "STR_PROGRAM_FOLDER", "", szBuf, sizeof(szBuf), szFileIniInstall))
{
lstrcat(szMessageBuf, szBuf);
lstrcat(szMessageBuf, "\r\n");
@ -1952,7 +2105,7 @@ LPSTR GetStartInstallMessage()
lstrcat(szMessageBuf, "\r\n");
/* site selector info */
if(NS_LoadString(hSetupRscInst, IDS_STR_DOWNLOAD_SITE, szBuf, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "STR_DOWNLOAD_SITE", "", szBuf, sizeof(szBuf), szFileIniInstall))
{
lstrcat(szMessageBuf, szBuf);
lstrcat(szMessageBuf, "\r\n");
@ -1967,7 +2120,7 @@ LPSTR GetStartInstallMessage()
lstrcat(szMessageBuf, "\r\n");
/* site selector info */
if(NS_LoadString(hSetupRscInst, IDS_STR_SAVE_INSTALLER_FILES, szBuf, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "STR_SAVE_INSTALLER_FILES", "", szBuf, sizeof(szBuf), szFileIniInstall))
{
lstrcat(szMessageBuf, szBuf);
lstrcat(szMessageBuf, "\r\n");
@ -1995,6 +2148,17 @@ LRESULT CALLBACK DlgProcStartInstall(HWND hDlg, UINT msg, WPARAM wParam, LONG lP
DisableSystemMenuItems(hDlg, FALSE);
SetWindowText(hDlg, diStartInstall.szTitle);
SetDlgItemText(hDlg, IDC_STATIC, sgInstallGui.szCurrentSettings);
SetDlgItemText(hDlg, IDWIZBACK, sgInstallGui.szBack_);
SetDlgItemText(hDlg, IDWIZNEXT, sgInstallGui.szInstall_);
SetDlgItemText(hDlg, IDCANCEL, sgInstallGui.szCancel_);
SendDlgItemMessage (hDlg, IDC_STATIC, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDWIZBACK, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDWIZNEXT, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDCANCEL, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_MESSAGE0, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_CURRENT_SETTINGS, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
if(GetClientRect(hDlg, &rDlg))
SetWindowPos(hDlg,
HWND_TOP,
@ -2079,6 +2243,14 @@ LRESULT CALLBACK DlgProcReboot(HWND hDlg, UINT msg, WPARAM wParam, LONG lParam)
0,
SWP_NOSIZE);
SetDlgItemText(hDlg, 202, sgInstallGui.szSetupMessage);
SetDlgItemText(hDlg, IDC_RADIO_YES, sgInstallGui.szYesRestart);
SetDlgItemText(hDlg, IDC_RADIO_NO, sgInstallGui.szNoRestart);
SetDlgItemText(hDlg, IDOK, sgInstallGui.szOk);
SendDlgItemMessage (hDlg, 202, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_RADIO_YES, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_RADIO_NO, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDOK, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
break;
case WM_COMMAND:
@ -2143,7 +2315,7 @@ LRESULT CALLBACK DlgProcMessage(HWND hDlg, UINT msg, WPARAM wParam, LONG lParam)
switch(msg)
{
case WM_INITDIALOG:
if(NS_LoadString(hSetupRscInst, IDS_STR_MESSAGEBOX_TITLE, szBuf2, sizeof(szBuf2)) == WIZ_OK)
if(GetPrivateProfileString("Messages", "STR_MESSAGEBOX_TITLE", "", szBuf2, sizeof(szBuf2), szFileIniInstall))
{
if((sgProduct.szProductName != NULL) && (*sgProduct.szProductName != '\0'))
wsprintf(szBuf, szBuf2, sgProduct.szProductName);
@ -2223,15 +2395,16 @@ void ProcessWindowsMessages()
void ShowMessage(LPSTR szMessage, BOOL bShow)
{
char szBuf[MAX_BUF];
if(sgProduct.dwMode != SILENT)
{
if((bShow) && (hDlgMessage == NULL))
{
ZeroMemory(szBuf, sizeof(szBuf));
NS_LoadString(hSetupRscInst, IDS_MB_MESSAGE_STR, szBuf, MAX_BUF);
GetPrivateProfileString("Messages", "MB_MESSAGE_STR", "", szBuf, sizeof(szBuf), szFileIniInstall);
hDlgMessage = InstantiateDialog(hWndMain, DLG_MESSAGE, szBuf, DlgProcMessage);
SendMessage(hDlgMessage, WM_COMMAND, IDC_MESSAGE, (LPARAM)szMessage);
SendDlgItemMessage (hDlgMessage, IDC_MESSAGE, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
}
else if(!bShow && hDlgMessage)
{
@ -2250,7 +2423,7 @@ HWND InstantiateDialog(HWND hParent, DWORD dwDlgID, LPSTR szTitle, WNDPROC wpDlg
{
char szEDialogCreate[MAX_BUF];
if(NS_LoadString(hSetupRscInst, IDS_ERROR_DIALOG_CREATE, szEDialogCreate, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "ERROR_DIALOG_CREATE", "", szEDialogCreate, sizeof(szEDialogCreate), szFileIniInstall))
{
wsprintf(szBuf, szEDialogCreate, szTitle);
PrintError(szBuf, ERROR_CODE_SHOW);
@ -2684,3 +2857,13 @@ void DlgSequencePrev()
} while(!bDone);
}
HFONT myGetSysFont()
{
LOGFONT lf;
HFONT fontDlg;
SystemParametersInfo(SPI_GETICONTITLELOGFONT,sizeof(LOGFONT),&lf,0);
fontDlg = CreateFontIndirect( &lf );
return fontDlg;
}

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

@ -53,6 +53,7 @@ extern LPSTR szSetupDir;
extern LPSTR szTempDir;
extern LPSTR szOSTempDir;
extern LPSTR szFileIniConfig;
extern LPSTR szFileIniInstall;
extern LPSTR szSiteSelectorDescription;
@ -90,6 +91,7 @@ extern siCF siCFXpcomFile;
extern siC *siComponents;
extern ssi *ssiSiteSelector;
extern char *SetupFileList[];
extern installGui sgInstallGui;
extern sems gErrorMessageStream;
extern sysinfo gSystemInfo;
extern dsN *gdsnComponentDSRequirement;

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

@ -258,10 +258,19 @@ BOOL CheckForPreviousUnfinishedDownload()
char szKey[MAX_BUF_TINY];
BOOL bRv = FALSE;
wsprintf(szKey, "Software\\%s\\%s\\%s", sgProduct.szCompanyName, sgProduct.szProductName, sgProduct.szUserAgent);
GetWinReg(HKEY_LOCAL_MACHINE, szKey, "Setup State", szBuf, sizeof(szBuf));
if(lstrcmpi(szBuf, "downloading") == 0)
bRv = TRUE;
if(sgProduct.szCompanyName &&
sgProduct.szProductName &&
sgProduct.szUserAgent)
{
wsprintf(szKey,
"Software\\%s\\%s\\%s",
sgProduct.szCompanyName,
sgProduct.szProductName,
sgProduct.szUserAgent);
GetWinReg(HKEY_LOCAL_MACHINE, szKey, "Setup State", szBuf, sizeof(szBuf));
if(lstrcmpi(szBuf, "downloading") == 0)
bRv = TRUE;
}
return(bRv);
}
@ -484,6 +493,9 @@ HRESULT Initialize(HINSTANCE hInstance)
if((szFileIniConfig = NS_GlobalAlloc(MAX_BUF)) == NULL)
return(1);
if((szFileIniInstall = NS_GlobalAlloc(MAX_BUF)) == NULL)
return(1);
// determine the system's TEMP path
if(GetTempPath(MAX_BUF, szTempDir) == 0)
{
@ -491,7 +503,7 @@ HRESULT Initialize(HINSTANCE hInstance)
{
char szEGetWinDirFailed[MAX_BUF];
if(NS_LoadString(hSetupRscInst, IDS_ERROR_GET_WINDOWS_DIRECTORY_FAILED, szEGetWinDirFailed, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "ERROR_GET_WINDOWS_DIRECTORY_FAILED", "", szEGetWinDirFailed, sizeof(szEGetWinDirFailed), szFileIniInstall))
PrintError(szEGetWinDirFailed, ERROR_CODE_SHOW);
return(1);
@ -512,7 +524,7 @@ HRESULT Initialize(HINSTANCE hInstance)
{
char szECreateTempDir[MAX_BUF];
if(NS_LoadString(hSetupRscInst, IDS_ERROR_CREATE_TEMP_DIR, szECreateTempDir, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "ERROR_CREATE_TEMP_DIR", "", szECreateTempDir, sizeof(szECreateTempDir), szFileIniInstall))
{
wsprintf(szBuf, szECreateTempDir, szTempDir);
PrintError(szBuf, ERROR_CODE_HIDE);
@ -762,7 +774,7 @@ HRESULT ParseSetupIni()
{
char szEFileNotFound[MAX_BUF];
if(NS_LoadString(hSetupRscInst, IDS_ERROR_FILE_NOT_FOUND, szEFileNotFound, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "ERROR_FILE_NOT_FOUND", "", szEFileNotFound, sizeof(szEFileNotFound), szFileIniInstall))
{
wsprintf(szBuf, szEFileNotFound, szFileIdiGetConfigIni);
PrintError(szBuf, ERROR_CODE_HIDE);
@ -781,7 +793,7 @@ HRESULT GetConfigIni()
char szBuf[MAX_BUF];
HRESULT hResult = 0;
if(NS_LoadString(hSetupRscInst, IDS_MSG_RETRIEVE_CONFIGINI, szMsgRetrieveConfigIni, MAX_BUF) != WIZ_OK)
if(!GetPrivateProfileString("Messages", "MSG_RETRIEVE_CONFIGINI", "", szMsgRetrieveConfigIni, sizeof(szMsgRetrieveConfigIni), szFileIniInstall))
return(1);
lstrcpy(szFileIniTempDir, szTempDir);
@ -807,7 +819,7 @@ HRESULT GetConfigIni()
{
char szEFileNotFound[MAX_BUF];
if(NS_LoadString(hSetupRscInst, IDS_ERROR_FILE_NOT_FOUND, szEFileNotFound, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "ERROR_FILE_NOT_FOUND", "", szEFileNotFound, sizeof(szEFileNotFound), szFileIniInstall))
{
wsprintf(szBuf, szEFileNotFound, FILE_INI_CONFIG);
PrintError(szBuf, ERROR_CODE_HIDE);
@ -821,6 +833,54 @@ HRESULT GetConfigIni()
return(hResult);
}
HRESULT GetInstallIni()
{
char szFileIniTempDir[MAX_BUF];
char szFileIniSetupDir[MAX_BUF];
char szMsgRetrieveInstallIni[MAX_BUF];
char szBuf[MAX_BUF];
HRESULT hResult = 0;
if(NS_LoadString(hSetupRscInst, IDS_MSG_RETRIEVE_INSTALLINI, szMsgRetrieveInstallIni, MAX_BUF) != WIZ_OK)
return(1);
lstrcpy(szFileIniTempDir, szTempDir);
AppendBackSlash(szFileIniTempDir, sizeof(szFileIniTempDir));
lstrcat(szFileIniTempDir, FILE_INI_INSTALL);
/* set default value for szFileIniInstall here */
lstrcpy(szFileIniInstall, szFileIniTempDir);
lstrcpy(szFileIniSetupDir, szSetupDir);
AppendBackSlash(szFileIniSetupDir, sizeof(szFileIniSetupDir));
lstrcat(szFileIniSetupDir, FILE_INI_INSTALL);
/* if installer.ini exists, then use it, else download installer.ini from the net */
if(!FileExists(szFileIniTempDir))
{
if(FileExists(szFileIniSetupDir))
{
lstrcpy(szFileIniInstall, szFileIniSetupDir);
hResult = 0;
}
else
{
char szEFileNotFound[MAX_BUF];
if(NS_LoadString(hSetupRscInst, IDS_ERROR_FILE_NOT_FOUND, szEFileNotFound, MAX_BUF) == WIZ_OK)
{
wsprintf(szBuf, szEFileNotFound, FILE_INI_INSTALL);
PrintError(szBuf, ERROR_CODE_HIDE);
}
hResult = 1;
}
}
else
hResult = 0;
return(hResult);
}
int LocateJar(siC *siCObject, LPSTR szPath, int dwPathSize, BOOL bIncludeTempDir)
{
BOOL bRet;
@ -1001,10 +1061,7 @@ int UpdateIdiFile(char *szPartialUrl,
{
char szEWPPS[MAX_BUF];
if(NS_LoadString(hSetupRscInst,
IDS_ERROR_WRITEPRIVATEPROFILESTRING,
szEWPPS,
sizeof(szEWPPS)) == WIZ_OK)
if(GetPrivateProfileString("Messages", "ERROR_WRITEPRIVATEPROFILESTRING", "", szEWPPS, sizeof(szEWPPS), szFileIniInstall))
{
wsprintf(szBufTemp,
"%s\n [%s]\n url=%s",
@ -1187,7 +1244,7 @@ long RetrieveRedirectFile()
if(FileExists(szFileIniRedirect))
DeleteFile(szFileIniRedirect);
GetPrivateProfileString("Redirect", "Status", "", szBuf, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Redirect", "Status", "", szBuf, sizeof(szBuf), szFileIniConfig);
if(lstrcmpi(szBuf, "ENABLED") != 0)
return(0);
@ -1217,7 +1274,7 @@ long RetrieveRedirectFile()
{
char szEWPPS[MAX_BUF];
if(NS_LoadString(hSetupRscInst, IDS_ERROR_WRITEPRIVATEPROFILESTRING, szEWPPS, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "ERROR_WRITEPRIVATEPROFILESTRING", "", szEWPPS, sizeof(szEWPPS), szFileIniInstall))
{
wsprintf(szBufTemp, "%s\n [%s]\n %s=%s", szFileIdiGetRedirect, "File0", szIndex0, szBufUrl);
wsprintf(szBuf, szEWPPS, szBufTemp);
@ -1279,7 +1336,7 @@ int CRCCheckDownloadedArchives(char *szCorruptedArchiveList,
char szBuf[MAX_BUF];
char szEFileNotFound[MAX_BUF];
if(NS_LoadString(hSetupRscInst, IDS_ERROR_FILE_NOT_FOUND, szEFileNotFound, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "ERROR_FILE_NOT_FOUND", "", szEFileNotFound, sizeof(szEFileNotFound), szFileIniInstall))
{
wsprintf(szBuf, szEFileNotFound, siCObject->szArchiveName);
PrintError(szBuf, ERROR_CODE_HIDE);
@ -1727,7 +1784,7 @@ HRESULT LaunchApps()
char szMsg[MAX_BUF];
LogISLaunchApps(W_START);
if(NS_LoadString(hSetupRscInst, IDS_MSG_CONFIGURING, szMsg, MAX_BUF) != WIZ_OK)
if(!GetPrivateProfileString("Messages", "MSG_CONFIGURING", "", szMsg, sizeof(szMsg), szFileIniInstall))
return(1);
dwIndex0 = 0;
@ -1816,10 +1873,7 @@ void DetermineOSVersionEx()
* some complications during installation */
char szEMsg[MAX_BUF_TINY];
if(NS_LoadString(hSetupRscInst,
IDS_ERROR_GETVERSION,
szEMsg,
sizeof(szEMsg)) == WIZ_OK)
if(GetPrivateProfileString("Messages", "ERROR_GETVERSION", "", szEMsg, sizeof(szEMsg), szFileIniInstall))
PrintError(szEMsg, ERROR_CODE_SHOW);
}
@ -1857,10 +1911,7 @@ void DetermineOSVersionEx()
break;
default:
if(NS_LoadString(hSetupRscInst,
IDS_ERROR_SETUP_REQUIREMENT,
szESetupRequirement,
sizeof(szESetupRequirement)) == WIZ_OK)
if(GetPrivateProfileString("Messages", "ERROR_SETUP_REQUIREMENT", "", szESetupRequirement, sizeof(szESetupRequirement), szFileIniInstall))
PrintError(szESetupRequirement, ERROR_CODE_HIDE);
break;
}
@ -2232,7 +2283,7 @@ void DeInitDlgDownload(diD *diDialog)
DWORD InitDlgReboot(diR *diDialog)
{
diDialog->dwShowDialog = FALSE;
if(NS_LoadStringAlloc(hSetupRscInst, IDS_DLG_REBOOT_TITLE, &(diDialog->szTitle), MAX_BUF))
if(!GetPrivateProfileString("Messages", "DLG_REBOOT_TITLE", "", diDialog->szTitle, MAX_BUF, szFileIniInstall))
return(1);
return(0);
@ -2280,7 +2331,7 @@ HRESULT InitSetupGeneral()
if((szSiteSelectorDescription = NS_GlobalAlloc(MAX_BUF)) == NULL)
return(1);
if(NS_LoadString(hSetupRscInst, IDS_CB_DEFAULT, szBuf, MAX_BUF) == WIZ_OK);
if(GetPrivateProfileString("Messages", "CB_DEFAULT", "", szBuf, sizeof(szBuf), szFileIniInstall))
lstrcpy(szSiteSelectorDescription, szBuf);
return(0);
@ -3257,7 +3308,7 @@ ULONGLONG GetDiskSpaceAvailable(LPSTR szPath)
{
char szEDeterminingDiskSpace[MAX_BUF];
if(NS_LoadString(hSetupRscInst, IDS_ERROR_DETERMINING_DISK_SPACE, szEDeterminingDiskSpace, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "ERROR_DETERMINING_DISK_SPACE", "", szEDeterminingDiskSpace, sizeof(szEDeterminingDiskSpace), szFileIniInstall))
{
lstrcpy(szBuf2, "\n ");
lstrcat(szBuf2, szPath);
@ -3290,19 +3341,19 @@ HRESULT ErrorMsgDiskSpace(ULONGLONG ullDSAvailable, ULONGLONG ullDSRequired, LPS
char szDlgDiskSpaceCheckMsg[MAX_BUF];
DWORD dwDlgType;
if(NS_LoadString(hSetupRscInst, IDS_DLG_DISK_SPACE_CHECK_TITLE, szDlgDiskSpaceCheckTitle, MAX_BUF) != WIZ_OK)
if(!GetPrivateProfileString("Messages", "DLG_DISK_SPACE_CHECK_TITLE", "", szDlgDiskSpaceCheckTitle, sizeof(szDlgDiskSpaceCheckTitle), szFileIniInstall))
exit(1);
if(bCrutialMsg)
{
dwDlgType = MB_RETRYCANCEL;
if(NS_LoadString(hSetupRscInst, IDS_DLG_DISK_SPACE_CHECK_CRUTIAL_MSG, szDlgDiskSpaceCheckMsg, MAX_BUF) != WIZ_OK)
if(!GetPrivateProfileString("Messages", "DLG_DISK_SPACE_CHECK_CRUTIAL_MSG", "", szDlgDiskSpaceCheckMsg, sizeof(szDlgDiskSpaceCheckMsg), szFileIniInstall))
exit(1);
}
else
{
dwDlgType = MB_OK;
if(NS_LoadString(hSetupRscInst, IDS_DLG_DISK_SPACE_CHECK_MSG, szDlgDiskSpaceCheckMsg, MAX_BUF) != WIZ_OK)
if(!GetPrivateProfileString("Messages", "DLG_DISK_SPACE_CHECK_MSG", "", szDlgDiskSpaceCheckMsg, sizeof(szDlgDiskSpaceCheckMsg), szFileIniInstall))
exit(1);
}
@ -3697,7 +3748,7 @@ void InitSiComponents(char *szFileIni)
GetPrivateProfileString(szSTSection, szComponentKey, "", szComponentSection, sizeof(szComponentSection), szFileIni);
while(*szComponentSection != '\0')
{
GetPrivateProfileString(szComponentSection, "Archive", "", szBuf, MAX_BUF, szFileIni);
GetPrivateProfileString(szComponentSection, "Archive", "", szBuf, sizeof(szBuf), szFileIni);
if((*szBuf != '\0') && (SiCNodeFind(siComponents, szComponentSection) == NULL))
{
/* create and initialize empty node */
@ -3707,11 +3758,11 @@ void InitSiComponents(char *szFileIni)
lstrcpy(siCTemp->szArchiveName, szBuf);
/* get short description of component */
GetPrivateProfileString(szComponentSection, "Description Short", "", szBuf, MAX_BUF, szFileIni);
GetPrivateProfileString(szComponentSection, "Description Short", "", szBuf, sizeof(szBuf), szFileIni);
lstrcpy(siCTemp->szDescriptionShort, szBuf);
/* get long description of component */
GetPrivateProfileString(szComponentSection, "Description Long", "", szBuf, MAX_BUF, szFileIni);
GetPrivateProfileString(szComponentSection, "Description Long", "", szBuf, sizeof(szBuf), szFileIni);
lstrcpy(siCTemp->szDescriptionLong, szBuf);
/* get commandline parameter for component */
@ -3721,33 +3772,33 @@ void InitSiComponents(char *szFileIni)
lstrcpy(siCTemp->szReferenceName, szComponentSection);
/* get install size required in destination for component. Sould be in Kilobytes */
GetPrivateProfileString(szComponentSection, "Install Size", "", szBuf, MAX_BUF, szFileIni);
GetPrivateProfileString(szComponentSection, "Install Size", "", szBuf, sizeof(szBuf), szFileIni);
if(*szBuf != '\0')
siCTemp->ullInstallSize = _atoi64(szBuf);
else
siCTemp->ullInstallSize = 0;
/* get install size required in system for component. Sould be in Kilobytes */
GetPrivateProfileString(szComponentSection, "Install Size System", "", szBuf, MAX_BUF, szFileIni);
GetPrivateProfileString(szComponentSection, "Install Size System", "", szBuf, sizeof(szBuf), szFileIni);
if(*szBuf != '\0')
siCTemp->ullInstallSizeSystem = _atoi64(szBuf);
else
siCTemp->ullInstallSizeSystem = 0;
/* get install size required in temp for component. Sould be in Kilobytes */
GetPrivateProfileString(szComponentSection, "Install Size Archive", "", szBuf, MAX_BUF, szFileIni);
GetPrivateProfileString(szComponentSection, "Install Size Archive", "", szBuf, sizeof(szBuf), szFileIni);
if(*szBuf != '\0')
siCTemp->ullInstallSizeArchive = _atoi64(szBuf);
else
siCTemp->ullInstallSizeArchive = 0;
/* get attributes of component */
GetPrivateProfileString(szComponentSection, "Attributes", "", szBuf, MAX_BUF, szFileIni);
GetPrivateProfileString(szComponentSection, "Attributes", "", szBuf, sizeof(szBuf), szFileIni);
siCTemp->dwAttributes = ParseComponentAttributes(szBuf);
/* get the random percentage value and select or deselect the component (by default) for
* installation */
GetPrivateProfileString(szComponentSection, "Random Install Percentage", "", szBuf, MAX_BUF, szFileIni);
GetPrivateProfileString(szComponentSection, "Random Install Percentage", "", szBuf, sizeof(szBuf), szFileIni);
if(*szBuf != '\0')
{
siCTemp->lRandomInstallPercentage = atol(szBuf);
@ -3760,7 +3811,7 @@ void InitSiComponents(char *szFileIni)
itoa(dwIndex1, szIndex1, 10);
lstrcpy(szDependency, "Dependency");
lstrcat(szDependency, szIndex1);
GetPrivateProfileString(szComponentSection, szDependency, "", szBuf, MAX_BUF, szFileIni);
GetPrivateProfileString(szComponentSection, szDependency, "", szBuf, sizeof(szBuf), szFileIni);
while(*szBuf != '\0')
{
/* create and initialize empty node */
@ -3777,7 +3828,7 @@ void InitSiComponents(char *szFileIni)
itoa(dwIndex1, szIndex1, 10);
lstrcpy(szDependency, "Dependency");
lstrcat(szDependency, szIndex1);
GetPrivateProfileString(szComponentSection, szDependency, "", szBuf, MAX_BUF, szFileIni);
GetPrivateProfileString(szComponentSection, szDependency, "", szBuf, sizeof(szBuf), szFileIni);
}
/* get all dependees for this component */
@ -3785,7 +3836,7 @@ void InitSiComponents(char *szFileIni)
itoa(dwIndex1, szIndex1, 10);
lstrcpy(szDependee, "Dependee");
lstrcat(szDependee, szIndex1);
GetPrivateProfileString(szComponentSection, szDependee, "", szBuf, MAX_BUF, szFileIni);
GetPrivateProfileString(szComponentSection, szDependee, "", szBuf, sizeof(szBuf), szFileIni);
while(*szBuf != '\0')
{
/* create and initialize empty node */
@ -3802,7 +3853,7 @@ void InitSiComponents(char *szFileIni)
itoa(dwIndex1, szIndex1, 10);
lstrcpy(szDependee, "Dependee");
lstrcat(szDependee, szIndex1);
GetPrivateProfileString(szComponentSection, szDependee, "", szBuf, MAX_BUF, szFileIni);
GetPrivateProfileString(szComponentSection, szDependee, "", szBuf, sizeof(szBuf), szFileIni);
}
// locate previous path if necessary
@ -3842,7 +3893,7 @@ void ResetComponentAttributes(char *szFileIni)
lstrcat(szComponentItem, szIndex);
siCTemp = SiCNodeGetObject(dwCounter, TRUE, AC_ALL);
GetPrivateProfileString(szComponentItem, "Attributes", "", szBuf, MAX_BUF, szFileIni);
GetPrivateProfileString(szComponentItem, "Attributes", "", szBuf, sizeof(szBuf), szFileIni);
siCTemp->dwAttributes = ParseComponentAttributes(szBuf);
}
}
@ -3872,12 +3923,12 @@ void UpdateSiteSelector()
lstrcpy(szKDomain, "Domain");
lstrcat(szKDescription, szIndex);
lstrcat(szKDomain, szIndex);
GetPrivateProfileString("Site Selector", szKDescription, "", szDescription, MAX_BUF, szFileIniRedirect);
GetPrivateProfileString("Site Selector", szKDescription, "", szDescription, sizeof(szDescription), szFileIniRedirect);
while(*szDescription != '\0')
{
if(lstrcmpi(szDescription, szSiteSelectorDescription) == 0)
{
GetPrivateProfileString("Site Selector", szKDomain, "", szDomain, MAX_BUF, szFileIniRedirect);
GetPrivateProfileString("Site Selector", szKDomain, "", szDomain, sizeof(szDomain), szFileIniRedirect);
if(*szDomain != '\0')
{
ssiSiteSelectorTemp = SsiGetNode(szDescription);
@ -3908,7 +3959,7 @@ void UpdateSiteSelector()
lstrcat(szKDomain, szIndex);
ZeroMemory(szDescription, sizeof(szDescription));
ZeroMemory(szDomain, sizeof(szDomain));
GetPrivateProfileString("Site Selector", szKDescription, "", szDescription, MAX_BUF, szFileIniRedirect);
GetPrivateProfileString("Site Selector", szKDescription, "", szDescription, sizeof(szDescription), szFileIniRedirect);
}
}
@ -3935,12 +3986,12 @@ void InitSiteSelector(char *szFileIni)
lstrcat(szKDescription, szIndex);
lstrcat(szKDomain, szIndex);
lstrcat(szKIdentifier, szIndex);
GetPrivateProfileString("Site Selector", szKDescription, "", szDescription, MAX_BUF, szFileIni);
GetPrivateProfileString("Site Selector", szKDescription, "", szDescription, sizeof(szDescription), szFileIni);
while(*szDescription != '\0')
{
/* if the Domain and Identifier are not set, then skip */
GetPrivateProfileString("Site Selector", szKDomain, "", szDomain, MAX_BUF, szFileIni);
GetPrivateProfileString("Site Selector", szKIdentifier, "", szIdentifier, MAX_BUF, szFileIni);
GetPrivateProfileString("Site Selector", szKDomain, "", szDomain, sizeof(szDomain), szFileIni);
GetPrivateProfileString("Site Selector", szKIdentifier, "", szIdentifier, sizeof(szIdentifier), szFileIni);
if((*szDomain != '\0') && (*szIdentifier != '\0'))
{
/* create and initialize empty node */
@ -3966,7 +4017,7 @@ void InitSiteSelector(char *szFileIni)
ZeroMemory(szDescription, sizeof(szDescription));
ZeroMemory(szDomain, sizeof(szDomain));
ZeroMemory(szIdentifier, sizeof(szIdentifier));
GetPrivateProfileString("Site Selector", szKDescription, "", szDescription, MAX_BUF, szFileIni);
GetPrivateProfileString("Site Selector", szKDescription, "", szDescription, sizeof(szDescription), szFileIni);
}
}
@ -4629,8 +4680,8 @@ HRESULT CheckInstances()
lstrcpy(szSection, "Check Instance");
lstrcat(szSection, szIndex);
GetPrivateProfileString(szSection, "Message", "", szMessage, MAX_BUF, szFileIniConfig);
if(GetPrivateProfileString(szSection, "Process Name", "", szProcessName, MAX_BUF, szFileIniConfig) != 0L)
GetPrivateProfileString(szSection, "Message", "", szMessage, sizeof(szMessage), szFileIniConfig);
if(GetPrivateProfileString(szSection, "Process Name", "", szProcessName, sizeof(szProcessName), szFileIniConfig) != 0L)
{
if(*szProcessName != '\0')
{
@ -4679,8 +4730,8 @@ HRESULT CheckInstances()
}
/* Process Name= key did not exist, so look for other keys */
dwRv0 = GetPrivateProfileString(szSection, "Class Name", "", szClassName, MAX_BUF, szFileIniConfig);
dwRv1 = GetPrivateProfileString(szSection, "Window Name", "", szWindowName, MAX_BUF, szFileIniConfig);
dwRv0 = GetPrivateProfileString(szSection, "Class Name", "", szClassName, sizeof(szClassName), szFileIniConfig);
dwRv1 = GetPrivateProfileString(szSection, "Window Name", "", szWindowName, sizeof(szWindowName), szFileIniConfig);
if((dwRv0 == 0L) &&
(dwRv1 == 0L))
{
@ -4913,7 +4964,7 @@ int StartupCheckArchives(void)
switch(sgProduct.dwMode)
{
case NORMAL:
if(NS_LoadString(hSetupRscInst, IDS_STR_MESSAGEBOX_TITLE, szBuf, sizeof(szBuf)) != WIZ_OK)
if(GetPrivateProfileString("Messages", "STR_MESSAGEBOX_TITLE", "", szBuf, sizeof(szBuf), szFileIniInstall))
lstrcpy(szTitle, "Setup");
else
wsprintf(szTitle, szBuf, sgProduct.szProductName);
@ -4988,7 +5039,7 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
return(1);
/* get install Mode information */
GetPrivateProfileString("General", "Run Mode", "", szBuf, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("General", "Run Mode", "", szBuf, sizeof(szBuf), szFileIniConfig);
SetSetupRunMode(szBuf);
if(ParseCommandLine(lpszCmdLine))
return(1);
@ -4996,7 +5047,7 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
if(CheckInstances())
return(1);
if(NS_LoadString(hSetupRscInst, IDS_MSG_INIT_SETUP, szMsgInitSetup, sizeof(szMsgInitSetup)) == WIZ_OK)
if(GetPrivateProfileString("Messages", "MSG_INIT_SETUP", "", szMsgInitSetup, sizeof(szMsgInitSetup), szFileIniInstall))
ShowMessage(szMsgInitSetup, TRUE);
/* get product name description */
@ -5006,14 +5057,14 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
GetPrivateProfileString("General", "User Agent", "", sgProduct.szUserAgent, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("General", "Sub Path", "", sgProduct.szSubPath, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("General", "Program Name", "", sgProduct.szProgramName, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("General", "Lock Path", "", szBuf, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("General", "Lock Path", "", szBuf, sizeof(szBuf), szFileIniConfig);
if(lstrcmpi(szBuf, "TRUE") == 0)
sgProduct.bLockPath = TRUE;
/* get main install path */
if(LocatePreviousPath("Locate Previous Product Path", szPreviousPath, sizeof(szPreviousPath)) == FALSE)
{
GetPrivateProfileString("General", "Path", "", szBuf, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("General", "Path", "", szBuf, sizeof(szBuf), szFileIniConfig);
DecryptString(sgProduct.szPath, szBuf);
}
else
@ -5066,7 +5117,7 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
else
{
/* If we still can't locate ProgramName file, then use the default in the config.ini */
GetPrivateProfileString("General", "Path", "", szBuf, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("General", "Path", "", szBuf, sizeof(szBuf), szFileIniConfig);
DecryptString(sgProduct.szPath, szBuf);
}
}
@ -5082,15 +5133,15 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
lstrcpy(szTempSetupPath, sgProduct.szPath);
/* get main program folder path */
GetPrivateProfileString("General", "Program Folder Path", "", szBuf, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("General", "Program Folder Path", "", szBuf, sizeof(szBuf), szFileIniConfig);
DecryptString(sgProduct.szProgramFolderPath, szBuf);
/* get main program folder name */
GetPrivateProfileString("General", "Program Folder Name", "", szBuf, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("General", "Program Folder Name", "", szBuf, sizeof(szBuf), szFileIniConfig);
DecryptString(sgProduct.szProgramFolderName, szBuf);
/* Welcome dialog */
GetPrivateProfileString("Dialog Welcome", "Show Dialog", "", szShowDialog, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Welcome", "Show Dialog", "", szShowDialog, sizeof(szShowDialog), szFileIniConfig);
GetPrivateProfileString("Dialog Welcome", "Title", "", diWelcome.szTitle, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Welcome", "Message0", "", diWelcome.szMessage0, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Welcome", "Message1", "", diWelcome.szMessage1, MAX_BUF, szFileIniConfig);
@ -5099,7 +5150,7 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
diWelcome.bShowDialog = TRUE;
/* License dialog */
GetPrivateProfileString("Dialog License", "Show Dialog", "", szShowDialog, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog License", "Show Dialog", "", szShowDialog, sizeof(szShowDialog), szFileIniConfig);
GetPrivateProfileString("Dialog License", "Title", "", diLicense.szTitle, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog License", "License File", "", diLicense.szLicenseFilename, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog License", "Message0", "", diLicense.szMessage0, MAX_BUF, szFileIniConfig);
@ -5108,7 +5159,7 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
diLicense.bShowDialog = TRUE;
/* Setup Type dialog */
GetPrivateProfileString("Dialog Setup Type", "Show Dialog", "", szShowDialog, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Setup Type", "Show Dialog", "", szShowDialog, sizeof(szShowDialog), szFileIniConfig);
GetPrivateProfileString("Dialog Setup Type", "Title", "", diSetupType.szTitle, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Setup Type", "Message0", "", diSetupType.szMessage0, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Setup Type", "Readme Filename", "", diSetupType.szReadmeFilename, MAX_BUF, szFileIniConfig);
@ -5137,21 +5188,21 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
SetCustomType();
/* Select Components dialog */
GetPrivateProfileString("Dialog Select Components", "Show Dialog", "", szShowDialog, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Select Components", "Show Dialog", "", szShowDialog, sizeof(szShowDialog), szFileIniConfig);
GetPrivateProfileString("Dialog Select Components", "Title", "", diSelectComponents.szTitle, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Select Components", "Message0", "", diSelectComponents.szMessage0, MAX_BUF, szFileIniConfig);
if(lstrcmpi(szShowDialog, "TRUE") == 0)
diSelectComponents.bShowDialog = TRUE;
/* Select Additional Components dialog */
GetPrivateProfileString("Dialog Select Additional Components", "Show Dialog", "", szShowDialog, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Select Additional Components", "Show Dialog", "", szShowDialog, sizeof(szShowDialog), szFileIniConfig);
GetPrivateProfileString("Dialog Select Additional Components", "Title", "", diSelectAdditionalComponents.szTitle, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Select Additional Components", "Message0", "", diSelectAdditionalComponents.szMessage0, MAX_BUF, szFileIniConfig);
if(lstrcmpi(szShowDialog, "TRUE") == 0)
diSelectAdditionalComponents.bShowDialog = TRUE;
/* Windows Integration dialog */
GetPrivateProfileString("Dialog Windows Integration", "Show Dialog", "", szShowDialog, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Windows Integration", "Show Dialog", "", szShowDialog, sizeof(szShowDialog), szFileIniConfig);
GetPrivateProfileString("Dialog Windows Integration", "Title", "", diWindowsIntegration.szTitle, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Windows Integration", "Message0", "", diWindowsIntegration.szMessage0, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Windows Integration", "Message1", "", diWindowsIntegration.szMessage1, MAX_BUF, szFileIniConfig);
@ -5159,18 +5210,18 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
diWindowsIntegration.bShowDialog = TRUE;
/* Program Folder dialog */
GetPrivateProfileString("Dialog Program Folder", "Show Dialog", "", szShowDialog, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Program Folder", "Show Dialog", "", szShowDialog, sizeof(szShowDialog), szFileIniConfig);
GetPrivateProfileString("Dialog Program Folder", "Title", "", diProgramFolder.szTitle, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Program Folder", "Message0", "", diProgramFolder.szMessage0, MAX_BUF, szFileIniConfig);
if(lstrcmpi(szShowDialog, "TRUE") == 0)
diProgramFolder.bShowDialog = TRUE;
/* Download Options dialog */
GetPrivateProfileString("Dialog Download Options", "Show Dialog", "", szShowDialog, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Download Options", "Show Dialog", "", szShowDialog, sizeof(szShowDialog), 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", "Message1", "", diDownloadOptions.szMessage1, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Download Options", "Save Installer", "", szBuf, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Download Options", "Save Installer", "", szBuf, sizeof(szBuf), szFileIniConfig);
if(lstrcmpi(szBuf, "TRUE") == 0)
diDownloadOptions.bSaveInstaller = TRUE;
@ -5201,7 +5252,7 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
diDownloadOptions.bShowDialog = TRUE;
/* Advanced Settings dialog */
GetPrivateProfileString("Dialog Advanced Settings", "Show Dialog", "", szShowDialog, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Advanced Settings", "Show Dialog", "", szShowDialog, sizeof(szShowDialog), szFileIniConfig);
GetPrivateProfileString("Dialog Advanced Settings", "Title", "", diAdvancedSettings.szTitle, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Advanced Settings", "Message0", "", diAdvancedSettings.szMessage0, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Advanced Settings", "Proxy Server", "", diAdvancedSettings.szProxyServer, MAX_BUF, szFileIniConfig);
@ -5212,7 +5263,7 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
diAdvancedSettings.bShowDialog = TRUE;
/* Start Install dialog */
GetPrivateProfileString("Dialog Start Install", "Show Dialog", "", szShowDialog, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Start Install", "Show Dialog", "", szShowDialog, sizeof(szShowDialog), szFileIniConfig);
GetPrivateProfileString("Dialog Start Install", "Title", "", diStartInstall.szTitle, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Start Install", "Message Install", "", diStartInstall.szMessageInstall, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Start Install", "Message Download", "", diStartInstall.szMessageDownload, MAX_BUF, szFileIniConfig);
@ -5220,7 +5271,7 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
diStartInstall.bShowDialog = TRUE;
/* Download dialog */
GetPrivateProfileString("Dialog Download", "Show Dialog", "", szShowDialog, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Download", "Show Dialog", "", szShowDialog, sizeof(szShowDialog), szFileIniConfig);
GetPrivateProfileString("Dialog Download", "Title", "", diDownload.szTitle, MAX_BUF_TINY, szFileIniConfig);
GetPrivateProfileString("Dialog Download", "Message Download0", "", diDownload.szMessageDownload0, MAX_BUF_MEDIUM, szFileIniConfig);
GetPrivateProfileString("Dialog Download", "Message Retry0", "", diDownload.szMessageRetry0, MAX_BUF_MEDIUM, szFileIniConfig);
@ -5228,13 +5279,13 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
diDownload.bShowDialog = TRUE;
/* Reboot dialog */
GetPrivateProfileString("Dialog Reboot", "Show Dialog", "", szShowDialog, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Reboot", "Show Dialog", "", szShowDialog, sizeof(szShowDialog), szFileIniConfig);
if(lstrcmpi(szShowDialog, "TRUE") == 0)
diReboot.dwShowDialog = TRUE;
else if(lstrcmpi(szShowDialog, "AUTO") == 0)
diReboot.dwShowDialog = AUTO;
GetPrivateProfileString("Windows Integration-Item0", "CheckBoxState", "", szBuf, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Windows Integration-Item0", "CheckBoxState", "", szBuf, sizeof(szBuf), szFileIniConfig);
GetPrivateProfileString("Windows Integration-Item0", "Description", "", diWindowsIntegration.wiCB0.szDescription, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Windows Integration-Item0", "Archive", "", diWindowsIntegration.wiCB0.szArchive, MAX_BUF, szFileIniConfig);
/* Check to see if the checkbox need to be shown at all or not */
@ -5244,7 +5295,7 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
if(lstrcmpi(szBuf, "TRUE") == 0)
diWindowsIntegration.wiCB0.bCheckBoxState = TRUE;
GetPrivateProfileString("Windows Integration-Item1", "CheckBoxState", "", szBuf, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Windows Integration-Item1", "CheckBoxState", "", szBuf, sizeof(szBuf), szFileIniConfig);
GetPrivateProfileString("Windows Integration-Item1", "Description", "", diWindowsIntegration.wiCB1.szDescription, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Windows Integration-Item1", "Archive", "", diWindowsIntegration.wiCB1.szArchive, MAX_BUF, szFileIniConfig);
/* Check to see if the checkbox need to be shown at all or not */
@ -5254,7 +5305,7 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
if(lstrcmpi(szBuf, "TRUE") == 0)
diWindowsIntegration.wiCB1.bCheckBoxState = TRUE;
GetPrivateProfileString("Windows Integration-Item2", "CheckBoxState", "", szBuf, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Windows Integration-Item2", "CheckBoxState", "", szBuf, sizeof(szBuf), szFileIniConfig);
GetPrivateProfileString("Windows Integration-Item2", "Description", "", diWindowsIntegration.wiCB2.szDescription, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Windows Integration-Item2", "Archive", "", diWindowsIntegration.wiCB2.szArchive, MAX_BUF, szFileIniConfig);
/* Check to see if the checkbox need to be shown at all or not */
@ -5264,7 +5315,7 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
if(lstrcmpi(szBuf, "TRUE") == 0)
diWindowsIntegration.wiCB2.bCheckBoxState = TRUE;
GetPrivateProfileString("Windows Integration-Item3", "CheckBoxState", "", szBuf, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Windows Integration-Item3", "CheckBoxState", "", szBuf, sizeof(szBuf), szFileIniConfig);
GetPrivateProfileString("Windows Integration-Item3", "Description", "", diWindowsIntegration.wiCB3.szDescription, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Windows Integration-Item3", "Archive", "", diWindowsIntegration.wiCB3.szArchive, MAX_BUF, szFileIniConfig);
/* Check to see if the checkbox need to be shown at all or not */
@ -5297,7 +5348,7 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
InitErrorMessageStream(szFileIniConfig);
/* get Default Setup Type */
GetPrivateProfileString("General", "Default Setup Type", "", szBuf, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("General", "Default Setup Type", "", szBuf, sizeof(szBuf), szFileIniConfig);
if((lstrcmpi(szBuf, "Setup Type 0") == 0) && diSetupType.stSetupType0.bVisible)
{
dwSetupType = ST_RADIO0;
@ -5344,7 +5395,7 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
SiCNodeSetItemsSelected(dwSetupType);
/* get install size required in temp for component Xpcom. Sould be in Kilobytes */
GetPrivateProfileString("Core", "Install Size", "", szBuf, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Core", "Install Size", "", szBuf, sizeof(szBuf), szFileIniConfig);
if(*szBuf != '\0')
siCFXpcomFile.ullInstallSize = _atoi64(szBuf);
else
@ -5361,12 +5412,12 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
GetPrivateProfileString("SmartDownload-Execution", "exe", "", siSDObject.szExe, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("SmartDownload-Execution", "exe_param", "", siSDObject.szExeParam, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Core", "Source", "", szBuf, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Core", "Source", "", szBuf, sizeof(szBuf), szFileIniConfig);
DecryptString(siCFXpcomFile.szSource, szBuf);
GetPrivateProfileString("Core", "Destination", "", szBuf, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Core", "Destination", "", szBuf, sizeof(szBuf), szFileIniConfig);
DecryptString(siCFXpcomFile.szDestination, szBuf);
GetPrivateProfileString("Core", "Message", "", siCFXpcomFile.szMessage, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Core", "Cleanup", "", szBuf, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Core", "Cleanup", "", szBuf, sizeof(szBuf), szFileIniConfig);
if(lstrcmpi(szBuf, "FALSE") == 0)
siCFXpcomFile.bCleanup = FALSE;
else
@ -5379,14 +5430,15 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
/* check the windows registry to see if a previous instance of setup finished downloading
* all the required archives. */
if(gbPreviousUnfinishedDownload = CheckForPreviousUnfinishedDownload())
gbPreviousUnfinishedDownload = CheckForPreviousUnfinishedDownload();
if(gbPreviousUnfinishedDownload)
{
char szTitle[MAX_BUF_TINY];
switch(sgProduct.dwMode)
{
case NORMAL:
if(NS_LoadString(hSetupRscInst, IDS_STR_MESSAGEBOX_TITLE, szBuf, sizeof(szBuf)) != WIZ_OK)
if(!GetPrivateProfileString("Messages", "STR_MESSAGEBOX_TITLE", "", szBuf, sizeof(szBuf), szFileIniInstall))
lstrcpy(szTitle, "Setup");
else
wsprintf(szTitle, szBuf, sgProduct.szProductName);
@ -5405,6 +5457,50 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
return(iRv);
}
HRESULT ParseInstallIni()
{
GetPrivateProfileString("General", "OK_", "", sgInstallGui.szOk_, sizeof(sgInstallGui.szOk_), szFileIniInstall);
GetPrivateProfileString("General", "OK", "", sgInstallGui.szOk, sizeof(sgInstallGui.szOk), szFileIniInstall);
GetPrivateProfileString("General", "CANCEL_", "", sgInstallGui.szCancel_, sizeof(sgInstallGui.szCancel_), szFileIniInstall);
GetPrivateProfileString("General", "CANCEL", "", sgInstallGui.szCancel, sizeof(sgInstallGui.szCancel), szFileIniInstall);
GetPrivateProfileString("General", "NEXT_", "", sgInstallGui.szNext_, sizeof(sgInstallGui.szNext_), szFileIniInstall);
GetPrivateProfileString("General", "BACK_", "", sgInstallGui.szBack_, sizeof(sgInstallGui.szBack_), szFileIniInstall);
GetPrivateProfileString("General", "PROXYSETTINGS_", "", sgInstallGui.szProxySettings_, sizeof(sgInstallGui.szProxySettings_), szFileIniInstall);
GetPrivateProfileString("General", "PROXYSETTINGS", "", sgInstallGui.szProxySettings, sizeof(sgInstallGui.szProxySettings), szFileIniInstall);
GetPrivateProfileString("General", "SERVER", "", sgInstallGui.szServer, sizeof(sgInstallGui.szServer), szFileIniInstall);
GetPrivateProfileString("General", "PORT", "", sgInstallGui.szPort, sizeof(sgInstallGui.szPort), szFileIniInstall);
GetPrivateProfileString("General", "USERID", "", sgInstallGui.szUserId, sizeof(sgInstallGui.szUserId), szFileIniInstall);
GetPrivateProfileString("General", "PASSWORD", "", sgInstallGui.szPassword, sizeof(sgInstallGui.szPassword), szFileIniInstall);
GetPrivateProfileString("General", "SELECTDIRECTORY", "", sgInstallGui.szSelectDirectory, sizeof(sgInstallGui.szSelectDirectory), szFileIniInstall);
GetPrivateProfileString("General", "DIRECTORIES_", "", sgInstallGui.szDirectories_, sizeof(sgInstallGui.szDirectories_), szFileIniInstall);
GetPrivateProfileString("General", "DRIVES_", "", sgInstallGui.szDrives_, sizeof(sgInstallGui.szDrives_), szFileIniInstall);
GetPrivateProfileString("General", "STATUS", "", sgInstallGui.szStatus, sizeof(sgInstallGui.szStatus), szFileIniInstall);
GetPrivateProfileString("General", "FILE", "", sgInstallGui.szFile, sizeof(sgInstallGui.szFile), szFileIniInstall);
GetPrivateProfileString("General", "URL", "", sgInstallGui.szUrl, sizeof(sgInstallGui.szUrl), szFileIniInstall);
GetPrivateProfileString("General", "ACCEPT_", "", sgInstallGui.szAccept_, sizeof(sgInstallGui.szAccept_), szFileIniInstall);
GetPrivateProfileString("General", "NO_", "", sgInstallGui.szNo_, sizeof(sgInstallGui.szNo_), szFileIniInstall);
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", "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);
GetPrivateProfileString("General", "DESCRIPTION", "", sgInstallGui.szDescription, sizeof(sgInstallGui.szDescription), szFileIniInstall);
GetPrivateProfileString("General", "TOTALDOWNLOADSIZE", "", sgInstallGui.szTotalDownloadSize, sizeof(sgInstallGui.szTotalDownloadSize), szFileIniInstall);
GetPrivateProfileString("General", "SPACEAVAILABLE", "", sgInstallGui.szSpaceAvailable, sizeof(sgInstallGui.szSpaceAvailable), szFileIniInstall);
GetPrivateProfileString("General", "COMPONENTS_", "", sgInstallGui.szComponents_, sizeof(sgInstallGui.szComponents_), szFileIniInstall);
GetPrivateProfileString("General", "DESTINATIONDIRECTORY", "", sgInstallGui.szDestinationDirectory, sizeof(sgInstallGui.szDestinationDirectory), szFileIniInstall);
GetPrivateProfileString("General", "BROWSE_", "", sgInstallGui.szBrowse_, sizeof(sgInstallGui.szBrowse_), szFileIniInstall);
GetPrivateProfileString("General", "CURRENTSETTINGS", "", sgInstallGui.szCurrentSettings, sizeof(sgInstallGui.szCurrentSettings), szFileIniInstall);
GetPrivateProfileString("General", "INSTALL_", "", sgInstallGui.szInstall_, sizeof(sgInstallGui.szInstall_), szFileIniInstall);
GetPrivateProfileString("General", "DELETE_", "", sgInstallGui.szDelete_, sizeof(sgInstallGui.szDelete_), szFileIniInstall);
GetPrivateProfileString("General", "EXTRACTING", "", sgInstallGui.szExtracting, sizeof(sgInstallGui.szExtracting), szFileIniInstall);
GetPrivateProfileString("General", "README", "", sgInstallGui.szReadme_, sizeof(sgInstallGui.szReadme_), szFileIniInstall);
return(0);
}
BOOL LocatePreviousPath(LPSTR szMainSectionName, LPSTR szPath, DWORD dwPathSize)
{
DWORD dwIndex;
@ -5422,17 +5518,17 @@ BOOL LocatePreviousPath(LPSTR szMainSectionName, LPSTR szPath, DWORD dwPathSize)
lstrcpy(szSection, szMainSectionName);
lstrcat(szSection, szIndex);
GetPrivateProfileString(szSection, "Key", "", szValue, MAX_BUF, szFileIniConfig);
GetPrivateProfileString(szSection, "Key", "", szValue, sizeof(szValue), szFileIniConfig);
if(*szValue != '\0')
bFound = LocatePathNscpReg(szSection, szPath, dwPathSize);
else
{
GetPrivateProfileString(szSection, "HKey", "", szValue, MAX_BUF, szFileIniConfig);
GetPrivateProfileString(szSection, "HKey", "", szValue, sizeof(szValue), szFileIniConfig);
if(*szValue != '\0')
bFound = LocatePathWinReg(szSection, szPath, dwPathSize);
else
{
GetPrivateProfileString(szSection, "Path", "", szValue, MAX_BUF, szFileIniConfig);
GetPrivateProfileString(szSection, "Path", "", szValue, sizeof(szValue), szFileIniConfig);
if(*szValue != '\0')
bFound = LocatePath(szSection, szPath, dwPathSize);
else
@ -5452,7 +5548,7 @@ BOOL LocatePathNscpReg(LPSTR szSection, LPSTR szPath, DWORD dwPathSize)
BOOL bReturn;
bReturn = FALSE;
GetPrivateProfileString(szSection, "Key", "", szKey, MAX_BUF, szFileIniConfig);
GetPrivateProfileString(szSection, "Key", "", szKey, sizeof(szKey), szFileIniConfig);
if(*szKey != '\0')
{
bReturn = FALSE;
@ -5461,7 +5557,7 @@ BOOL LocatePathNscpReg(LPSTR szSection, LPSTR szPath, DWORD dwPathSize)
VR_GetPath(szKey, MAX_BUF, szBuf);
if(*szBuf != '\0')
{
GetPrivateProfileString(szSection, "Contains Filename", "", szContainsFilename, MAX_BUF, szFileIniConfig);
GetPrivateProfileString(szSection, "Contains Filename", "", szContainsFilename, sizeof(szContainsFilename), szFileIniConfig);
if(lstrcmpi(szContainsFilename, "TRUE") == 0)
ParsePath(szBuf, szPath, dwPathSize, FALSE, PP_PATH_ONLY);
else
@ -5598,7 +5694,7 @@ BOOL LocatePath(LPSTR szSection, LPSTR szPath, DWORD dwPathSize)
BOOL bReturn;
bReturn = FALSE;
GetPrivateProfileString(szSection, "Path", "", szPathKey, MAX_BUF, szFileIniConfig);
GetPrivateProfileString(szSection, "Path", "", szPathKey, sizeof(szPathKey), szFileIniConfig);
if(*szPathKey != '\0')
{
bReturn = FALSE;
@ -5849,7 +5945,7 @@ HRESULT DecryptVariable(LPSTR szVariable, DWORD dwVariableSize)
{
char szEGetWinDirFailed[MAX_BUF];
if(NS_LoadString(hSetupRscInst, IDS_ERROR_GET_WINDOWS_DIRECTORY_FAILED, szEGetWinDirFailed, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "ERROR_GET_WINDOWS_DIRECTORY_FAILED", "", szEGetWinDirFailed, sizeof(szEGetWinDirFailed), szFileIniInstall))
PrintError(szEGetWinDirFailed, ERROR_CODE_SHOW);
exit(1);
@ -5871,7 +5967,7 @@ HRESULT DecryptVariable(LPSTR szVariable, DWORD dwVariableSize)
{
char szEGetWinDirFailed[MAX_BUF];
if(NS_LoadString(hSetupRscInst, IDS_ERROR_GET_WINDOWS_DIRECTORY_FAILED, szEGetWinDirFailed, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "ERROR_GET_WINDOWS_DIRECTORY_FAILED", "", szEGetWinDirFailed, sizeof(szEGetWinDirFailed), szFileIniInstall))
PrintError(szEGetWinDirFailed, ERROR_CODE_SHOW);
exit(1);
}
@ -5883,7 +5979,7 @@ HRESULT DecryptVariable(LPSTR szVariable, DWORD dwVariableSize)
{
char szEGetSysDirFailed[MAX_BUF];
if(NS_LoadString(hSetupRscInst, IDS_ERROR_GET_SYSTEM_DIRECTORY_FAILED, szEGetSysDirFailed, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "ERROR_GET_SYSTEM_DIRECTORY_FAILED", "", szEGetSysDirFailed, sizeof(szEGetSysDirFailed), szFileIniInstall))
PrintError(szEGetSysDirFailed, ERROR_CODE_SHOW);
exit(1);
@ -5897,7 +5993,7 @@ HRESULT DecryptVariable(LPSTR szVariable, DWORD dwVariableSize)
return(FALSE);
else
{
ParsePath(szVariable, szBuf, MAX_BUF, FALSE, PP_PATH_ONLY);
ParsePath(szVariable, szBuf, sizeof(szBuf), FALSE, PP_PATH_ONLY);
lstrcpy(szVariable, szBuf);
}
}
@ -6249,6 +6345,24 @@ BOOL DeleteIdiFileIniConfig()
return(bFileExists);
}
BOOL DeleteIdiFileIniInstall()
{
char szFileIniInstall[MAX_BUF];
BOOL bFileExists = FALSE;
ZeroMemory(szFileIniInstall, sizeof(szFileIniInstall));
lstrcpy(szFileIniInstall, szTempDir);
AppendBackSlash(szFileIniInstall, sizeof(szFileIniInstall));
lstrcat(szFileIniInstall, FILE_INI_INSTALL);
if(FileExists(szFileIniInstall))
{
bFileExists = TRUE;
}
DeleteFile(szFileIniInstall);
return(bFileExists);
}
void DeleteArchives(DWORD dwDeleteCheck)
{
DWORD dwIndex0;
@ -6264,7 +6378,7 @@ void DeleteArchives(DWORD dwDeleteCheck)
while(siCObject)
{
lstrcpy(szArchiveName, szTempDir);
AppendBackSlash(szArchiveName, sizeof(szArchiveName));
AppendBackSlash(szArchiveName, sizeof(szArchiveName));
lstrcat(szArchiveName, siCObject->szArchiveName);
switch(dwDeleteCheck)
@ -6306,6 +6420,7 @@ void CleanTempFiles()
don't have to worry about that case
*/
DeleteIdiFileIniConfig();
DeleteIdiFileIniInstall();
DeleteArchives(DA_IGNORE_ARCHIVES_LST);
DeleteInstallLogFile(FILE_INSTALL_LOG);
DeleteInstallLogFile(FILE_INSTALL_STATUS_LOG);
@ -6442,7 +6557,7 @@ char *GetSaveInstallerPath(char *szBuf, DWORD dwBufSize)
#ifdef XXX_INTL_HACK_WORKAROUND_FOR_NOW
/* Installer can't create the Save Installer Path if the word "Setup" is localized. */
if(NS_LoadString(hSetupRscInst, IDS_STR_SETUP, szBuf2, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "STR_SETUP", "", szBuf2, sizeof(szBuf2), szFileIniInstall))
lstrcat(szBuf, szBuf2);
else
#endif

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

@ -39,6 +39,8 @@ HRESULT NS_LoadStringAlloc(HANDLE hInstance, DWORD dwID, LPSTR *szStri
HRESULT NS_LoadString(HANDLE hInstance, DWORD dwID, LPSTR szStringBuf, DWORD dwStringBuf);
HRESULT WinSpawn(LPSTR szClientName, LPSTR szParameters, LPSTR szCurrentDir, int iShowCmd, BOOL bWait);
HRESULT ParseConfigIni(LPSTR lpszCmdLine);
HRESULT ParseInstallIni();
HFONT myGetSysFont();
HRESULT DecryptString(LPSTR szOutputStr, LPSTR szInputStr);
HRESULT DecryptVariable(LPSTR szVariable, DWORD dwVariableSize);
HRESULT InitSetupGeneral(void);
@ -95,6 +97,7 @@ void DeInitSiComponents(siC **siComponents);
void DeInitSetupGeneral(void);
HRESULT ParseSetupIni(void);
HRESULT GetConfigIni(void);
HRESULT GetInstallIni(void);
void CleanTempFiles(void);
void OutputSetupTitle(HDC hDC);
long RetrieveArchives(void);
@ -108,6 +111,7 @@ BOOL DeleteIdiGetConfigIni(void);
BOOL DeleteIdiGetArchives(void);
BOOL DeleteIdiGetRedirect(void);
BOOL DeleteIdiFileIniConfig(void);
BOOL DeleteIdiFileIniInstall(void);
void DeleteArchives(DWORD dwDeleteCheck);
BOOL DeleteIniRedirect(void);
HRESULT LaunchApps(void);

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

@ -53,6 +53,7 @@ LPSTR szSetupDir;
LPSTR szTempDir;
LPSTR szOSTempDir;
LPSTR szFileIniConfig;
LPSTR szFileIniInstall;
LPSTR szSiteSelectorDescription;
@ -91,6 +92,7 @@ siSD siSDObject;
siCF siCFXpcomFile;
siC *siComponents;
ssi *ssiSiteSelector;
installGui sgInstallGui;
sems gErrorMessageStream;
sysinfo gSystemInfo;
dsN *gdsnComponentDSRequirement = NULL;
@ -100,6 +102,7 @@ dsN *gdsnComponentDSRequirement = NULL;
char *SetupFileList[] = {"setuprsc.dll",
"config.ini",
"setup.ini",
"installer.ini",
""};
int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLine, int nCmdShow)
@ -134,7 +137,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmd
{
char szEFailed[MAX_BUF];
if(NS_LoadString(hInstance, IDS_ERROR_FAILED, szEFailed, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "ERROR_FAILED", "", szEFailed, sizeof(szEFailed), szFileIniInstall))
{
wsprintf(szBuf, szEFailed, "InitApplication().");
PrintError(szBuf, ERROR_CODE_SHOW);
@ -145,13 +148,21 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmd
{
char szEFailed[MAX_BUF];
if(NS_LoadString(hInstance, IDS_ERROR_FAILED, szEFailed, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "ERROR_FAILED", "", szEFailed, sizeof(szEFailed), szFileIniInstall))
{
wsprintf(szBuf, szEFailed, "InitInstance().");
PrintError(szBuf, ERROR_CODE_SHOW);
}
PostQuitMessage(1);
}
else if(GetInstallIni())
{
PostQuitMessage(1);
}
else if(ParseInstallIni())
{
PostQuitMessage(1);
}
else if(GetConfigIni())
{
PostQuitMessage(1);

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

@ -54,6 +54,7 @@ typedef int PRInt32;
#define CLASS_NAME_SETUP_DLG "MozillaSetupDlg"
#define FILE_INI_SETUP "setup.ini"
#define FILE_INI_CONFIG "config.ini"
#define FILE_INI_INSTALL "install.ini"
#define FILE_IDI_GETCONFIGINI "getconfigini.idi"
#define FILE_IDI_GETARCHIVES "getarchives.idi"
#define FILE_IDI_GETREDIRECT "getredirect.idi"
@ -424,6 +425,47 @@ struct ssInfo
ssi *Prev;
};
typedef struct dlgInstall
{
char szOk_[MAX_BUF];
char szOk[MAX_BUF];
char szCancel_[MAX_BUF];
char szCancel[MAX_BUF];
char szNext_[MAX_BUF];
char szBack_[MAX_BUF];
char szProxySettings_[MAX_BUF];
char szProxySettings[MAX_BUF];
char szServer[MAX_BUF];
char szPort[MAX_BUF];
char szUserId[MAX_BUF];
char szPassword[MAX_BUF];
char szSelectDirectory[MAX_BUF];
char szDirectories_[MAX_BUF];
char szDrives_[MAX_BUF];
char szStatus[MAX_BUF];
char szFile[MAX_BUF];
char szUrl[MAX_BUF];
char szAccept_[MAX_BUF];
char szNo_[MAX_BUF];
char szProgramFolder_[MAX_BUF];
char szExistingFolder_[MAX_BUF];
char szSetupMessage[MAX_BUF];
char szYesRestart[MAX_BUF];
char szNoRestart[MAX_BUF];
char szAdditionalComponents_[MAX_BUF];
char szDescription[MAX_BUF];
char szTotalDownloadSize[MAX_BUF];
char szSpaceAvailable[MAX_BUF];
char szComponents_[MAX_BUF];
char szDestinationDirectory[MAX_BUF];
char szBrowse_[MAX_BUF];
char szCurrentSettings[MAX_BUF];
char szInstall_[MAX_BUF];
char szDelete_[MAX_BUF];
char szExtracting[MAX_BUF];
char szReadme_[MAX_BUF];
} installGui;
/* structure message stream */
typedef struct sEMsgStream sems;
struct sEMsgStream

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

@ -73,7 +73,7 @@ HRESULT InitializeXPIStub()
hXPIStubInst = NULL;
if(NS_LoadString(hSetupRscInst, IDS_ERROR_GETPROCADDRESS, szEGetProcAddress, MAX_BUF) != WIZ_OK)
if(!GetPrivateProfileString("Messages", "ERROR_GETPROCADDRESS", "", szEGetProcAddress, sizeof(szEGetProcAddress), szFileIniInstall))
return(1);
/* change current directory to where xpistub.dll */
@ -189,15 +189,15 @@ HRESULT SmartUpdateJars()
char szMsgSmartUpdateStart[MAX_BUF];
char szDlgExtractingTitle[MAX_BUF];
if(NS_LoadString(hSetupRscInst, IDS_MSG_SMARTUPDATE_START, szMsgSmartUpdateStart, MAX_BUF) != WIZ_OK)
if(!GetPrivateProfileString("Messages", "MSG_SMARTUPDATE_START", "", szMsgSmartUpdateStart, sizeof(szMsgSmartUpdateStart), szFileIniInstall))
return(1);
if(NS_LoadString(hSetupRscInst, IDS_DLG_EXTRACTING_TITLE, szDlgExtractingTitle, MAX_BUF) != WIZ_OK)
if(!GetPrivateProfileString("Messages", "DLG_EXTRACTING_TITLE", "", szDlgExtractingTitle, sizeof(szDlgExtractingTitle), szFileIniInstall))
return(1);
if(NS_LoadString(hSetupRscInst, IDS_STR_PROCESSINGFILE, szStrProcessingFile, MAX_BUF) != WIZ_OK)
if(!GetPrivateProfileString("Messages", "STR_PROCESSINGFILE", "", szStrProcessingFile, sizeof(szStrProcessingFile), szFileIniInstall))
exit(1);
if(NS_LoadString(hSetupRscInst, IDS_STR_INSTALLING, szStrInstalling, MAX_BUF) != WIZ_OK)
if(!GetPrivateProfileString("Messages", "STR_INSTALLING", "", szStrInstalling, sizeof(szStrInstalling), szFileIniInstall))
exit(1);
if(NS_LoadString(hSetupRscInst, IDS_STR_COPYINGFILE, szStrCopyingFile, MAX_BUF) != WIZ_OK)
if(!GetPrivateProfileString("Messages", "STR_COPYINGFILE", "", szStrCopyingFile, sizeof(szStrCopyingFile), szFileIniInstall))
exit(1);
ShowMessage(szMsgSmartUpdateStart, TRUE);
@ -256,7 +256,7 @@ HRESULT SmartUpdateJars()
{
char szEFileNotFound[MAX_BUF];
if(NS_LoadString(hSetupRscInst, IDS_ERROR_FILE_NOT_FOUND, szEFileNotFound, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "ERROR_FILE_NOT_FOUND", "", szEFileNotFound, sizeof(szEFileNotFound), szFileIniInstall))
{
wsprintf(szBuf, szEFileNotFound, szArchive);
PrintError(szBuf, ERROR_CODE_HIDE);
@ -284,7 +284,7 @@ HRESULT SmartUpdateJars()
{
LogMSXPInstallStatus(siCObject->szArchiveName, hrResult);
LogISXPInstallComponentResult(hrResult);
if(NS_LoadString(hSetupRscInst, IDS_ERROR_XPI_INSTALL, szEXpiInstall, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "ERROR_XPI_INSTALL", "", szEXpiInstall, sizeof(szEXpiInstall), szFileIniInstall))
{
char szErrorString[MAX_BUF];
@ -406,6 +406,10 @@ ProgressDlgProc(HWND hWndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_INITDIALOG:
DisableSystemMenuItems(hWndDlg, TRUE);
CenterWindow(hWndDlg);
SendDlgItemMessage (hWndDlg, IDC_STATUS0, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hWndDlg, IDC_GAUGE_ARCHIVE, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hWndDlg, IDC_STATUS3, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hWndDlg, IDC_GAUGE_FILE, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
return FALSE;
case WM_COMMAND:

26
xpinstall/wizard/windows/setup/xpnetHook.cpp
Просмотреть файл

@ -146,6 +146,7 @@ void SetStatusFile(void)
/* Set the download dialog status*/
SetDlgItemText(dlgInfo.hWndDlg, IDC_STATUS_FILE, gszCurrentDownloadFileDescription);
SetStatusStatus();
}
void SetStatusUrl(void)
@ -641,12 +642,25 @@ DownloadDlgProc(HWND hWndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
switch (msg)
{
case WM_INITDIALOG:
DisableSystemMenuItems(hWndDlg, FALSE);
CenterWindow(hWndDlg);
if(gbShowDownloadRetryMsg)
SetDlgItemText(hWndDlg, IDC_MESSAGE0, diDownload.szMessageRetry0);
else
SetDlgItemText(hWndDlg, IDC_MESSAGE0, diDownload.szMessageDownload0);
DisableSystemMenuItems(hWndDlg, FALSE);
CenterWindow(hWndDlg);
if(gbShowDownloadRetryMsg)
SetDlgItemText(hWndDlg, IDC_MESSAGE0, diDownload.szMessageRetry0);
else
SetDlgItemText(hWndDlg, IDC_MESSAGE0, diDownload.szMessageDownload0);
SetDlgItemText(hWndDlg, IDC_STATIC1, sgInstallGui.szStatus);
SetDlgItemText(hWndDlg, IDC_STATIC2, sgInstallGui.szFile);
SetDlgItemText(hWndDlg, IDC_STATIC3, sgInstallGui.szUrl);
SetDlgItemText(hWndDlg, IDCANCEL, sgInstallGui.szCancel);
SendDlgItemMessage (hWndDlg, IDC_STATIC1, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hWndDlg, IDC_STATIC2, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hWndDlg, IDC_STATIC3, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hWndDlg, IDCANCEL, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hWndDlg, IDC_MESSAGE0, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hWndDlg, IDC_STATUS_STATUS, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hWndDlg, IDC_STATUS_FILE, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hWndDlg, IDC_STATUS_URL, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
return FALSE;

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

@ -6,37 +6,8 @@
#define WINVER 0x0400
#endif
#include "winresrc.h"
#define IDS_ERROR_DIALOG_CREATE 1
#define IDS_ERROR_FAILED 2
#define IDS_ERROR_FILE_NOT_FOUND 3
#define IDS_ERROR_GET_SYSTEM_DIRECTORY_FAILED 4
#define IDS_ERROR_GET_WINDOWS_DIRECTORY_FAILED 5
#define IDS_DLGQUITTITLE 6
#define IDS_DLGQUITMSG 7
#define IDS_DLG_REBOOT_TITLE 8
#define IDS_ERROR_GETPROCADDRESS 9
#define IDS_ERROR_WRITEPRIVATEPROFILESTRING 10
#define IDS_MSG_RETRIEVE_CONFIGINI 11
#define IDS_ERROR_CREATE_TEMP_DIR 12
#define IDS_DLGBROWSETITLE 13
#define IDS_ERROR_DETERMINING_DISK_SPACE 14
#define IDS_DLG_DISK_SPACE_CHECK_TITLE 15
#define IDS_DLG_DISK_SPACE_CHECK_SYS_MSG 16
#define IDS_DLG_DISK_SPACE_CHECK_CRUTIAL_MSG 16
#define IDS_DLG_DISK_SPACE_CHECK_MSG 17
#define IDS_ERROR_CREATE_DIRECTORY 18
#define IDS_STR_FILE_NUMBER 19
#define IDS_STR_FILENAME 20
#define IDS_MSG_SMARTUPDATE_START 21
#define IDS_MSG_CONFIGURING 22
#define IDS_ERROR_XPI_INSTALL 23
#define IDS_ERROR_SETUP_REQUIREMENT 24
#define IDS_DLG_EXTRACTING_TITLE 25
#define IDS_STR_PROCESSINGFILE 26
#define IDS_STR_INSTALLING 27
#define IDS_STR_COPYINGFILE 28
#define IDS_MB_WARNING_STR 29
#define IDS_MB_MESSAGE_STR 30
#define IDS_MSG_RETRIEVE_INSTALLINI 11
#define IDI_ICON1 105
#define IDI_SETUP 105
#define IDB_BITMAP_WELCOME 108
@ -80,6 +51,8 @@
#define IDC_STATIC0 1033
#define IDC_STATIC1 1034
#define IDC_STATIC2 1035
#define IDC_STATIC3 1036
#define IDC_STATIC4 1037
#define IDC_MESSAGE1 1040
#define IDC_PICT0 1041
#define IDC_MESSAGE0 1042
@ -146,21 +119,6 @@
#define IDWIZNEXT 11014
#define IDS_MSG_CREATE_DIRECTORY 11015
#define IDWIZNEXT2 11015
#define IDS_STR_CREATE_DIRECTORY 11016
#define IDS_ERROR_PROGRAM_FOLDER_NAME 11017
#define IDS_CB_DEFAULT 11018
#define IDS_ERROR_DESTINATION_PATH 11019
#define IDS_STR_SETUP_TYPE 11020
#define IDS_STR_SELECTED_COMPONENTS 11021
#define IDS_STR_DESTINATION_DIRECTORY 11022
#define IDS_STR_PROGRAM_FOLDER 11023
#define IDS_STR_DELETING_DESTINATION_DIR 11024
#define IDS_STR_SETUP 11025
#define IDS_STR_DOWNLOAD_SITE 11026
#define IDS_STR_SAVE_INSTALLER_FILES 11027
#define IDS_MSG_INIT_SETUP 11028
#define IDS_STR_MESSAGEBOX_TITLE 11029
#define IDS_ERROR_GETVERSION 11030
#define IDC_STATIC -1
// Next default values for new objects

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

@ -52,14 +52,14 @@ END
// Dialog
//
DLG_WELCOME DIALOG DISCARDABLE 51, 56, 315, 205
DLG_WELCOME DIALOGEX 51, 56, 315, 205
STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CLASS "MozillaSetupDlg"
FONT 8, "MS Sans Serif"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "&Next >",IDWIZNEXT,188,186,53,14
PUSHBUTTON "&Cancel",IDCANCEL,252,186,53,14
DEFPUSHBUTTON "",IDWIZNEXT,188,186,53,14
PUSHBUTTON "",IDCANCEL,252,186,53,14
LTEXT "",IDC_STATIC0,101,11,202,37,NOT WS_GROUP
LTEXT "",IDC_STATIC1,102,53,201,37,NOT WS_GROUP
LTEXT "",IDC_STATIC2,102,96,201,37,NOT WS_GROUP
@ -69,12 +69,12 @@ BEGIN
WS_EX_STATICEDGE
END
DLG_SETUP_TYPE DIALOG DISCARDABLE 51, 56, 315, 205
DLG_SETUP_TYPE DIALOGEX 51, 56, 315, 205
STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION ":"
CLASS "MozillaSetupDlg"
FONT 8, "MS Sans Serif"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
CONTROL "",IDC_RADIO_ST0,"Button",BS_AUTORADIOBUTTON |
WS_TABSTOP,102,29,65,12
@ -88,36 +88,36 @@ BEGIN
LTEXT "",IDC_STATIC_ST3_DESCRIPTION,175,114,126,25
LTEXT "",IDC_STATIC_ST1_DESCRIPTION,175,59,126,24
LTEXT "",IDC_STATIC_ST2_DESCRIPTION,175,86,126,24
GROUPBOX "Destination Directory",IDC_STATIC,101,147,204,27
PUSHBUTTON "B&rowse...",IDC_BUTTON_BROWSE,255,156,46,14
PUSHBUTTON "< &Back",IDWIZBACK,134,186,53,14
DEFPUSHBUTTON "&Next >",IDWIZNEXT,188,186,53,14
PUSHBUTTON "&Cancel",IDCANCEL,252,186,53,14
GROUPBOX "",IDC_STATIC,101,147,204,27
PUSHBUTTON "",IDC_BUTTON_BROWSE,255,156,46,14
PUSHBUTTON "",IDWIZBACK,134,186,53,14
DEFPUSHBUTTON "",IDWIZNEXT,188,186,53,14
PUSHBUTTON "",IDCANCEL,252,186,53,14
LTEXT "",IDC_STATIC_MSG0,101,11,204,17,NOT WS_GROUP
CONTROL 108,IDC_STATIC,"Static",SS_BITMAP,11,11,83,162,
WS_EX_CLIENTEDGE
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,11,179,295,1,
WS_EX_STATICEDGE
PUSHBUTTON "Re&ad Me",IDC_README,11,186,53,14
PUSHBUTTON "",IDC_README,11,186,83,14
CONTROL "",IDC_EDIT_DESTINATION,"Static",SS_LEFTNOWORDWRAP |
WS_GROUP,107,160,143,9
END
DLG_SELECT_COMPONENTS DIALOG DISCARDABLE 51, 56, 315, 205
DLG_SELECT_COMPONENTS DIALOGEX 51, 56, 315, 205
STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CLASS "MozillaSetupDlg"
FONT 8, "MS Sans Serif"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "&Next >",IDWIZNEXT,188,186,53,14
PUSHBUTTON "&Cancel",IDCANCEL,252,186,53,14
DEFPUSHBUTTON "",IDWIZNEXT,188,186,53,14
PUSHBUTTON "",IDCANCEL,252,186,53,14
LISTBOX IDC_LIST_COMPONENTS,101,42,204,67,LBS_OWNERDRAWFIXED |
LBS_HASSTRINGS | LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_HSCROLL | WS_GROUP | WS_TABSTOP
PUSHBUTTON "< &Back",IDWIZBACK,134,186,53,14
PUSHBUTTON "",IDWIZBACK,134,186,53,14
LTEXT "",IDC_MESSAGE0,101,10,204,19,NOT WS_GROUP
LTEXT "C&omponents:",IDC_STATIC,101,32,103,8
GROUPBOX "Description",IDC_STATIC,101,115,204,22
LTEXT "",IDC_STATIC1,101,32,103,8
GROUPBOX "",IDC_STATIC2,101,115,204,22
LTEXT "",IDC_STATIC_DESCRIPTION,106,124,195,8,SS_NOPREFIX
GROUPBOX "",IDC_STATIC,101,140,204,33
LTEXT "",IDC_DOWNLOAD_SIZE,105,160,92,8,NOT WS_GROUP
@ -127,28 +127,28 @@ BEGIN
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,11,179,295,1,
WS_EX_STATICEDGE
LTEXT "",IDC_STATIC,201,32,103,8,0,WS_EX_RIGHT
LTEXT "Total Download Size:",IDC_STATIC,105,148,92,9
LTEXT "Space Available:",IDC_STATIC,206,148,94,9
LTEXT "",IDC_STATIC3,105,148,92,9
LTEXT "",IDC_STATIC4,206,148,94,9
END
DLG_WINDOWS_INTEGRATION DIALOG DISCARDABLE 51, 56, 315, 205
DLG_WINDOWS_INTEGRATION DIALOGEX 51, 56, 315, 205
STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CLASS "MozillaSetupDlg"
FONT 8, "MS Sans Serif"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
CONTROL "Check0",IDC_CHECK0,"Button",BS_AUTOCHECKBOX | BS_TOP |
CONTROL "",IDC_CHECK0,"Button",BS_AUTOCHECKBOX | BS_TOP |
BS_MULTILINE | WS_TABSTOP,101,32,205,17
CONTROL "Check1",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | BS_TOP |
CONTROL "",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | BS_TOP |
BS_MULTILINE | WS_TABSTOP,101,53,205,17
CONTROL "Check2",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | BS_TOP |
CONTROL "",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | BS_TOP |
BS_MULTILINE | WS_TABSTOP,101,73,205,17
CONTROL "Check3",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | BS_TOP |
CONTROL "",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | BS_TOP |
BS_MULTILINE | WS_TABSTOP,101,94,205,17
LTEXT "",IDC_MESSAGE1,101,117,205,54,NOT WS_GROUP
PUSHBUTTON "< &Back",IDWIZBACK,134,186,53,14
DEFPUSHBUTTON "&Next >",IDWIZNEXT,188,186,53,14
PUSHBUTTON "&Cancel",IDCANCEL,252,186,53,14
PUSHBUTTON "",IDWIZBACK,134,186,53,14
DEFPUSHBUTTON "",IDWIZNEXT,188,186,53,14
PUSHBUTTON "",IDCANCEL,252,186,53,14
LTEXT "",IDC_MESSAGE0,101,11,204,17,NOT WS_GROUP
CONTROL 108,IDC_PICT0,"Static",SS_BITMAP,11,11,83,162,
WS_EX_CLIENTEDGE
@ -156,66 +156,65 @@ BEGIN
WS_EX_STATICEDGE
END
DLG_PROGRAM_FOLDER DIALOG DISCARDABLE 51, 56, 315, 205
DLG_PROGRAM_FOLDER DIALOGEX 51, 56, 315, 205
STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CLASS "MozillaSetupDlg"
FONT 8, "MS Sans Serif"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
EDITTEXT IDC_EDIT_PROGRAM_FOLDER,101,64,204,12,ES_AUTOHSCROLL
LISTBOX IDC_LIST,101,94,204,79,LBS_SORT | LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
PUSHBUTTON "< &Back",IDWIZBACK,134,186,53,14
DEFPUSHBUTTON "&Next >",IDWIZNEXT,188,186,53,14
PUSHBUTTON "&Cancel",IDCANCEL,252,186,53,14
PUSHBUTTON "",IDWIZBACK,134,186,53,14
DEFPUSHBUTTON "",IDWIZNEXT,188,186,53,14
PUSHBUTTON "",IDCANCEL,252,186,53,14
LTEXT "",IDC_MESSAGE0,101,11,204,33,NOT WS_GROUP
LTEXT "&Program Folder:",IDC_STATIC,101,54,105,8
LTEXT "E&xisting Folders:",IDC_STATIC,101,84,163,8
LTEXT "",IDC_STATIC1,101,54,105,8
LTEXT "",IDC_STATIC2,101,84,163,8
CONTROL 108,IDC_STATIC,"Static",SS_BITMAP,11,11,83,162,
WS_EX_CLIENTEDGE
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,11,179,295,1,
WS_EX_STATICEDGE
END
DLG_LICENSE DIALOG DISCARDABLE 51, 56, 315, 205
DLG_LICENSE DIALOGEX 51, 56, 315, 205
STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CLASS "MozillaSetupDlg"
FONT 8, "MS Sans Serif"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "&Accept",IDWIZNEXT,188,186,53,14
PUSHBUTTON "&No",IDCANCEL,252,186,53,14
DEFPUSHBUTTON "",IDWIZNEXT,188,186,53,14
PUSHBUTTON "",IDCANCEL,252,186,53,14
EDITTEXT IDC_EDIT_LICENSE,11,29,295,119,ES_MULTILINE |
ES_OEMCONVERT | ES_READONLY | WS_VSCROLL | WS_GROUP
PUSHBUTTON "< &Back",IDWIZBACK,134,186,53,14
PUSHBUTTON "",IDWIZBACK,134,186,53,14
LTEXT "",IDC_MESSAGE0,11,8,295,17,NOT WS_GROUP
LTEXT "",IDC_MESSAGE1,11,152,295,19,NOT WS_GROUP
CONTROL "",-1,"Static",SS_ETCHEDHORZ,11,179,295,1,
WS_EX_STATICEDGE
END
DLG_START_INSTALL DIALOG DISCARDABLE 51, 56, 315, 205
DLG_START_INSTALL DIALOGEX 51, 56, 315, 205
STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CLASS "MozillaSetupDlg"
FONT 8, "MS Sans Serif"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
EDITTEXT IDC_CURRENT_SETTINGS,101,67,204,106,ES_MULTILINE |
ES_OEMCONVERT | ES_READONLY | WS_VSCROLL | WS_HSCROLL
PUSHBUTTON "< &Back",IDWIZBACK,134,186,53,14
DEFPUSHBUTTON "&Install",IDWIZNEXT,188,186,53,14
PUSHBUTTON "&Cancel",IDCANCEL,252,186,53,14
PUSHBUTTON "",IDWIZBACK,134,186,53,14
DEFPUSHBUTTON "",IDWIZNEXT,188,186,53,14
PUSHBUTTON "",IDCANCEL,252,186,53,14
LTEXT "",IDC_MESSAGE0,101,11,204,33,NOT WS_GROUP
LTEXT "Current Settings:",IDC_STATIC,101,57,163,8,NOT WS_GROUP
LTEXT "",IDC_STATIC,101,57,163,8,NOT WS_GROUP
CONTROL 108,IDC_STATIC,"Static",SS_BITMAP,11,11,83,162,
WS_EX_CLIENTEDGE
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,11,179,295,1,
WS_EX_STATICEDGE
END
DLG_BROWSE_DIR DIALOG DISCARDABLE 147, 23, 190, 143
DLG_BROWSE_DIR DIALOGEX 147, 23, 190, 143
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Select a directory"
FONT 8, "MS Shell Dlg"
BEGIN
EDITTEXT IDC_EDIT_DESTINATION,8,16,177,12,ES_AUTOHSCROLL |
@ -227,25 +226,23 @@ BEGIN
COMBOBOX 1137,8,118,121,68,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED |
CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER |
WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK",1,135,43,50,14,WS_GROUP
PUSHBUTTON "Cancel",IDCANCEL,135,63,50,14,WS_GROUP
LTEXT "&Directories:",-1,8,6,92,9
LTEXT "Dri&ves:",1091,8,108,92,9
DEFPUSHBUTTON "",1,135,43,50,14,WS_GROUP
PUSHBUTTON "",IDCANCEL,135,63,50,14,WS_GROUP
LTEXT "",1092,8,6,92,9
LTEXT "",1091,8,108,92,9
END
DLG_RESTART DIALOG FIXED IMPURE 133, 69, 226, 110
DLG_RESTART DIALOG FIXED IMPURE 133, 69, 255, 111
STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CLASS "MozillaSetupDlg"
FONT 8, "MS Sans Serif"
BEGIN
LTEXT "Setup has finished copying files to your computer. Before you can use the program, you must restart Windows or your computer.\n\n Choose one of the following options and click OK to finish setup.",
202,10,10,209,36,SS_NOPREFIX
CONTROL "Yes, I want to restart my computer now.",IDC_RADIO_YES,
"Button",BS_AUTORADIOBUTTON,26,52,191,12
CONTROL "No, I will restart my computer later.",IDC_RADIO_NO,
"Button",BS_AUTORADIOBUTTON,26,68,191,12
DEFPUSHBUTTON "OK",IDOK,169,88,50,14,WS_GROUP
LTEXT "",202,10,10,236,36,SS_NOPREFIX
CONTROL "",IDC_RADIO_YES,"Button",BS_AUTORADIOBUTTON,26,52,220,
12
CONTROL "",IDC_RADIO_NO,"Button",BS_AUTORADIOBUTTON,26,68,223,12
DEFPUSHBUTTON "",IDOK,189,88,50,14,WS_GROUP
END
DLG_MESSAGE DIALOG DISCARDABLE 0, 0, 236, 34
@ -270,43 +267,43 @@ BEGIN
CONTROL "",IDC_GAUGE_ARCHIVE,"GaugeArchive",0x0,9,21,175,11
END
DLG_ADVANCED_SETTINGS DIALOG DISCARDABLE 51, 56, 315, 205
DLG_ADVANCED_SETTINGS DIALOGEX 51, 56, 315, 205
STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CLASS "MozillaSetupDlg"
FONT 8, "MS Sans Serif"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
EDITTEXT IDC_EDIT_PROXY_SERVER,147,57,152,12,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_PROXY_PORT,147,74,152,12,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_PROXY_USER,147,101,152,12,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_PROXY_PASSWD,147,118,152,12,ES_PASSWORD |
EDITTEXT IDC_EDIT_PROXY_SERVER,165,57,134,12,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_PROXY_PORT,165,74,134,12,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_PROXY_USER,165,101,134,12,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_PROXY_PASSWD,165,118,134,12,ES_PASSWORD |
ES_AUTOHSCROLL
DEFPUSHBUTTON "&Ok",IDWIZNEXT,188,186,53,14
PUSHBUTTON "&Cancel",IDCANCEL,252,186,53,14
DEFPUSHBUTTON "",IDWIZNEXT,188,186,53,14
PUSHBUTTON "",IDCANCEL,252,186,53,14
CONTROL 108,IDC_STATIC,"Static",SS_BITMAP,11,11,83,162,
WS_EX_CLIENTEDGE
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,11,179,295,1,
WS_EX_STATICEDGE
RTEXT "Server:",IDC_STATIC,108,59,35,9
RTEXT "Port:",IDC_STATIC,108,75,35,9
GROUPBOX "Proxy Settings:",IDC_STATIC,101,44,206,94
RTEXT "",IDC_STATIC1,108,59,52,9
RTEXT "",IDC_STATIC2,108,75,52,9
GROUPBOX "",IDC_STATIC,101,44,206,94
LTEXT "",IDC_MESSAGE0,101,11,204,29,NOT WS_GROUP
RTEXT "User id:",IDC_STATIC,108,102,35,9
RTEXT "Password:",IDC_STATIC,108,120,35,9
RTEXT "",IDC_STATIC3,108,102,52,9
RTEXT "",IDC_STATIC4,108,120,52,9
END
DLG_SELECT_ADDITIONAL_COMPONENTS DIALOG DISCARDABLE 51, 56, 315, 205
DLG_SELECT_ADDITIONAL_COMPONENTS DIALOGEX 51, 56, 315, 205
STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CLASS "MozillaSetupDlg"
FONT 8, "MS Sans Serif"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
PUSHBUTTON "< &Back",IDWIZBACK,134,186,53,14
DEFPUSHBUTTON "&Next >",IDWIZNEXT,188,186,53,14
PUSHBUTTON "&Cancel",IDCANCEL,252,186,53,14
PUSHBUTTON "",IDWIZBACK,134,186,53,14
DEFPUSHBUTTON "",IDWIZNEXT,188,186,53,14
PUSHBUTTON "",IDCANCEL,252,186,53,14
LTEXT "",IDC_MESSAGE0,101,10,204,19,NOT WS_GROUP
LTEXT "&Additional Components:",IDC_STATIC,101,32,125,8
GROUPBOX "Description",IDC_STATIC,101,115,204,22
LTEXT "",IDC_STATIC1,101,32,125,8
GROUPBOX "",IDC_STATIC2,101,115,204,22
LTEXT "",IDC_STATIC_DESCRIPTION,106,124,195,8,SS_NOPREFIX
GROUPBOX "",IDC_STATIC,101,140,204,33
LTEXT "",IDC_DOWNLOAD_SIZE,105,160,92,8,NOT WS_GROUP
@ -319,8 +316,8 @@ BEGIN
LBS_HASSTRINGS | LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_HSCROLL | WS_GROUP | WS_TABSTOP
LTEXT "",IDC_STATIC,241,32,63,8,0,WS_EX_RIGHT
LTEXT "Total download size:",IDC_STATIC,105,148,92,9
LTEXT "Space Available:",IDC_STATIC,206,148,94,9
LTEXT "",IDC_STATIC3,105,148,92,9
LTEXT "",IDC_STATIC4,206,148,94,9
END
DLG_UPGRADE DIALOG DISCARDABLE 51, 56, 310, 166
@ -330,17 +327,17 @@ BEGIN
LTEXT "",IDC_MESSAGE0,17,13,276,31,NOT WS_GROUP
LTEXT "",IDC_MESSAGE1,17,48,276,21,NOT WS_GROUP
LTEXT "",IDC_MESSAGE2,17,73,276,21,NOT WS_GROUP
GROUPBOX "Destination Directory",IDC_STATIC,16,102,276,25
GROUPBOX "",IDC_STATIC,16,102,276,25
LTEXT "",IDC_DELETE_PATH,22,111,264,13,SS_CENTERIMAGE
PUSHBUTTON "&Delete",ID_DELETE,95,139,53,14
DEFPUSHBUTTON "&Back",IDWIZBACK,162,139,53,14
PUSHBUTTON "",ID_DELETE,95,139,53,14
DEFPUSHBUTTON "",IDWIZBACK,162,139,53,14
END
DLG_DOWNLOAD_OPTIONS DIALOG DISCARDABLE 51, 56, 315, 205
DLG_DOWNLOAD_OPTIONS DIALOGEX 51, 56, 315, 205
STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CLASS "MozillaSetupDlg"
FONT 8, "MS Sans Serif"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
COMBOBOX IDC_LIST_SITE_SELECTOR,101,45,206,124,CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
@ -353,32 +350,31 @@ BEGIN
101,148,112,9
CONTROL "",IDC_USE_HTTP,"Button",BS_AUTORADIOBUTTON,101,161,112,
9
PUSHBUTTON "&Proxy Settings",IDC_BUTTON_PROXY_SETTINGS,221,159,84,
14
PUSHBUTTON "< &Back",IDWIZBACK,134,186,53,14
DEFPUSHBUTTON "&Next >",IDWIZNEXT,188,186,53,14
PUSHBUTTON "&Cancel",IDCANCEL,252,186,53,14
PUSHBUTTON "",IDC_BUTTON_PROXY_SETTINGS,221,159,84,14
PUSHBUTTON "",IDWIZBACK,134,186,53,14
DEFPUSHBUTTON "",IDWIZNEXT,188,186,53,14
PUSHBUTTON "",IDCANCEL,252,186,53,14
LTEXT "",IDC_MESSAGE0,101,15,204,25,NOT WS_GROUP
CONTROL 108,-1,"Static",SS_BITMAP,11,11,83,162,WS_EX_CLIENTEDGE
CONTROL "",-1,"Static",SS_ETCHEDHORZ,11,179,295,1,
WS_EX_STATICEDGE
END
DLG_DOWNLOADING DIALOG DISCARDABLE 0, 0, 311, 114
DLG_DOWNLOADING DIALOGEX 0, 0, 311, 114
STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CLASS "MozillaSetupDlg"
FONT 8, "MS Sans Serif"
BEGIN
PUSHBUTTON "Cancel",IDCANCEL,131,92,50,14,WS_GROUP
PUSHBUTTON "",IDCANCEL,131,92,50,14,WS_GROUP
LTEXT "",IDC_MESSAGE0,9,9,293,21
RTEXT "File:",IDC_STATIC,9,53,37,8,SS_NOPREFIX
RTEXT "",IDC_STATIC2,9,53,37,8,SS_NOPREFIX
CONTROL "",IDC_STATUS_FILE,"Static",SS_LEFTNOWORDWRAP |
SS_NOPREFIX | WS_GROUP,49,53,253,8
RTEXT "Url:",IDC_STATIC,9,61,37,8,SS_NOPREFIX
RTEXT "",IDC_STATIC3,9,61,37,8,SS_NOPREFIX
CONTROL "",IDC_STATUS_URL,"Static",SS_LEFTNOWORDWRAP |
SS_NOPREFIX | WS_GROUP,49,61,253,8
RTEXT "Status:",IDC_STATIC,9,44,37,8,SS_NOPREFIX
RTEXT "",IDC_STATIC1,9,44,37,8,SS_NOPREFIX
CONTROL "",IDC_STATUS_STATUS,"Static",SS_LEFTNOWORDWRAP |
SS_NOPREFIX | WS_GROUP,49,44,253,8
CONTROL "",IDC_GAUGE_FILE,"GaugeFile",0x0,9,72,293,11
@ -432,74 +428,9 @@ END
STRINGTABLE DISCARDABLE
BEGIN
IDS_ERROR_DIALOG_CREATE "Could not create %s dialog."
IDS_ERROR_FAILED "%s failed."
IDS_ERROR_FILE_NOT_FOUND "File not found: %s"
IDS_ERROR_GET_SYSTEM_DIRECTORY_FAILED "GetSystemDirectory() failed."
IDS_ERROR_GET_WINDOWS_DIRECTORY_FAILED "GetWindowsDirectory() failed."
IDS_DLGQUITTITLE "Exit Setup"
IDS_DLGQUITMSG "Setup is not complete. If you quit the Setup program now, the program will not be installed. \n\nYou may run the Setup program at a later time to complete the installation.\n\nAre you sure you want to cancel Setup?"
IDS_DLG_REBOOT_TITLE "Restarting Windows"
IDS_ERROR_GETPROCADDRESS "GetProcAddress() of %s failed."
IDS_ERROR_WRITEPRIVATEPROFILESTRING
"WritePrivateProfileString() failed for file %s"
IDS_MSG_RETRIEVE_CONFIGINI
"Please wait while Setup is attempting to retrieve Config.ini, required by Setup, from the Web..."
IDS_ERROR_CREATE_TEMP_DIR
"Setup was unable to create the TEMP directory: %s"
IDS_DLGBROWSETITLE "Select a directory"
IDS_ERROR_DETERMINING_DISK_SPACE
"Could not determine available disk space for: %s"
IDS_DLG_DISK_SPACE_CHECK_TITLE "Disk space check"
END
STRINGTABLE DISCARDABLE
BEGIN
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."
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."
IDS_ERROR_CREATE_DIRECTORY
"Could not create folder: %sMake sure you have access to create the folder."
IDS_STR_FILE_NUMBER "File count:"
IDS_STR_FILENAME "Filename:"
IDS_MSG_SMARTUPDATE_START "Preparing Install, please wait..."
IDS_MSG_CONFIGURING "Configuring %s, please wait..."
IDS_ERROR_XPI_INSTALL "Error occurred during installation"
IDS_ERROR_SETUP_REQUIREMENT
"Windows95 or greater Operating System is required! Exiting setup..."
IDS_DLG_EXTRACTING_TITLE "Install Progress"
IDS_STR_PROCESSINGFILE "Preparing file: %s"
IDS_STR_INSTALLING "Currently installing %s"
IDS_STR_COPYINGFILE "Copying file: %s"
IDS_MB_WARNING_STR "Warning"
IDS_MB_MESSAGE_STR "Message"
END
STRINGTABLE DISCARDABLE
BEGIN
IDS_MSG_CREATE_DIRECTORY
"The following directory does not exist:%sWould you like to create it?"
IDS_STR_CREATE_DIRECTORY "Create Directory?"
IDS_ERROR_PROGRAM_FOLDER_NAME "Invalid Program folder name entered."
IDS_CB_DEFAULT "Default"
IDS_ERROR_DESTINATION_PATH "Invalid path entered."
IDS_STR_SETUP_TYPE "Setup Type:"
IDS_STR_SELECTED_COMPONENTS "Selected Components:"
IDS_STR_DESTINATION_DIRECTORY "Destination Directory:"
IDS_STR_PROGRAM_FOLDER "Program Folder:"
END
STRINGTABLE DISCARDABLE
BEGIN
IDS_STR_DELETING_DESTINATION_DIR
"Deleting destination directory to be able to upgrade, please wait..."
IDS_STR_SETUP "Setup"
IDS_STR_DOWNLOAD_SITE "Download Site:"
IDS_STR_SAVE_INSTALLER_FILES "Save downloaded and Setup program files to:"
IDS_MSG_INIT_SETUP "Initializing Setup, please wait..."
IDS_STR_MESSAGEBOX_TITLE "%s Setup"
IDS_ERROR_GETVERSION "GetVersionEx() failed!"
IDS_MSG_RETRIEVE_INSTALLINI
"Please wait while Setup is attempting to retrieve Installer.ini, required by Setup, from the Web..."
END
#endif // English (U.S.) resources

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

@ -89,6 +89,13 @@ LRESULT CALLBACK DlgProcUninstall(HWND hDlg, UINT msg, WPARAM wParam, LONG lPara
SetWindowText(hDlg, diUninstall.szTitle);
wsprintf(szBuf, diUninstall.szMessage0, ugUninstall.szDescription);
SetDlgItemText(hDlg, IDC_MESSAGE0, szBuf);
GetPrivateProfileString("Dialog Uninstall", "Uninstall", "", szBuf, sizeof(szBuf), szFileIniUninstall);
SetDlgItemText(hDlg, IDWIZNEXT, szBuf);
GetPrivateProfileString("Dialog Uninstall", "Cancel", "", szBuf, sizeof(szBuf), szFileIniUninstall);
SetDlgItemText(hDlg, IDCANCEL, szBuf);
SendDlgItemMessage (hDlg, IDC_MESSAGE0, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDWIZNEXT, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDCANCEL, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
if(GetClientRect(hDlg, &rDlg))
SetWindowPos(hDlg, HWND_TOP, (dwScreenX/2)-(rDlg.right/2), (dwScreenY/2)-(rDlg.bottom/2), 0, 0, SWP_NOSIZE);
@ -127,12 +134,36 @@ LRESULT CALLBACK DlgProcWhatToDo(HWND hDlg, UINT msg, WPARAM wParam, LONG lParam
switch(msg)
{
case WM_INITDIALOG:
NS_LoadString(hInst, IDS_DLG_REMOVE_FILE_TITLE, szBuf, MAX_BUF);
GetPrivateProfileString("Messages", "DLG_REMOVE_FILE_TITLE", "", szBuf, sizeof(szBuf), szFileIniUninstall);
SetWindowText(hDlg, szBuf);
if((LPSTR)lParam != NULL)
SetDlgItemText(hDlg, IDC_STATIC_SHARED_FILENAME, (LPSTR)lParam);
GetPrivateProfileString("Dialog Uninstall", "Message1", "", szBuf, sizeof(szBuf), szFileIniUninstall);
SetDlgItemText(hDlg, IDC_MESSAGE0, szBuf);
GetPrivateProfileString("Dialog Uninstall", "Message2", "", szBuf, sizeof(szBuf), szFileIniUninstall);
SetDlgItemText(hDlg, IDC_MESSAGE1, szBuf);
GetPrivateProfileString("Dialog Uninstall", "FileName", "", szBuf, sizeof(szBuf), szFileIniUninstall);
SetDlgItemText(hDlg, IDC_STATIC, szBuf);
GetPrivateProfileString("Dialog Uninstall", "No", "", szBuf, sizeof(szBuf), szFileIniUninstall);
SetDlgItemText(hDlg, ID_NO, szBuf);
GetPrivateProfileString("Dialog Uninstall", "NoToAll", "", szBuf, sizeof(szBuf), szFileIniUninstall);
SetDlgItemText(hDlg, ID_NO_TO_ALL, szBuf);
GetPrivateProfileString("Dialog Uninstall", "Yes", "", szBuf, sizeof(szBuf), szFileIniUninstall);
SetDlgItemText(hDlg, ID_YES, szBuf);
GetPrivateProfileString("Dialog Uninstall", "YesToAll", "", szBuf, sizeof(szBuf), szFileIniUninstall);
SetDlgItemText(hDlg, ID_YES_TO_ALL, szBuf);
SendDlgItemMessage (hDlg, IDC_MESSAGE0, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_MESSAGE1, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_STATIC, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, IDC_STATIC_SHARED_FILENAME, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, ID_NO, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, ID_NO_TO_ALL, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, ID_YES, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
SendDlgItemMessage (hDlg, ID_YES_TO_ALL, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
if(GetClientRect(hDlg, &rDlg))
SetWindowPos(hDlg, HWND_TOP, (dwScreenX/2)-(rDlg.right/2), (dwScreenY/2)-(rDlg.bottom/2), 0, 0, SWP_NOSIZE);
@ -179,6 +210,7 @@ LRESULT CALLBACK DlgProcMessage(HWND hDlg, UINT msg, WPARAM wParam, LONG lParam)
switch(msg)
{
case WM_INITDIALOG:
SendDlgItemMessage (hDlg, IDC_MESSAGE, WM_SETFONT, (WPARAM)myGetSysFont(), 0L);
break;
case WM_COMMAND:
@ -249,7 +281,7 @@ void ShowMessage(LPSTR szMessage, BOOL bShow)
if((bShow) && (hDlgMessage == NULL))
{
ZeroMemory(szBuf, sizeof(szBuf));
NS_LoadString(hInst, IDS_MB_MESSAGE_STR, szBuf, MAX_BUF);
GetPrivateProfileString("Messages", "MB_MESSAGE_STR", "", szBuf, sizeof(szBuf), szFileIniUninstall);
hDlgMessage = InstantiateDialog(hWndMain, DLG_MESSAGE, szBuf, DlgProcMessage);
SendMessage(hDlgMessage, WM_COMMAND, IDC_MESSAGE, (LPARAM)szMessage);
}
@ -270,7 +302,7 @@ HWND InstantiateDialog(HWND hParent, DWORD dwDlgID, LPSTR szTitle, WNDPROC wpDlg
{
char szEDialogCreate[MAX_BUF];
if(NS_LoadString(hInst, IDS_ERROR_DIALOG_CREATE, szEDialogCreate, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "ERROR_DIALOG_CREATE", "", szEDialogCreate, sizeof(szEDialogCreate), szFileIniUninstall))
{
wsprintf(szBuf, szEDialogCreate, szTitle);
PrintError(szBuf, ERROR_CODE_SHOW);
@ -282,3 +314,13 @@ HWND InstantiateDialog(HWND hParent, DWORD dwDlgID, LPSTR szTitle, WNDPROC wpDlg
return(hDlg);
}
HFONT myGetSysFont()
{
LOGFONT lf;
HFONT fontDlg;
SystemParametersInfo(SPI_GETICONTITLELOGFONT,sizeof(LOGFONT),&lf,0);
fontDlg = CreateFontIndirect( &lf );
return fontDlg;
}

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

@ -213,7 +213,9 @@ HRESULT Initialize(HINSTANCE hInstance)
{
char szEGetWinDirFailed[MAX_BUF];
if(NS_LoadString(hInst, IDS_ERROR_GET_WINDOWS_DIRECTORY_FAILED, szEGetWinDirFailed, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "ERROR_GET_WINDOWS_DIRECTORY_FAILED", "",
szEGetWinDirFailed, sizeof(szEGetWinDirFailed),
szFileIniUninstall))
PrintError(szEGetWinDirFailed, ERROR_CODE_SHOW);
return(1);
@ -234,7 +236,9 @@ HRESULT Initialize(HINSTANCE hInstance)
{
char szECreateTempDir[MAX_BUF];
if(NS_LoadString(hInst, IDS_ERROR_CREATE_TEMP_DIR, szECreateTempDir, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "ERROR_CREATE_TEMP_DIR", "",
szECreateTempDir, sizeof(szECreateTempDir),
szFileIniUninstall))
{
wsprintf(szBuf, szECreateTempDir, szTempDir);
PrintError(szBuf, ERROR_CODE_HIDE);
@ -629,7 +633,9 @@ void DetermineOSVersion()
}
else
{
if(NS_LoadString(hInst, IDS_ERROR_SETUP_REQUIREMENT, szESetupRequirement, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "ERROR_SETUP_REQUIREMENT", "",
szESetupRequirement, sizeof(szESetupRequirement),
szFileIniUninstall))
PrintError(szESetupRequirement, ERROR_CODE_HIDE);
exit(1);
@ -1036,7 +1042,9 @@ BOOL CheckLegacy(HWND hDlg)
{
char szMBWarningStr[MAX_BUF];
if(NS_LoadString(hInst, IDS_MB_WARNING_STR, szMBWarningStr, MAX_BUF) != WIZ_OK)
if(!GetPrivateProfileString("Messages", "MB_WARNING_STR", "",
szMBWarningStr, sizeof(szMBWarningStr),
szFileIniUninstall))
lstrcpy(szMBWarningStr, "Warning");
if(MessageBox(hDlg, szMessage, szMBWarningStr, MB_ICONWARNING | MB_YESNO) == IDYES)
@ -1053,7 +1061,9 @@ BOOL CheckLegacy(HWND hDlg)
{
char szMBWarningStr[MAX_BUF];
if(NS_LoadString(hInst, IDS_MB_WARNING_STR, szMBWarningStr, MAX_BUF) != WIZ_OK)
if(!GetPrivateProfileString("Messages", "MB_WARNING_STR", "",
szMBWarningStr, sizeof(szMBWarningStr),
szFileIniUninstall))
lstrcpy(szMBWarningStr, "Warning");
if(MessageBox(hDlg, szMessage, szMBWarningStr, MB_ICONWARNING | MB_YESNO) == IDYES)
@ -1107,7 +1117,9 @@ HRESULT GetUninstallLogPath()
if(FileExists(szLogFolder) == FALSE)
{
if(NS_LoadString(hInst, IDS_ERROR_UNINSTALL_LOG_FOLDER, szEUninstallLogFolder, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "ERROR_UNINSTALL_LOG_FOLDER", "",
szEUninstallLogFolder, sizeof(szEUninstallLogFolder),
szFileIniUninstall))
{
lstrcpy(szBuf, "\n\n ");
@ -1445,7 +1457,9 @@ HRESULT DecryptVariable(LPSTR szVariable, DWORD dwVariableSize)
{
char szEGetWinDirFailed[MAX_BUF];
if(NS_LoadString(hInst, IDS_ERROR_GET_WINDOWS_DIRECTORY_FAILED, szEGetWinDirFailed, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "ERROR_GET_WINDOWS_DIRECTORY_FAILED", "",
szEGetWinDirFailed, sizeof(szEGetWinDirFailed),
szFileIniUninstall))
PrintError(szEGetWinDirFailed, ERROR_CODE_SHOW);
exit(1);
@ -1467,7 +1481,9 @@ HRESULT DecryptVariable(LPSTR szVariable, DWORD dwVariableSize)
{
char szEGetWinDirFailed[MAX_BUF];
if(NS_LoadString(hInst, IDS_ERROR_GET_WINDOWS_DIRECTORY_FAILED, szEGetWinDirFailed, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "ERROR_GET_WINDOWS_DIRECTORY_FAILED", "",
szEGetWinDirFailed, sizeof(szEGetWinDirFailed),
szFileIniUninstall))
PrintError(szEGetWinDirFailed, ERROR_CODE_SHOW);
exit(1);
}
@ -1479,7 +1495,9 @@ HRESULT DecryptVariable(LPSTR szVariable, DWORD dwVariableSize)
{
char szEGetSysDirFailed[MAX_BUF];
if(NS_LoadString(hInst, IDS_ERROR_GET_SYSTEM_DIRECTORY_FAILED, szEGetSysDirFailed, MAX_BUF) == WIZ_OK)
if(GetPrivateProfileString("Messages", "ERROR_GET_SYSTEM_DIRECTORY_FAILED", "",
szEGetSysDirFailed, sizeof(szEGetSysDirFailed),
szFileIniUninstall))
PrintError(szEGetSysDirFailed, ERROR_CODE_SHOW);
exit(1);

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

@ -88,6 +88,7 @@ void ParseCommandLine(LPSTR lpszCmdLine);
void SetUninstallRunMode(LPSTR szMode);
void Delay(DWORD dwSeconds);
HRESULT GetUninstallLogPath();
HFONT myGetSysFont();
#endif

61
xpinstall/wizard/windows/uninstall/resource.h
Просмотреть файл

@ -1,61 +0,0 @@
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by uninstall.rc
//
#ifndef WINVER
#define WINVER 0x0400
#endif
#include "winresrc.h"
#define IDS_ERROR_DLL_LOAD 1
#define IDS_ERROR_STRING_LOAD 2
#define IDS_ERROR_STRING_NULL 4
#define IDS_ERROR_GLOBALALLOC 5
#define IDS_ERROR_FAILED 6
#define IDS_ERROR_DIALOG_CREATE 7
#define IDS_DLGQUITTITLE 8
#define IDS_DLGQUITMSG 9
#define IDS_ERROR_GET_SYSTEM_DIRECTORY_FAILED 10
#define IDS_ERROR_GET_WINDOWS_DIRECTORY_FAILED 11
#define IDS_ERROR_CREATE_TEMP_DIR 12
#define IDS_ERROR_SETUP_REQUIREMENT 13
#define IDS_MB_WARNING_STR 14
#define IDS_ERROR_UNINSTALL_LOG_FOLDER 15
#define IDS_MB_MESSAGE_STR 16
#define IDS_DLG_REMOVE_FILE_TITLE 17
#define IDI_SETUP 105
#define IDI_UNINSTALL 105
#define DLG_MESSAGE 110
#define IDC_LIST_PRODUCTS 1000
#define ID_NO 1001
#define IDC_GAUGE_FILE 1002
#define ID_NO_TO_ALL 1002
#define IDC_STATUS0 1004
#define ID_YES 1004
#define IDC_STATUS3 1005
#define ID_YES_TO_ALL 1005
#define IDC_GAUGE_ARCHIVE 1006
#define IDC_STATIC_SHARED_FILENAME 1006
#define IDC_EDIT_CURRENT_SETTINGS 1026
#define IDC_MESSAGE0 1042
#define IDC_MESSAGE1 1043
#define IDC_MESSAGE 1049
#define DLG_UNINSTALL 2008
#define DLG_EXTRACTING 2009
#define DLG_PRODUCT_LIST 2009
#define DLG_WHAT_TO_DO 2009
#define IDWIZBACK 11013
#define IDWIZNEXT 11014
#define IDC_STATIC -1
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NO_MFC 1
#define _APS_NEXT_RESOURCE_VALUE 103
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1007
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

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

@ -112,8 +112,8 @@ STYLE WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CLASS "Uninstall"
FONT 8, "MS Sans Serif"
BEGIN
DEFPUSHBUTTON "&Uninstall",IDWIZNEXT,54,55,53,14
PUSHBUTTON "&Cancel",IDCANCEL,118,55,53,14
DEFPUSHBUTTON "",IDWIZNEXT,54,55,53,14
PUSHBUTTON "",IDCANCEL,118,55,53,14
LTEXT "",IDC_MESSAGE0,17,11,191,32,NOT WS_GROUP
END
@ -129,15 +129,13 @@ STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
FONT 8, "MS Sans Serif"
BEGIN
DEFPUSHBUTTON "&No",ID_NO,40,108,53,14
PUSHBUTTON "N&o to all",ID_NO_TO_ALL,107,108,53,14
PUSHBUTTON "&Yes",ID_YES,174,108,53,14
PUSHBUTTON "Y&es to all",ID_YES_TO_ALL,241,108,53,14
LTEXT "Uninstall has detected that the following shared file is no longer used by any programs. If any programs still require the shared file and it is removed, those programs may no longer function. Are you sure you want to remove this shared file?",
IDC_MESSAGE0,16,13,301,33,NOT WS_GROUP
LTEXT "Leaving this file will not harm your system. If you are not sure, it is recommended that the shared file be not removed from the system.",
IDC_MESSAGE1,16,50,301,19,NOT WS_GROUP
RTEXT "File name:",IDC_STATIC,18,81,41,8
DEFPUSHBUTTON "",ID_NO,40,108,53,14
PUSHBUTTON "",ID_NO_TO_ALL,107,108,53,14
PUSHBUTTON "",ID_YES,174,108,53,14
PUSHBUTTON "",ID_YES_TO_ALL,241,108,53,14
LTEXT "",IDC_MESSAGE0,16,13,301,33,NOT WS_GROUP
LTEXT "",IDC_MESSAGE1,16,50,301,19,NOT WS_GROUP
RTEXT "",IDC_STATIC,18,81,41,8
LTEXT "Static",IDC_STATIC_SHARED_FILENAME,66,79,251,14,
SS_CENTERIMAGE | SS_SUNKEN
END
@ -154,24 +152,6 @@ BEGIN
IDS_ERROR_STRING_LOAD "Could not load string resource ID %d"
IDS_ERROR_STRING_NULL "Null pointer encountered."
IDS_ERROR_GLOBALALLOC "Memory allocation error."
IDS_ERROR_FAILED "%s failed."
IDS_ERROR_DIALOG_CREATE "Could not create %s dialog."
IDS_DLGQUITTITLE "Question"
IDS_DLGQUITMSG "Are you sure you want to cancel?"
IDS_ERROR_GET_SYSTEM_DIRECTORY_FAILED "GetSystemDirectory() failed."
IDS_ERROR_GET_WINDOWS_DIRECTORY_FAILED "GetWindowsDirectory() failed."
IDS_ERROR_CREATE_TEMP_DIR
"Setup was unable to create the TEMP directory: %s"
IDS_ERROR_SETUP_REQUIREMENT
"Windows95 or greater Operating System is required! Exiting setup..."
IDS_MB_WARNING_STR "Warning"
IDS_ERROR_UNINSTALL_LOG_FOLDER "Uninstall log folder not found:%s"
END
STRINGTABLE DISCARDABLE
BEGIN
IDS_MB_MESSAGE_STR "Message"
IDS_DLG_REMOVE_FILE_TITLE "Remove File?"
END
#endif // English (U.S.) resources