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

Added some comments and shortened some heap blocks. Called WaitNextEvent a few times before trying to get high-level events.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@28983 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mcmullen%netscape.com 1999-04-23 23:09:29 +00:00
parent dbdf4825fe
commit 8feb26532a
2 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp
View File

@ -528,6 +528,7 @@ OSErr nsAppleEventHandler::HandleAppleEvent(
{
case ae_OpenApp:
err = noErr;
break;
case ae_Quit:
@ -2625,17 +2626,29 @@ void InitializeMacCommandLine(int& argc, char**& argv)
// parameters or -print parameters, with file URLs.
EventRecord anEvent;
for (int i = 1; i < 5; i++)
::WaitNextEvent(0, &anEvent, 0, nsnull);
while (::EventAvail(highLevelEventMask, &anEvent))
{
::WaitNextEvent(highLevelEventMask, &anEvent, 0, 0);
::WaitNextEvent(highLevelEventMask, &anEvent, 0, nsnull);
if (anEvent.what == kHighLevelEvent)
OSErr err = ::AEProcessAppleEvent(&anEvent);
}
// Now we've grabbed all the initial high-level events, and written them into
// the command-line buffer as url commands, parse the buffer.
handler->SetStartedUp(PR_TRUE);
if (!argBuffer)
return;
// Release some unneeded memory
char* oldBuffer = argBuffer;
argBuffer = new char[PL_strlen(argBuffer) + 1];
PL_strcpy(argBuffer, oldBuffer);
delete [] oldBuffer;
// Parse the buffer.
int rowNumber = 0;
char* strtokFirstParam = argBuffer;
@ -2651,4 +2664,15 @@ void InitializeMacCommandLine(int& argc, char**& argv)
argc++;
strtokFirstParam = nsnull;
}
// Release the unneeded memory.
if (argc < MAX_TOKENS)
{
charP* oldArgs = args;
int arraySize = 1 + argc;
args = new charP[arraySize];
memcpy(args, oldArgs, arraySize * sizeof(charP));
delete [] oldArgs;
argv = args;
}
} // InitializeMac

26
mozilla/xpfe/components/startup/src/nsCommandLineServiceMac.cpp
View File

@ -528,6 +528,7 @@ OSErr nsAppleEventHandler::HandleAppleEvent(
{
case ae_OpenApp:
err = noErr;
break;
case ae_Quit:
@ -2625,17 +2626,29 @@ void InitializeMacCommandLine(int& argc, char**& argv)
// parameters or -print parameters, with file URLs.
EventRecord anEvent;
for (int i = 1; i < 5; i++)
::WaitNextEvent(0, &anEvent, 0, nsnull);
while (::EventAvail(highLevelEventMask, &anEvent))
{
::WaitNextEvent(highLevelEventMask, &anEvent, 0, 0);
::WaitNextEvent(highLevelEventMask, &anEvent, 0, nsnull);
if (anEvent.what == kHighLevelEvent)
OSErr err = ::AEProcessAppleEvent(&anEvent);
}
// Now we've grabbed all the initial high-level events, and written them into
// the command-line buffer as url commands, parse the buffer.
handler->SetStartedUp(PR_TRUE);
if (!argBuffer)
return;
// Release some unneeded memory
char* oldBuffer = argBuffer;
argBuffer = new char[PL_strlen(argBuffer) + 1];
PL_strcpy(argBuffer, oldBuffer);
delete [] oldBuffer;
// Parse the buffer.
int rowNumber = 0;
char* strtokFirstParam = argBuffer;
@ -2651,4 +2664,15 @@ void InitializeMacCommandLine(int& argc, char**& argv)
argc++;
strtokFirstParam = nsnull;
}
// Release the unneeded memory.
if (argc < MAX_TOKENS)
{
charP* oldArgs = args;
int arraySize = 1 + argc;
args = new charP[arraySize];
memcpy(args, oldArgs, arraySize * sizeof(charP));
delete [] oldArgs;
argv = args;
}
} // InitializeMac