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

(1) Fix leaks. (2) Rearchitect failovers [bzilla=49741]. (3) Fix upgrade string [bscape=1784]. [r=ssu,dbragg,sfraser]

This commit is contained in:
sgehani%netscape.com 2000-09-06 00:24:37 +00:00
Родитель 100904a3c3
Коммит 9f88733fea
8 изменённых файлов: 273 добавлений и 312 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

Двоичные данные
xpinstall/wizard/mac/rsrc/MIWCommon.rsrc
Просмотреть файл

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

337
xpinstall/wizard/mac/src/InstAction.c
Просмотреть файл

@ -38,6 +38,7 @@ pascal void* Install(void* unused)
#if MOZILLA == 0
FSSpec redirectSpec;
HRESULT dlErr;
short siteIndex;
#endif
#ifdef MIW_DEBUG
FSSpec tmpSpec;
@ -101,11 +102,34 @@ pascal void* Install(void* unused)
GetPort(&oldPort);
#if MOZILLA == 0
if (gControls->cfg->redirect.numURLs > 0)
HLock(gControls->cfg->redirect.subpath);
if (gControls->cfg->redirect.subpath && *(gControls->cfg->redirect.subpath))
{
if (DownloadRedirect(vRefNum, dirID, &redirectSpec))
ParseRedirect(&redirectSpec);
HUnlock(gControls->cfg->redirect.subpath);
/* replace global URL from redirect.ini */
if (DownloadRedirect(vRefNum, dirID, &redirectSpec))
ParseRedirect(&redirectSpec);
}
else
{
HUnlock(gControls->cfg->redirect.subpath);
/* otherwise if site selector exists, replace global URL with selected site */
if (gControls->cfg->numSites > 0)
{
if (gControls->cfg->globalURL)
DisposeHandle(gControls->cfg->globalURL);
gControls->cfg->globalURL = NewHandleClear(kValueMaxLen);
siteIndex = gControls->opt->siteChoice - 1;
HLock(gControls->cfg->globalURL);
HLock(gControls->cfg->site[siteIndex].domain);
strcpy(*(gControls->cfg->globalURL), *(gControls->cfg->site[siteIndex].domain));
HUnlock(gControls->cfg->globalURL);
HUnlock(gControls->cfg->site[siteIndex].domain);
}
}
#endif /* MOZILLA == 0 */
/* generate idi */
@ -131,7 +155,10 @@ pascal void* Install(void* unused)
#endif /* SDINST_IS_DLL */
if (dlErr != 0)
{
ErrorHandler(dlErr);
if (dlErr != 0x800704C7)
ErrorHandler(dlErr);
else
gDone = true;
return (void*) nil;
}
#endif /* MOZILLA */
@ -179,10 +206,6 @@ pascal void* Install(void* unused)
InitProgressBar();
/* extract contents of downloaded or packaged core file */
// XXX move this call to the end by 06/18/2000 if the issue is cleared
// XXX IfRemoveOldCore(vRefNum, dirID);
err = ExtractCoreFile(srcVRefNum, srcDirID, vRefNum, dirID);
if (err!=noErr)
{
@ -224,24 +247,22 @@ pascal void* Install(void* unused)
return (void*) 0;
}
#define GETRED_BUF_SIZE 512
Boolean
DownloadRedirect(short vRefNum, long dirID, FSSpecPtr redirectINI)
{
Boolean bSuccess = true;
char *buf = NULL, *idx = NULL, *leaf = NULL;;
int i;
char buf[GETRED_BUF_SIZE], *leaf = NULL;
FSSpec getRedirectIDI;
short refNum;
long count;
SDISTRUCT sdistruct;
StringPtr pLeaf = NULL;
OSErr err = noErr;
buf = NewPtrClear(2048);
if (!buf)
return false;
/* generate IDI */
memset(buf, 0, GETRED_BUF_SIZE);
/*
[Netscape Install]
@ -264,22 +285,19 @@ DownloadRedirect(short vRefNum, long dirID, FSSpecPtr redirectINI)
HUnlock(gControls->cfg->redirect.desc);
strcat(buf, "\r");
/* iterate <n>=URLn */
for (i = 0; i < gControls->cfg->redirect.numURLs; i++)
{
idx = ltoa(i);
strcat(buf, idx);
strcat(buf, "=");
HLock(gControls->cfg->redirect.url[i]);
strcat(buf, *(gControls->cfg->redirect.url[i]));
HUnlock(gControls->cfg->redirect.url[i]);
strcat(buf, "\r");
if (idx)
free(idx);
idx = NULL;
}
/* 1=URL */
strcat(buf, "1=");
/* get domain of selected site */
HLock(gControls->cfg->site[gControls->opt->siteChoice-1].domain);
strcat(buf, *(gControls->cfg->site[gControls->opt->siteChoice-1].domain));
HUnlock(gControls->cfg->site[gControls->opt->siteChoice-1].domain);
/* tack on redirect subpath (usually just the file leaf name) */
HLock(gControls->cfg->redirect.subpath);
strcat(buf, *(gControls->cfg->redirect.subpath));
HUnlock(gControls->cfg->redirect.subpath);
strcat(buf, "\r");
/* write out buffer to temp location */
err = FSMakeFSSpec(vRefNum, dirID, "\pGetRedirect.idi", &getRedirectIDI);
@ -308,6 +326,9 @@ DownloadRedirect(short vRefNum, long dirID, FSSpecPtr redirectINI)
bSuccess = false;
FSClose(refNum);
if (!bSuccess)
goto BAIL;
/* populate SDI struct */
sdistruct.dwStructSize = sizeof(SDISTRUCT);
sdistruct.fsIDIFile = getRedirectIDI;
@ -324,34 +345,26 @@ DownloadRedirect(short vRefNum, long dirID, FSSpecPtr redirectINI)
#endif /* SDINST_IS_DLL */
#endif /* MOZILLA */
bSuccess = false;
for (i = 0; i < gControls->cfg->redirect.numURLs; i++)
{
/* verify redirect.ini existence */
HLock(gControls->cfg->redirect.url[i]);
leaf = strrchr(*(gControls->cfg->redirect.url[i]), '/');
if (!leaf)
{
bSuccess = false;
goto BAIL;
}
pLeaf = CToPascal(leaf+1);
HUnlock(gControls->cfg->redirect.url[i]);
err = FSMakeFSSpec(vRefNum, dirID, pLeaf, redirectINI);
if (err == noErr)
{
bSuccess = true;
break;
}
}
bSuccess = false;
if (!bSuccess)
FSMakeFSSpec(0, 0, "\p", redirectINI);
/* verify redirect.ini existence */
HLock(gControls->cfg->redirect.subpath);
leaf = strrchr(*(gControls->cfg->redirect.subpath), '/');
if (!leaf)
leaf = *(gControls->cfg->redirect.subpath);
else
leaf++;
pLeaf = CToPascal(leaf);
HUnlock(gControls->cfg->redirect.subpath);
err = FSMakeFSSpec(vRefNum, dirID, pLeaf, redirectINI);
if (err == noErr)
bSuccess = true;
BAIL:
if (buf)
DisposePtr((Ptr)buf);
if (!bSuccess)
FSMakeFSSpec(0, 0, "\p", redirectINI);
if (pLeaf)
DisposePtr((Ptr)pLeaf);
@ -362,11 +375,10 @@ void
ParseRedirect(FSSpecPtr redirectINI)
{
short fileRefNum;
Boolean bSuccess = false;
OSErr err = noErr;
long dataSize;
char *text = NULL, *cDomain = NULL, *cSection = NULL, *cIndex = NULL;
Str255 pSection, pDomainRoot;
char *text = NULL, *cId = NULL, *cSection = NULL;
Str255 pSection;
int siteIndex;
Handle domainH = NULL;
@ -379,51 +391,51 @@ ParseRedirect(FSSpecPtr redirectINI)
return;
if (dataSize > 0)
{
text = (char*) NewPtrClear(dataSize);
text = (char*) NewPtrClear(dataSize + 1);
if (!text)
return;
err = FSRead(fileRefNum, &dataSize, text);
if (err != noErr)
{
FSClose(fileRefNum);
goto BAIL;
}
}
FSClose(fileRefNum);
/* parse text for selected site replacing selected
* site with parsed text (new site domain)
/* parse text for selected site replacing teh global URL
* with the identifed site's URL in the redirect.ini
*/
if (gControls->cfg->numSites > 0)
{
siteIndex = gControls->opt->siteChoice - 1;
if (!gControls->cfg->site[siteIndex].id)
goto BAIL;
HLock(gControls->cfg->site[siteIndex].id);
cId = NewPtrClear(strlen(*(gControls->cfg->site[siteIndex].id)) + 1); // add 1 for null termination
strcpy(cId, *(gControls->cfg->site[siteIndex].id));
HUnlock(gControls->cfg->site[siteIndex].id);
GetIndString(pSection, rParseKeys, sSiteSelector);
GetIndString(pDomainRoot, rParseKeys, sDomain);
cDomain = NewPtrClear(pDomainRoot[0] + 4);
cSection = PascalToC(pSection);
if (!cSection || !cDomain)
if (!cSection || !cId)
goto BAIL;
cIndex = ltoa(siteIndex);
if (!cIndex)
goto BAIL;
memset(cDomain, 0 , pDomainRoot[0] + 4);
strncpy(cDomain, (char*)&pDomainRoot[1], pDomainRoot[0]);
strcat(cDomain, cIndex);
domainH = NewHandleClear(kValueMaxLen);
if (!domainH )
goto BAIL;
if (FillKeyValueUsingName(cSection, cDomain, domainH, text))
if (FillKeyValueUsingName(cSection, cId, domainH, text))
{
if (gControls->cfg->site[siteIndex].domain)
DisposeHandle(gControls->cfg->site[siteIndex].domain);
gControls->cfg->site[siteIndex].domain = NewHandleClear(kValueMaxLen);
HLock(domainH);
HLock(gControls->cfg->site[siteIndex].domain);
strcpy(*(gControls->cfg->site[siteIndex].domain), *domainH);
HUnlock(domainH);
HUnlock(gControls->cfg->site[siteIndex].domain);
if (gControls->cfg->globalURL)
DisposeHandle(gControls->cfg->globalURL);
gControls->cfg->globalURL = NewHandleClear(kValueMaxLen);
HLock(domainH);
HLock(gControls->cfg->globalURL);
strcpy(*(gControls->cfg->globalURL), *domainH);
HUnlock(domainH);
HUnlock(gControls->cfg->globalURL);
}
if (domainH)
DisposeHandle(domainH);
@ -432,12 +444,10 @@ ParseRedirect(FSSpecPtr redirectINI)
BAIL:
if (text)
DisposePtr((Ptr) text);
if (cDomain)
DisposePtr((Ptr) cDomain);
if (cId)
DisposePtr((Ptr) cId);
if (cSection)
DisposePtr((Ptr) cSection);
if (cIndex)
free(cIndex);
}
void
@ -451,15 +461,17 @@ IfRemoveOldCore(short vRefNum, long dirID)
err = DeleteDirectory(fsViewer.vRefNum, fsViewer.parID, fsViewer.name);
}
#define IDI_BUF_SIZE 512
Boolean
GenerateIDIFromOpt(Str255 idiName, long dirID, short vRefNum, FSSpec *idiSpec)
{
Boolean bSuccess = true;
OSErr err;
short refNum, instChoice;
long count, compsDone, i, j, k, len;
char ch, siteDomain[255];
Ptr buf, keybuf, fnum;
long count, compsDone, i;
char ch, buf[IDI_BUF_SIZE];
Ptr keybuf;
Str255 pkeybuf;
FSSpec fsExists;
StringPtr pcurrArchive = 0;
@ -478,14 +490,6 @@ GenerateIDIFromOpt(Str255 idiName, long dirID, short vRefNum, FSSpec *idiSpec)
}
ERR_CHECK_RET(FSpOpenDF(idiSpec, fsRdWrPerm, &refNum), false);
// setup buffer to at least 8K
buf = NULL;
buf = NewPtrClear(kGenIDIFileSize);
if (!buf)
{
ErrorHandler(eMem);
return false;
}
compsDone = 0;
instChoice = gControls->opt->instChoice-1;
@ -502,7 +506,6 @@ GenerateIDIFromOpt(Str255 idiName, long dirID, short vRefNum, FSSpec *idiSpec)
(gControls->cfg->comp[i].selected == true)) ||
(instChoice < gControls->cfg->numSetupTypes-1) )
{
// XXX shouldn't this be #if MOZILLA == 1
// verify that file does not exist already
HLock(gControls->cfg->comp[i].archive);
pcurrArchive = CToPascal(*gControls->cfg->comp[i].archive);
@ -512,36 +515,29 @@ GenerateIDIFromOpt(Str255 idiName, long dirID, short vRefNum, FSSpec *idiSpec)
// if file doesn't exist
if (err == fnfErr)
{
// XXX shouldn't this be #endif /* MOZILLA == 1 */
char fnum[12];
// get file number
fnum = ltoa(compsDone);
// fnum = ltoa(compsDone);
sprintf(fnum, "%ld", compsDone);
memset(buf, 0, IDI_BUF_SIZE);
// construct through concatenation [File<num>]\r
GetIndString(pkeybuf, rIDIKeys, sFile);
keybuf = PascalToC(pkeybuf);
ch = '[';
strncat(buf, &ch, 1);
strncat(buf, keybuf, strlen(keybuf));
strncpy(buf, &ch, 1);
CopyPascalStrToC(pkeybuf, buf + strlen(buf));
strncat(buf, fnum, strlen(fnum));
DisposePtr(keybuf);
keybuf = NewPtrClear(3);
keybuf = "]\r";
strncat(buf, keybuf, strlen(keybuf));
if (keybuf)
DisposePtr(keybuf);
strcat(buf, "]\r");
// write out \tdesc=
GetIndString(pkeybuf, rIDIKeys, sDesc);
keybuf = PascalToC(pkeybuf);
ch = '\t';
strncat(buf, &ch, 1); // \t
strncat(buf, keybuf, strlen(keybuf)); // \tdesc
CopyPascalStrToC(pkeybuf, buf + strlen(buf));
ch = '='; // \tdesc=
strncat(buf, &ch, 1);
if (keybuf)
DisposePtr(keybuf);
// write out gControls->cfg->comp[i].shortDesc\r
HLock(gControls->cfg->comp[i].shortDesc);
@ -549,87 +545,30 @@ GenerateIDIFromOpt(Str255 idiName, long dirID, short vRefNum, FSSpec *idiSpec)
HUnlock(gControls->cfg->comp[i].shortDesc);
ch = '\r';
strncat(buf, &ch, 1);
// if [Site Selector] sections exists
if (gControls->cfg->numSites > 0)
{
memset(siteDomain, 0 , 255);
// get domain of selected site
HLock(gControls->cfg->site[gControls->opt->siteChoice-1].domain);
len = strlen(*(gControls->cfg->site[gControls->opt->siteChoice-1].domain));
strncpy(siteDomain, *(gControls->cfg->site[gControls->opt->siteChoice-1].domain),
(len < 255) ? len : 255);
HUnlock(gControls->cfg->site[gControls->opt->siteChoice-1].domain);
// iterate over gControls->cfg->comp[i].numURLs
for (j=0; j<gControls->cfg->comp[i].numURLs; j++)
{
// write out \tnumURLs+1= from STR# resource
GetIndString(pkeybuf, rIndices, j+2); // j+2 since 1-based idx, not 0-based
keybuf = PascalToC(pkeybuf);
ch = '\t';
strncat(buf, &ch, 1); // \t
strncat(buf, keybuf, strlen(keybuf)); // \t<n>
ch = '=';
strncat(buf, &ch, 1); // \t<n>=
if (keybuf)
DisposePtr(keybuf);
// use selected DomainX to replace Domain0 in curr ComponentX section
strncat(buf, siteDomain, strlen(siteDomain));
// tack on server path for this index
HLock(gControls->cfg->comp[i].serverPath[j]);
strncat(buf, *gControls->cfg->comp[i].serverPath[j], strlen(*gControls->cfg->comp[i].serverPath[j]));
HUnlock(gControls->cfg->comp[i].serverPath[j]);
// tack on 'archive\r'
HLock(gControls->cfg->comp[i].archive);
strncat(buf, *gControls->cfg->comp[i].archive, strlen(*gControls->cfg->comp[i].archive));
HUnlock(gControls->cfg->comp[i].archive);
ch = '\r';
strncat(buf, &ch, 1);
}
}
// now tack on failovers from ComponentX section
for (k=0; k<gControls->cfg->comp[i].numURLs; k++)
{
// write out \tnumURLs+1= from STR# resource
GetIndString(pkeybuf, rIndices, k+j+2); // j+2 since 1-based idx, not 0-based
keybuf = PascalToC(pkeybuf);
ch = '\t';
strncat(buf, &ch, 1); // \t
strncat(buf, keybuf, strlen(keybuf)); // \t<n>
ch = '=';
strncat(buf, &ch, 1); // \t<n>=
if (keybuf)
DisposePtr(keybuf);
// get domain for this index
HLock(gControls->cfg->comp[i].domain[k]);
strncat(buf, *gControls->cfg->comp[i].domain[k], strlen(*gControls->cfg->comp[i].domain[k]));
HUnlock(gControls->cfg->comp[i].domain[k]);
// tack on server path for this index
HLock(gControls->cfg->comp[i].serverPath[k]);
strncat(buf, *gControls->cfg->comp[i].serverPath[k], strlen(*gControls->cfg->comp[i].serverPath[k]));
HUnlock(gControls->cfg->comp[i].serverPath[k]);
// tack on 'archive\r'
HLock(gControls->cfg->comp[i].archive);
strncat(buf, *gControls->cfg->comp[i].archive, strlen(*gControls->cfg->comp[i].archive));
HUnlock(gControls->cfg->comp[i].archive);
ch = '\r';
strncat(buf, &ch, 1);
}
if (fnum)
free(fnum);
// write out \t0= // \t0=
strcat(buf, "\t0=");
// tack on URL to xpi directory // \t0=<URL>
HLock(gControls->cfg->globalURL);
strcat(buf, *gControls->cfg->globalURL);
HUnlock(gControls->cfg->globalURL);
// tack on 'archive\r' // \t0=<URL>/archive\r
HLock(gControls->cfg->comp[i].archive);
strncat(buf, *gControls->cfg->comp[i].archive, strlen(*gControls->cfg->comp[i].archive));
HUnlock(gControls->cfg->comp[i].archive);
ch = '\r';
strncat(buf, &ch, 1);
count = strlen(buf);
err = FSWrite(refNum, &count, buf);
if (err != noErr)
goto BAIL;
compsDone++;
// XXX shouldn't this be #if MOZILLA == 1
}
// XXX shouldn't this be #endif /* MOZILLA == 1 */
}
}
else if (compsDone >= gControls->cfg->st[instChoice].numComps)
@ -637,10 +576,11 @@ GenerateIDIFromOpt(Str255 idiName, long dirID, short vRefNum, FSSpec *idiSpec)
}
// terminate by entering Netscape Install section
memset(buf, 0, IDI_BUF_SIZE);
GetIndString(pkeybuf, rIDIKeys, sNSInstall);
keybuf = PascalToC(pkeybuf);
ch = '[';
strncat(buf, &ch, 1); // [
strncpy(buf, &ch, 1); // [
strncat(buf, keybuf, strlen(keybuf)); // [Netscape Install
if (keybuf)
DisposePtr(keybuf);
@ -672,12 +612,11 @@ GenerateIDIFromOpt(Str255 idiName, long dirID, short vRefNum, FSSpec *idiSpec)
// write buf to disk
count = strlen(buf);
ERR_CHECK_RET(FSWrite(refNum, &count, buf), false);
BAIL:
// close file
ERR_CHECK_RET(FSClose(refNum), false)
ERR_CHECK_RET(FSClose(refNum), false);
if (buf)
DisposePtr(buf);
return bSuccess;
}

1
xpinstall/wizard/mac/src/LicenseWin.c
Просмотреть файл

@ -99,7 +99,6 @@ InitLicTxt(void)
HLock(gControls->cfg->licFileName);
if(**gControls->cfg->licFileName != nil)
{
cLicFName = (unsigned char*)NewPtrClear(strlen(*gControls->cfg->licFileName));
cLicFName = CToPascal(*gControls->cfg->licFileName);
ERR_CHECK(FSMakeFSSpec(vRefNum, dirID, cLicFName, &licFile));

65
xpinstall/wizard/mac/src/MacInstallWizard.c
Просмотреть файл

@ -48,7 +48,7 @@ void main(void)
OSErr err = noErr;
Init();
if (VerifyEnv())
if (VerifyEnv() && !gDone)
{
err = NavLoad();
if (err!=noErr)
@ -359,6 +359,13 @@ void ErrorHandler(short errCode)
// TO DO
// * handle a "fatality" parameter for recovery
// only throw up the error dialog once (since we have no fatality param)
static Boolean bErrHandled = false;
if (bErrHandled)
return;
else
bErrHandled = true;
Str255 pErrorStr = "\pUnexpected error!";
Str255 pMessage = "\pError ";
char *cErrNo = 0;
@ -396,7 +403,7 @@ void ErrorHandler(short errCode)
void Shutdown(void)
{
WindowPtr frontWin;
long MIWMagic = 0;
long MIWMagic = 0, i;
#if (SDINST_IS_DLL == 1) && (MOZILLA == 0)
UnloadSDLib(&gConnID);
@ -404,8 +411,58 @@ void Shutdown(void)
NavUnload();
/* deallocate config object */
// TO DO
if (gControls->cfg)
{
/* General */
if (gControls->cfg->targetSubfolder)
DisposePtr((Ptr) gControls->cfg->targetSubfolder);
if (gControls->cfg->globalURL)
DisposePtr((Ptr) gControls->cfg->globalURL);
/* LicenseWin */
if (gControls->cfg->licFileName)
DisposePtr((Ptr) gControls->cfg->licFileName);
/* WelcomeWin */
for (i = 0; i < kNumWelcMsgs; i++)
{
if (gControls->cfg->welcMsg[i])
DisposePtr((Ptr) gControls->cfg->welcMsg[i]);
}
if (gControls->cfg->readmeFile)
DisposePtr((Ptr) gControls->cfg->readmeFile);
if (gControls->cfg->readmeApp)
DisposePtr((Ptr) gControls->cfg->readmeApp);
/* ComponentsWin and AdditionsWin */
if (gControls->cfg->selCompMsg)
DisposePtr((Ptr) gControls->cfg->selCompMsg);
if (gControls->cfg->selAddMsg)
DisposePtr((Ptr) gControls->cfg->selAddMsg);
/* TerminalWin */
if (gControls->cfg->startMsg)
DisposePtr((Ptr) gControls->cfg->startMsg);
if (gControls->cfg->saveBitsMsg)
DisposePtr((Ptr) gControls->cfg->saveBitsMsg);
/* "Tunneled" IDI keys */
if (gControls->cfg->coreFile)
DisposePtr((Ptr) gControls->cfg->coreFile);
if (gControls->cfg->coreDir)
DisposePtr((Ptr) gControls->cfg->coreDir);
if (gControls->cfg->noAds)
DisposePtr((Ptr) gControls->cfg->noAds);
if (gControls->cfg->silent)
DisposePtr((Ptr) gControls->cfg->silent);
if (gControls->cfg->execution)
DisposePtr((Ptr) gControls->cfg->execution);
if (gControls->cfg->confirmInstall)
DisposePtr((Ptr) gControls->cfg->confirmInstall);
DisposePtr((Ptr)gControls->cfg);
}
/* deallocate options object */
if (gControls->opt && gControls->opt->folder)
{

16
xpinstall/wizard/mac/src/MacInstallWizard.h
Просмотреть файл

@ -146,9 +146,8 @@ if (err) \
#define kValueMaxLen 512
#define kSNameMaxLen 128 /* v--- for KV_DELIM char */
#define kSectionMaxLen (kKeyMaxLen+1+kValueMaxLen)*kMaxNumKeys
#define kMaxURLPerComp 8
#define kArchiveMaxLen 64
#define kGenIDIFileSize 0x2000
#define kGenIDIFileSize 2048
#define kEnableControl 0
#define kDisableControl 255
#define kNotSelected 0
@ -312,9 +311,11 @@ if (err) \
#define sMessage 41
#define sSiteSelector 42
#define sIdentifier 50
#define sDomain 43
#define sDescription 44
#define sRedirect 46
#define sSubpath 51
#define sTermDlg 27
@ -347,11 +348,6 @@ typedef struct InstComp {
Handle archive;
long size;
/* URL details */
Handle domain[kMaxURLPerComp];
Handle serverPath[kMaxURLPerComp];
short numURLs;
/* attributes */
Boolean selected;
Boolean invisible;
@ -389,14 +385,14 @@ typedef struct LegacyCheck {
} LegacyCheck;
typedef struct SiteSelector {
Handle id;
Handle desc;
Handle domain;
} SiteSelector;
typedef struct Redirect {
Handle desc;
Handle url[kMaxSites];
short numURLs;
Handle subpath;
} Redirect;
typedef struct Config {
@ -407,6 +403,7 @@ typedef struct Config {
/* General */
Handle targetSubfolder;
Handle globalURL;
/* LicenseWin */
Handle licFileName;
@ -604,6 +601,7 @@ Boolean GetNextSection(char **, char *, char *);
Boolean GetNextKeyVal(char **, char *, char*);
unsigned char *CToPascal(char *);
char * PascalToC(unsigned char *);
void CopyPascalStrToC(ConstStr255Param srcPString, char* dest);
/*-----------------------------------------------------------*
* EvtHandlers

159
xpinstall/wizard/mac/src/Parser.c
Просмотреть файл

@ -161,7 +161,18 @@ PopulateGeneralKeys(char *cfgText)
/* don't check retval siunce we don't care if we don't find this: it's optional */
FillKeyValueUsingResID(sGeneral, sSubfolder, gControls->cfg->targetSubfolder, cfgText);
/* General section: global URL */
gControls->cfg->globalURL = NewHandleClear(kValueMaxLen);
if (!gControls->cfg->globalURL)
{
ErrorHandler(eMem);
return eParseFailed;
}
/* not compulsory since mozilla doesn't download */
FillKeyValueUsingResID(sGeneral, sURL, gControls->cfg->globalURL, cfgText);
return err;
}
@ -324,6 +335,8 @@ PopulateCompWinKeys(char *cfgText)
gControls->cfg->comp[i].shortDesc = NewHandleClear(kValueMaxLen);
if (!FillKeyValueUsingName(currSName, currKey, gControls->cfg->comp[i].shortDesc, cfgText))
{
DisposePtr(currSName);
DisposePtr(currSNameBuf);
DisposePtr(currKey);
break; // no more Components
}
@ -453,59 +466,6 @@ PopulateCompWinKeys(char *cfgText)
/* initialize to not highlighted */
gControls->cfg->comp[i].highlighted = false;
/* URLs for redundancy/retry/failover */
gControls->cfg->comp[i].numURLs = 0;
for (j=0; j<kMaxURLPerComp; j++)
{
// first get domain
GetIndString(pkey, rParseKeys, sDomain);
currKeyBuf = PascalToC(pkey);
currKey = NewPtrClear(strlen(currKeyBuf)+3); // tens, unit, null termination
strncpy(currKey, currKeyBuf, strlen(currKeyBuf));
gControls->cfg->comp[i].domain[j] = NewHandleClear(kValueMaxLen);
GetIndString(pidx, rIndices, j+1);
idxCh = PascalToC(pidx);
strncat(currKey, idxCh, 1);
DisposePtr(idxCh);
strncat(currKey, eof, 1);
// don't break if this fails since there may be more Server Paths thatn Domains
FillKeyValueUsingName(currSName, currKey, gControls->cfg->comp[i].domain[j], cfgText);
if (currKey)
DisposePtr(currKey);
if (currKeyBuf)
DisposePtr(currKeyBuf);
// then get server paths
GetIndString(pkey, rParseKeys, sServerPath);
currKeyBuf = PascalToC(pkey);
currKey = NewPtrClear(strlen(currKeyBuf)+3); // tens, unit, null termination
strncpy(currKey, currKeyBuf, strlen(currKeyBuf));
gControls->cfg->comp[i].serverPath[j] = NewHandleClear(kValueMaxLen);
GetIndString(pidx, rIndices, j+1);
idxCh = PascalToC(pidx);
strncat(currKey, idxCh, 1);
DisposePtr(idxCh);
strncat(currKey, eof, 1);
if (!FillKeyValueUsingName(currSName, currKey, gControls->cfg->comp[i].serverPath[j], cfgText))
{
if (currKey)
DisposePtr(currKey);
if (currKeyBuf)
DisposePtr(currKeyBuf);
break;
}
gControls->cfg->comp[i].numURLs++;
if (currKey)
DisposePtr(currKey);
if (currKeyBuf)
DisposePtr(currKeyBuf);
}
/* dependees for other components */
gControls->cfg->comp[i].numDeps = 0;
GetIndString(pkey, rParseKeys, sDependee);
@ -584,6 +544,8 @@ PopulateSetupTypeWinKeys(char *cfgText)
if (!FillKeyValueUsingName(currSName, currKey, gControls->cfg->st[i].shortDesc, cfgText))
{
DisposePtr(currKey);
DisposePtr(currSName);
DisposePtr(currSNameBuf);
break; // no more SetupTypes
}
DisposePtr(currKey);
@ -667,8 +629,9 @@ PopulateTermWinKeys(char *cfgText)
{
OSErr err = noErr;
short i;
Str255 pSection, pDomainRoot, pDescRoot, pURLRoot;
char *cSection = NULL, *cDesc = NULL, *cDomain = NULL, *cIndex = NULL, *cURL = NULL;
Str255 pSection, pIdRoot, pDomainRoot, pDescRoot, pSubpath;
char *cSection = NULL, *cId = NULL, *cDomain = NULL,
*cDesc = NULL, *cSubpath = NULL, *cIndex = NULL;
Boolean bMoreSites = true;
/* TerminalWin: start install msg */
@ -678,11 +641,13 @@ PopulateTermWinKeys(char *cfgText)
/* site selector keys */
gControls->cfg->numSites = 0;
GetIndString(pSection, rParseKeys, sSiteSelector);
GetIndString(pIdRoot, rParseKeys, sIdentifier);
GetIndString(pDomainRoot, rParseKeys, sDomain);
GetIndString(pDescRoot, rParseKeys, sDescription);
cSection = PascalToC(pSection);
cId = NewPtrClear(pIdRoot[0] + 4);
cDesc = NewPtrClear(pDescRoot[0] + 4);
cDomain = NewPtrClear(pDomainRoot[0] + 4);
cSection = PascalToC(pSection);
if (!cSection || !cDesc || !cDomain)
return eParseFailed;
for (i = 0; i < kMaxSites; i++)
@ -691,6 +656,10 @@ PopulateTermWinKeys(char *cfgText)
if (!cIndex)
break;
memset(cId, 0, pIdRoot[0] + 4);
strncpy(cId, (char*)&pIdRoot[1], pIdRoot[0]);
strcat(cId, cIndex);
memset(cDesc, 0, pDescRoot[0] + 4);
strncpy(cDesc, (char*)&pDescRoot[1], pDescRoot[0]);
strcat(cDesc, cIndex);
@ -699,11 +668,14 @@ PopulateTermWinKeys(char *cfgText)
strncpy(cDomain, (char*)&pDomainRoot[1], pDomainRoot[0]);
strcat(cDomain, cIndex);
gControls->cfg->site[i].desc = NewHandleClear(kValueMaxLen);
if (!FillKeyValueUsingName(cSection, cDesc, gControls->cfg->site[i].desc, cfgText))
bMoreSites = false;
gControls->cfg->site[i].id = NewHandleClear(kValueMaxLen);
if (!FillKeyValueUsingName(cSection, cId, gControls->cfg->site[i].id, cfgText))
bMoreSites = false;
if (bMoreSites)
{
gControls->cfg->site[i].desc = NewHandleClear(kValueMaxLen);
if (!FillKeyValueUsingName(cSection, cDesc, gControls->cfg->site[i].desc, cfgText))
bMoreSites = false;
gControls->cfg->site[i].domain = NewHandleClear(kValueMaxLen);
if (!FillKeyValueUsingName(cSection, cDomain, gControls->cfg->site[i].domain, cfgText))
bMoreSites = false;
@ -711,7 +683,6 @@ PopulateTermWinKeys(char *cfgText)
gControls->cfg->numSites++;
}
if (cIndex)
free(cIndex);
cIndex = NULL;
@ -722,44 +693,27 @@ PopulateTermWinKeys(char *cfgText)
if (cSection)
DisposePtr((Ptr) cSection);
if (cId)
DisposePtr((Ptr) cId);
if (cDesc)
DisposePtr((Ptr) cDesc);
if (cDomain)
DisposePtr((Ptr) cDomain);
/* redirect for remote site selector section */
gControls->cfg->redirect.numURLs = 0;
GetIndString(pSection, rParseKeys, sRedirect);
GetIndString(pURLRoot, rParseKeys, sURL);
GetIndString(pSubpath, rParseKeys, sSubpath);
cSection = PascalToC(pSection);
cDesc = PascalToC(pDescRoot);
cURL = NewPtrClear(pURLRoot[0] + 4);
if (!cURL || !cSection || !cDesc)
cSubpath = PascalToC(pSubpath);
if (!cSubpath || !cSection || !cDesc)
return eMem;
gControls->cfg->redirect.desc = NewHandleClear(kValueMaxLen);
if (FillKeyValueUsingResID(sRedirect, sDescription, gControls->cfg->redirect.desc, cfgText))
{
for (i = 0; i < kMaxSites; i++)
{
cIndex = ltoa(i);
if (!cIndex)
break;
memset(cURL, 0 , pURLRoot[0] + 4);
strncpy(cURL, (char*)&pURLRoot[1], pURLRoot[0]);
strcat(cURL, cIndex);
gControls->cfg->redirect.url[i] = NewHandleClear(kValueMaxLen);
if (!FillKeyValueUsingName(cSection, cURL, gControls->cfg->redirect.url[i], cfgText))
break;
gControls->cfg->redirect.numURLs++;
if (cIndex)
free(cIndex);
cIndex = NULL;
}
{
gControls->cfg->redirect.subpath = NewHandleClear(kValueMaxLen);
FillKeyValueUsingName(cSection, cSubpath, gControls->cfg->redirect.subpath, cfgText);
}
/* save bits msg */
@ -770,8 +724,8 @@ PopulateTermWinKeys(char *cfgText)
DisposePtr((Ptr)cSection);
if (cDesc)
DisposePtr((Ptr)cDesc);
if (cURL)
DisposePtr((Ptr)cURL);
if (cSubpath)
DisposePtr((Ptr)cSubpath);
return err;
}
@ -1196,17 +1150,20 @@ find_contents:
}
/* handle case where '[' is in key or value (i.e., for i18n)*/
if (*txt == START_SECTION &&
!(txt == *ioTxt || *(txt-1) == MAC_EOL || *(txt-1) == WIN_EOL))
if (*txt != MY_EOF)
{
if( kSectionMaxLen-1 >= cnt++) /* prevent from falling of end of outSection buffer */
{
*sbuf = *txt;
sbuf++; txt++;
}
else
txt++;
goto find_contents;
if (*txt == START_SECTION &&
!(txt == *ioTxt || *(txt-1) == MAC_EOL || *(txt-1) == WIN_EOL))
{
if( kSectionMaxLen-1 >= cnt++) /* prevent from falling of end of outSection buffer */
{
*sbuf = *txt;
sbuf++; txt++;
}
else
txt++;
goto find_contents;
}
}
*sbuf = MY_EOF; /* close string */
@ -1328,3 +1285,9 @@ char *PascalToC(unsigned char *str)
*p = '\0';
return((char *)cpy);
}
void CopyPascalStrToC(ConstStr255Param srcPString, char* dest)
{
BlockMoveData(&srcPString[1], dest, srcPString[0]);
dest[srcPString[0]] = '\0';
}

1
xpinstall/wizard/mac/src/SetupTypeWin.c
Просмотреть файл

@ -95,7 +95,6 @@ ShowSetupTypeWin(void)
HUnlock((Handle)gControls->stw->instDescBox);
InsetRect(&viewRect, kTxtRectPad, kTxtRectPad);
gControls->stw->instDescTxt = (TEHandle) NewPtrClear(sizeof(TEPtr));
TextFont(systemFont);
TextFace(normal);
TextSize(12);

6
xpinstall/wizard/mac/src/TerminalWin.c
Просмотреть файл

@ -63,7 +63,10 @@ ShowTerminalWin(void)
rectH = Get1Resource('RECT', rStartMsgBox);
reserr = ResError();
if (reserr == noErr && rectH != NULL)
{
viewRect = (Rect) **((Rect **)rectH);
ReleaseResource(rectH);
}
else
{
ErrorHandler(reserr);
@ -135,7 +138,10 @@ ShowTerminalWin(void)
rectH = Get1Resource('RECT', rSaveBitsMsgBox);
reserr = ResError();
if (reserr == noErr && rectH != NULL)
{
gControls->tw->saveBitsMsgBox = (Rect) **((Rect **)rectH);
DisposeHandle(rectH);
}
else
{
ErrorHandler(reserr);