diff --git a/xpinstall/wizard/windows/setup/extra.c b/xpinstall/wizard/windows/setup/extra.c index cf6db16d42f..f1330e390a9 100644 --- a/xpinstall/wizard/windows/setup/extra.c +++ b/xpinstall/wizard/windows/setup/extra.c @@ -2853,6 +2853,18 @@ HRESULT DecriptVariable(LPSTR szVariable, DWORD dwVariableSize) exit(1); } } + else if(lstrcmpi(szVariable, "JRE BIN PATH") == 0) + { + /* Locate the "c:\Program Files\JavaSoft\JRE\1.3\Bin" directory */ + GetWinReg(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\javaw.Exe", NULL, szVariable, dwVariableSize); + if(*szVariable == '\0') + return(FALSE); + else + { + ParsePath(szVariable, szBuf, MAX_BUF, PP_PATH_ONLY); + lstrcpy(szVariable, szBuf); + } + } else if(lstrcmpi(szVariable, "SETUP PATH") == 0) { lstrcpy(szVariable, sgProduct.szPath); diff --git a/xpinstall/wizard/windows/setup/xpi.c b/xpinstall/wizard/windows/setup/xpi.c index 28b1abecad0..3f5a3530e1c 100644 --- a/xpinstall/wizard/windows/setup/xpi.c +++ b/xpinstall/wizard/windows/setup/xpi.c @@ -143,9 +143,12 @@ HRESULT SmartUpdateJars() char szEXpiInstall[MAX_BUF]; char szArchive[MAX_BUF]; char szMsgSmartUpdateStart[MAX_BUF]; + char szDlgExtractingTitle[MAX_BUF]; if(NS_LoadString(hSetupRscInst, IDS_MSG_SMARTUPDATE_START, szMsgSmartUpdateStart, MAX_BUF) != WIZ_OK) return(1); + if(NS_LoadString(hSetupRscInst, IDS_DLG_EXTRACTING_TITLE, szDlgExtractingTitle, MAX_BUF) != WIZ_OK) + return(1); ShowMessage(szMsgSmartUpdateStart, TRUE); if(InitializeXPIStub() == WIZ_OK) @@ -196,6 +199,8 @@ HRESULT SmartUpdateJars() } } + wsprintf(szBuf, szDlgExtractingTitle, siCObject->szDescriptionShort); + SetWindowText(dlgInfo.hWndDlg, szBuf); hrResult = pfnXpiInstall(szArchive, "", 0xFFFF); if(hrResult == 999) bReboot = TRUE; diff --git a/xpinstall/wizard/windows/setuprsc/setuprsc.h b/xpinstall/wizard/windows/setuprsc/setuprsc.h index fcd0023e38f..12b8631426e 100644 --- a/xpinstall/wizard/windows/setuprsc/setuprsc.h +++ b/xpinstall/wizard/windows/setuprsc/setuprsc.h @@ -27,6 +27,7 @@ #define IDS_MSG_CONFIGURING 22 #define IDS_ERROR_XPI_INSTALL 23 #define IDS_ERROR_SETUP_REQUIREMENT 24 +#define IDS_DLG_EXTRACTING_TITLE 25 #define IDI_ICON1 105 #define IDI_SETUP 105 #define IDB_BITMAP_WELCOME 108 diff --git a/xpinstall/wizard/windows/setuprsc/setuprsc.rc b/xpinstall/wizard/windows/setuprsc/setuprsc.rc index 9495a24ed7a..428d39c3cac 100644 --- a/xpinstall/wizard/windows/setuprsc/setuprsc.rc +++ b/xpinstall/wizard/windows/setuprsc/setuprsc.rc @@ -334,6 +334,7 @@ BEGIN IDS_ERROR_XPI_INSTALL "Error ocurred during installation" IDS_ERROR_SETUP_REQUIREMENT "Windows95 or greater Operating System is required! Exiting setup..." + IDS_DLG_EXTRACTING_TITLE "Installing %s" END #endif // English (U.S.) resources