Rob Shearman : rpcrt4: The format structures used in the marshaling code should have 1-byte alignment .
Module: wine Branch: master Commit: b6d8b27be596f167f60d7ae4558d1b54b9b19d87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6d8b27be596f167f60d7ae455... Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 12 13:29:04 2007 +0000 rpcrt4: The format structures used in the marshaling code should have 1-byte alignment. --- dlls/rpcrt4/ndr_marshall.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 3dc5265..7fce001 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2933,6 +2933,7 @@ void WINAPI NdrConvert2( PMIDL_STUB_MESS is to raise an exception */ } +#include "pshpack1.h" typedef struct _NDR_CSTRUCT_FORMAT { unsigned char type; @@ -2940,6 +2941,7 @@ typedef struct _NDR_CSTRUCT_FORMAT unsigned short memory_size; short offset_to_array_description; } NDR_CSTRUCT_FORMAT, NDR_CVSTRUCT_FORMAT; +#include "poppack.h" /*********************************************************************** * NdrConformantStructMarshall [RPCRT4.@] @@ -3509,6 +3511,7 @@ void WINAPI NdrConformantVaryingStructFr EmbeddedPointerFree(pStubMsg, pMemory, pFormat); } +#include "pshpack1.h" typedef struct { unsigned char type; @@ -3522,6 +3525,7 @@ typedef struct unsigned char alignment; unsigned long total_size; } NDR_LGFARRAY_FORMAT; +#include "poppack.h" /*********************************************************************** * NdrFixedArrayMarshall [RPCRT4.@]
participants (1)
-
Alexandre Julliard