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

rpcrt4: Don't call NdrBaseTypeMemorySize from within NdrBaseTypeUnmarshall.

This commit is contained in:
Robert Shearman 2006-06-05 01:41:18 +01:00 committed by Alexandre Julliard
parent 65da8987d5
commit cd19c99284
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/rpcrt4/ndr_marshall.c
View File

@ -4153,19 +4153,11 @@ static unsigned char *WINAPI NdrBaseTypeUnmarshall(
{
TRACE("pStubMsg: %p, ppMemory: %p, type: 0x%02x, fMustAlloc: %s\n", pStubMsg, ppMemory, *pFormat, fMustAlloc ? "true" : "false");
if (fMustAlloc || !*ppMemory)
{
unsigned char *Buffer = pStubMsg->Buffer;
unsigned long MemorySize = pStubMsg->MemorySize;
*ppMemory = NdrAllocate(pStubMsg, NdrBaseTypeMemorySize(pStubMsg, pFormat));
pStubMsg->MemorySize = MemorySize;
pStubMsg->Buffer = Buffer;
}
TRACE("*ppMemory: %p\n", *ppMemory);
#define BASE_TYPE_UNMARSHALL(type) \
ALIGN_POINTER(pStubMsg->Buffer, sizeof(type)); \
if (fMustAlloc || !*ppMemory) \
*ppMemory = NdrAllocate(pStubMsg, sizeof(type)); \
TRACE("*ppMemory: %p\n", *ppMemory); \
**(type **)ppMemory = *(type *)pStubMsg->Buffer; \
pStubMsg->Buffer += sizeof(type);
@ -4205,6 +4197,9 @@ static unsigned char *WINAPI NdrBaseTypeUnmarshall(
break;
case RPC_FC_ENUM16:
ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT));
if (fMustAlloc || !*ppMemory)
*ppMemory = NdrAllocate(pStubMsg, sizeof(UINT));
TRACE("*ppMemory: %p\n", *ppMemory);
/* 16-bits on the wire, but int in memory */
**(UINT **)ppMemory = *(USHORT *)pStubMsg->Buffer;
pStubMsg->Buffer += sizeof(USHORT);