Changeset 8620 for trunk/src/ole32/oleproxy.c

Timestamp:

Jun 9, 2002, 6:37:22 PM (23 years ago)

Author:

sandervl

Message:

Resync with latest Wine

File:

• trunk/src/ole32/oleproxy.c (modified) (7 diffs)

trunk/src/ole32/oleproxy.c

@@ -250 +250 @@
 }
 
-/* Since we create proxy buffers and classfactory in a pair, there is 
- * no need for 2 seperate structs. Just put them in one, but remember 
+/* Since we create proxy buffers and classfactory in a pair, there is
+ * no need for 2 seperate structs. Just put them in one, but remember
  * the refcount.
  */
@@ -348 +348 @@
     TRACE("(%p,%s,%p)\n",pUnkOuter,debugstr_guid(riid),ppv);
 
-    /* Send CreateInstance to the remote classfactory. 
+    /* Send CreateInstance to the remote classfactory.
      *
      * Data: Only the 'IID'.
@@ -437 +437 @@
 PSFacBuf_QueryInterface(LPPSFACTORYBUFFER iface, REFIID iid, LPVOID *ppv) {
     if (IsEqualIID(iid,&IID_IPSFactoryBuffer)||IsEqualIID(iid,&IID_IUnknown)) {
-        *ppv = (LPVOID)iface; 
+        *ppv = (LPVOID)iface;
         /* No ref counting, static class */
         return S_OK;
@@ -453 +453 @@
     IRpcProxyBuffer **ppProxy, LPVOID *ppv
 ) {
-    if (IsEqualIID(&IID_IClassFactory,riid))
+    if (IsEqualIID(&IID_IClassFactory,riid) ||
+        IsEqualIID(&IID_IUnknown,riid)
+    )
         return CFProxy_Construct(ppv,(LPVOID*)ppProxy);
     FIXME("proxying not implemented for (%s) yet!\n",debugstr_guid(riid));
@@ -468 +470 @@
     TRACE("(%s,%p,%p)\n",debugstr_guid(riid),pUnkServer,ppStub);
 
-    if (IsEqualIID(&IID_IClassFactory,riid)) {
+    if (IsEqualIID(&IID_IClassFactory,riid) ||
+        IsEqualIID(&IID_IUnknown,riid)
+    ) {
         hres = CFStub_Construct(ppStub);
         if (!hres)
@@ -498 +502 @@
     if (IsEqualIID(rclsid,&CLSID_PSFactoryBuffer)) {
         *ppv = &lppsfac;
-        /* If we create a ps factory, we might need a stub manager later 
+        /* If we create a ps factory, we might need a stub manager later
          * anyway
          */
@@ -504 +508 @@
         return S_OK;
     }
-    if (IsEqualIID(rclsid,&CLSID_DfMarshal)&&IsEqualIID(iid,&IID_IClassFactory))
+    if (IsEqualIID(rclsid,&CLSID_DfMarshal)&&(
+                IsEqualIID(iid,&IID_IClassFactory) ||
+                IsEqualIID(iid,&IID_IUnknown)
+        )
+    )
         return MARSHAL_GetStandardMarshalCF(ppv);
     FIXME("\n\tCLSID:\t%s,\n\tIID:\t%s\n",debugstr_guid(rclsid),debugstr_guid(iid));