Robert Shearman : oleaut32:
We always pass in an IRpcChannelBuffer to IRpcStubBuffer::Invoke now,
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Jun 9 14:40:00 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: 70c34ccc47affe8df7d197c4342fc47658ee2881
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=70c34ccc47affe8df7d197c4342fc47658ee2881
Author: Robert Shearman <rob at codeweavers.com>
Date: Fri Jun 9 17:25:50 2006 +0100
oleaut32: We always pass in an IRpcChannelBuffer to IRpcStubBuffer::Invoke now,
so remove the case for it being NULL.
---
dlls/oleaut32/tmarshal.c | 20 +++-----------------
1 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c
index 5523d28..12aef0d 100644
--- a/dlls/oleaut32/tmarshal.c
+++ b/dlls/oleaut32/tmarshal.c
@@ -1820,23 +1820,9 @@ TMStubImpl_Invoke(
HeapFree(GetProcessHeap(), 0, args);
xmsg->cbBuffer = buf.curoff;
- if (rpcchanbuf)
- {
- hres = IRpcChannelBuffer_GetBuffer(rpcchanbuf, xmsg, &This->iid);
- if (hres != S_OK)
- ERR("IRpcChannelBuffer_GetBuffer failed with error 0x%08lx\n", hres);
- }
- else
- {
- /* FIXME: remove this case when we start sending an IRpcChannelBuffer
- * object with builtin OLE */
- RPC_STATUS status = I_RpcGetBuffer((RPC_MESSAGE *)xmsg);
- if (status != RPC_S_OK)
- {
- ERR("I_RpcGetBuffer failed with error %ld\n", status);
- hres = E_FAIL;
- }
- }
+ hres = IRpcChannelBuffer_GetBuffer(rpcchanbuf, xmsg, &This->iid);
+ if (hres != S_OK)
+ ERR("IRpcChannelBuffer_GetBuffer failed with error 0x%08lx\n", hres);
if (hres == S_OK)
memcpy(xmsg->Buffer, buf.base, buf.curoff);
More information about the wine-cvs
mailing list