marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Get rid of no longer used silent argument of load_gecko.

oldstable
Jacek Caban 2012-03-08 12:18:04 +01:00 committed by Alexandre Julliard
parent 8889b66ffe
commit a729027c69
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/mshtml/main.c
View File

@ -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;
}

2
dlls/mshtml/mshtml_private.h
View File

@ -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;

8
dlls/mshtml/nsembed.c
View File

@ -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));