From 643cc20639174950436c56d4b051dbf9153248d4 Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Fri, 18 Jan 2008 10:42:16 +0000 Subject: [PATCH] rpcrt4: Don't set Buffer to NULL in I_RpcFreeBuffer. svn path=/trunk/; revision=31853 --- reactos/dll/win32/rpcrt4/rpc_message.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/reactos/dll/win32/rpcrt4/rpc_message.c b/reactos/dll/win32/rpcrt4/rpc_message.c index 1248e4605fa..9f0df0555ca 100644 --- a/reactos/dll/win32/rpcrt4/rpc_message.c +++ b/reactos/dll/win32/rpcrt4/rpc_message.c @@ -917,12 +917,10 @@ fail: RPC_STATUS WINAPI I_RpcGetBuffer(PRPC_MESSAGE pMsg) { TRACE("(%p): BufferLength=%d\n", pMsg, pMsg->BufferLength); - /* FIXME: pfnAllocate? */ pMsg->Buffer = HeapAlloc(GetProcessHeap(), 0, pMsg->BufferLength); TRACE("Buffer=%p\n", pMsg->Buffer); - /* FIXME: which errors to return? */ - return pMsg->Buffer ? S_OK : E_OUTOFMEMORY; + return pMsg->Buffer ? RPC_S_OK : ERROR_OUTOFMEMORY; } /*********************************************************************** @@ -934,7 +932,7 @@ static RPC_STATUS I_RpcReAllocateBuffer(PRPC_MESSAGE pMsg) pMsg->Buffer = HeapReAlloc(GetProcessHeap(), 0, pMsg->Buffer, pMsg->BufferLength); TRACE("Buffer=%p\n", pMsg->Buffer); - return pMsg->Buffer ? RPC_S_OK : RPC_S_OUT_OF_RESOURCES; + return pMsg->Buffer ? RPC_S_OK : ERROR_OUTOFMEMORY; } /*********************************************************************** @@ -955,10 +953,8 @@ static RPC_STATUS I_RpcReAllocateBuffer(PRPC_MESSAGE pMsg) RPC_STATUS WINAPI I_RpcFreeBuffer(PRPC_MESSAGE pMsg) { TRACE("(%p) Buffer=%p\n", pMsg, pMsg->Buffer); - /* FIXME: pfnFree? */ HeapFree(GetProcessHeap(), 0, pMsg->Buffer); - pMsg->Buffer = NULL; - return S_OK; + return RPC_S_OK; } /***********************************************************************