ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rpcrt4: Fix the argument size of conformant arrays.

This commit is contained in:
Huw Davies 2006-06-16 10:32:27 +01:00 committed by Alexandre Julliard
parent 07edeb8394
commit 26c2953e58
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dlls/rpcrt4/ndr_stubless.c
View File

@ -1014,6 +1014,26 @@ LONG_PTR __cdecl call_server_func(SERVER_ROUTINE func, unsigned char * args, uns
}
#endif
static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat)
{
DWORD size;
switch(*pFormat)
{
case RPC_FC_CARRAY:
size = *(const WORD*)(pFormat + 2);
ComputeConformance(pStubMsg, NULL, pFormat + 4, 0);
size *= pStubMsg->MaxCount;
break;
default:
FIXME("Unhandled type %02x\n", *pFormat);
/* fallthrough */
case RPC_FC_RP:
size = sizeof(void *);
break;
}
return size;
}
/* FIXME: need to free some stuff in here too */
long WINAPI NdrStubCall2(
struct IRpcStubBuffer * pThis,
@ -1367,8 +1387,13 @@ long WINAPI NdrStubCall2(
else if (pParam->param_attributes.IsOut &&
!pParam->param_attributes.IsByValue)
{
*(void **)pArg = NdrAllocate(&stubMsg, sizeof(void *));
**(void ***)pArg = 0;
DWORD size = calc_arg_size(&stubMsg, pTypeFormat);
if(size)
{
*(void **)pArg = NdrAllocate(&stubMsg, size);
memset(*(void **)pArg, 0, size);
}
}
break;
case STUBLESS_CALCSIZE: