Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 07:53:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

rpcrt4: Fix the calculation of element sizes for complex arrays by using a new function ComplexStructSize that doesn 't touch the buffer to calculate the size.

Browse source 
<rob at codeweavers.com>

svn path=/trunk/; revision=31858
This commit is contained in:
Christoph von Wittich 2008-01-18 11:35:06 +00:00
parent 690e2cd071
commit 88179de4f8
1 changed files with 64 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

70
reactos/dll/win32/rpcrt4/ndr_marshall.c
View file

@ -2655,6 +2655,69 @@ static unsigned long ComplexStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
return size; return size;
} }
static unsigned long ComplexStructSize(PMIDL_STUB_MESSAGE pStubMsg,
PFORMAT_STRING pFormat)
{
PFORMAT_STRING desc;
unsigned long size = 0;
while (*pFormat != RPC_FC_END) {
switch (*pFormat) {
case RPC_FC_BYTE:
case RPC_FC_CHAR:
case RPC_FC_SMALL:
case RPC_FC_USMALL:
size += 1;
break;
case RPC_FC_WCHAR:
case RPC_FC_SHORT:
case RPC_FC_USHORT:
size += 2;
break;
case RPC_FC_LONG:
case RPC_FC_ULONG:
case RPC_FC_ENUM32:
size += 4;
break;
case RPC_FC_HYPER:
size += 8;
break;
case RPC_FC_POINTER:
size += sizeof(void *);
break;
case RPC_FC_ALIGNM4:
ALIGN_LENGTH(size, 4);
break;
case RPC_FC_ALIGNM8:
ALIGN_LENGTH(size, 8);
break;
case RPC_FC_STRUCTPAD1:
case RPC_FC_STRUCTPAD2:
case RPC_FC_STRUCTPAD3:
case RPC_FC_STRUCTPAD4:
case RPC_FC_STRUCTPAD5:
case RPC_FC_STRUCTPAD6:
case RPC_FC_STRUCTPAD7:
size += *pFormat - RPC_FC_STRUCTPAD1 + 1;
break;
case RPC_FC_EMBEDDED_COMPLEX:
size += pFormat[1];
pFormat += 2;
desc = pFormat + *(const SHORT*)pFormat;
size += EmbeddedComplexSize(pStubMsg, desc);
pFormat += 2;
continue;
case RPC_FC_PAD:
break;
default:
FIXME("unhandled format 0x%02x\n", *pFormat);
}
pFormat++;
}
return size;
}
/*********************************************************************** /***********************************************************************
* NdrComplexStructMarshall [RPCRT4.@] * NdrComplexStructMarshall [RPCRT4.@]
*/ */
@ -3453,7 +3516,6 @@ ULONG WINAPI NdrComplexArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
{ {
ULONG i, count, esize, SavedMemorySize, MemorySize; ULONG i, count, esize, SavedMemorySize, MemorySize;
unsigned char alignment; unsigned char alignment;
unsigned char *Buffer;
TRACE("(%p,%p)\n", pStubMsg, pFormat); TRACE("(%p,%p)\n", pStubMsg, pFormat);
@ -3475,11 +3537,7 @@ ULONG WINAPI NdrComplexArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
SavedMemorySize = pStubMsg->MemorySize; SavedMemorySize = pStubMsg->MemorySize;
Buffer = pStubMsg->Buffer; esize = ComplexStructSize(pStubMsg, pFormat);
pStubMsg->MemorySize = 0;
esize = ComplexStructMemorySize(pStubMsg, pFormat);
pStubMsg->Buffer = Buffer;
MemorySize = safe_multiply(pStubMsg->MaxCount, esize); MemorySize = safe_multiply(pStubMsg->MaxCount, esize);
count = pStubMsg->ActualCount; count = pStubMsg->ActualCount;