Rob Shearman : ole32: Don' t get the HRESULT from the buffer if we get an RPC_S_CALL_FAILED status back from the runtime .
Alexandre Julliard
julliard at winehq.org
Tue Jan 22 06:01:48 CST 2008
Module: wine
Branch: master
Commit: ee2250bc44d2b3ad844ba1d8809bda2ac21decd9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee2250bc44d2b3ad844ba1d8809bda2ac21decd9
Author: Rob Shearman <rob at codeweavers.com>
Date: Mon Jan 21 22:54:43 2008 +0000
ole32: Don't get the HRESULT from the buffer if we get an RPC_S_CALL_FAILED status back from the runtime.
The buffer might not contain any data and nowhere in our ole32 code
passes HRESULTs in the buffer.
---
dlls/ole32/rpc.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c
index e2f56fc..256ec04 100644
--- a/dlls/ole32/rpc.c
+++ b/dlls/ole32/rpc.c
@@ -893,12 +893,8 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac
orpcthat.flags = ORPCF_NULL;
orpcthat.extensions = NULL;
- /* for normal RPC calls, faults are returned in first 4 bytes of the
- * buffer */
TRACE("RPC call status: 0x%lx\n", status);
- if (status == RPC_S_CALL_FAILED)
- hrFault = *(HRESULT *)olemsg->Buffer;
- else if (status != RPC_S_OK)
+ if (status != RPC_S_OK)
hr = HRESULT_FROM_WIN32(status);
TRACE("hrFault = 0x%08x\n", hrFault);
More information about the wine-cvs
mailing list