Module: wine Branch: master Commit: 5b362f07f67db5f90ac355c62a1f3d73658c4346 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b362f07f67db5f90ac355c62... Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 9 13:51:59 2021 +0100 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: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/main.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 642e2fdbffd..7ee26076513 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -524,9 +524,15 @@ DWORD WINAPI RNIGetCompatibleVersion(void) /*********************************************************************** * 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; } @@ -669,9 +675,6 @@ HRESULT WINAPI DllRegisterServer(void) hres = __wine_register_resources( hInst ); if(SUCCEEDED(hres)) hres = register_server(TRUE); - if(SUCCEEDED(hres)) - load_gecko(); - return hres; }