[PATCH 23/24] mshtml: Make sure system xpcom dll gets loaded, try 2
Maarten Lankhorst
m.b.lankhorst at gmail.com
Tue Feb 22 17:20:33 CST 2011
---
---
dlls/mshtml/nsembed.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c
index 9e17bbf..5b66505 100644
--- a/dlls/mshtml/nsembed.c
+++ b/dlls/mshtml/nsembed.c
@@ -311,13 +311,16 @@ static void set_environment(LPCWSTR gre_path)
static BOOL load_xpcom(const PRUnichar *gre_path)
{
- 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};
+ WCHAR file_name[MAX_PATH];
+ strcpyW(file_name, gre_path);
+ strcatW(file_name, strXPCOM);
- TRACE("(%s)\n", debugstr_w(gre_path));
+ TRACE("(%s)\n", debugstr_w(file_name));
set_environment(gre_path);
- hXPCOM = LoadLibraryW(strXPCOM);
+ hXPCOM = LoadLibraryExW(file_name, 0, LOAD_WITH_ALTERED_SEARCH_PATH);
if(!hXPCOM) {
WARN("Could not load XPCOM: %d\n", GetLastError());
return FALSE;
--
1.7.2.3
--------------090703050806010105070301--
More information about the wine-patches
mailing list