Rob Shearman : rpcrt4: Re-use existing memory for embedded pointers in NdrConformantVaryingArrayUnmarshall .
Alexandre Julliard
julliard at winehq.org
Wed Dec 26 10:05:08 CST 2007
Module: wine
Branch: master
Commit: 273766ee6fde333a89ea1c8574272c954916a122
URL: http://source.winehq.org/git/wine.git/?a=commit;h=273766ee6fde333a89ea1c8574272c954916a122
Author: Rob Shearman <rob at codeweavers.com>
Date: Mon Dec 24 17:01:27 2007 +0000
rpcrt4: Re-use existing memory for embedded pointers in NdrConformantVaryingArrayUnmarshall.
---
dlls/rpcrt4/ndr_marshall.c | 11 ++++++++---
dlls/rpcrt4/tests/server.c | 1 -
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c
index 38210f3..b07f8b2 100644
--- a/dlls/rpcrt4/ndr_marshall.c
+++ b/dlls/rpcrt4/ndr_marshall.c
@@ -2864,6 +2864,8 @@ unsigned char* WINAPI NdrConformantVaryingArrayUnmarshall( PMIDL_STUB_MESSAGE pS
ULONG bufsize, memsize;
unsigned char alignment = pFormat[1] + 1;
DWORD esize = *(const WORD*)(pFormat+2);
+ unsigned char *saved_buffer;
+ ULONG offset;
TRACE("(%p, %p, %p, %d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc);
@@ -2881,13 +2883,16 @@ unsigned char* WINAPI NdrConformantVaryingArrayUnmarshall( PMIDL_STUB_MESSAGE pS
bufsize = safe_multiply(esize, pStubMsg->ActualCount);
memsize = safe_multiply(esize, pStubMsg->MaxCount);
+ offset = pStubMsg->Offset;
if (!*ppMemory || fMustAlloc)
*ppMemory = NdrAllocate(pStubMsg, memsize);
- pStubMsg->BufferMark = pStubMsg->Buffer;
- safe_copy_from_buffer(pStubMsg, *ppMemory + pStubMsg->Offset, bufsize);
+ saved_buffer = pStubMsg->BufferMark = pStubMsg->Buffer;
+ safe_buffer_increment(pStubMsg, bufsize);
- EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, *ppMemory, pFormat, TRUE /* FIXME */);
+ EmbeddedPointerUnmarshall(pStubMsg, saved_buffer, *ppMemory, pFormat, fMustAlloc);
+
+ memcpy(*ppMemory + offset, saved_buffer, bufsize);
return NULL;
}
diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c
index 2e392dd..eee6ec2 100644
--- a/dlls/rpcrt4/tests/server.c
+++ b/dlls/rpcrt4/tests/server.c
@@ -1143,7 +1143,6 @@ array_tests(void)
api[0].pi = pi;
get_numbers(1, 1, api);
- todo_wine
ok(api[0].pi == pi, "RPC conformant varying array [out] pointer changed from %p to %p\n", pi, api[0].pi);
ok(*api[0].pi == 0, "pi unmarshalled incorrectly %d\n", *pi);
HeapFree(GetProcessHeap(), 0, pi);
More information about the wine-cvs
mailing list