Changeset 7954 for trunk/src

Timestamp:

Feb 18, 2002, 11:57:27 PM (24 years ago)

Author:

phaller

Message:

Moved CoGetPSClsid call to where it belongs

Location:

trunk/src/ole32

Files:

• compobj_private.h (modified) (2 diffs)
• marshal.c (modified) (1 diff)

trunk/src/ole32/compobj_private.h

@@ -17 +17 @@
 extern HRESULT create_marshalled_proxy(REFCLSID rclsid, REFIID iid, LPVOID *ppv);
 
+#ifndef __WIN32OS2__
 inline static HRESULT
 get_facbuf_for_iid(REFIID riid,IPSFactoryBuffer **facbuf) {
@@ -26 +27 @@
     return CoGetClassObject(&pxclsid,CLSCTX_INPROC_SERVER,NULL,&IID_IPSFactoryBuffer,(LPVOID*)facbuf);
 }
+#endif
 
 #define PIPEPREF "\\\\.\\pipe\\"

trunk/src/ole32/marshal.c

@@ -63 +63 @@
 static int nrofproxies = 0;
 
+#ifdef __WIN32OS2__
+inline static HRESULT
+get_facbuf_for_iid(REFIID riid,IPSFactoryBuffer **facbuf) {
+    HRESULT       hres;
+    CLSID         pxclsid;
+
+    if ((hres = CoGetPSClsid(riid,&pxclsid)))
+        return hres;
+    return CoGetClassObject(&pxclsid,CLSCTX_INPROC_SERVER,NULL,&IID_IPSFactoryBuffer,(LPVOID*)facbuf);
+}
+#endif
+
+
 HRESULT
 MARSHAL_Find_Stub_Server(wine_marshal_id *mid,LPUNKNOWN *punk) {