ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Always add gecko directory to the path before loading xpcom.

Browse Source
This commit is contained in:
Jacek Caban 2005-08-22 09:21:53 +00:00 committed by Alexandre Julliard
parent 80af49401b
commit ec48726f0c
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/mshtml/nsembed.c
View File

@ -178,8 +178,11 @@ static BOOL load_gecko()
nsString path; nsString path;
nsIFile *gre_dir; nsIFile *gre_dir;
PRUnichar gre_path[MAX_PATH]; PRUnichar gre_path[MAX_PATH];
WCHAR path_env[MAX_PATH];
int len;
static BOOL tried_load = FALSE; static BOOL tried_load = FALSE;
static const WCHAR wszPATH[] = {'P','A','T','H',0};
static const WCHAR strXPCOM[] = {'x','p','c','o','m','.','d','l','l',0}; static const WCHAR strXPCOM[] = {'x','p','c','o','m','.','d','l','l',0};
TRACE("()\n"); TRACE("()\n");
@ -192,27 +195,20 @@ static BOOL load_gecko()
MESSAGE("Could not load Mozilla. HTML rendering will be disabled.\n"); MESSAGE("Could not load Mozilla. HTML rendering will be disabled.\n");
return FALSE; return FALSE;
} }
TRACE("found path %s\n", debugstr_w(gre_path)); TRACE("found path %s\n", debugstr_w(gre_path));
/* We have to modify PATH as XPCOM loads other DLLs from this directory. */
GetEnvironmentVariableW(wszPATH, path_env, sizeof(path_env)/sizeof(WCHAR));
len = strlenW(path_env);
path_env[len++] = ';';
strcpyW(path_env+len, gre_path);
SetEnvironmentVariableW(wszPATH, path_env);
hXPCOM = LoadLibraryW(strXPCOM); hXPCOM = LoadLibraryW(strXPCOM);
if(!hXPCOM) { if(!hXPCOM) {
/* We have to modify PATH as XPCOM loads other DLLs from this directory. */ ERR("Could not load XPCOM: %ld\n", GetLastError());
WCHAR path_env[MAX_PATH]; return FALSE;
static WCHAR wszPATH[] = {'P','A','T','H',0};
int len;
GetEnvironmentVariableW(wszPATH, path_env, sizeof(path_env)/sizeof(WCHAR));
len = strlenW(path_env);
path_env[len++] = ';';
strcpyW(path_env+len, gre_path);
SetEnvironmentVariableW(wszPATH, path_env);
hXPCOM = LoadLibraryW(strXPCOM);
if(!hXPCOM) {
ERR("Could not load XPCOM: %ld\n", GetLastError());
return FALSE;
}
} }
#define NS_DLSYM(func) \ #define NS_DLSYM(func) \