Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 05:45:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix for bug 240986 "XPCOM sample fails to start inside xpcshell" r=bsmedberg,dougt

Browse Source
This commit is contained in:
darin%meer.net 2004-07-19 19:27:24 +00:00
parent f02971003b
commit f430137b16
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
xpcom/glue/standalone/nsXPCOMGlue.cpp
View File

@ -66,7 +66,7 @@ nsresult XPCOMGlueStartup(const char* xpcomFile)
return NS_OK;
#else
nsresult rv;
GetFrozenFunctionsFunc function;
GetFrozenFunctionsFunc function = nsnull;
xpcomFunctions.version = XPCOM_GLUE_VERSION;
xpcomFunctions.size = sizeof(XPCOMFunctions);
@ -82,20 +82,25 @@ nsresult XPCOMGlueStartup(const char* xpcomFile)
//
if (xpcomFile && (xpcomFile[0] == '.' && xpcomFile[1] == '\0')) {
function = (GetFrozenFunctionsFunc)PR_FindSymbolAndLibrary("NS_GetFrozenFunctions", &xpcomLib);
if (!function)
return NS_ERROR_FAILURE;
char *libPath = PR_GetLibraryFilePathname(XPCOM_DLL, (PRFuncPtr) function);
if (!libPath)
rv = NS_ERROR_FAILURE;
function = (GetFrozenFunctionsFunc)
PR_FindSymbolAndLibrary("NS_GetFrozenFunctions", &xpcomLib);
if (!function) {
// The symbol was not found, so failover to loading XPCOM_DLL,
// and look for the symbol there. See bug 240986 for details.
xpcomFile = nsnull;
}
else {
rv = (*function)(&xpcomFunctions, libPath);
PR_Free(libPath);
char *libPath = PR_GetLibraryFilePathname(XPCOM_DLL, (PRFuncPtr) function);
if (!libPath)
rv = NS_ERROR_FAILURE;
else {
rv = (*function)(&xpcomFunctions, libPath);
PR_Free(libPath);
}
}
}
else {
if (!function) {
PRLibSpec libSpec;
libSpec.type = PR_LibSpec_Pathname;