[2/5] ole32: Cleanup IRpcChannelBuffer
Nikolay Sivov
nsivov at codeweavers.com
Mon Oct 15 06:47:06 CDT 2012
Cleanup IRpcChannelBuffer
-------------- next part --------------
>From 2a1ffab1fc1889e09b5170eeecb28d26c6893059 Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov at codeweavers.com>
Date: Sun, 14 Oct 2012 10:38:04 -0400
Subject: [PATCH 3/6] Cleanup IRpcChannelBuffer
---
dlls/ole32/rpc.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c
index cf3a823..12c6bb0 100644
--- a/dlls/ole32/rpc.c
+++ b/dlls/ole32/rpc.c
@@ -94,8 +94,8 @@ static inline void get_rpc_endpoint(LPWSTR endpoint, const OXID *oxid)
typedef struct
{
- const IRpcChannelBufferVtbl *lpVtbl;
- LONG refs;
+ IRpcChannelBuffer IRpcChannelBuffer_iface;
+ LONG refs;
} RpcChannelBuffer;
typedef struct
@@ -1142,7 +1142,7 @@ HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid,
return E_OUTOFMEMORY;
}
- This->super.lpVtbl = &ClientRpcChannelBufferVtbl;
+ This->super.IRpcChannelBuffer_iface.lpVtbl = &ClientRpcChannelBufferVtbl;
This->super.refs = 1;
This->bind = bind;
apartment_getoxid(COM_CurrentApt(), &This->oxid);
@@ -1151,7 +1151,7 @@ HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid,
This->dest_context_data = dest_context_data;
This->event = NULL;
- *chan = (IRpcChannelBuffer*)This;
+ *chan = &This->super.IRpcChannelBuffer_iface;
return S_OK;
}
@@ -1162,10 +1162,10 @@ HRESULT RPC_CreateServerChannel(IRpcChannelBuffer **chan)
if (!This)
return E_OUTOFMEMORY;
- This->lpVtbl = &ServerRpcChannelBufferVtbl;
+ This->IRpcChannelBuffer_iface.lpVtbl = &ServerRpcChannelBufferVtbl;
This->refs = 1;
- *chan = (IRpcChannelBuffer*)This;
+ *chan = &This->IRpcChannelBuffer_iface;
return S_OK;
}
--
1.7.10.4
More information about the wine-patches
mailing list