- Remove unneeded STUBMGR_Start call.
- Cleanup compobj_private.h.
diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h
index b316636..ef7c826 100644
--- a/dlls/ole32/compobj_private.h
+++ b/dlls/ole32/compobj_private.h
@@ -118,18 +118,9 @@
extern void* StdGlobalInterfaceTableInstance;
-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);
-}
-
#define PIPEPREF "\\\\.\\pipe\\"
#define OLESTUBMGR PIPEPREF"WINE_OLE_StubMgr"
+
/* Standard Marshalling definitions */
typedef struct _wine_marshal_id {
DWORD processid;
@@ -156,41 +147,9 @@
}
HRESULT MARSHAL_Find_Stub_Buffer(wine_marshal_id *mid,IRpcStubBuffer **stub);
-HRESULT MARSHAL_Find_Stub_Server(wine_marshal_id *mid,LPUNKNOWN *punk);
-HRESULT MARSHAL_Register_Stub(wine_marshal_id *mid,LPUNKNOWN punk, IRpcStubBuffer *stub);
HRESULT MARSHAL_GetStandardMarshalCF(LPVOID *ppv);
-typedef struct _wine_marshal_data {
- DWORD dwDestContext;
- DWORD mshlflags;
-} wine_marshal_data;
-
-
-#define REQTYPE_REQUEST 0
-typedef struct _wine_rpc_request_header {
- DWORD reqid;
- wine_marshal_id mid;
- DWORD iMethod;
- DWORD cbBuffer;
-} wine_rpc_request_header;
-
-#define REQTYPE_RESPONSE 1
-typedef struct _wine_rpc_response_header {
- DWORD reqid;
- DWORD cbBuffer;
- DWORD retval;
-} wine_rpc_response_header;
-
-#define REQSTATE_START 0
-#define REQSTATE_REQ_QUEUED 1
-#define REQSTATE_REQ_WAITING_FOR_REPLY 2
-#define REQSTATE_REQ_GOT 3
-#define REQSTATE_INVOKING 4
-#define REQSTATE_RESP_QUEUED 5
-#define REQSTATE_RESP_GOT 6
-#define REQSTATE_DONE 6
-
void STUBMGR_Start();
extern HRESULT PIPE_GetNewPipeBuf(wine_marshal_id *mid, IRpcChannelBuffer **pipebuf);
