Jacek Caban : mshtml: Get rid of no longer used silent argument of load_gecko.
Module: wine Branch: master Commit: a729027c69b698e272e143ed145410f6cf7c9852 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a729027c69b698e272e143ed14... Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 8 12:18:04 2012 +0100 mshtml: Get rid of no longer used silent argument of load_gecko. --- dlls/mshtml/main.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/nsembed.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index c1dfd13..165bf03 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -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; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2385588..75591f2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -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; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index d96bcaf..057a495 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -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));
participants (1)
-
Alexandre Julliard