reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-24 20:30:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

oleaut32: We always pass in an IRpcChannelBuffer to IRpcStubBuffer::Invoke now,

Browse Source 
so remove the case for it being NULL.
This commit is contained in:
Robert Shearman 2006-06-09 17:25:50 +01:00 committed by Alexandre Julliard
parent c60c28cf08
commit 70c34ccc47
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/oleaut32/tmarshal.c
View File

@ -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);