Rob Shearman : rpcrt4: Fix NdrFixedArrayUnmarshall to use buffer memory if applicable and to reuse memory for embedded pointers .
Alexandre Julliard
julliard at winehq.org
Sat Dec 8 13:43:42 CST 2007
Module: wine
Branch: master
Commit: a5f9ed81e317d44c33725e84ba73af0e0e151417
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5f9ed81e317d44c33725e84ba73af0e0e151417
Author: Rob Shearman <rob at codeweavers.com>
Date: Sat Dec 8 17:14:16 2007 +0000
rpcrt4: Fix NdrFixedArrayUnmarshall to use buffer memory if applicable and to reuse memory for embedded pointers.
---
dlls/rpcrt4/ndr_marshall.c | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c
index f7c6104..0a5bd9c 100644
--- a/dlls/rpcrt4/ndr_marshall.c
+++ b/dlls/rpcrt4/ndr_marshall.c
@@ -4059,6 +4059,7 @@ unsigned char * WINAPI NdrFixedArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
{
const NDR_SMFARRAY_FORMAT *pSmFArrayFormat = (const NDR_SMFARRAY_FORMAT *)pFormat;
unsigned long total_size;
+ unsigned char *saved_buffer;
TRACE("(%p, %p, %p, %d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc);
@@ -4084,12 +4085,22 @@ unsigned char * WINAPI NdrFixedArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
pFormat = (const unsigned char *)(pLgFArrayFormat + 1);
}
- if (fMustAlloc || !*ppMemory)
+ if (fMustAlloc)
*ppMemory = NdrAllocate(pStubMsg, total_size);
- pStubMsg->BufferMark = pStubMsg->Buffer;
- safe_copy_from_buffer(pStubMsg, *ppMemory, total_size);
+ else
+ {
+ if (!pStubMsg->IsClient && !*ppMemory)
+ /* for servers, we just point straight into the RPC buffer */
+ *ppMemory = pStubMsg->Buffer;
+ }
+
+ saved_buffer = pStubMsg->BufferMark = pStubMsg->Buffer;
+ safe_buffer_increment(pStubMsg, total_size);
+ pFormat = EmbeddedPointerUnmarshall(pStubMsg, saved_buffer, *ppMemory, pFormat, fMustAlloc);
- pFormat = EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, *ppMemory, pFormat, TRUE /* FIXME */);
+ TRACE("copying %p to %p\n", saved_buffer, *ppMemory);
+ if (*ppMemory != saved_buffer)
+ memcpy(*ppMemory, saved_buffer, total_size);
return NULL;
}
More information about the wine-cvs
mailing list