Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

missed this file.

Browse Source
This commit is contained in:
dougt%netscape.com 2000-02-21 21:52:18 +00:00
parent 8c83662e4d
commit 3c681f228e
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
xpcom/build/nsXPComInit.cpp
View File

@ -56,6 +56,7 @@
#include "nsThread.h"
#include "nsFileSpecImpl.h"
#include "nsSpecialSystemDirectory.h"
#include "nsILocalFile.h"
#include "nsLocalFile.h"
@ -171,6 +172,7 @@ RegisterGenericFactory(nsIComponentManager* compMgr, const nsCID& cid, const cha
nsComponentManagerImpl* nsComponentManagerImpl::gComponentManager = NULL;
nsICaseConversion *gCaseConv = NULL;
nsDirectoryService *gDirectoryService = NULL;
extern nsIServiceManager* gServiceManager;
extern PRBool gShuttingDown;
@ -201,8 +203,7 @@ nsresult NS_COM NS_InitXPCOM(nsIServiceManager* *result,
// 2. Create the Component Manager and register with global service manager
// It is understood that the component manager can use the global service manager.
nsComponentManagerImpl *compMgr = NULL;
nsDirectoryService *directoryService = NULL;
if (nsComponentManagerImpl::gComponentManager == NULL)
{
compMgr = new nsComponentManagerImpl();
@ -212,7 +213,11 @@ nsresult NS_COM NS_InitXPCOM(nsIServiceManager* *result,
rv = nsDirectoryService::Create(nsnull,
NS_GET_IID(nsIProperties),
(void**)&directoryService); // needs to be around for life of product
(void**)&gDirectoryService);
if (NS_FAILED(rv))
return rv;
PRBool value;
if (binDirectory)
@ -220,9 +225,19 @@ nsresult NS_COM NS_InitXPCOM(nsIServiceManager* *result,
rv = binDirectory->IsDirectory(&value);
if (NS_SUCCEEDED(rv) && value)
directoryService->Define("xpcom.currentProcessDirectory", binDirectory);
gDirectoryService->Define("xpcom.currentProcessDirectory", binDirectory);
//Since people are still using the nsSpecialSystemDirectory, we should init it.
char* path;
binDirectory->GetPath(&path);
nsFileSpec spec(path);
nsAllocator::Free(path);
nsSpecialSystemDirectory::Set(nsSpecialSystemDirectory::Moz_BinDirectory, &spec);
}
rv = compMgr->Init();
if (NS_FAILED(rv))
{
@ -571,6 +586,9 @@ nsresult NS_COM NS_ShutdownXPCOM(nsIServiceManager* servMgr)
// Release the global case converter
NS_IF_RELEASE(gCaseConv);
// Release the directory service
NS_IF_RELEASE(gDirectoryService);
// Shutdown xpcom. This will release all loaders and cause others holding
// a refcount to the component manager to release it.