Commit 5b362f07 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

mshtml: Move load_gecko() call from DllRegisterServer to DllInstall.

With this patch, Wine will no longer ensure that Wine Gecko is available during prefix creation and update. We have shared Gecko installations and good support for installing Gecko on demand now. To ensure that Gecko is installed, one may use DllInstall with something like |regsvr32 -i mshtml|. Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 6cf0e7fe
...@@ -524,9 +524,15 @@ DWORD WINAPI RNIGetCompatibleVersion(void) ...@@ -524,9 +524,15 @@ DWORD WINAPI RNIGetCompatibleVersion(void)
/*********************************************************************** /***********************************************************************
* DllInstall (MSHTML.@) * DllInstall (MSHTML.@)
*/ */
HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) HRESULT WINAPI DllInstall(BOOL install, const WCHAR *cmdline)
{ {
FIXME("stub %d %s: returning S_OK\n", bInstall, debugstr_w(cmdline)); TRACE("(%x %s)\n", install, debugstr_w(cmdline));
if(cmdline && *cmdline)
FIXME("unsupported cmdline: %s\n", debugstr_w(cmdline));
else if(install)
load_gecko();
return S_OK; return S_OK;
} }
...@@ -669,9 +675,6 @@ HRESULT WINAPI DllRegisterServer(void) ...@@ -669,9 +675,6 @@ HRESULT WINAPI DllRegisterServer(void)
hres = __wine_register_resources( hInst ); hres = __wine_register_resources( hInst );
if(SUCCEEDED(hres)) if(SUCCEEDED(hres))
hres = register_server(TRUE); hres = register_server(TRUE);
if(SUCCEEDED(hres))
load_gecko();
return hres; return hres;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment