Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#175487

Browse Source 
r=pedemonte, sr=blizzard, a=tor
OS/2 only - Finishing up OS/2 install wizard work, I swear


git-svn-id: svn://10.0.0.236/trunk@132603 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkaply%us.ibm.com 2002-10-28 20:56:47 +00:00
parent 1c677558db
commit f4c95f9d5f
9 changed files with 38 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/xpinstall/wizard/os2/nsinstall/Makefile.in
View File

@ -26,13 +26,13 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
PROGRAM = nsinstall$(BIN_SUFFIX)
RESFILE = nsinstall.res
PROGRAM = stubinstall$(BIN_SUFFIX)
RESFILE = stubinstall.res
USE_NON_MT_LIBS = 1
USE_STATIC_LIBS = 1
CPPSRCS = \
nsinstall.cpp \
stubinstall.cpp \
nsINIParser.cpp \
$(NULL)

4
mozilla/xpinstall/wizard/os2/nsinstall/nsinstall.cpp → mozilla/xpinstall/wizard/os2/nsinstall/stubinstall.cpp
View File

@ -617,8 +617,8 @@ main(int argc, char *argv[], char *envp[])
WinLoadString(0, NULLHANDLE, IDS_TITLE, MAX_BUF, szTitle);
/* Allow only one instance of nsinstall to run.
* Detect a previous instance of nsinstall, bring it to the
/* Allow only one instance of stubnsinstall to run.
* Detect a previous instance of stubnsinstall, bring it to the
* foreground, and quit current instance */
if(FindWindow("NSExtracting") != NULL)
return(1);

0
mozilla/xpinstall/wizard/os2/nsinstall/nsinstall.ico → mozilla/xpinstall/wizard/os2/nsinstall/stubinstall.ico
View File

2
mozilla/xpinstall/wizard/os2/nsinstall/nsinstall.rc → mozilla/xpinstall/wizard/os2/nsinstall/stubinstall.rc
View File

@ -49,7 +49,7 @@ END
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
ICON 1 DISCARDABLE "nsinstall.ico"
ICON 1 DISCARDABLE "stubinstall.ico"
/////////////////////////////////////////////////////////////////////////////
//

8
mozilla/xpinstall/wizard/os2/setup/dialogs.c
View File

@ -733,10 +733,16 @@ MRESULT EXPENTRY DlgProcSetupType(HWND hDlg, ULONG msg, MPARAM mp1, MPARAM mp2)
break;
case IDC_README:
{
char fullReadme[CCHMAXPATH];
strcpy(fullReadme, szSetupDir);
strcat(fullReadme, diSetupType.szReadmeFilename);
if(*diSetupType.szReadmeApp == '\0')
WinSpawn(diSetupType.szReadmeFilename, NULL, szSetupDir, FALSE);
else
WinSpawn(diSetupType.szReadmeApp, diSetupType.szReadmeFilename, szSetupDir, FALSE);
WinSpawn(diSetupType.szReadmeApp, fullReadme, szSetupDir, FALSE);
}
return (MRESULT)TRUE;
break;

24
mozilla/xpinstall/wizard/os2/setup/extra.c
View File

@ -1333,24 +1333,14 @@ long RetrieveArchives()
void RemoveBackSlash(PSZ szInput)
{
ULONG ulInputLen;
BOOL bDone;
/* Workaround for compiler optimization bug */
volatile char *ptrChar = NULL;
char *ptrChar = NULL;
if(szInput)
{
ulInputLen = strlen(szInput);
bDone = FALSE;
ptrChar = &szInput[ulInputLen];
while(!bDone)
{
ptrChar = WinPrevChar(0, 0, 0, szInput, ptrChar);
if(*ptrChar == '\\')
*ptrChar = '\0';
else
bDone = TRUE;
}
if(!szInput)
return;
ptrChar = WinPrevChar(0, 0, 0, szInput, szInput + strlen(szInput));
if (*ptrChar == '\\') {
*ptrChar = '\0';
}
}

23
mozilla/xpinstall/wizard/os2/setup/ifuncns.c
View File

@ -1363,13 +1363,7 @@ HRESULT ProcessProgramFolder(DWORD dwTiming, char *szSectionPrefix)
dwIndex0 = 0;
BuildNumberedString(dwIndex0, szSectionPrefix, "Program Folder", szSection0, sizeof(szSection0));
GetPrivateProfileString(szSection0, "Program Folder", "", szBuf, sizeof(szBuf), szFileIniConfig);
if(TimingCheck(dwTiming, szSection0, szFileIniConfig))
{
/* Create program folder */
WinCreateObject("WPFolder", sgProduct.szProgramFolderName, "",
sgProduct.szProgramFolderPath, CO_REPLACEIFEXISTS);
}
GetPrivateProfileString(szSection0, "Timing", "", szBuf, sizeof(szBuf), szFileIniConfig);
while(*szBuf != '\0')
{
if(TimingCheck(dwTiming, szSection0, szFileIniConfig))
@ -1381,11 +1375,10 @@ HRESULT ProcessProgramFolder(DWORD dwTiming, char *szSectionPrefix)
strcpy(szSection1, szSection0);
strcat(szSection1, "-Object");
strcat(szSection1, szIndex1);
GetPrivateProfileString(szSection1, "ClassName", "", szClassName, sizeof(szClassName), szFileIniConfig);
GetPrivateProfileString(szSection1, "Title", "", szBuf, sizeof(szBuf), szFileIniConfig);
while(*szBuf != '\0')
{
*szSetupString = '\0';
GetPrivateProfileString(szSection1, "Title", "", szBuf, sizeof(szBuf), szFileIniConfig);
DecryptString(szTitle, szBuf);
GetPrivateProfileString(szSection1, "Location", "", szBuf, sizeof(szBuf), szFileIniConfig);
DecryptString(szLocation, szBuf);
@ -1452,10 +1445,16 @@ HRESULT ProcessProgramFolder(DWORD dwTiming, char *szSectionPrefix)
}
strcat(szSetupString, szBuf2);
}
GetPrivateProfileString(szSection1, "ClassName", "", szBuf, sizeof(szBuf), szFileIniConfig);
if (szBuf[0]) {
strcpy(szClassName, szBuf);
} else {
strcpy(szClassName, "WPProgram");
}
WinCreateObject(szClassName, szTitle, szSetupString, szLocation, CO_REPLACEIFEXISTS);
WinCreateObject(szClassName, szTitle, szSetupString, szLocation, CO_UPDATEIFEXISTS);
if (szObjectID) {
if (szObjectID[0]) {
strcpy(szBuf, szObjectID);
} else {
strcpy(szBuf, szProgramFolder);
@ -1469,7 +1468,7 @@ HRESULT ProcessProgramFolder(DWORD dwTiming, char *szSectionPrefix)
strcpy(szSection1, szSection0);
strcat(szSection1, "-Object");
strcat(szSection1, szIndex1);
GetPrivateProfileString(szSection1, "ClassName", "", szBuf, sizeof(szBuf), szFileIniConfig);
GetPrivateProfileString(szSection1, "Title", "", szBuf, sizeof(szBuf), szFileIniConfig);
}
}

1
mozilla/xpinstall/wizard/os2/setuprsc/Makefile.in
View File

@ -31,6 +31,7 @@ LIBRARY_NAME = setuprsc
RESFILE = setuprsc.res
USE_NON_MT_LIBS = 1
USE_STATIC_LIBS = 1
NO_DIST_INSTALL = 1

18
mozilla/xpinstall/wizard/os2/uninstall/extra.c
View File

@ -324,20 +324,14 @@ void SetUninstallRunMode(PSZ szMode)
void RemoveBackSlash(PSZ szInput)
{
int iCounter;
ULONG ulInputLen;
char *ptrChar = NULL;
if(szInput != NULL)
{
ulInputLen = strlen(szInput);
if(!szInput)
return;
for(iCounter = ulInputLen -1; iCounter >= 0 ; iCounter--)
{
if(szInput[iCounter] == '\\')
szInput[iCounter] = '\0';
else
break;
}
ptrChar = WinPrevChar(0, 0, 0, szInput, szInput + strlen(szInput));
if (*ptrChar == '\\') {
*ptrChar = '\0';
}
}