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@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

mshtml: Move load_gecko() call from DllRegisterServer to DllInstall.
5b362f07 · Jacek Caban · Alexandre Julliard · 6cf0e7fe · 5b362f07
Commit 5b362f07 authored Feb 09, 2021 by Jacek Caban Committed by Alexandre Julliard Feb 09, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

main.c dlls/mshtml/main.c +8 -5

No files found.
--- 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;
 }