Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
d3a57f80
Commit
d3a57f80
authored
Apr 12, 2011
by
Jacek Caban
Committed by
Alexandre Julliard
Apr 12, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Use xul.dll directly instead of via xpcom.dll.
parent
d1b51d85
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
nsembed.c
dlls/mshtml/nsembed.c
+10
-10
No files found.
dlls/mshtml/nsembed.c
View file @
d3a57f80
...
...
@@ -64,7 +64,7 @@ static nsresult (CDECL *NS_NewLocalFile)(const nsAString*,PRBool,nsIFile**);
static
PRUint32
(
CDECL
*
NS_StringGetData
)(
const
nsAString
*
,
const
PRUnichar
**
,
PRBool
*
);
static
PRUint32
(
CDECL
*
NS_CStringGetData
)(
const
nsACString
*
,
const
char
**
,
PRBool
*
);
static
HINSTANCE
hXPCOM
=
NULL
;
static
HINSTANCE
xul_handle
=
NULL
;
static
nsIServiceManager
*
pServMgr
=
NULL
;
static
nsIComponentManager
*
pCompMgr
=
NULL
;
...
...
@@ -307,26 +307,26 @@ static void set_environment(LPCWSTR gre_path)
}
}
static
BOOL
load_x
pcom
(
const
PRUnichar
*
gre_path
)
static
BOOL
load_x
ul
(
const
PRUnichar
*
gre_path
)
{
static
const
WCHAR
strXPCOM
[]
=
{
'\\'
,
'x'
,
'p'
,
'c'
,
'o'
,
'm
'
,
'.'
,
'd'
,
'l'
,
'l'
,
0
};
static
const
WCHAR
xul_dllW
[]
=
{
'\\'
,
'x'
,
'u'
,
'l
'
,
'.'
,
'd'
,
'l'
,
'l'
,
0
};
WCHAR
file_name
[
MAX_PATH
];
strcpyW
(
file_name
,
gre_path
);
strcatW
(
file_name
,
strXPCOM
);
strcatW
(
file_name
,
xul_dllW
);
TRACE
(
"(%s)
\n
"
,
debugstr_w
(
file_name
));
set_environment
(
gre_path
);
hXPCOM
=
LoadLibraryExW
(
file_name
,
0
,
LOAD_WITH_ALTERED_SEARCH_PATH
);
if
(
!
hXPCOM
)
{
xul_handle
=
LoadLibraryExW
(
file_name
,
0
,
LOAD_WITH_ALTERED_SEARCH_PATH
);
if
(
!
xul_handle
)
{
WARN
(
"Could not load XPCOM: %d
\n
"
,
GetLastError
());
return
FALSE
;
}
#define NS_DLSYM(func) \
func = (void *)GetProcAddress(
hXPCOM, #func
); \
func = (void *)GetProcAddress(
xul_handle, #func "_P"
); \
if(!func) \
ERR("Could not GetProcAddress(" #func ") failed\n")
...
...
@@ -407,7 +407,7 @@ static BOOL load_wine_gecko_v(PRUnichar *gre_path, HKEY mshtml_key,
if
(
!
check_version
(
gre_path
,
version_string
))
return
FALSE
;
return
load_x
pcom
(
gre_path
);
return
load_x
ul
(
gre_path
);
}
static
BOOL
load_wine_gecko
(
PRUnichar
*
gre_path
)
...
...
@@ -568,14 +568,14 @@ static BOOL init_xpcom(const PRUnichar *gre_path)
nsAString_Finish
(
&
path
);
if
(
NS_FAILED
(
nsres
))
{
ERR
(
"NS_NewLocalFile failed: %08x
\n
"
,
nsres
);
FreeLibrary
(
hXPCOM
);
FreeLibrary
(
xul_handle
);
return
FALSE
;
}
nsres
=
NS_InitXPCOM2
(
&
pServMgr
,
gre_dir
,
&
nsDirectoryServiceProvider
);
if
(
NS_FAILED
(
nsres
))
{
ERR
(
"NS_InitXPCOM2 failed: %08x
\n
"
,
nsres
);
FreeLibrary
(
hXPCOM
);
FreeLibrary
(
xul_handle
);
return
FALSE
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment