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

Applying fix for smoketest blocker, bug 266214 "Browser will not start after install (xpcom_core.dll not found)"

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@164499 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
darin%meer.net
2004-10-27 08:10:40 +00:00
parent dbb8c50233
commit 4e60c971ec
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mozilla/xpcom/glue/standalone/nsXPCOMGlue.cpp
View File

@@ -49,6 +49,7 @@
#if XP_WIN32
#include <windows.h>
#include <mbstring.h>
#endif
void GRE_AddGREToEnvironment();
@@ -109,8 +110,28 @@ nsresult XPCOMGlueStartup(const char* xpcomFile)
libSpec.type = PR_LibSpec_Pathname;
if (!xpcomFile)
libSpec.value.pathname = XPCOM_DLL;
else
else {
libSpec.value.pathname = xpcomFile;
#ifdef XP_WIN32
// Add directory containing xpcomFile to the DLL search path. This
// is done so that the OS knows where to find xpcom_core.dll and
// any other dependent libs.
const char *lastSlash =
(const char *) _mbsrchr((const unsigned char *) xpcomFile, '\\');
if (lastSlash) {
char path[32767];
DWORD pathLen = GetEnvironmentVariable("PATH", path, sizeof(path));
if (pathLen != 0)
path[pathLen++] = ';';
DWORD dirLen = lastSlash - xpcomFile;
if (sizeof(path) - pathLen > dirLen) {
memcpy(&path[pathLen], xpcomFile, dirLen);
path[pathLen + dirLen] = '\0';
SetEnvironmentVariable("PATH", path);
}
}
#endif
}
xpcomLib = PR_LoadLibraryWithFlags(libSpec, PR_LD_LAZY|PR_LD_GLOBAL);
if (!xpcomLib)