Module: wine Branch: stable Commit: 41827e733435212efe981149e2af02538a8d314a URL: http://source.winehq.org/git/wine.git/?a=commit;h=41827e733435212efe981149e2...
Author: Maarten Lankhorst m.b.lankhorst@gmail.com Date: Wed Feb 23 00:20:33 2011 +0100
mshtml: Make sure system xpcom dll gets loaded. (cherry picked from commit e9a4dee1eb610e567ac4df00368b41282326f03f)
---
dlls/mshtml/nsembed.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 56c5d94..2e45931 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -162,13 +162,17 @@ 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;