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

OS/2 Wizard work - not part of build

This commit is contained in:
mkaply%us.ibm.com 2002-09-03 22:32:08 +00:00
Родитель 3dcee9b795
Коммит a28a09ecd5
11 изменённых файлов: 187 добавлений и 166 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
xpinstall/wizard/os2/nsinstall/nsINIParser.cpp
Просмотреть файл

@ -67,7 +67,7 @@ nsINIParser::nsINIParser(char *aFilename)
mfWrite = 0;
mFileBuf = NULL;
mFilename = (char*)malloc(strlen(aFilename));
mFilename = (char*)malloc(strlen(aFilename)+1);
strcpy(mFilename, aFilename);
mFileBufSize = 0;
mError = OK;

2
xpinstall/wizard/os2/setup/Makefile.in
Просмотреть файл

@ -71,9 +71,11 @@ LDFLAGS += /PM:PM
libs:: $(PROGRAM)
$(INSTALL) $(PROGRAM) $(DIST)/install
$(INSTALL) $(srcdir)/icons/mozilla.ico $(DIST)/install
install:: $(PROGRAM)
$(INSTALL) $(PROGRAM) $(DESTDIR)$(mozappdir)/install
$(INSTALL) $(srcdir)/icons/mozilla.ico $(DESTDIR)$(mozappdir)/install
clean clobber realclean clobber_all::
$(RM) $(DIST)/install/$(PROGRAM)

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

@ -786,7 +786,7 @@ MRESULT EXPENTRY DlgProcSetupType(HWND hDlg, ULONG msg, MPARAM mp1, MPARAM mp2)
}
else
{
break;
return (MRESULT)TRUE;
}
}

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

@ -3244,7 +3244,7 @@ HRESULT ErrorMsgDiskSpace(ULONGLONG ullDSAvailable, ULONGLONG ullDSRequired, LPS
if(bCrutialMsg)
{
dwDlgType = MB_RETRYCANCEL;
if(!GetPrivateProfileString("Messages", "DLG_DISK_SPACE_CHECK_CRUTIAL_MSG", "", szDlgDiskSpaceCheckMsg, sizeof(szDlgDiskSpaceCheckMsg), szFileIniInstall))
if(!GetPrivateProfileString("Messages", "DLG_DISK_SPACE_CHECK_CRUCIAL_MSG", "", szDlgDiskSpaceCheckMsg, sizeof(szDlgDiskSpaceCheckMsg), szFileIniInstall))
exit(1);
}
else
@ -5495,8 +5495,6 @@ HRESULT ParseInstallIni()
GetPrivateProfileString("General", "TO", "", sgInstallGui.szTo, sizeof(sgInstallGui.szTo), szFileIniInstall);
GetPrivateProfileString("General", "ACCEPT_", "", sgInstallGui.szAccept_, sizeof(sgInstallGui.szAccept_), szFileIniInstall);
GetPrivateProfileString("General", "DECLINE_", "", sgInstallGui.szDecline_, sizeof(sgInstallGui.szDecline_), 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);

2
xpinstall/wizard/os2/setup/ifuncns.c
Просмотреть файл

@ -1373,7 +1373,7 @@ HRESULT ProcessOS2INI(ULONG ulTiming, char *szSectionPrefix)
ULONG ulSize;
ulIndex = 0;
BuildNumberedString(ulIndex, szSectionPrefix, "OS2INI", szSection, sizeof(szSection));
BuildNumberedString(ulIndex, szSectionPrefix, "OS2 INI", szSection, sizeof(szSection));
GetPrivateProfileString(szSection, "App", "", szBuf, sizeof(szBuf), szFileIniConfig);
while(*szBuf != '\0')
{

87
xpinstall/wizard/os2/setup/nsINIParser.cpp
Просмотреть файл

@ -145,7 +145,7 @@ nsINIParser::GetString( char *aSection, char *aKey,
DUMP("GetString");
/* param check */
if ( !aSection || !aKey || !aValBuf ||
if ( !aSection || !aValBuf ||
!aIOValBufSize || (*aIOValBufSize <= 0) )
return E_PARAM;
@ -154,8 +154,13 @@ nsINIParser::GetString( char *aSection, char *aKey,
if (mError != OK)
return mError;
/* find the key if it exists in the valid section we found */
mError = GetValue(secPtr, aKey, aValBuf, aIOValBufSize);
if (aKey) {
/* find the key if it exists in the valid section we found */
mError = GetValue(secPtr, aKey, aValBuf, aIOValBufSize);
} else {
mError = GetAllKeys(secPtr, aValBuf, aIOValBufSize);
}
return mError;
}
@ -442,6 +447,82 @@ find_end:
return mError;
}
int
nsINIParser::GetAllKeys(char *aSecPtr, char *aVal, int *aIOValSize)
{
char *nextNL = NULL;
char *secEnd = NULL;
char *currLine = aSecPtr;
char *nextEq = NULL;
char *outPtr = NULL;
mError = E_NO_KEY;
DUMP("FindKey");
// param check
if (!aSecPtr || !aVal || !aIOValSize || (*aIOValSize <= 0))
{
mError = E_PARAM;
return mError;
}
// determine the section end
secEnd = aSecPtr;
find_end:
if (secEnd)
secEnd = strchr(secEnd, '['); // search for next sec start
if (!secEnd)
{
secEnd = strchr(aSecPtr, '\0'); // else search for file end
if (!secEnd)
{
mError = E_SEC_CORRUPT; // else this data is corrupt
return mError;
}
}
// handle start section token ('[') in values for i18n
if (*secEnd == '[' && !(secEnd == aSecPtr || *(secEnd-1) == NL))
{
secEnd++;
goto find_end;
}
outPtr = aVal;
while (currLine < secEnd)
{
nextNL = NULL;
nextNL = strchr(currLine, NL);
if (!nextNL)
nextNL = mFileBuf + mFileBufSize;
// ignore commented lines (starting with ;)
if (currLine == strchr(currLine, ';'))
{
currLine = nextNL + 1;
continue;
}
// extract key before '='
nextEq = NULL;
nextEq = strchr(currLine, '=');
if (!nextEq || nextEq > nextNL)
{
currLine = nextNL + 1;
continue;
}
strncpy(aVal, currLine, nextEq-currLine);
aVal+= nextEq-currLine;
*aVal = \0;
aVal++;
currLine = nextNL + 1;
}
return OK;
}
int
nsINIParser::FindKey(char *aSecPtr, char *aKey, char **aOutKeyPtr)
{

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

@ -146,6 +146,7 @@ private:
int FindSection(char *aSection, char **aOutSecPtr);
int FindKey(char *aSecPtr, char *aKey, char **aOutSecPtr);
int GetValue(char *aSecPtr, char *aKey, char *aVal, int *aIOValSize);
int GetAllKeys(char *aSecPtr, char *aVal, int *aIOValSize);
char *mFileBuf;
char *mFilename;

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

@ -478,8 +478,6 @@ typedef struct dlgInstall
char szTo[MAX_BUF];
char szAccept_[MAX_BUF];
char szDecline_[MAX_BUF];
char szProgramFolder_[MAX_BUF];
char szExistingFolder_[MAX_BUF];
char szSetupMessage[MAX_BUF];
char szYesRestart[MAX_BUF];
char szNoRestart[MAX_BUF];

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

@ -62,11 +62,11 @@ HRESULT InitializeXPIStub()
{
char szBuf[MAX_BUF];
char szXPIStubFile[MAX_BUF];
char szEGetProcAddress[MAX_BUF];
char szEDosQueryProcAddr[MAX_BUF];
hXPIStubInst = NULL;
if(!GetPrivateProfileString("Messages", "ERROR_GETPROCADDRESS", "", szEGetProcAddress, sizeof(szEGetProcAddress), szFileIniInstall))
if(!GetPrivateProfileString("Messages", "ERROR_DOSQUERYPROCADDR", "", szEDosQueryProcAddr, sizeof(szEDosQueryProcAddr), szFileIniInstall))
return(1);
/* change current directory to where xpistub.dll */
@ -96,19 +96,19 @@ HRESULT InitializeXPIStub()
}
if(DosQueryProcAddr(hXPIStubInst, 0, "XPI_Init", &pfnXpiInit) != NO_ERROR)
{
sprintf(szBuf, szEGetProcAddress, "XPI_Init");
sprintf(szBuf, szEDosQueryProcAddr, "XPI_Init");
PrintError(szBuf, ERROR_CODE_SHOW);
return(1);
}
if(DosQueryProcAddr(hXPIStubInst, 0, "XPI_Install", &pfnXpiInstall) != NO_ERROR)
{
sprintf(szBuf, szEGetProcAddress, "XPI_Install");
sprintf(szBuf, szEDosQueryProcAddr, "XPI_Install");
PrintError(szBuf, ERROR_CODE_SHOW);
return(1);
}
if(DosQueryProcAddr(hXPIStubInst, 0, "XPI_Exit", &pfnXpiExit) != NO_ERROR)
{
sprintf(szBuf, szEGetProcAddress, "XPI_Exit");
sprintf(szBuf, szEDosQueryProcAddr, "XPI_Exit");
PrintError(szBuf, ERROR_CODE_SHOW);
return(1);
}

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

@ -1257,6 +1257,8 @@ CenterWindow(HWND hWndDlg)
MRESULT EXPENTRY
DownloadDlgProc(HWND hWndDlg, ULONG msg, MPARAM mp1, MPARAM mp2)
{
PSWP pswp;
switch (msg)
{
case WM_INITDLG:
@ -1289,24 +1291,24 @@ DownloadDlgProc(HWND hWndDlg, ULONG msg, MPARAM mp1, MPARAM mp2)
WinSetDlgItemText(hWndDlg, IDRESUME, sgInstallGui.szResume_);
break;
#ifdef OLDCODE
case WM_SIZE:
switch(wParam)
{
case SIZE_MINIMIZED:
SetMinimizedDownloadTitle((int)GetPercentSoFar());
gbDlgDownloadMinimized = TRUE;
gbDlgDownloadJustMinimized = TRUE;
break;
case SIZE_RESTORED:
SetStatusUrl();
SetRestoredDownloadTitle();
gbDlgDownloadMinimized = FALSE;
break;
case WM_ADJUSTWINDOWPOS:
pswp = (PSWP)mp1;
if (pswp->fl & SWP_MINIMIZE) {
SetMinimizedDownloadTitle((int)GetPercentSoFar());
gbDlgDownloadMinimized = TRUE;
gbDlgDownloadJustMinimized = TRUE;
}
return(FALSE);
#endif
if (pswp->fl & SWP_RESTORE) {
SetStatusUrl();
SetRestoredDownloadTitle();
gbDlgDownloadMinimized = FALSE;
}
break;
case WM_CLOSE:
if(AskCancelDlg(hWndDlg))
gdwDownloadDialogStatus = CS_CANCEL;
return (MRESULT)TRUE;
case WM_COMMAND:
switch ( SHORT1FROMMP( mp1 ) )

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

@ -93,6 +93,7 @@ BEGIN
END
END
#if 0 /* Not used right now */
DLGTEMPLATE DLG_WINDOWS_INTEGRATION DISCARDABLE
BEGIN
DIALOG "", DLG_WINDOWS_INTEGRATION, 64, -69, 394, 205,
@ -117,25 +118,6 @@ BEGIN
END
END
DLGTEMPLATE DLG_PROGRAM_FOLDER DISCARDABLE
BEGIN
DIALOG "", DLG_PROGRAM_FOLDER, 64, -69, 394, 205,
WS_VISIBLE | FS_DLGBORDER | FS_SCREENALIGN,
FCF_TITLEBAR | FCF_SYSMENU | FCF_NOMOVEWITHOWNER | FCF_TASKLIST
BEGIN
LTEXT "", IDC_STATIC1, 127, 143, 132, 8, SS_TEXT | DT_WORDBREAK | DT_MNEMONIC
ENTRYFIELD "",IDC_EDIT_PROGRAM_FOLDER, 129, 130, 251, 9, ES_AUTOSCROLL | ES_MARGIN
LTEXT "", IDC_STATIC2, 127, 113, 204, 8, SS_TEXT | DT_WORDBREAK | DT_MNEMONIC
LISTBOX IDC_LIST, 127, 32, 255, 79, LS_NOADJUSTPOS | WS_TABSTOP
PUSHBUTTON "", IDWIZBACK, 168, 5, 67, 14
DEFPUSHBUTTON "", IDWIZNEXT, 235, 5, 67, 14
PUSHBUTTON "", DID_CANCEL, 315, 5, 67, 14
LTEXT "", IDC_MESSAGE0, 127, 161, 255, 33, NOT WS_GROUP | SS_TEXT | DT_WORDBREAK | DT_MNEMONIC
CONTROL 108, IDC_STATIC, 14, 32, 104, 162, WC_STATIC, SS_BITMAP | WS_VISIBLE
CONTROL "", IDC_STATIC, 14, 25, 369, 1, WC_STATIC, SS_TEXT | DT_WORDBREAK | DT_MNEMONIC | WS_VISIBLE
END
END
DLGTEMPLATE DLG_QUICK_LAUNCH DISCARDABLE
BEGIN
DIALOG "", DLG_QUICK_LAUNCH, 64, -69, 394, 205,
@ -155,101 +137,7 @@ BEGIN
CONTROL 115, IDC_STATIC, 128, 109, 25, 20, WC_STATIC, SS_BITMAP | WS_VISIBLE
END
END
DLGTEMPLATE DLG_BROWSE_DIR DISCARDABLE
BEGIN
DIALOG "", DLG_BROWSE_DIR, 184, 26, 238, 143,
FS_DLGBORDER | FS_SCREENALIGN,
FCF_TITLEBAR | FCF_SYSMENU | FCF_NOMOVEWITHOWNER | FCF_TASKLIST
BEGIN
LTEXT "", 1092, 10, 128, 115, 9, SS_TEXT | DT_WORDBREAK | DT_MNEMONIC
ENTRYFIELD "", IDC_EDIT_DESTINATION, 10, 115, 222, 12, ES_AUTOSCROLL
LISTBOX 1121, 10, 38, 150, 68, LS_OWNERDRAW | WS_TABSTOP
LTEXT "", 1091, 10, 26, 115, 9, SS_TEXT | DT_WORDBREAK | DT_MNEMONIC
COMBOBOX "", 1137, 10, -43, 152, 68, CBS_DROPDOWNLIST | WS_TABSTOP
DEFPUSHBUTTON "", 1, 169, 86, 63, 14, WS_GROUP
PUSHBUTTON "", DID_CANCEL, 169, 66, 63, 14, WS_GROUP
END
END
DLGTEMPLATE DLG_RESTART FIXED IMPURE
BEGIN
DIALOG "", DLG_RESTART, 167, 12, 319, 111,
WS_VISIBLE | FS_DLGBORDER | FS_SCREENALIGN,
FCF_TITLEBAR | FCF_SYSMENU | FCF_NOMOVEWITHOWNER | FCF_TASKLIST
BEGIN
LTEXT "", 202, 13, 65, 295, 36, SS_TEXT | DT_WORDBREAK
CONTROL "", IDC_RADIO_YES, 33, 47, 275, 12, WC_BUTTON, BS_AUTORADIOBUTTON | BS_PUSHBUTTON | WS_VISIBLE
CONTROL "", IDC_RADIO_NO, 33, 31, 279, 12, WC_BUTTON, BS_AUTORADIOBUTTON | BS_PUSHBUTTON | WS_VISIBLE
DEFPUSHBUTTON "", DID_OK, 237, 9, 63, 14, WS_GROUP
END
END
DLGTEMPLATE DLG_MESSAGE DISCARDABLE
BEGIN
DIALOG "", DLG_MESSAGE, 0, 0, 100, 32,
WS_VISIBLE | FS_DLGBORDER | FS_SCREENALIGN,
FCF_TITLEBAR | FCF_NOMOVEWITHOWNER | FCF_TASKLIST
BEGIN
CTEXT "", IDC_MESSAGE, 0, 0, 90, 32, SS_TEXT | DT_VCENTER
END
END
DLGTEMPLATE DLG_EXTRACTING DISCARDABLE
BEGIN
DIALOG "", DLG_EXTRACTING, 0, 0, 488, 166,
WS_VISIBLE | FS_DLGBORDER | FS_SCREENALIGN,
FCF_TITLEBAR | FCF_SYSMENU | FCF_NOMOVEWITHOWNER | FCF_TASKLIST
BEGIN
CONTROL 114, IDC_STATIC, 10, 102, 1, 1, WC_STATIC, SS_BITMAP | WS_VISIBLE
LTEXT "", IDC_STATUS0, 10, 76, 468, 16
LTEXT "", IDC_STATUS3, 10, 50, 468, 16
SLIDER IDC_GAUGE_ARCHIVE, 10, 10, 468, 20, SLS_RIBBONSTRIP | SLS_READONLY
CTLDATA 12, 0, 100, 0, 0, 0
END
END
DLGTEMPLATE DLG_SELECT_ADDITIONAL_COMPONENTS DISCARDABLE
BEGIN
DIALOG "", DLG_SELECT_ADDITIONAL_COMPONENTS, 64, -69, 394, 205,
WS_VISIBLE | FS_DLGBORDER | FS_SCREENALIGN,
FCF_TITLEBAR | FCF_SYSMENU | FCF_NOMOVEWITHOWNER | FCF_TASKLIST
BEGIN
LTEXT "", IDC_STATIC1, 127, 165, 157, 8, SS_TEXT | DT_WORDBREAK | DT_MNEMONIC
LISTBOX IDC_LIST_COMPONENTS, 127, 96, 255, 67, LS_OWNERDRAW | LS_NOADJUSTPOS | WS_GROUP | WS_TABSTOP
PUSHBUTTON "", IDWIZBACK, 168, 5, 67, 14
DEFPUSHBUTTON "", IDWIZNEXT, 235, 5, 67, 14
PUSHBUTTON "", DID_CANCEL, 315, 5, 67, 14
LTEXT "", IDC_MESSAGE0, 127, 176, 255, 19, NOT WS_GROUP | SS_TEXT | DT_WORDBREAK | DT_MNEMONIC
GROUPBOX "", IDC_STATIC2, 127, 68, 255, 22, DT_MNEMONIC
LTEXT "", IDC_STATIC_DESCRIPTION, 133, 73, 244, 8, SS_TEXT | DT_WORDBREAK
GROUPBOX "", IDC_STATIC, 127, 32, 255, 33, DT_MNEMONIC
LTEXT "", IDC_DOWNLOAD_SIZE, 132, 37, 115, 8, NOT WS_GROUP | SS_TEXT | DT_WORDBREAK | DT_MNEMONIC
LTEXT "", IDC_SPACE_AVAILABLE, 258, 37, 118, 8, NOT WS_GROUP | SS_TEXT | DT_WORDBREAK | DT_MNEMONIC
CONTROL 108, IDC_STATIC, 14, 32, 104, 162, WC_STATIC, SS_BITMAP | WS_VISIBLE
CONTROL "", IDC_STATIC, 14, 25, 369, 1, WC_STATIC, SS_TEXT | DT_WORDBREAK | DT_MNEMONIC | WS_VISIBLE
LTEXT "", IDC_STATIC, 302, 165, 79, 8, SS_TEXT | DT_WORDBREAK | DT_MNEMONIC
LTEXT "", IDC_STATIC3, 132, 48, 115, 9, SS_TEXT | DT_WORDBREAK | DT_MNEMONIC
LTEXT "", IDC_STATIC4, 258, 48, 118, 9, SS_TEXT | DT_WORDBREAK | DT_MNEMONIC
END
END
DLGTEMPLATE DLG_UPGRADE DISCARDABLE
BEGIN
DIALOG "", DLG_UPGRADE, 64, -30, 388, 166,
WS_VISIBLE | FS_DLGBORDER | FS_SCREENALIGN,
FCF_TITLEBAR | FCF_NOMOVEWITHOWNER | FCF_TASKLIST
BEGIN
LTEXT "", IDC_MESSAGE0, 22, 122, 345, 31, NOT WS_GROUP | SS_TEXT | DT_WORDBREAK | DT_MNEMONIC
LTEXT "", IDC_MESSAGE1, 22, 97, 345, 21, NOT WS_GROUP | SS_TEXT | DT_WORDBREAK | DT_MNEMONIC
LTEXT "", IDC_MESSAGE2, 22, 72, 345, 21, NOT WS_GROUP | SS_TEXT | DT_WORDBREAK | DT_MNEMONIC
GROUPBOX "", IDC_STATIC, 20, 39, 345, 25, DT_MNEMONIC
LTEXT "", IDC_DELETE_PATH, 28, 42, 330, 13, SS_TEXT | DT_WORDBREAK | DT_MNEMONIC
PUSHBUTTON "", ID_DELETE, 119, 13, 67, 14
DEFPUSHBUTTON "", IDWIZBACK, 203, 13, 67, 14
END
END
#endif
DLGTEMPLATE DLG_ADDITIONAL_OPTIONS DISCARDABLE
BEGIN
@ -301,15 +189,67 @@ BEGIN
END
END
DLGTEMPLATE DLG_RESTART FIXED
BEGIN
DIALOG "", DLG_RESTART, 167, 12, 319, 111,
WS_VISIBLE | FS_DLGBORDER | FS_SCREENALIGN,
FCF_TITLEBAR | FCF_SYSMENU | FCF_NOMOVEWITHOWNER | FCF_TASKLIST
BEGIN
LTEXT "", 202, 13, 65, 295, 36, SS_TEXT | DT_WORDBREAK
CONTROL "", IDC_RADIO_YES, 33, 47, 275, 12, WC_BUTTON, BS_AUTORADIOBUTTON | BS_PUSHBUTTON | WS_VISIBLE
CONTROL "", IDC_RADIO_NO, 33, 31, 279, 12, WC_BUTTON, BS_AUTORADIOBUTTON | BS_PUSHBUTTON | WS_VISIBLE
DEFPUSHBUTTON "", DID_OK, 237, 9, 63, 14, WS_GROUP
END
END
DLGTEMPLATE DLG_MESSAGE DISCARDABLE
BEGIN
DIALOG "", DLG_MESSAGE, 0, 0, 100, 32,
WS_VISIBLE | FS_DLGBORDER | FS_SCREENALIGN,
FCF_TITLEBAR | FCF_NOMOVEWITHOWNER | FCF_TASKLIST
BEGIN
CTEXT "", IDC_MESSAGE, 0, 0, 90, 32, SS_TEXT | DT_VCENTER
END
END
DLGTEMPLATE DLG_EXTRACTING DISCARDABLE
BEGIN
DIALOG "", DLG_EXTRACTING, 0, 0, 488, 166,
WS_VISIBLE | FS_DLGBORDER | FS_SCREENALIGN,
FCF_TITLEBAR | FCF_SYSMENU | FCF_NOMOVEWITHOWNER | FCF_TASKLIST
BEGIN
CONTROL 114, IDC_STATIC, 10, 102, 1, 1, WC_STATIC, SS_BITMAP | WS_VISIBLE
LTEXT "", IDC_STATUS0, 10, 76, 468, 16
LTEXT "", IDC_STATUS3, 10, 50, 468, 16
SLIDER IDC_GAUGE_ARCHIVE, 10, 10, 468, 20, SLS_RIBBONSTRIP | SLS_READONLY
CTLDATA 12, 0, 100, 0, 0, 0
END
END
DLGTEMPLATE DLG_UPGRADE DISCARDABLE
BEGIN
DIALOG "", DLG_UPGRADE, 64, -30, 388, 166,
WS_VISIBLE | FS_DLGBORDER | FS_SCREENALIGN,
FCF_TITLEBAR | FCF_NOMOVEWITHOWNER | FCF_TASKLIST
BEGIN
LTEXT "", IDC_MESSAGE0, 22, 122, 345, 31, NOT WS_GROUP | SS_TEXT | DT_WORDBREAK | DT_MNEMONIC
LTEXT "", IDC_MESSAGE1, 22, 97, 345, 21, NOT WS_GROUP | SS_TEXT | DT_WORDBREAK | DT_MNEMONIC
LTEXT "", IDC_MESSAGE2, 22, 72, 345, 21, NOT WS_GROUP | SS_TEXT | DT_WORDBREAK | DT_MNEMONIC
GROUPBOX "", IDC_STATIC, 20, 39, 345, 25, DT_MNEMONIC
LTEXT "", IDC_DELETE_PATH, 28, 42, 330, 13, SS_TEXT | DT_WORDBREAK | DT_MNEMONIC
PUSHBUTTON "", ID_DELETE, 119, 13, 67, 14
DEFPUSHBUTTON "", IDWIZBACK, 203, 13, 67, 14
END
END
DLGTEMPLATE DLG_DOWNLOADING DISCARDABLE
BEGIN
DIALOG "", DLG_DOWNLOADING, 0, 0, 488, 306,
WS_VISIBLE | FS_DLGBORDER | FS_SCREENALIGN,
FCF_TITLEBAR | FCF_SYSMENU | FCF_NOMOVEWITHOWNER | FCF_TASKLIST
FCF_TITLEBAR | FCF_SYSMENU | FCF_NOMOVEWITHOWNER | FCF_TASKLIST | FCF_MINBUTTON
BEGIN
#ifdef OLDCODE
#endif
CONTROL 114, IDC_STATIC, 10, 242, 1, 1, WC_STATIC, SS_BITMAP | WS_VISIBLE
LTEXT "", IDC_MESSAGE0, 10, 184, 468, 48, DT_WORDBREAK
LTEXT "", IDC_STATIC1, 10, 158, 100, 16
@ -335,14 +275,14 @@ BEGIN
WS_VISIBLE | FS_DLGBORDER | FS_SCREENALIGN,
FCF_TITLEBAR | FCF_SYSMENU | FCF_NOMOVEWITHOWNER | FCF_TASKLIST
BEGIN
LTEXT "", IDC_MESSAGE0, 145, 262, 315, 64, SS_TEXT | DT_WORDBREAK
MLE "", IDC_CURRENT_SETTINGS, 145, 62, 315, 190, MLS_WORDWRAP | MLS_READONLY | MLS_VSCROLL | MLS_HSCROLL
CONTROL 108, IDC_STATIC, 12, 64, 1, 1, WC_STATIC, SS_BITMAP | WS_VISIBLE
CONTROL "", IDC_STATIC3, 10, 62, 125, 264, WC_STATIC, SS_FGNDFRAME | WS_VISIBLE
CONTROL "", IDC_STATIC, 10, 50, 450, 2, WC_STATIC, SS_FGNDRECT | WS_VISIBLE
PUSHBUTTON "", IDWIZBACK, 200, 10, 80, 30, WS_GROUP
DEFPUSHBUTTON "", IDWIZNEXT, 290, 10, 80, 30
PUSHBUTTON "", DID_CANCEL, 380, 10, 80, 30
LTEXT "", IDC_MESSAGE0, 145, 262, 315, 64, SS_TEXT | DT_WORDBREAK
MLE "", IDC_CURRENT_SETTINGS, 145, 62, 315, 190, MLS_WORDWRAP | MLS_READONLY | MLS_VSCROLL | MLS_HSCROLL
CONTROL 108, IDC_STATIC, 12, 64, 1, 1, WC_STATIC, SS_BITMAP | WS_VISIBLE
CONTROL "", IDC_STATIC3, 10, 62, 125, 264, WC_STATIC, SS_FGNDFRAME | WS_VISIBLE
CONTROL "", IDC_STATIC, 10, 50, 450, 2, WC_STATIC, SS_FGNDRECT | WS_VISIBLE
PUSHBUTTON "", IDWIZBACK, 200, 10, 80, 30, WS_GROUP
DEFPUSHBUTTON "", IDWIZNEXT, 290, 10, 80, 30
PUSHBUTTON "", DID_CANCEL, 380, 10, 80, 30
END
END
@ -354,18 +294,18 @@ END
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
ICON IDI_SETUP DISCARDABLE "setup.ico"
ICON IDI_SETUP DISCARDABLE "setup.ico"
/////////////////////////////////////////////////////////////////////////////
//
// Bitmap
//
BITMAP IDB_BOX_UNCHECKED FIXED IMPURE "box_unch.bmp"
BITMAP IDB_BOX_CHECKED FIXED IMPURE "box_chec.bmp"
BITMAP IDB_BITMAP_WELCOME DISCARDABLE "bitmap1.bmp"
BITMAP IDB_BOX_CHECKED_DISABLED FIXED IMPURE "box_ch_d.bmp"
BITMAP IDB_BITMAP_DOWNLOAD_LOGO DISCARDABLE "downloadLogo.bmp"
BITMAP IDB_BOX_UNCHECKED DISCARDABLE "box_unch.bmp"
BITMAP IDB_BOX_CHECKED DISCARDABLE "box_chec.bmp"
BITMAP IDB_BITMAP_WELCOME DISCARDABLE "bitmap1.bmp"
BITMAP IDB_BOX_CHECKED_DISABLED DISCARDABLE "box_ch_d.bmp"
BITMAP IDB_BITMAP_DOWNLOAD_LOGO DISCARDABLE "downloadLogo.bmp"
/////////////////////////////////////////////////////////////////////////////
//
@ -375,8 +315,7 @@ BITMAP IDB_BITMAP_DOWNLOAD_LOGO DISCARDABLE "downloadLogo.bmp"
STRINGTABLE DISCARDABLE
BEGIN
IDS_ERROR_FILE_NOT_FOUND "File not found: %s"
IDS_MSG_RETRIEVE_INSTALLINI
"Please wait while Setup is attempting to retrieve install.ini, required by Setup, from the Web..."
IDS_MSG_RETRIEVE_INSTALLINI "Please wait while Setup is attempting to retrieve install.ini, required by Setup, from the Web..."
END
/////////////////////////////////////////////////////////////////////////////