This commit is contained in:
ben%bengoodger.com 2003-10-30 02:11:38 +00:00
Родитель 551c678677
Коммит 8279751bf8
12 изменённых файлов: 1451 добавлений и 840 удалений

Просмотреть файл

@ -0,0 +1,824 @@
# Microsoft Developer Studio Project File - Name="installer" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Application" 0x0101
CFG=installer - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "installer.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "installer.mak" CFG="installer - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "installer - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE "installer - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "installer - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
!ENDIF
# Begin Target
# Name "installer - Win32 Release"
# Name "installer - Win32 Debug"
# Begin Group "setup"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\windows\wizard\setup\dialogs.c
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\dialogs.h
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\extern.h
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\extra.c
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\extra.h
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\ifuncns.c
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\ifuncns.h
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\logging.c
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\logging.h
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\nsEscape.cpp
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\nsEscape.h
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\process.c
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\process.h
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\resource.h
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\setup.c
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\setup.h
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\setup.rc
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\shortcut.cpp
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\shortcut.h
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\supersede.c
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\supersede.h
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\version.c
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\version.h
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\wizverreg.h
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\xperr.h
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\xpi.c
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\xpi.h
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\xpistub.h
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\xpnetHook.cpp
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\xpnetHook.h
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setup\zipfile.h
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Ignore_Default_Tool 1
!ENDIF
# End Source File
# End Group
# Begin Group "setuprsc"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\windows\wizard\setuprsc\setuprsc.cpp
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setuprsc\setuprsc.h
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\wizard\setuprsc\setuprsc.rc
# PROP Exclude_From_Build 1
# End Source File
# End Group
# Begin Group "xappscripts"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\windows\build_static.pl
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\windows\makeall.pl
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# End Group
# Begin Group "browserscripts"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\..\..\..\browser\installer\windows\abe.jst
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\..\browser\installer\windows\adt.jst
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\..\browser\installer\windows\browser.jst
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\..\browser\installer\windows\chatzilla.jst
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\..\browser\installer\windows\config.it
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\..\browser\installer\windows\deflenus.jst
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\..\browser\installer\windows\editor.jst
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# Begin Source File
SOURCE="..\..\..\..\..\..\browser\installer\windows\firebird-win32-stub-installer.jst"
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\..\browser\installer\windows\inspector.jst
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\..\browser\installer\windows\install.it
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\..\browser\installer\windows\installer.cfg
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\..\browser\installer\windows\langenus.jst
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\..\browser\installer\windows\psm.jst
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\..\browser\installer\windows\redirect.it
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\..\browser\installer\windows\regus.jst
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\..\browser\installer\windows\talkback.jst
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\..\browser\installer\windows\uninstall.it
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\..\browser\installer\windows\venkman.jst
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\..\browser\installer\windows\xpcom.jst
!IF "$(CFG)" == "installer - Win32 Release"
!ELSEIF "$(CFG)" == "installer - Win32 Debug"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# End Group
# Begin Source File
SOURCE=.\setuprsc\Header.bmp
# End Source File
# Begin Source File
SOURCE=.\setuprsc\setup.ico
# End Source File
# Begin Source File
SOURCE=.\setuprsc\Watermrk.bmp
# End Source File
# End Target
# End Project

Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Просмотреть файл

@ -53,7 +53,7 @@ HWND InstantiateDialog(HWND hParent, DWORD dwDlgID, LPSTR szTitle,
void InitSequence(HINSTANCE hInstance);
void DlgSequence(int iDirection);
void PaintGradientShade(HWND hWnd, HDC hdc);
BOOL BrowseForDirectory(HWND hDlg, char *szCurrDir);
void BrowseForDirectory(HWND hDlg);
LRESULT CALLBACK BrowseHookProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
void ShowMessage(LPSTR szMessage, BOOL bShow);
void DrawLBText(LPDRAWITEMSTRUCT lpdis, DWORD dwACFlag);

Просмотреть файл

@ -42,6 +42,7 @@ extern HANDLE hAccelTable;
extern HWND hDlgCurrent;
extern HWND hDlgMessage;
extern HWND hWndMain;
extern HWND hWizardWnd;
extern LPSTR szEGlobalAlloc;
extern LPSTR szEStringLoad;

Просмотреть файл

@ -3335,6 +3335,8 @@ HRESULT InitDlgWelcome(diW *diDialog)
diDialog->bShowDialog = FALSE;
if((diDialog->szTitle = NS_GlobalAlloc(MAX_BUF)) == NULL)
return(1);
if((diDialog->szMessageWelcome = NS_GlobalAlloc(MAX_BUF)) == NULL)
return(1);
if((diDialog->szMessage0 = NS_GlobalAlloc(MAX_BUF)) == NULL)
return(1);
if((diDialog->szMessage1 = NS_GlobalAlloc(MAX_BUF)) == NULL)
@ -3350,6 +3352,7 @@ HRESULT InitDlgWelcome(diW *diDialog)
void DeInitDlgWelcome(diW *diDialog)
{
FreeMemory(&(diDialog->szTitle));
FreeMemory(&(diDialog->szMessageWelcome));
FreeMemory(&(diDialog->szMessage0));
FreeMemory(&(diDialog->szMessage1));
FreeMemory(&(diDialog->szMessage2));
@ -3367,11 +3370,9 @@ HRESULT InitDlgLicense(diL *diDialog)
return(1);
if((diDialog->szMessage0 = NS_GlobalAlloc(MAX_BUF)) == NULL)
return(1);
if((diDialog->szMessage1 = NS_GlobalAlloc(MAX_BUF)) == NULL)
if((diDialog->szRadioAccept = NS_GlobalAlloc(MAX_BUF)) == NULL)
return(1);
if((diDialog->szMessage2 = NS_GlobalAlloc(MAX_BUF)) == NULL)
return(1);
if((diDialog->szMessage3 = NS_GlobalAlloc(MAX_BUF)) == NULL)
if((diDialog->szRadioDecline = NS_GlobalAlloc(MAX_BUF)) == NULL)
return(1);
return(0);
@ -3383,9 +3384,8 @@ void DeInitDlgLicense(diL *diDialog)
FreeMemory(&(diDialog->szSubTitle));
FreeMemory(&(diDialog->szLicenseFilename));
FreeMemory(&(diDialog->szMessage0));
FreeMemory(&(diDialog->szMessage1));
FreeMemory(&(diDialog->szMessage2));
FreeMemory(&(diDialog->szMessage3));
FreeMemory(&(diDialog->szRadioAccept));
FreeMemory(&(diDialog->szRadioDecline));
}
HRESULT InitDlgQuickLaunch(diQL *diDialog)
@ -7301,6 +7301,7 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
/* Welcome dialog */
GetPrivateProfileString("Dialog Welcome", "Show Dialog", "", szShowDialog, sizeof(szShowDialog), szFileIniConfig);
GetPrivateProfileString("Dialog Welcome", "Title", "", diWelcome.szTitle, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Welcome", "MessageWelcome", "", diWelcome.szMessageWelcome, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Welcome", "Message0", "", diWelcome.szMessage0, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Welcome", "Message1", "", diWelcome.szMessage1, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog Welcome", "Message2", "", diWelcome.szMessage2, MAX_BUF, szFileIniConfig);
@ -7314,9 +7315,8 @@ HRESULT ParseConfigIni(LPSTR lpszCmdLine)
GetPrivateProfileString("Dialog License", "Sub Title", "", diLicense.szSubTitle, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog License", "License File", "", diLicense.szLicenseFilename, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog License", "Message0", "", diLicense.szMessage0, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog License", "Message1", "", diLicense.szMessage1, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog License", "Message2", "", diLicense.szMessage2, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog License", "Message3", "", diLicense.szMessage3, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog License", "RadioAccept", "", diLicense.szRadioAccept, MAX_BUF, szFileIniConfig);
GetPrivateProfileString("Dialog License", "RadioDecline", "", diLicense.szRadioDecline, MAX_BUF, szFileIniConfig);
if(lstrcmpi(szShowDialog, "TRUE") == 0)
diLicense.bShowDialog = TRUE;
@ -7751,8 +7751,10 @@ HRESULT ParseInstallIni()
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", "BROWSEINFO", "", sgInstallGui.szBrowseInfo, sizeof(sgInstallGui.szBrowseInfo), szFileIniInstall);
GetPrivateProfileString("General", "DESTINATIONDIRECTORY", "", sgInstallGui.szDestinationDirectory, sizeof(sgInstallGui.szDestinationDirectory), szFileIniInstall);
GetPrivateProfileString("General", "BROWSE_", "", sgInstallGui.szBrowse_, sizeof(sgInstallGui.szBrowse_), szFileIniInstall);
GetPrivateProfileString("General", "DOWNLOADSIZE", "", sgInstallGui.szDownloadSize, sizeof(sgInstallGui.szDownloadSize), 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);

Просмотреть файл

@ -42,6 +42,7 @@ HANDLE hAccelTable;
HWND hDlgCurrent;
HWND hDlgMessage;
HWND hWndMain;
HWND hWizardWnd;
LPSTR szEGlobalAlloc;
LPSTR szEStringLoad;

Просмотреть файл

@ -320,6 +320,7 @@ typedef struct dlgWelcome
{
BOOL bShowDialog;
LPSTR szTitle;
LPSTR szMessageWelcome;
LPSTR szMessage0;
LPSTR szMessage1;
LPSTR szMessage2;
@ -333,9 +334,8 @@ typedef struct dlgLicense
LPSTR szSubTitle;
LPSTR szLicenseFilename;
LPSTR szMessage0;
LPSTR szMessage1;
LPSTR szMessage2;
LPSTR szMessage3;
LPSTR szRadioAccept;
LPSTR szRadioDecline;
} diL;
typedef struct dlgQuickLaunch
@ -590,57 +590,60 @@ typedef struct dlgInstall
{
HFONT systemFont;
HFONT definedFont;
char szFontName[MAX_BUF];
char szFontSize[MAX_BUF];
char szCharSet[MAX_BUF];
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 szIgnore_[MAX_BUF];
char szProxyMessage[MAX_BUF];
char szProxyButton[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 szTo[MAX_BUF];
char szAccept_[MAX_BUF];
char szDecline_[MAX_BUF];
char szProgramFolder_[MAX_BUF];
char szExistingFolder_[MAX_BUF];
char szSetupMessage[MAX_BUF];
char szRestart[MAX_BUF];
char szYesRestart[MAX_BUF];
char szNoRestart[MAX_BUF];
char szAdditionalComponents_[MAX_BUF];
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 szContinue_[MAX_BUF];
char szSkip_[MAX_BUF];
char szExtracting[MAX_BUF];
char szReadme_[MAX_BUF];
char szPause_[MAX_BUF];
char szResume_[MAX_BUF];
char szChecked[MAX_BUF];
char szUnchecked[MAX_BUF];
HFONT welcomeTitleFont;
char szFontName[MAX_BUF];
char szFontSize[MAX_BUF];
char szCharSet[MAX_BUF];
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 szIgnore_[MAX_BUF];
char szProxyMessage[MAX_BUF];
char szProxyButton[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 szTo[MAX_BUF];
char szAccept_[MAX_BUF];
char szDecline_[MAX_BUF];
char szProgramFolder_[MAX_BUF];
char szExistingFolder_[MAX_BUF];
char szSetupMessage[MAX_BUF];
char szRestart[MAX_BUF];
char szYesRestart[MAX_BUF];
char szNoRestart[MAX_BUF];
char szAdditionalComponents_[MAX_BUF];
char szDescription[MAX_BUF];
char szTotalDownloadSize[MAX_BUF];
char szSpaceAvailable[MAX_BUF];
char szComponents_[MAX_BUF];
char szBrowseInfo[MAX_BUF];
char szDestinationDirectory[MAX_BUF];
char szBrowse_[MAX_BUF];
char szDownloadSize[MAX_BUF];
char szCurrentSettings[MAX_BUF];
char szInstall_[MAX_BUF];
char szDelete_[MAX_BUF];
char szContinue_[MAX_BUF];
char szSkip_[MAX_BUF];
char szExtracting[MAX_BUF];
char szReadme_[MAX_BUF];
char szPause_[MAX_BUF];
char szResume_[MAX_BUF];
char szChecked[MAX_BUF];
char szUnchecked[MAX_BUF];
} installGui;
/* structure message stream */

Двоичный файл не отображается.

До

Ширина:  |  Высота:  |  Размер: 59 KiB

После

Ширина:  |  Высота:  |  Размер: 59 KiB

Двоичный файл не отображается.

До

Ширина:  |  Высота:  |  Размер: 293 KiB

После

Ширина:  |  Высота:  |  Размер: 293 KiB

Просмотреть файл

@ -104,6 +104,15 @@
#define IDC_CHECK_TURBO_MODE 1075
#define IDC_CHECK_RECAPTURE_HOMEPAGE 1076
#define IDC_STATIC_MSG1 1079
#define IDC_STATIC_TITLE 1080
#define IDC_RADIO_ACCEPT 1081
#define IDC_RADIO_DECLINE 1082
#define IDC_FOLDER_ICON 1083
#define IDC_PRIMARY_COMPONENT 1084
#define IDC_OPTIONAL_COMPONENTS 1085
#define IDC_INSTALL_FOLDER 1086
#define IDC_INSTALL_FOLDER_LABEL 1087
#define IDC_STATIC_DOWNLOAD_SIZE 1088
#define DLG_WELCOME 2001
#define DLG_LICENSE 2002
#define DLG_SETUP_TYPE 2003

Просмотреть файл

@ -58,10 +58,11 @@ STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
CLASS "MozillaSetupDlg"
FONT 8, "MS Sans Serif"
BEGIN
LTEXT "",IDC_STATIC0,115,11,195,37,NOT WS_GROUP
LTEXT "",IDC_STATIC1,115,53,195,37,NOT WS_GROUP
LTEXT "",IDC_STATIC2,115,96,195,37,NOT WS_GROUP
LTEXT "",IDC_STATIC3,115,169,195,15
LTEXT "",IDC_STATIC_TITLE,130,8,180,18,NOT WS_GROUP
LTEXT "",IDC_STATIC1,130,58,180,24,NOT WS_GROUP
LTEXT "",IDC_STATIC2,130,90,180,37,NOT WS_GROUP
LTEXT "",IDC_STATIC3,130,169,180,15
LTEXT "",IDC_STATIC0,130,34,180,16,NOT WS_GROUP
END
DLG_SETUP_TYPE DIALOG DISCARDABLE 51, 56, 315, 143
@ -90,6 +91,7 @@ BEGIN
LTEXT "",IDC_MESSAGE0,11,1,295,19,NOT WS_GROUP
GROUPBOX "",IDC_STATIC2,11,75,295,37
LTEXT "",IDC_STATIC_DESCRIPTION,18,87,282,16,SS_NOPREFIX
RTEXT "",IDC_STATIC_DOWNLOAD_SIZE,140,120,164,8
END
DLG_WINDOWS_INTEGRATION DIALOG DISCARDABLE 51, 56, 315, 205
@ -144,10 +146,13 @@ STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
CLASS "MozillaSetupDlg"
FONT 8, "MS Sans Serif"
BEGIN
EDITTEXT IDC_EDIT_LICENSE,11,29,295,83,ES_MULTILINE |
EDITTEXT IDC_EDIT_LICENSE,11,29,295,72,ES_MULTILINE |
ES_OEMCONVERT | ES_READONLY | WS_VSCROLL | WS_GROUP
LTEXT "",IDC_MESSAGE0,11,8,295,17,NOT WS_GROUP
LTEXT "",IDC_MESSAGE1,11,119,295,15,NOT WS_GROUP
CONTROL "",IDC_RADIO_ACCEPT,"Button",BS_AUTORADIOBUTTON |
WS_GROUP,11,109,295,9
CONTROL "",IDC_RADIO_DECLINE,"Button",BS_AUTORADIOBUTTON,11,122,
295,9
END
DLG_QUICK_LAUNCH DIALOG DISCARDABLE 51, 56, 315, 205
@ -334,8 +339,8 @@ BEGIN
CONTROL "",IDC_STATUS_FILE,"Static",SS_LEFTNOWORDWRAP |
SS_NOPREFIX | WS_GROUP,51,72,254,8
LTEXT "",IDC_PERCENTAGE,283,115,20,8,SS_NOPREFIX
CONTROL "",IDC_GAUGE_FILE,"msctls_progress32",WS_BORDER,
11,85,295,11
CONTROL "",IDC_GAUGE_FILE,"msctls_progress32",WS_BORDER,11,85,
295,11
END
DLG_START_INSTALL DIALOG DISCARDABLE 51, 56, 315, 143
@ -344,12 +349,14 @@ STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
CLASS "MozillaSetupDlg"
FONT 8, "MS Sans Serif"
BEGIN
EDITTEXT IDC_CURRENT_SETTINGS,11,16,295,79,ES_MULTILINE |
ES_OEMCONVERT | ES_READONLY | WS_VSCROLL | WS_HSCROLL
LTEXT "",IDC_MESSAGE0,11,1,295,8,NOT WS_GROUP
LTEXT "",IDC_MESSAGE1,11,130,295,8
PUSHBUTTON "",IDC_CONNECTION_SETTINGS,250,103,56,14
LTEXT "",IDC_MESSAGE2,11,103,232,19
LTEXT "",IDC_PRIMARY_COMPONENT,11,16,295,8,NOT WS_GROUP
LTEXT "",IDC_OPTIONAL_COMPONENTS,21,31,285,28,NOT WS_GROUP
LTEXT "",IDC_INSTALL_FOLDER,21,81,285,8,NOT WS_GROUP
LTEXT "",IDC_INSTALL_FOLDER_LABEL,11,66,295,8,NOT WS_GROUP
END
DLG_SELECT_INSTALL_PATH DIALOG DISCARDABLE 0, 0, 315, 143
@ -357,9 +364,10 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
FONT 8, "MS Sans Serif"
BEGIN
CONTROL "",IDC_EDIT_DESTINATION,"Static",SS_LEFTNOWORDWRAP |
WS_GROUP,19,23,219,9
WS_GROUP,43,24,205,9
PUSHBUTTON "",IDC_BUTTON_BROWSE,260,22,46,14
LTEXT "",IDC_STATIC_MSG0,11,1,295,9
ICON "",IDC_FOLDER_ICON,28,22,20,20
END
@ -415,6 +423,11 @@ BEGIN
RIGHTMARGIN, 310
END
DLG_START_INSTALL, DIALOG
BEGIN
BOTTOMMARGIN, 138
END
DLG_SELECT_INSTALL_PATH, DIALOG
BEGIN
LEFTMARGIN, 7