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
a729027c
Commit
a729027c
authored
Mar 08, 2012
by
Jacek Caban
Committed by
Alexandre Julliard
Mar 08, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Get rid of no longer used silent argument of load_gecko.
parent
8889b66f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
main.c
dlls/mshtml/main.c
+1
-1
mshtml_private.h
dlls/mshtml/mshtml_private.h
+1
-1
nsembed.c
dlls/mshtml/nsembed.c
+4
-4
No files found.
dlls/mshtml/main.c
View file @
a729027c
...
...
@@ -484,7 +484,7 @@ HRESULT WINAPI DllRegisterServer(void)
if
(
SUCCEEDED
(
hres
))
hres
=
register_server
(
TRUE
);
if
(
SUCCEEDED
(
hres
))
load_gecko
(
FALSE
);
load_gecko
();
return
hres
;
}
...
...
dlls/mshtml/mshtml_private.h
View file @
a729027c
...
...
@@ -671,7 +671,7 @@ HRESULT get_client_disp_property(IOleClientSite*,DISPID,VARIANT*) DECLSPEC_HIDDE
HRESULT
ProtocolFactory_Create
(
REFCLSID
,
REFIID
,
void
**
)
DECLSPEC_HIDDEN
;
BOOL
load_gecko
(
BOOL
)
DECLSPEC_HIDDEN
;
BOOL
load_gecko
(
void
)
DECLSPEC_HIDDEN
;
void
close_gecko
(
void
)
DECLSPEC_HIDDEN
;
void
register_nsservice
(
nsIComponentRegistrar
*
,
nsIServiceManager
*
)
DECLSPEC_HIDDEN
;
void
init_nsio
(
nsIComponentManager
*
,
nsIComponentRegistrar
*
)
DECLSPEC_HIDDEN
;
...
...
dlls/mshtml/nsembed.c
View file @
a729027c
...
...
@@ -230,7 +230,7 @@ static void register_nscontainer_class(void)
nscontainer_class
=
RegisterClassExW
(
&
wndclass
);
}
static
BOOL
install_wine_gecko
(
BOOL
silent
)
static
BOOL
install_wine_gecko
(
void
)
{
PROCESS_INFORMATION
pi
;
STARTUPINFOW
si
;
...
...
@@ -573,7 +573,7 @@ static CRITICAL_SECTION_DEBUG cs_load_gecko_dbg =
};
static
CRITICAL_SECTION
cs_load_gecko
=
{
&
cs_load_gecko_dbg
,
-
1
,
0
,
0
,
0
,
0
};
BOOL
load_gecko
(
BOOL
silent
)
BOOL
load_gecko
(
void
)
{
PRUnichar
gre_path
[
MAX_PATH
];
BOOL
ret
=
FALSE
;
...
...
@@ -592,7 +592,7 @@ BOOL load_gecko(BOOL silent)
loading_thread
=
GetCurrentThreadId
();
if
(
load_wine_gecko
(
gre_path
)
||
(
install_wine_gecko
(
silent
)
&&
load_wine_gecko
(
gre_path
)))
||
(
install_wine_gecko
()
&&
load_wine_gecko
(
gre_path
)))
ret
=
init_xpcom
(
gre_path
);
else
MESSAGE
(
"Could not load wine-gecko. HTML rendering will be disabled.
\n
"
);
...
...
@@ -1862,7 +1862,7 @@ HRESULT create_nscontainer(HTMLDocumentObj *doc, NSContainer *parent, NSContaine
NSContainer
*
ret
;
HRESULT
hres
;
if
(
!
load_gecko
(
TRUE
))
if
(
!
load_gecko
())
return
CLASS_E_CLASSNOTAVAILABLE
;
ret
=
heap_alloc_zero
(
sizeof
(
NSContainer
));
...
...
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