From 5cdfeeeed3a0d1b369c1688f8c04cc7a00386ac0 Mon Sep 17 00:00:00 2001
From: Robert Shearman <rob@codeweavers.com>
Date: Sat, 13 May 2006 17:00:09 +0100
Subject: [PATCH] rpcrt4: Make ComplexStructSize increment the buffer.

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

diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c
index a86817390bb..18c1874133a 100644
--- a/dlls/rpcrt4/ndr_marshall.c
+++ b/dlls/rpcrt4/ndr_marshall.c
@@ -1778,22 +1778,28 @@ unsigned long WINAPI ComplexStructSize(PMIDL_STUB_MESSAGE pStubMsg,
     case RPC_FC_SHORT:
     case RPC_FC_USHORT:
       size += 2;
+      pStubMsg->Buffer += 2;
       break;
     case RPC_FC_LONG:
     case RPC_FC_ULONG:
       size += 4;
+      pStubMsg->Buffer += 4;
       break;
     case RPC_FC_POINTER:
       size += 4;
+      pStubMsg->Buffer += 4;
       break;
     case RPC_FC_ALIGNM4:
       ALIGN_LENGTH(size, 4);
+      ALIGN_POINTER(pStubMsg->Buffer, 4);
       break;
     case RPC_FC_ALIGNM8:
       ALIGN_LENGTH(size, 8);
+      ALIGN_POINTER(pStubMsg->Buffer, 8);
       break;
     case RPC_FC_STRUCTPAD2:
       size += 2;
+      pStubMsg->Buffer += 2;
       break;
     case RPC_FC_EMBEDDED_COMPLEX:
       size += pFormat[1];
-- 
2.11.4.GIT