Rob Shearman : rpcrt4: Fix the memory pointer passed into the conformant array marshaller in NdrComplexStructMarshall .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8af1dba5a9f7ba29c8b319e46db13fbf1a64858f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8af1dba5a9f7ba29c8b319e46d...

Author: Rob Shearman 
Date:   Tue Jul 15 23:35:40 2008 +0100

rpcrt4: Fix the memory pointer passed into the conformant array marshaller in NdrComplexStructMarshall.

It needs to be the end of the memory used by the constant part of the
structure, which is returned by CompkexStructMarshall.

---

dlls/rpcrt4/ndr_marshall.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c
index 3d06cf1..836410b 100644
--- a/dlls/rpcrt4/ndr_marshall.c
+++ b/dlls/rpcrt4/ndr_marshall.c
@@ -2858,7 +2858,7 @@ unsigned char * WINAPI NdrComplexStructMarshall(PMIDL_STUB_MESSAGE pStubMsg,

pStubMsg->Memory = pMemory;

-  ComplexMarshall(pStubMsg, pMemory, pFormat, pointer_desc);
+  pMemory = ComplexMarshall(pStubMsg, pMemory, pFormat, pointer_desc);

if (conf_array)
     NdrConformantArrayMarshall(pStubMsg, pMemory, conf_array);