Commit 70c34ccc authored by Robert Shearman's avatar Robert Shearman Committed by Alexandre Julliard

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

so remove the case for it being NULL.
parent c60c28cf
...@@ -1820,23 +1820,9 @@ TMStubImpl_Invoke( ...@@ -1820,23 +1820,9 @@ TMStubImpl_Invoke(
HeapFree(GetProcessHeap(), 0, args); HeapFree(GetProcessHeap(), 0, args);
xmsg->cbBuffer = buf.curoff; xmsg->cbBuffer = buf.curoff;
if (rpcchanbuf)
{
hres = IRpcChannelBuffer_GetBuffer(rpcchanbuf, xmsg, &This->iid); hres = IRpcChannelBuffer_GetBuffer(rpcchanbuf, xmsg, &This->iid);
if (hres != S_OK) if (hres != S_OK)
ERR("IRpcChannelBuffer_GetBuffer failed with error 0x%08lx\n", hres); 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;
}
}
if (hres == S_OK) if (hres == S_OK)
memcpy(xmsg->Buffer, buf.base, buf.curoff); memcpy(xmsg->Buffer, buf.base, buf.curoff);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment