Fix compatibility with native advpack dlls

Francois Gouget fgouget at free.fr
Mon Mar 6 04:11:09 CST 2006


Changelog:

  * dlls/mshtml/main.c
    dlls/urlmon/regsvr.c

    Francois Gouget <fgouget at free.fr>
    Most native advpack dlls in circulation don't have RegInstallA. So 
mshtml and urlmon should do a GetProcAddress() on 'RegInstall' instead.
    This should fix bug 4708.

-- 
Francois Gouget <fgouget at free.fr>              http://fgouget.free.fr/
   Any sufficiently advanced Operating System is indistinguishable from Linux
-------------- next part --------------
Index: dlls/mshtml/main.c
===================================================================
RCS file: /home/wine/wine/dlls/mshtml/main.c,v
retrieving revision 1.23
diff -u -p -r1.23 main.c
--- dlls/mshtml/main.c	27 Feb 2006 15:35:20 -0000	1.23
+++ dlls/mshtml/main.c	6 Mar 2006 09:54:38 -0000
@@ -316,7 +316,7 @@ static HRESULT register_server(BOOL do_r
     strtable.pse = pse;
 
     hAdvpack = LoadLibraryW(wszAdvpack);
-    pRegInstall = (typeof(RegInstallA)*)GetProcAddress(hAdvpack, "RegInstallA");
+    pRegInstall = (typeof(RegInstallA)*)GetProcAddress(hAdvpack, "RegInstall");
 
     hres = pRegInstall(hInst, do_register ? "RegisterDll" : "UnregisterDll", &strtable);
 
Index: dlls/urlmon/regsvr.c
===================================================================
RCS file: /home/wine/wine/dlls/urlmon/regsvr.c,v
retrieving revision 1.5
diff -u -p -r1.5 regsvr.c
--- dlls/urlmon/regsvr.c	27 Feb 2006 15:35:20 -0000	1.5
+++ dlls/urlmon/regsvr.c	6 Mar 2006 09:54:44 -0000
@@ -608,7 +608,7 @@ static HRESULT register_inf(BOOL doregis
     strtable.pse = pse;
 
     hAdvpack = LoadLibraryW(wszAdvpack);
-    pRegInstall = (typeof(RegInstallA)*)GetProcAddress(hAdvpack, "RegInstallA");
+    pRegInstall = (typeof(RegInstallA)*)GetProcAddress(hAdvpack, "RegInstall");
 
     hres = pRegInstall(URLMON_hInstance, doregister ? "RegisterDll" : "UnregisterDll", &strtable);
 


More information about the wine-patches mailing list