corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #43585, r=sfraser, fix type/creator mix up calling FSpCreate() in nsLocalFile::Create(), fix passing correct FSSpec to AECreateDesc, fix passing AppParameters correctly in LaunchParamBlockRec.

Browse Source
This commit is contained in:
pchen@netscape.com
2000-09-06 21:13:10 +00:00
parent 91bf9a1b34
commit d74ece1e04
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
xpcom/io/nsLocalFileMac.cpp
View File

@@ -1128,7 +1128,7 @@ nsLocalFile::Create(PRUint32 type, PRUint32 attributes)
switch (type)
{
case NORMAL_FILE_TYPE:
err = ::FSpCreate(&mResolvedSpec, mType, mCreator, smCurrentScript);
err = ::FSpCreate(&mResolvedSpec, mCreator, mType, smCurrentScript);
return (MacErrorMapper(err));
break;
@@ -2343,12 +2343,10 @@ nsresult nsLocalFile::MyLaunchAppWithDoc(const FSSpec& appSpec, const FSSpec* aD
if (aDocToLoad)
{
FSSpec docSpec;
err = AECreateList(nil, 0, false, &docList);
if (err != noErr) return NS_ERROR_FAILURE;
err = AECreateDesc(typeFSS, &docSpec, sizeof(FSSpec), &docDesc);
err = AECreateDesc(typeFSS, aDocToLoad, sizeof(FSSpec), &docDesc);
if (err != noErr) return NS_ERROR_FAILURE;
err = AEPutDesc(&docList, 0, &docDesc);
@@ -2384,8 +2382,7 @@ nsresult nsLocalFile::MyLaunchAppWithDoc(const FSSpec& appSpec, const FSSpec* aD
::AEGetDescData(&launchDesc, &launchThis.launchAppParameters, sizeof(launchThis.launchAppParameters));
#else
// no need to lock this handle.
AppParameters appParameters = *(AppParametersPtr)*launchDesc.dataHandle;
launchThis.launchAppParameters = &appParameters;
launchThis.launchAppParameters = (AppParametersPtr) *(launchDesc.dataHandle);
#endif
launchThis.launchBlockID = extendedBlock;
launchThis.launchEPBLength = extendedBlockLen;