Remove typelib ProxyStubClsid registration when no oleautomation interface is being registered

Jeroen Janssen japj at xs4all.nl
Sat Jul 31 05:51:01 CDT 2004


This change will make sure that if a proxy/stub dll was already registered,
it is not overwritten by the TypeLib Marshaller if we're not registering 
an ole automation interface.
I think we (always?) want to use a 'real' available proxy/stub 
implementation when available, instead of simply 'overruling' to the 
typelib marshaller.

ChangeLog:
    Remove forced proxy/stub (ProxyStubClsid) registration for 
non-oleautomation interface.
-------------- next part --------------
Index: dlls/oleaut32/typelib.c
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/typelib.c,v
retrieving revision 1.116
diff -u -r1.116 typelib.c
--- dlls/oleaut32/typelib.c	6 Jul 2004 21:28:13 -0000	1.116
+++ dlls/oleaut32/typelib.c	31 Jul 2004 10:36:53 -0000
@@ -586,17 +586,8 @@
 			MESSAGE("\n");
 		    }
 
-		    /*
-		     * FIXME: The 1 is just here until we implement rpcrt4
-		     *        stub/proxy handling. Until then it helps IShield
-		     *        v6 to work.
-		     */
-		    if (1 || (tattr->wTypeFlags & TYPEFLAG_FOLEAUTOMATION))
+		    if (tattr->wTypeFlags & TYPEFLAG_FOLEAUTOMATION)
 		    {
-                        if (!(tattr->wTypeFlags & TYPEFLAG_FOLEAUTOMATION)) {
-                            FIXME("Registering non-oleautomation interface!\n");
-                        }
-
 			/* register interface<->typelib coupling */
 			StringFromGUID2(&tattr->guid, guid, 80);
 			guidA = HEAP_strdupWtoA(GetProcessHeap(), 0, guid);


More information about the wine-patches mailing list