Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
d3a57f80
Commit
d3a57f80
authored
13 years ago
by
Jacek Caban
Committed by
Alexandre Julliard
13 years ago
Browse files
Options
Downloads
Patches
Plain Diff
mshtml: Use xul.dll directly instead of via xpcom.dll.
parent
d1b51d85
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/mshtml/nsembed.c
+10
-10
10 additions, 10 deletions
dlls/mshtml/nsembed.c
with
10 additions
and
10 deletions
dlls/mshtml/nsembed.c
+
10
−
10
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
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment