From b7f135e4805cc6592b42b08698984f938fe03bf2 Mon Sep 17 00:00:00 2001 From: "pchen%netscape.com" Date: Wed, 6 Sep 2000 21:13:10 +0000 Subject: [PATCH] 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. git-svn-id: svn://10.0.0.236/trunk@78277 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/io/nsLocalFileMac.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/mozilla/xpcom/io/nsLocalFileMac.cpp b/mozilla/xpcom/io/nsLocalFileMac.cpp index 8ec6877f839..5a4c2d97591 100644 --- a/mozilla/xpcom/io/nsLocalFileMac.cpp +++ b/mozilla/xpcom/io/nsLocalFileMac.cpp @@ -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;