From 1a346a4a134b867f0494835782c1aae028335b39 Mon Sep 17 00:00:00 2001
From: Robert Shearman <rob@codeweavers.com>
Date: Fri, 2 Jun 2006 20:43:22 +0100
Subject: [PATCH] rpcrt4: NdrClientContextMarshall/Unmarshall should both
 increment the buffer pointer.

---
 dlls/rpcrt4/ndr_marshall.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c
index 90c19c98d2f..befe1242246 100644
--- a/dlls/rpcrt4/ndr_marshall.c
+++ b/dlls/rpcrt4/ndr_marshall.c
@@ -4347,8 +4347,10 @@ void WINAPI NdrClientContextMarshall(PMIDL_STUB_MESSAGE pStubMsg,
 {
     TRACE("(%p, %p, %d): stub\n", pStubMsg, ContextHandle, fCheck);
     /* FIXME: what does fCheck do? */
-    return NDRCContextMarshall(ContextHandle,
-                               pStubMsg->Buffer);
+    NDRCContextMarshall(ContextHandle,
+                        pStubMsg->Buffer);
+
+    pStubMsg->Buffer += cbNDRContext;
 }
 
 /***********************************************************************
@@ -4359,10 +4361,12 @@ void WINAPI NdrClientContextUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                        RPC_BINDING_HANDLE BindHandle)
 {
     TRACE("(%p, %p, %p): stub\n", pStubMsg, pContextHandle, BindHandle);
-    return NDRCContextUnmarshall(pContextHandle,
-                                 BindHandle,
-                                 pStubMsg->Buffer,
-                                 pStubMsg->RpcMsg->DataRepresentation);
+    NDRCContextUnmarshall(pContextHandle,
+                          BindHandle,
+                          pStubMsg->Buffer,
+                          pStubMsg->RpcMsg->DataRepresentation);
+
+    pStubMsg->Buffer += cbNDRContext;
 }
 
 void WINAPI NdrServerContextMarshall(PMIDL_STUB_MESSAGE pStubMsg,
-- 
2.11.4.GIT