ole32: Add widl-generated proxies for unknwn.idl and dcom.idl.

.gitignore

@@ -70,8 +70,11 @@ dlls/ole2nls.dll16
 dlls/ole2prox.dll16
 dlls/ole2thk.dll16
 dlls/ole32/dcom.h
+dlls/ole32/dcom_p.c
 dlls/ole32/irot.h
 dlls/ole32/irot_c.c
+dlls/ole32/ole32_unknwn.h
+dlls/ole32/ole32_unknwn_p.c
 dlls/oleaut32/oleaut32_oaidl.h
 dlls/oleaut32/oleaut32_oaidl_p.c
 dlls/oleaut32/tests/test_tlb.tlb

dlls/ole32/Makefile.in

@@ -64,12 +64,13 @@ RC_SRCS = ole32res.rc
 
 RC_SRCS16 = version16.rc
 
-IDL_H_SRCS = \
-	dcom.idl
-
 IDL_C_SRCS = \
 	irot.idl
 
+IDL_P_SRCS = \
+	dcom.idl \
+	ole32_unknwn.idl
+
 @MAKE_DLL_RULES@
 
 ole2nls.spec.o: ole2nls.spec version16.res

dlls/ole32/ole32_unknwn.idl

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2007 Google (Dan Hipschman)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+/* The header file generated from this includes rpc.h, which ends up
+   including unknwn.h at some point.  This will cause all sorts of errors
+   so the easiest thing to do is just comment out our entire header.  */
+
+cpp_quote("#if 0    /* oleaut32_unknwn.idl hack */")
+#include "unknwn.idl"
+cpp_quote("#endif   /* oleaut32_unknwn.idl hack */")

dlls/ole32/oleproxy.c

@@ -36,8 +36,7 @@
 #include "objbase.h"
 #include "ole2.h"
 #include "rpc.h"
-#include "winerror.h"
+#include "rpcproxy.h"
-#include "wtypes.h"
 
 #include "compobj_private.h"
 #include "moniker.h"
@@ -46,956 +45,25 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
-static ULONG WINAPI RURpcProxyBufferImpl_Release(LPRPCPROXYBUFFER iface);
+static CStdPSFactoryBuffer PSFactoryBuffer;
 
-/* From msdn:
+CSTDSTUBBUFFERRELEASE(&PSFactoryBuffer)
- *
- * The first time a client requests a pointer to an interface on a
- * particular object, COM loads an IClassFactory stub in the server
- * process and uses it to marshal the first pointer back to the
- * client. In the client process, COM loads the generic proxy for the
- * class factory object and calls its implementation of IMarshal to
- * unmarshal that first pointer. COM then creates the first interface
- * proxy and hands it a pointer to the RPC channel. Finally, COM returns
- * the IClassFactory pointer to the client, which uses it to call
- * IClassFactory::CreateInstance, passing it a reference to the interface.
- *
- * Back in the server process, COM now creates a new instance of the
- * object, along with a stub for the requested interface. This stub marshals
- * the interface pointer back to the client process, where another object
- * proxy is created, this time for the object itself. Also created is a
- * proxy for the requested interface, a pointer to which is returned to
- * the client. With subsequent calls to other interfaces on the object,
- * COM will load the appropriate interface stubs and proxies as needed.
- */
-typedef struct _CFStub {
-    const IRpcStubBufferVtbl   *lpvtbl;
-    LONG			ref;
 
-    LPUNKNOWN			pUnkServer;
+extern const ExtendedProxyFileInfo dcom_ProxyFileInfo;
-} CFStub;
+extern const ExtendedProxyFileInfo ole32_unknwn_ProxyFileInfo;
 
-static HRESULT WINAPI
+static const ProxyFileInfo *OLE32_ProxyFileList[] = {
-CFStub_QueryInterface(LPRPCSTUBBUFFER iface, REFIID riid, LPVOID *ppv) {
+  &dcom_ProxyFileInfo,
-    if (IsEqualIID(&IID_IUnknown,riid)||IsEqualIID(&IID_IRpcStubBuffer,riid)) {
+  &ole32_unknwn_ProxyFileInfo,
-	*ppv = (LPVOID)iface;
+  NULL
-	IUnknown_AddRef(iface);
-	return S_OK;
-    }
-    FIXME("(%s), interface not supported.\n",debugstr_guid(riid));
-    return E_NOINTERFACE;
-}
-
-static ULONG WINAPI
-CFStub_AddRef(LPRPCSTUBBUFFER iface) {
-    CFStub *This = (CFStub *)iface;
-    return InterlockedIncrement(&This->ref);
-}
-
-static ULONG WINAPI
-CFStub_Release(LPRPCSTUBBUFFER iface) {
-    CFStub *This = (CFStub *)iface;
-    ULONG ref;
-
-    ref = InterlockedDecrement(&This->ref);
-    if (!ref) {
-        IRpcStubBuffer_Disconnect(iface);
-        HeapFree(GetProcessHeap(),0,This);
-    }
-    return ref;
-}
-
-static HRESULT WINAPI
-CFStub_Connect(LPRPCSTUBBUFFER iface, IUnknown *pUnkServer) {
-    CFStub *This = (CFStub *)iface;
-
-    This->pUnkServer = pUnkServer;
-    IUnknown_AddRef(pUnkServer);
-    return S_OK;
-}
-
-static void WINAPI
-CFStub_Disconnect(LPRPCSTUBBUFFER iface) {
-    CFStub *This = (CFStub *)iface;
-
-    if (This->pUnkServer) {
-        IUnknown_Release(This->pUnkServer);
-        This->pUnkServer = NULL;
-    }
-}
-
-static HRESULT WINAPI
-CFStub_Invoke(
-    LPRPCSTUBBUFFER iface,RPCOLEMESSAGE* msg,IRpcChannelBuffer* chanbuf
-) {
-    CFStub *This = (CFStub *)iface;
-    HRESULT hres;
-
-    if (msg->iMethod == 3) { /* CreateInstance */
-	IID iid;
-	IClassFactory	*classfac;
-	IUnknown	*ppv;
-	IStream		*pStm;
-	STATSTG		ststg;
-	ULARGE_INTEGER	newpos;
-	LARGE_INTEGER	seekto;
-	ULONG		res;
-
-	if (msg->cbBuffer < sizeof(IID)) {
-            FIXME("Not enough bytes in buffer (%d)?\n",msg->cbBuffer);
-	    return E_FAIL;
-	}
-	memcpy(&iid,msg->Buffer,sizeof(iid));
-	TRACE("->CreateInstance(%s)\n",debugstr_guid(&iid));
-	hres = IUnknown_QueryInterface(This->pUnkServer,&IID_IClassFactory,(LPVOID*)&classfac);
-	if (hres) {
-	    FIXME("Ole server does not provide an IClassFactory?\n");
-	    return hres;
-	}
-	hres = IClassFactory_CreateInstance(classfac,NULL,&iid,(LPVOID*)&ppv);
-	IClassFactory_Release(classfac);
-	msg->cbBuffer = 0;
-	if (hres) {
-	    FIXME("Failed to create an instance of %s\n",debugstr_guid(&iid));
-	    goto getbuffer;
-	}
-	hres = CreateStreamOnHGlobal(0,TRUE,&pStm);
-	if (hres) {
-	    FIXME("Failed to create stream on hglobal\n");
-	    goto getbuffer;
-	}
-	hres = IStream_Write(pStm, &ppv, sizeof(ppv), NULL);
-	if (hres) {
-	   ERR("IStream_Write failed, 0x%08x\n", hres);
-	   goto getbuffer;
-	}
-	if (ppv) {
-        hres = CoMarshalInterface(pStm,&iid,ppv,0,NULL,0);
-        IUnknown_Release(ppv);
-        if (hres) {
-            FIXME("CoMarshalInterface failed, %x!\n",hres);
-            goto getbuffer;
-        }
-    }
-	hres = IStream_Stat(pStm,&ststg,0);
-	if (hres) {
-	    FIXME("Stat failed.\n");
-	    goto getbuffer;
-	}
-
-	msg->cbBuffer = ststg.cbSize.u.LowPart;
-
-getbuffer:
-        IRpcChannelBuffer_GetBuffer(chanbuf, msg, &IID_IClassFactory);
-        if (hres) return hres;
-
-	seekto.u.LowPart = 0;seekto.u.HighPart = 0;
-	hres = IStream_Seek(pStm,seekto,STREAM_SEEK_SET,&newpos);
-	if (hres) {
-            FIXME("IStream_Seek failed, %x\n",hres);
-	    return hres;
-	}
-	hres = IStream_Read(pStm,msg->Buffer,msg->cbBuffer,&res);
-	if (hres) {
-            FIXME("Stream Read failed, %x\n",hres);
-	    return hres;
-	}
-	IStream_Release(pStm);
-	return S_OK;
-    }
-    FIXME("(%p,%p), stub!\n",msg,chanbuf);
-    FIXME("iMethod is %d\n",msg->iMethod);
-    FIXME("cbBuffer is %d\n",msg->cbBuffer);
-    return E_FAIL;
-}
-
-static LPRPCSTUBBUFFER WINAPI
-CFStub_IsIIDSupported(LPRPCSTUBBUFFER iface,REFIID riid) {
-    FIXME("(%s), stub!\n",debugstr_guid(riid));
-    return NULL;
-}
-
-static ULONG WINAPI
-CFStub_CountRefs(LPRPCSTUBBUFFER iface) {
-    FIXME("(), stub!\n");
-    return 1;
-}
-
-static HRESULT WINAPI
-CFStub_DebugServerQueryInterface(LPRPCSTUBBUFFER iface,void** ppv) {
-    FIXME("(%p), stub!\n",ppv);
-    return E_FAIL;
-}
-static void    WINAPI
-CFStub_DebugServerRelease(LPRPCSTUBBUFFER iface,void *pv) {
-    FIXME("(%p), stub!\n",pv);
-}
-
-static const IRpcStubBufferVtbl cfstubvt = {
-    CFStub_QueryInterface,
-    CFStub_AddRef,
-    CFStub_Release,
-    CFStub_Connect,
-    CFStub_Disconnect,
-    CFStub_Invoke,
-    CFStub_IsIIDSupported,
-    CFStub_CountRefs,
-    CFStub_DebugServerQueryInterface,
-    CFStub_DebugServerRelease
 };
 
-static HRESULT
-CFStub_Construct(LPRPCSTUBBUFFER *ppv) {
-    CFStub *cfstub;
-    cfstub = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(CFStub));
-    if (!cfstub)
-	return E_OUTOFMEMORY;
-    *ppv = (LPRPCSTUBBUFFER)cfstub;
-    cfstub->lpvtbl	= &cfstubvt;
-    cfstub->ref		= 1;
-    return S_OK;
-}
-
-/* Since we create proxy buffers and classfactory in a pair, there is
- * no need for 2 separate structs. Just put them in one, but remember
- * the refcount.
- */
-typedef struct _CFProxy {
-    const IClassFactoryVtbl		*lpvtbl_cf;
-    const IRpcProxyBufferVtbl	*lpvtbl_proxy;
-    LONG				ref;
-
-    IRpcChannelBuffer			*chanbuf;
-    IUnknown *outer_unknown;
-} CFProxy;
-
-static HRESULT WINAPI IRpcProxyBufferImpl_QueryInterface(LPRPCPROXYBUFFER iface,REFIID riid,LPVOID *ppv) {
-    *ppv = NULL;
-    if (IsEqualIID(riid,&IID_IRpcProxyBuffer)||IsEqualIID(riid,&IID_IUnknown)) {
-	IRpcProxyBuffer_AddRef(iface);
-	*ppv = (LPVOID)iface;
-	return S_OK;
-    }
-    FIXME("(%s), no interface.\n",debugstr_guid(riid));
-    return E_NOINTERFACE;
-}
-
-static ULONG WINAPI IRpcProxyBufferImpl_AddRef(LPRPCPROXYBUFFER iface) {
-    ICOM_THIS_MULTI(CFProxy,lpvtbl_proxy,iface);
-    return InterlockedIncrement(&This->ref);
-}
-
-static ULONG WINAPI IRpcProxyBufferImpl_Release(LPRPCPROXYBUFFER iface) {
-    ICOM_THIS_MULTI(CFProxy,lpvtbl_proxy,iface);
-    ULONG ref = InterlockedDecrement(&This->ref);
-
-    if (!ref) {
-        IRpcProxyBuffer_Disconnect(iface);
-        HeapFree(GetProcessHeap(),0,This);
-    }
-    return ref;
-}
-
-static HRESULT WINAPI IRpcProxyBufferImpl_Connect(LPRPCPROXYBUFFER iface,IRpcChannelBuffer* pRpcChannelBuffer) {
-    ICOM_THIS_MULTI(CFProxy,lpvtbl_proxy,iface);
-
-    This->chanbuf = pRpcChannelBuffer;
-    IRpcChannelBuffer_AddRef(This->chanbuf);
-    return S_OK;
-}
-static void WINAPI IRpcProxyBufferImpl_Disconnect(LPRPCPROXYBUFFER iface) {
-    ICOM_THIS_MULTI(CFProxy,lpvtbl_proxy,iface);
-    if (This->chanbuf) {
-	IRpcChannelBuffer_Release(This->chanbuf);
-	This->chanbuf = NULL;
-    }
-}
-
-static HRESULT WINAPI
-CFProxy_QueryInterface(LPCLASSFACTORY iface,REFIID riid, LPVOID *ppv) {
-    ICOM_THIS_MULTI(CFProxy,lpvtbl_cf,iface);
-    if (This->outer_unknown) return IUnknown_QueryInterface(This->outer_unknown, riid, ppv);
-    *ppv = NULL;
-    if (IsEqualIID(&IID_IClassFactory,riid) || IsEqualIID(&IID_IUnknown,riid)) {
-	*ppv = (LPVOID)iface;
-	IClassFactory_AddRef(iface);
-	return S_OK;
-    }
-    if (IsEqualIID(riid,&IID_IMarshal)) /* just to avoid debug output */
-	return E_NOINTERFACE;
-    FIXME("Unhandled interface: %s\n",debugstr_guid(riid));
-    return E_NOINTERFACE;
-}
-
-static ULONG   WINAPI CFProxy_AddRef(LPCLASSFACTORY iface) {
-    ICOM_THIS_MULTI(CFProxy,lpvtbl_cf,iface);
-    if (This->outer_unknown) return IUnknown_AddRef(This->outer_unknown);
-    return InterlockedIncrement(&This->ref);
-}
-
-static ULONG   WINAPI CFProxy_Release(LPCLASSFACTORY iface) {
-    ICOM_THIS_MULTI(CFProxy,lpvtbl_cf,iface);
-    if (This->outer_unknown)
-        return IUnknown_Release(This->outer_unknown);
-    else
-        return IRpcProxyBufferImpl_Release((IRpcProxyBuffer *)&This->lpvtbl_proxy);
-}
-
-static HRESULT WINAPI CFProxy_CreateInstance(
-    LPCLASSFACTORY iface,
-    LPUNKNOWN pUnkOuter,/* [in] */
-    REFIID riid,	/* [in] */
-    LPVOID *ppv		/* [out] */
-) {
-    ICOM_THIS_MULTI(CFProxy,lpvtbl_cf,iface);
-    HRESULT		hres;
-    LPSTREAM		pStream;
-    HGLOBAL		hGlobal;
-    ULONG		srstatus;
-    RPCOLEMESSAGE	msg;
-
-    TRACE("(%p,%s,%p)\n",pUnkOuter,debugstr_guid(riid),ppv);
-
-    /* Send CreateInstance to the remote classfactory.
-     *
-     * Data: Only the 'IID'.
-     */
-    memset(&msg, 0, sizeof(msg));
-    msg.iMethod  = 3;
-    msg.cbBuffer = sizeof(*riid);
-    hres = IRpcChannelBuffer_GetBuffer(This->chanbuf,&msg,&IID_IClassFactory);
-    if (hres) {
-	FIXME("IRpcChannelBuffer_GetBuffer failed with %x?\n",hres);
-	return hres;
-    }
-    memcpy(msg.Buffer,riid,sizeof(*riid));
-    hres = IRpcChannelBuffer_SendReceive(This->chanbuf,&msg,&srstatus);
-    if (hres) {
-	FIXME("IRpcChannelBuffer_SendReceive failed with %x?\n",hres);
-	IRpcChannelBuffer_FreeBuffer(This->chanbuf,&msg);
-	return hres;
-    }
-
-    if (!msg.cbBuffer) { /* interface not found on remote */
-	IRpcChannelBuffer_FreeBuffer(This->chanbuf,&msg);
-	return srstatus;
-    }
-
-    /* We got back: [Marshalled Interface data] */
-    TRACE("got %d bytes data.\n",msg.cbBuffer);
-    hGlobal = GlobalAlloc(GMEM_MOVEABLE|GMEM_NODISCARD|GMEM_SHARE,msg.cbBuffer);
-    memcpy(GlobalLock(hGlobal),msg.Buffer,msg.cbBuffer);
-    hres = CreateStreamOnHGlobal(hGlobal,TRUE,&pStream);
-    if (hres != S_OK) {
-	FIXME("CreateStreamOnHGlobal failed with %x\n",hres);
-	IRpcChannelBuffer_FreeBuffer(This->chanbuf,&msg);
-        GlobalFree(hGlobal);
-	return hres;
-    }
-    hres = IStream_Read(pStream, ppv, sizeof(*ppv), NULL);
-    if (hres != S_OK)
-        hres = E_FAIL;
-    else if (*ppv) {
-        hres = CoUnmarshalInterface(
-	       pStream,
-	       riid,
-	       ppv
-        );
-    }
-    IStream_Release(pStream); /* Does GlobalFree hGlobal too. */
-
-    IRpcChannelBuffer_FreeBuffer(This->chanbuf,&msg);
-
-    if (hres) {
-	FIXME("CoMarshalInterface failed, %x\n",hres);
-	return hres;
-    }
-    return S_OK;
-}
-
-static HRESULT WINAPI CFProxy_LockServer(LPCLASSFACTORY iface,BOOL fLock) {
-    /*ICOM_THIS_MULTI(CFProxy,lpvtbl_cf,iface);*/
-    FIXME("(%d), stub!\n",fLock);
-    /* basically: write BOOL, read empty */
-    return S_OK;
-}
-
-static const IRpcProxyBufferVtbl pspbvtbl = {
-    IRpcProxyBufferImpl_QueryInterface,
-    IRpcProxyBufferImpl_AddRef,
-    IRpcProxyBufferImpl_Release,
-    IRpcProxyBufferImpl_Connect,
-    IRpcProxyBufferImpl_Disconnect
-};
-static const IClassFactoryVtbl cfproxyvt = {
-    CFProxy_QueryInterface,
-    CFProxy_AddRef,
-    CFProxy_Release,
-    CFProxy_CreateInstance,
-    CFProxy_LockServer
-};
-
-static HRESULT
-CFProxy_Construct(IUnknown *pUnkOuter, LPVOID *ppv,LPVOID *ppProxy) {
-    CFProxy *cf;
-
-    cf = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(CFProxy));
-    if (!cf)
-	return E_OUTOFMEMORY;
-
-    cf->lpvtbl_cf	= &cfproxyvt;
-    cf->lpvtbl_proxy	= &pspbvtbl;
-    /* one reference for the proxy buffer */
-    cf->ref		= 1;
-    cf->outer_unknown = pUnkOuter;
-    *ppv		= &(cf->lpvtbl_cf);
-    *ppProxy		= &(cf->lpvtbl_proxy);
-    /* and one reference for the object */
-    IUnknown_AddRef((IUnknown *)*ppv);
-    return S_OK;
-}
-
-
-/********************* IRemUnknown Proxy/Stub ********************************/
-
-typedef struct
-{
-    const IRpcStubBufferVtbl *lpVtbl;
-    LONG refs;
-    IRemUnknown *iface;
-} RemUnkStub;
-
-static HRESULT WINAPI RemUnkStub_QueryInterface(LPRPCSTUBBUFFER iface,
-					     REFIID riid,
-					     LPVOID *obj)
-{
-  RemUnkStub *This = (RemUnkStub *)iface;
-  TRACE("(%p)->QueryInterface(%s,%p)\n",This,debugstr_guid(riid),obj);
-  if (IsEqualGUID(&IID_IUnknown,riid) ||
-      IsEqualGUID(&IID_IRpcStubBuffer,riid)) {
-    *obj = This;
-    return S_OK;
-  }
-  return E_NOINTERFACE;
-}
-
-static ULONG WINAPI RemUnkStub_AddRef(LPRPCSTUBBUFFER iface)
-{
-  RemUnkStub *This = (RemUnkStub *)iface;
-  TRACE("(%p)->AddRef()\n",This);
-  return InterlockedIncrement(&This->refs);
-}
-
-static ULONG WINAPI RemUnkStub_Release(LPRPCSTUBBUFFER iface)
-{
-  RemUnkStub *This = (RemUnkStub *)iface;
-  ULONG refs;
-  TRACE("(%p)->Release()\n",This);
-  refs = InterlockedDecrement(&This->refs);
-  if (!refs)
-  {
-    IRpcStubBuffer_Disconnect(iface);
-    HeapFree(GetProcessHeap(), 0, This);
-  }
-  return refs;
-}
-
-static HRESULT WINAPI RemUnkStub_Connect(LPRPCSTUBBUFFER iface,
-				      LPUNKNOWN lpUnkServer)
-{
-  RemUnkStub *This = (RemUnkStub *)iface;
-  TRACE("(%p)->Connect(%p)\n",This,lpUnkServer);
-  This->iface = (IRemUnknown*)lpUnkServer;
-  IRemUnknown_AddRef(This->iface);
-  return S_OK;
-}
-
-static void WINAPI RemUnkStub_Disconnect(LPRPCSTUBBUFFER iface)
-{
-  RemUnkStub *This = (RemUnkStub *)iface;
-  TRACE("(%p)->Disconnect()\n",This);
-  IUnknown_Release(This->iface);
-  This->iface = NULL;
-}
-
-static HRESULT WINAPI RemUnkStub_Invoke(LPRPCSTUBBUFFER iface,
-				     PRPCOLEMESSAGE pMsg,
-				     LPRPCCHANNELBUFFER pChannel)
-{
-  RemUnkStub *This = (RemUnkStub *)iface;
-  ULONG iMethod = pMsg->iMethod;
-  LPBYTE buf = pMsg->Buffer;
-  HRESULT hr = RPC_E_INVALIDMETHOD;
-
-  TRACE("(%p)->Invoke(%p,%p) method %d\n", This, pMsg, pChannel, iMethod);
-  switch (iMethod)
-  {
-  case 3: /* RemQueryInterface */
-  {
-    IPID ipid;
-    ULONG cRefs;
-    USHORT cIids;
-    IID *iids;
-    REMQIRESULT *pQIResults = NULL;
-
-    /* in */
-    memcpy(&ipid, buf, sizeof(ipid));
-    buf += sizeof(ipid);
-    memcpy(&cRefs, buf, sizeof(cRefs));
-    buf += sizeof(cRefs);
-    memcpy(&cIids, buf, sizeof(cIids));
-    buf += sizeof(cIids);
-    iids = (IID *)buf;
-
-    hr = IRemUnknown_RemQueryInterface(This->iface, &ipid, cRefs, cIids, iids, &pQIResults);
-
-    /* out */
-    pMsg->cbBuffer = cIids * sizeof(REMQIRESULT) + sizeof(HRESULT);
-
-    IRpcChannelBuffer_GetBuffer(pChannel, pMsg, &IID_IRemUnknown);
-
-    buf = pMsg->Buffer;
-    *(HRESULT *)buf = hr;
-    buf += sizeof(HRESULT);
-    
-    if (hr == S_OK)
-      /* FIXME: pQIResults is a unique pointer so pQIResults can be NULL! */
-      memcpy(buf, pQIResults, cIids * sizeof(REMQIRESULT));
-
-    CoTaskMemFree(pQIResults);
-
-    break;
-  }
-  case 4: /* RemAddRef */
-  {
-    USHORT cIids;
-    REMINTERFACEREF *ir;
-    HRESULT *pResults;
-
-    /* in */
-    memcpy(&cIids, buf, sizeof(USHORT));
-    buf += sizeof(USHORT);
-    ir = (REMINTERFACEREF*)buf;
-    pResults = CoTaskMemAlloc(cIids * sizeof(HRESULT));
-    if (!pResults) return E_OUTOFMEMORY;
-
-    hr = IRemUnknown_RemAddRef(This->iface, cIids, ir, pResults);
-
-    /* out */
-    pMsg->cbBuffer = cIids * sizeof(HRESULT);
-
-    IRpcChannelBuffer_GetBuffer(pChannel, pMsg, &IID_IRemUnknown);
-    if (hr == S_OK)
-    {
-        buf = pMsg->Buffer;
-        memcpy(buf, pResults, cIids * sizeof(HRESULT));
-    }
-
-    CoTaskMemFree(pResults);
-
-    break;
-  }
-  case 5: /* RemRelease */
-  {
-    USHORT cIids;
-    REMINTERFACEREF *ir;
-
-    /* in */
-    memcpy(&cIids, buf, sizeof(USHORT));
-    buf += sizeof(USHORT);
-    ir = (REMINTERFACEREF*)buf;
-
-    hr = IRemUnknown_RemRelease(This->iface, cIids, ir);
-
-    /* out */
-    pMsg->cbBuffer = 0;
-    IRpcChannelBuffer_GetBuffer(pChannel, pMsg, &IID_IRemUnknown);
-    break;
-  }
-  }
-  return hr;
-}
-
-static LPRPCSTUBBUFFER WINAPI RemUnkStub_IsIIDSupported(LPRPCSTUBBUFFER iface,
-						     REFIID riid)
-{
-  RemUnkStub *This = (RemUnkStub *)iface;
-  TRACE("(%p)->IsIIDSupported(%s)\n", This, debugstr_guid(riid));
-  return IsEqualGUID(&IID_IRemUnknown, riid) ? iface : NULL;
-}
-
-static ULONG WINAPI RemUnkStub_CountRefs(LPRPCSTUBBUFFER iface)
-{
-  RemUnkStub *This = (RemUnkStub *)iface;
-  FIXME("(%p)->CountRefs()\n", This);
-  return 1;
-}
-
-static HRESULT WINAPI RemUnkStub_DebugServerQueryInterface(LPRPCSTUBBUFFER iface,
-							LPVOID *ppv)
-{
-  RemUnkStub *This = (RemUnkStub *)iface;
-  FIXME("(%p)->DebugServerQueryInterface(%p)\n",This,ppv);
-  return E_NOINTERFACE;
-}
-
-static void WINAPI RemUnkStub_DebugServerRelease(LPRPCSTUBBUFFER iface,
-					      LPVOID pv)
-{
-  RemUnkStub *This = (RemUnkStub *)iface;
-  FIXME("(%p)->DebugServerRelease(%p)\n", This, pv);
-}
-
-static const IRpcStubBufferVtbl RemUnkStub_VTable =
-{
-  RemUnkStub_QueryInterface,
-  RemUnkStub_AddRef,
-  RemUnkStub_Release,
-  RemUnkStub_Connect,
-  RemUnkStub_Disconnect,
-  RemUnkStub_Invoke,
-  RemUnkStub_IsIIDSupported,
-  RemUnkStub_CountRefs,
-  RemUnkStub_DebugServerQueryInterface,
-  RemUnkStub_DebugServerRelease
-};
-
-static HRESULT RemUnkStub_Construct(IRpcStubBuffer **ppStub)
-{
-    RemUnkStub *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This));
-    if (!This) return E_OUTOFMEMORY;
-    This->lpVtbl = &RemUnkStub_VTable;
-    This->refs = 1;
-    This->iface = NULL;
-    *ppStub = (IRpcStubBuffer*)This;
-    return S_OK;
-}
-
-
-typedef struct _RemUnkProxy {
-    const IRemUnknownVtbl		*lpvtbl_remunk;
-    const IRpcProxyBufferVtbl	*lpvtbl_proxy;
-    LONG				refs;
-
-    IRpcChannelBuffer			*chan;
-    IUnknown *outer_unknown;
-} RemUnkProxy;
-
-static HRESULT WINAPI RemUnkProxy_QueryInterface(LPREMUNKNOWN iface, REFIID riid, void **ppv)
-{
-    RemUnkProxy *This = (RemUnkProxy *)iface;
-    if (This->outer_unknown)
-        return IUnknown_QueryInterface(This->outer_unknown, riid, ppv);
-    if (IsEqualIID(riid, &IID_IUnknown) ||
-        IsEqualIID(riid, &IID_IRemUnknown))
-    {
-        IRemUnknown_AddRef(iface);
-        *ppv = (LPVOID)iface;
-        return S_OK;
-    }
-    return E_NOINTERFACE;
-}
-
-static ULONG WINAPI RemUnkProxy_AddRef(LPREMUNKNOWN iface)
-{
-  RemUnkProxy *This = (RemUnkProxy *)iface;
-  ULONG refs;
-
-  TRACE("(%p)->AddRef()\n",This);
-
-  if (This->outer_unknown)
-      refs = IUnknown_AddRef(This->outer_unknown);
-  else
-      refs = InterlockedIncrement(&This->refs);
-  return refs;
-}
-
-static ULONG WINAPI RemUnkProxy_Release(LPREMUNKNOWN iface)
-{
-  RemUnkProxy *This = (RemUnkProxy *)iface;
-
-  TRACE("(%p)->Release()\n",This);
-  if (This->outer_unknown)
-      return IUnknown_Release(This->outer_unknown);
-  else
-      return IRpcProxyBufferImpl_Release((IRpcProxyBuffer *)&This->lpvtbl_proxy);
-}
-
-static HRESULT WINAPI RemUnkProxy_RemQueryInterface(LPREMUNKNOWN iface,
-						 REFIPID ripid,
-						 ULONG cRefs,
-						 USHORT cIids,
-						 IID* iids,
-						 REMQIRESULT** ppQIResults)
-{
-  RemUnkProxy *This = (RemUnkProxy *)iface;
-  RPCOLEMESSAGE msg;
-  HRESULT hr = S_OK;
-  ULONG status;
-
-  TRACE("(%p)->(%s,%d,%d,%p,%p)\n",This,
-	debugstr_guid(ripid),cRefs,cIids,iids,ppQIResults);
-
-  *ppQIResults = NULL;
-  memset(&msg, 0, sizeof(msg));
-  msg.iMethod = 3;
-  msg.cbBuffer = sizeof(IPID) + sizeof(ULONG) +
-    sizeof(USHORT) + cIids*sizeof(IID);
-  hr = IRpcChannelBuffer_GetBuffer(This->chan, &msg, &IID_IRemUnknown);
-  if (SUCCEEDED(hr)) {
-    LPBYTE buf = msg.Buffer;
-    memcpy(buf, ripid, sizeof(IPID));
-    buf += sizeof(IPID);
-    memcpy(buf, &cRefs, sizeof(ULONG));
-    buf += sizeof(ULONG);
-    memcpy(buf, &cIids, sizeof(USHORT));
-    buf += sizeof(USHORT);
-    memcpy(buf, iids, cIids*sizeof(IID));
-
-    hr = IRpcChannelBuffer_SendReceive(This->chan, &msg, &status);
-
-    buf = msg.Buffer;
-
-    if (SUCCEEDED(hr)) {
-        hr = *(HRESULT *)buf;
-        buf += sizeof(HRESULT);
-    }
-
-    if (SUCCEEDED(hr)) {
-      *ppQIResults = CoTaskMemAlloc(cIids*sizeof(REMQIRESULT));
-      memcpy(*ppQIResults, buf, cIids*sizeof(REMQIRESULT));
-    }
-
-    IRpcChannelBuffer_FreeBuffer(This->chan, &msg);
-  }
-
-  return hr;
-}
-
-static HRESULT WINAPI RemUnkProxy_RemAddRef(LPREMUNKNOWN iface,
-					 USHORT cInterfaceRefs,
-					 REMINTERFACEREF* InterfaceRefs,
-					 HRESULT* pResults)
-{
-  RemUnkProxy *This = (RemUnkProxy *)iface;
-  RPCOLEMESSAGE msg;
-  HRESULT hr = S_OK;
-  ULONG status;
-
-  TRACE("(%p)->(%d,%p,%p)\n",This,
-	cInterfaceRefs,InterfaceRefs,pResults);
-
-  memset(&msg, 0, sizeof(msg));
-  msg.iMethod = 4;
-  msg.cbBuffer = sizeof(USHORT) + cInterfaceRefs*sizeof(REMINTERFACEREF);
-  hr = IRpcChannelBuffer_GetBuffer(This->chan, &msg, &IID_IRemUnknown);
-  if (SUCCEEDED(hr)) {
-    LPBYTE buf = msg.Buffer;
-    memcpy(buf, &cInterfaceRefs, sizeof(USHORT));
-    buf += sizeof(USHORT);
-    memcpy(buf, InterfaceRefs, cInterfaceRefs*sizeof(REMINTERFACEREF));
-
-    hr = IRpcChannelBuffer_SendReceive(This->chan, &msg, &status);
-
-    if (SUCCEEDED(hr)) {
-      buf = msg.Buffer;
-      memcpy(pResults, buf, cInterfaceRefs*sizeof(HRESULT));
-    }
-
-    IRpcChannelBuffer_FreeBuffer(This->chan, &msg);
-  }
-
-  return hr;
-}
-
-static HRESULT WINAPI RemUnkProxy_RemRelease(LPREMUNKNOWN iface,
-					  USHORT cInterfaceRefs,
-					  REMINTERFACEREF* InterfaceRefs)
-{
-  RemUnkProxy *This = (RemUnkProxy *)iface;
-  RPCOLEMESSAGE msg;
-  HRESULT hr = S_OK;
-  ULONG status;
-
-  TRACE("(%p)->(%d,%p)\n",This,
-	cInterfaceRefs,InterfaceRefs);
-
-  memset(&msg, 0, sizeof(msg));
-  msg.iMethod = 5;
-  msg.cbBuffer = sizeof(USHORT) + cInterfaceRefs*sizeof(REMINTERFACEREF);
-  hr = IRpcChannelBuffer_GetBuffer(This->chan, &msg, &IID_IRemUnknown);
-  if (SUCCEEDED(hr)) {
-    LPBYTE buf = msg.Buffer;
-    memcpy(buf, &cInterfaceRefs, sizeof(USHORT));
-    buf += sizeof(USHORT);
-    memcpy(buf, InterfaceRefs, cInterfaceRefs*sizeof(REMINTERFACEREF));
-
-    hr = IRpcChannelBuffer_SendReceive(This->chan, &msg, &status);
-
-    IRpcChannelBuffer_FreeBuffer(This->chan, &msg);
-  }
-
-  return hr;
-}
-
-static const IRemUnknownVtbl RemUnkProxy_VTable =
-{
-  RemUnkProxy_QueryInterface,
-  RemUnkProxy_AddRef,
-  RemUnkProxy_Release,
-  RemUnkProxy_RemQueryInterface,
-  RemUnkProxy_RemAddRef,
-  RemUnkProxy_RemRelease
-};
-
-
-static HRESULT WINAPI RURpcProxyBufferImpl_QueryInterface(LPRPCPROXYBUFFER iface,REFIID riid,LPVOID *ppv) {
-    *ppv = NULL;
-    if (IsEqualIID(riid,&IID_IRpcProxyBuffer)||IsEqualIID(riid,&IID_IUnknown)) {
-	IRpcProxyBuffer_AddRef(iface);
-	*ppv = (LPVOID)iface;
-	return S_OK;
-    }
-    FIXME("(%s), no interface.\n",debugstr_guid(riid));
-    return E_NOINTERFACE;
-}
-
-static ULONG WINAPI RURpcProxyBufferImpl_AddRef(LPRPCPROXYBUFFER iface) {
-    ICOM_THIS_MULTI(RemUnkProxy,lpvtbl_proxy,iface);
-    TRACE("%p, %d\n", iface, This->refs + 1);
-    return InterlockedIncrement(&This->refs);
-}
-
-static ULONG WINAPI RURpcProxyBufferImpl_Release(LPRPCPROXYBUFFER iface) {
-    ICOM_THIS_MULTI(RemUnkProxy,lpvtbl_proxy,iface);
-    ULONG ref = InterlockedDecrement(&This->refs);
-    TRACE("%p, %d\n", iface, ref);
-    if (!ref) {
-        IRpcProxyBuffer_Disconnect(iface);
-        HeapFree(GetProcessHeap(),0,This);
-    }
-    return ref;
-}
-
-static HRESULT WINAPI RURpcProxyBufferImpl_Connect(LPRPCPROXYBUFFER iface,IRpcChannelBuffer* pRpcChannelBuffer) {
-    ICOM_THIS_MULTI(RemUnkProxy,lpvtbl_proxy,iface);
-
-    TRACE("%p, %p\n", iface, pRpcChannelBuffer);
-    This->chan = pRpcChannelBuffer;
-    IRpcChannelBuffer_AddRef(This->chan);
-    return S_OK;
-}
-static void WINAPI RURpcProxyBufferImpl_Disconnect(LPRPCPROXYBUFFER iface) {
-    ICOM_THIS_MULTI(RemUnkProxy,lpvtbl_proxy,iface);
-    TRACE("%p, %p\n", iface, This->chan);
-    if (This->chan) {
-	IRpcChannelBuffer_Release(This->chan);
-	This->chan = NULL;
-    }
-}
-
-
-static const IRpcProxyBufferVtbl RURpcProxyBuffer_VTable = {
-    RURpcProxyBufferImpl_QueryInterface,
-    RURpcProxyBufferImpl_AddRef,
-    RURpcProxyBufferImpl_Release,
-    RURpcProxyBufferImpl_Connect,
-    RURpcProxyBufferImpl_Disconnect
-};
-
-static HRESULT
-RemUnkProxy_Construct(IUnknown *pUnkOuter, LPVOID *ppv,LPVOID *ppProxy) {
-    RemUnkProxy *This;
-
-    This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(*This));
-    if (!This)
-	return E_OUTOFMEMORY;
-
-    This->lpvtbl_remunk	= &RemUnkProxy_VTable;
-    This->lpvtbl_proxy	= &RURpcProxyBuffer_VTable;
-    /* only one reference for the proxy buffer */
-    This->refs		= 1;
-    This->outer_unknown = pUnkOuter;
-    *ppv		= &(This->lpvtbl_remunk);
-    *ppProxy		= &(This->lpvtbl_proxy);
-    /* and one reference for the object */
-    IUnknown_AddRef((IUnknown *)*ppv);
-    return S_OK;
-}
-
-
-/********************* OLE Proxy/Stub Factory ********************************/
-static HRESULT WINAPI
-PSFacBuf_QueryInterface(LPPSFACTORYBUFFER iface, REFIID iid, LPVOID *ppv) {
-    if (IsEqualIID(iid,&IID_IPSFactoryBuffer)||IsEqualIID(iid,&IID_IUnknown)) {
-	*ppv = (LPVOID)iface;
-	/* No ref counting, static class */
-	return S_OK;
-    }
-    FIXME("(%s) unknown IID?\n",debugstr_guid(iid));
-    return E_NOINTERFACE;
-}
-
-static ULONG WINAPI PSFacBuf_AddRef(LPPSFACTORYBUFFER iface) { return 2; }
-static ULONG WINAPI PSFacBuf_Release(LPPSFACTORYBUFFER iface) { return 1; }
-
-static HRESULT WINAPI
-PSFacBuf_CreateProxy(
-    LPPSFACTORYBUFFER iface, IUnknown* pUnkOuter, REFIID riid,
-    IRpcProxyBuffer **ppProxy, LPVOID *ppv
-) {
-    if (IsEqualIID(&IID_IClassFactory,riid))
-	return CFProxy_Construct(pUnkOuter, ppv,(LPVOID*)ppProxy);
-    else if (IsEqualIID(&IID_IRemUnknown,riid))
-	return RemUnkProxy_Construct(pUnkOuter, ppv,(LPVOID*)ppProxy);
-    FIXME("proxying not implemented for (%s) yet!\n",debugstr_guid(riid));
-    return E_FAIL;
-}
-
-static HRESULT WINAPI
-PSFacBuf_CreateStub(
-    LPPSFACTORYBUFFER iface, REFIID riid,IUnknown *pUnkServer,
-    IRpcStubBuffer** ppStub
-) {
-    HRESULT hres;
-
-    TRACE("(%s,%p,%p)\n",debugstr_guid(riid),pUnkServer,ppStub);
-
-    if (IsEqualIID(&IID_IClassFactory, riid) ||
-        IsEqualIID(&IID_IUnknown, riid) /* FIXME: fixup stub manager and remove this*/) {
-	hres = CFStub_Construct(ppStub);
-	if (hres == S_OK)
-	    IRpcStubBuffer_Connect((*ppStub),pUnkServer);
-	return hres;
-    } else if (IsEqualIID(&IID_IRemUnknown,riid)) {
-	hres = RemUnkStub_Construct(ppStub);
-	if (hres == S_OK)
-	    IRpcStubBuffer_Connect((*ppStub),pUnkServer);
-	return hres;
-    }
-    FIXME("stubbing not implemented for (%s) yet!\n",debugstr_guid(riid));
-    return E_FAIL;
-}
-
-static const IPSFactoryBufferVtbl psfacbufvtbl = {
-    PSFacBuf_QueryInterface,
-    PSFacBuf_AddRef,
-    PSFacBuf_Release,
-    PSFacBuf_CreateProxy,
-    PSFacBuf_CreateStub
-};
-
-/* This is the whole PSFactoryBuffer object, just the vtableptr */
-static const IPSFactoryBufferVtbl *lppsfac = &psfacbufvtbl;
-
 /***********************************************************************
  *           DllGetClassObject [OLE32.@]
  */
 HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv)
 {
     *ppv = NULL;
-    if (IsEqualIID(rclsid, &CLSID_PSFactoryBuffer))
-        return IPSFactoryBuffer_QueryInterface((IPSFactoryBuffer *)&lppsfac, iid, ppv);
     if (IsEqualIID(rclsid,&CLSID_DfMarshal)&&(
 		IsEqualIID(iid,&IID_IClassFactory) ||
 		IsEqualIID(iid,&IID_IUnknown)
@@ -1017,6 +85,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv)
     if (IsEqualCLSID(rclsid, &CLSID_PointerMoniker))
         return PointerMonikerCF_Create(iid, ppv);
 
-    FIXME("\n\tCLSID:\t%s,\n\tIID:\t%s\n",debugstr_guid(rclsid),debugstr_guid(iid));
+    return NdrDllGetClassObject(rclsid, iid, ppv, OLE32_ProxyFileList,
-    return CLASS_E_CLASSNOTAVAILABLE;
+                                &CLSID_PSFactoryBuffer, &PSFactoryBuffer);
 }

dlls/ole32/usrmarshal.c

@@ -1957,3 +1957,47 @@ void __RPC_USER SNB_UserFree(ULONG *pFlags, SNB *pSnb)
 {
     FIXME(":stub\n");
 }
+
+/* call_as/local stubs for unknwn.idl */
+
+HRESULT CALLBACK IClassFactory_CreateInstance_Proxy(
+    IClassFactory* This,
+    IUnknown *pUnkOuter,
+    REFIID riid,
+    void **ppvObject)
+{
+    TRACE("(%p, %s, %p)\n", pUnkOuter, debugstr_guid(riid), ppvObject);
+    *ppvObject = NULL;
+    if (pUnkOuter)
+    {
+        ERR("aggregation is not allowed on remote objects\n");
+        return CLASS_E_NOAGGREGATION;
+    }
+    return IClassFactory_RemoteCreateInstance_Proxy(This, riid,
+                                                    (IUnknown **) ppvObject);
+}
+
+HRESULT __RPC_STUB IClassFactory_CreateInstance_Stub(
+    IClassFactory* This,
+    REFIID riid,
+    IUnknown **ppvObject)
+{
+    TRACE("(%s, %p)\n", debugstr_guid(riid), ppvObject);
+    return IClassFactory_CreateInstance(This, NULL, riid, (void **) ppvObject);
+}
+
+HRESULT CALLBACK IClassFactory_LockServer_Proxy(
+    IClassFactory* This,
+    BOOL fLock)
+{
+    FIXME(":stub\n");
+    return E_NOTIMPL;
+}
+
+HRESULT __RPC_STUB IClassFactory_LockServer_Stub(
+    IClassFactory* This,
+    BOOL fLock)
+{
+    FIXME(":stub\n");
+    return E_NOTIMPL;
+}