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

Fixing Xpcom INIT to use the new NS_NewLocalFile. may not work on mac yet.

Browse Source 
git-svn-id: svn://10.0.0.236/branches/NSIFILE_01062000_BRANCH@57321 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dougt%netscape.com
2000-01-11 01:19:06 +00:00
parent 4e35465abc
commit c3a3ebc592
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
mozilla/xpinstall/stub/xpistub.cpp
View File

@@ -90,23 +90,25 @@ PR_PUBLIC_API(nsresult) XPI_Init(
// Initialize XPCOM and AutoRegister() its components
//--------------------------------------------------------------------
#ifdef XP_MAC
OSErr err = noErr;
long xpiStubDirID = 0;
Boolean isDir = false;
FSpGetDirectoryID(&aXPIStubDir, &xpiStubDirID, &isDir);
nsfsDirectory = aXPIStubDir;
rv = NS_InitXPCOM(&gServiceMgr, &nsfsDirectory); // mac stuff FIX dougt/sdagley FIX
nsCOMPtr<nsIFile> file;
rv = NS_NewLocalFile(getter_AddRefs(file));
if (NS_SUCCEEDED(rv) && file)
{
nsCOMPtr<nsILocalFileMac> macFile = do_QueryInterface(file);
if (macFile)
macFile->InitWithFSSpec(aXPIStubDir);
}
rv = NS_InitXPCOM(&gServiceMgr, file);
#elif defined(XP_PC) || defined(XP_UNIX)
//nsfsDirectory = componentPath;
// nsCOMPtr<nsIFile> file;
// rv = NS_NewLocalFile(getter_AddRefs(file));
// if (NS_SUCCEEDED(rv) && file)
// {
// file->InitWithPath(aProgramDir)
rv = NS_InitXPCOM(&gServiceMgr, NULL); //file); // fix!!!
nsCOMPtr<nsIFile> file;
rv = NS_NewLocalFile(getter_AddRefs(file));
if (NS_SUCCEEDED(rv) && file)
{
file->InitWithPath(aProgramDir)
}
rv = NS_InitXPCOM(&gServiceMgr, file);
#else
rv = NS_InitXPCOM(&gServiceMgr, NULL);
#endif