From e8d1380aa7437753785e4d9319d0ba4eb02d7a57 Mon Sep 17 00:00:00 2001
From: Huw Davies <huw@codeweavers.com>
Date: Mon, 13 Jul 2015 13:11:38 +0100
Subject: [PATCH] rpcrt4: Use CorrDespIncrement to skip over the correlation
 descriptor.

---
 dlls/rpcrt4/ndr_marshall.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c
index 35c15a1de2c..5414329edd5 100644
--- a/dlls/rpcrt4/ndr_marshall.c
+++ b/dlls/rpcrt4/ndr_marshall.c
@@ -452,7 +452,7 @@ static inline BOOL IsConformanceOrVariancePresent(PFORMAT_STRING pFormat)
 
 static inline PFORMAT_STRING SkipConformance(const PMIDL_STUB_MESSAGE pStubMsg, const PFORMAT_STRING pFormat)
 {
-    return pStubMsg->fHasNewCorrDesc ? pFormat + 6 : pFormat + 4;
+    return pFormat + 4 + pStubMsg->CorrDespIncrement;
 }
 
 static PFORMAT_STRING ReadConformance(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat)