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

Fix for 4224 -- Mac crash on startup in registry code. sfraser & dp, approved sar.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@24996 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sfraser%netscape.com 1999-03-24 19:55:38 +00:00
parent d9fdf9bf34
commit d6e125d838
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/webshell/tests/viewer/nsSetupRegistry.cpp
View File

@ -274,7 +274,7 @@ NS_SetupRegistry()
{ {
// Autoregistration happens here. The rest of RegisterComponent() calls should happen // Autoregistration happens here. The rest of RegisterComponent() calls should happen
// only for dlls not in the components directory. // only for dlls not in the components directory.
#if defined(XP_UNIX) || defined(XP_PC)
// Create exeDir/"components" // Create exeDir/"components"
nsSpecialSystemDirectory sysdir(nsSpecialSystemDirectory::OS_CurrentProcessDirectory); nsSpecialSystemDirectory sysdir(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
sysdir += "components"; sysdir += "components";
@ -289,11 +289,15 @@ NS_SetupRegistry()
*/ */
#endif /* XP_PC */ #endif /* XP_PC */
printf("nsComponentManager: Using components dir: %s\n", componentsDir); printf("nsComponentManager: Using components dir: %s\n", componentsDir);
#ifdef XP_MAC
nsComponentManager::AutoRegister(nsIComponentManager::NS_Startup, nsnull);
#else
nsComponentManager::AutoRegister(nsIComponentManager::NS_Startup, componentsDir); nsComponentManager::AutoRegister(nsIComponentManager::NS_Startup, componentsDir);
#endif /* XP_MAC */
// XXX Look for user specific components // XXX Look for user specific components
// XXX UNIX: ~/.mozilla/components // XXX UNIX: ~/.mozilla/components
} }
#endif
nsComponentManager::RegisterComponent(kEventQueueServiceCID, NULL, NULL, XPCOM_DLL, PR_FALSE, PR_FALSE); nsComponentManager::RegisterComponent(kEventQueueServiceCID, NULL, NULL, XPCOM_DLL, PR_FALSE, PR_FALSE);
nsComponentManager::RegisterComponent(kAllocatorCID, NULL, NULL, XPCOM_DLL, PR_FALSE, PR_FALSE); nsComponentManager::RegisterComponent(kAllocatorCID, NULL, NULL, XPCOM_DLL, PR_FALSE, PR_FALSE);

6
mozilla/xpcom/components/nsComponentManager.cpp
View File

@ -223,12 +223,6 @@ nsresult nsComponentManagerImpl::Init(void)
PlatformVersionCheck(); PlatformVersionCheck();
#endif #endif
#if !defined(XP_UNIX) && !defined(XP_PC)
// The below code is being moved out into the applications using using
// nsSpecialSystemDirectory platform by platform.
AutoRegister(NS_Startup, NULL);
#endif /* !XP_UNIX */
return NS_OK; return NS_OK;
} }

6
mozilla/xpcom/src/nsComponentManager.cpp
View File

@ -223,12 +223,6 @@ nsresult nsComponentManagerImpl::Init(void)
PlatformVersionCheck(); PlatformVersionCheck();
#endif #endif
#if !defined(XP_UNIX) && !defined(XP_PC)
// The below code is being moved out into the applications using using
// nsSpecialSystemDirectory platform by platform.
AutoRegister(NS_Startup, NULL);
#endif /* !XP_UNIX */
return NS_OK; return NS_OK;
} }