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

partial rpcrt4 sync with wine 1.1.28

Browse source 
svn path=/trunk/; revision=42860
This commit is contained in:
Christoph von Wittich 2009-08-22 17:23:43 +00:00
parent 898e09db4d
commit ac215ed75c
1 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2727,6 +2727,9 @@ static unsigned char * ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg,
pMemory += sizeof(void *); pMemory += sizeof(void *);
break; break;
} }
case RPC_FC_ALIGNM2:
ALIGN_POINTER(pMemory, 2);
break;
case RPC_FC_ALIGNM4: case RPC_FC_ALIGNM4:
ALIGN_POINTER(pMemory, 4); ALIGN_POINTER(pMemory, 4);
break; break;
@ -2852,6 +2855,9 @@ static unsigned char * ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
pMemory += sizeof(void *); pMemory += sizeof(void *);
break; break;
} }
case RPC_FC_ALIGNM2:
ALIGN_POINTER_CLEAR(pMemory, 2);
break;
case RPC_FC_ALIGNM4: case RPC_FC_ALIGNM4:
ALIGN_POINTER_CLEAR(pMemory, 4); ALIGN_POINTER_CLEAR(pMemory, 4);
break; break;
@ -2966,6 +2972,9 @@ static unsigned char * ComplexBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
pPointer += 4; pPointer += 4;
pMemory += sizeof(void*); pMemory += sizeof(void*);
break; break;
case RPC_FC_ALIGNM2:
ALIGN_POINTER(pMemory, 2);
break;
case RPC_FC_ALIGNM4: case RPC_FC_ALIGNM4:
ALIGN_POINTER(pMemory, 4); ALIGN_POINTER(pMemory, 4);
break; break;
@ -3049,6 +3058,9 @@ static unsigned char * ComplexFree(PMIDL_STUB_MESSAGE pStubMsg,
pPointer += 4; pPointer += 4;
pMemory += sizeof(void *); pMemory += sizeof(void *);
break; break;
case RPC_FC_ALIGNM2:
ALIGN_POINTER(pMemory, 2);
break;
case RPC_FC_ALIGNM4: case RPC_FC_ALIGNM4:
ALIGN_POINTER(pMemory, 4); ALIGN_POINTER(pMemory, 4);
break; break;
@ -3161,6 +3173,9 @@ static ULONG ComplexStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
size += sizeof(void *); size += sizeof(void *);
break; break;
} }
case RPC_FC_ALIGNM2:
ALIGN_LENGTH(size, 2);
break;
case RPC_FC_ALIGNM4: case RPC_FC_ALIGNM4:
ALIGN_LENGTH(size, 4); ALIGN_LENGTH(size, 4);
break; break;
@ -3224,6 +3239,9 @@ ULONG ComplexStructSize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat)
case RPC_FC_POINTER: case RPC_FC_POINTER:
size += sizeof(void *); size += sizeof(void *);
break; break;
case RPC_FC_ALIGNM2:
ALIGN_LENGTH(size, 2);
break;
case RPC_FC_ALIGNM4: case RPC_FC_ALIGNM4:
ALIGN_LENGTH(size, 4); ALIGN_LENGTH(size, 4);
break; break;