Skip to content

W
wine-cw
Commit 5b629e95 authored by Robert Shearman's avatar Robert Shearman Committed by Alexandre Julliard
Browse files
Options

rpc: Skip over the right number of bytes in new correlation descriptors.

Skip over 6 bytes of the format descriptor if new correlation descriptors are being used, instead of 4.
parent 98734cc8
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 0 deletions
dlls/rpcrt4/ndr_marshall.c
View file @ 5b629e95
...@@ -310,6 +310,9 @@ PFORMAT_STRING ReadConformance(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pForm ...@@ -310,6 +310,9 @@ PFORMAT_STRING ReadConformance(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pForm
pStubMsg->MaxCount = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer); pStubMsg->MaxCount = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer);
pStubMsg->Buffer += 4; pStubMsg->Buffer += 4;
TRACE("unmarshalled conformance is %ld\n", pStubMsg->MaxCount); TRACE("unmarshalled conformance is %ld\n", pStubMsg->MaxCount);
if (pStubMsg->fHasNewCorrDesc)
return pFormat+6;
else
return pFormat+4; return pFormat+4;
} }
...@@ -330,6 +333,9 @@ static inline PFORMAT_STRING ReadVariance(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_S ...@@ -330,6 +333,9 @@ static inline PFORMAT_STRING ReadVariance(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_S
TRACE("variance is %ld\n", pStubMsg->ActualCount); TRACE("variance is %ld\n", pStubMsg->ActualCount);
done: done:
if (pStubMsg->fHasNewCorrDesc)
return pFormat+6;
else
return pFormat+4; return pFormat+4;
} }
...@@ -444,6 +450,9 @@ done_conf_grab: ...@@ -444,6 +450,9 @@ done_conf_grab:
finish_conf: finish_conf:
TRACE("resulting conformance is %ld\n", *pCount); TRACE("resulting conformance is %ld\n", *pCount);
if (pStubMsg->fHasNewCorrDesc)
return pFormat+6;
else
return pFormat+4; return pFormat+4;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment