ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-30 04:13:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rob Shearman : rpcrt4: Handle complex arrays in calc_arg_size. <rob at codeweavers.com>

Browse Source 
svn path=/trunk/; revision=31859
This commit is contained in:
Christoph von Wittich
2008-01-18 11:38:47 +00:00
parent 88179de4f8
commit cc0209690e
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/dll/win32/rpcrt4/ndr_marshall.c
+2 -2
View File
@@ -2655,8 +2655,8 @@ static unsigned long ComplexStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
return size;
}
static unsigned long ComplexStructSize(PMIDL_STUB_MESSAGE pStubMsg,
PFORMAT_STRING pFormat)
unsigned long ComplexStructSize(PMIDL_STUB_MESSAGE pStubMsg,
PFORMAT_STRING pFormat)
{
PFORMAT_STRING desc;
unsigned long size = 0;
reactos/dll/win32/rpcrt4/ndr_misc.h
+2
View File
@@ -62,4 +62,6 @@ extern const NDR_BUFFERSIZE NdrBufferSizer[];
extern const NDR_MEMORYSIZE NdrMemorySizer[];
extern const NDR_FREE NdrFreer[];
unsigned long ComplexStructSize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat);
#endif /* __WINE_NDR_MISC_H */
reactos/dll/win32/rpcrt4/ndr_stubless.c
+6
View File
@@ -849,6 +849,12 @@ static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat)
case RPC_FC_LGFARRAY:
size = *(const DWORD*)(pFormat + 2);
break;
case RPC_FC_BOGUS_ARRAY:
pFormat = ComputeConformance(pStubMsg, NULL, pFormat + 4, *(const WORD*)&pFormat[2]);
TRACE("conformance = %ld\n", pStubMsg->MaxCount);
pFormat = ComputeVariance(pStubMsg, NULL, pFormat, pStubMsg->MaxCount);
size = ComplexStructSize(pStubMsg, pFormat);
size *= pStubMsg->MaxCount;
default:
FIXME("Unhandled type %02x\n", *pFormat);
/* fallthrough */