Rob Shearman : rpcrt4: Fix the pointer saved during full pointer unmarshalling.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 37793cd5507df9a42e93f79ba6894fc0be0be431
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=37793cd5507df9a42e93f79ba6...

Author: Rob Shearman 
Date:   Wed Nov 18 00:25:26 2009 +0000

rpcrt4: Fix the pointer saved during full pointer unmarshalling.

The pointer address may set by the type unmarshalling function and
therefore will not be base_ptr_val. This value is the value at
*pPointer and is what needs to be retrieved during subsequent
unmarshalling of the same function.

---

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 d1b57fd..8db45b8 100644
--- a/dlls/rpcrt4/ndr_marshall.c
+++ b/dlls/rpcrt4/ndr_marshall.c
@@ -935,7 +935,7 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,

if (type == RPC_FC_FP)
       NdrFullPointerInsertRefId(pStubMsg->FullPtrXlatTables, pointer_id,
-                                base_ptr_val);
+                                *pPointer);
   }

TRACE("pointer=%p\n", *pPointer);