Commit b6d8b27b authored by Rob Shearman's avatar Rob Shearman Committed by Alexandre Julliard

rpcrt4: The format structures used in the marshaling code should have 1-byte alignment.

parent c3d037c7
...@@ -2933,6 +2933,7 @@ void WINAPI NdrConvert2( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, LO ...@@ -2933,6 +2933,7 @@ void WINAPI NdrConvert2( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, LO
is to raise an exception */ is to raise an exception */
} }
#include "pshpack1.h"
typedef struct _NDR_CSTRUCT_FORMAT typedef struct _NDR_CSTRUCT_FORMAT
{ {
unsigned char type; unsigned char type;
...@@ -2940,6 +2941,7 @@ typedef struct _NDR_CSTRUCT_FORMAT ...@@ -2940,6 +2941,7 @@ typedef struct _NDR_CSTRUCT_FORMAT
unsigned short memory_size; unsigned short memory_size;
short offset_to_array_description; short offset_to_array_description;
} NDR_CSTRUCT_FORMAT, NDR_CVSTRUCT_FORMAT; } NDR_CSTRUCT_FORMAT, NDR_CVSTRUCT_FORMAT;
#include "poppack.h"
/*********************************************************************** /***********************************************************************
* NdrConformantStructMarshall [RPCRT4.@] * NdrConformantStructMarshall [RPCRT4.@]
...@@ -3509,6 +3511,7 @@ void WINAPI NdrConformantVaryingStructFree(PMIDL_STUB_MESSAGE pStubMsg, ...@@ -3509,6 +3511,7 @@ void WINAPI NdrConformantVaryingStructFree(PMIDL_STUB_MESSAGE pStubMsg,
EmbeddedPointerFree(pStubMsg, pMemory, pFormat); EmbeddedPointerFree(pStubMsg, pMemory, pFormat);
} }
#include "pshpack1.h"
typedef struct typedef struct
{ {
unsigned char type; unsigned char type;
...@@ -3522,6 +3525,7 @@ typedef struct ...@@ -3522,6 +3525,7 @@ typedef struct
unsigned char alignment; unsigned char alignment;
unsigned long total_size; unsigned long total_size;
} NDR_LGFARRAY_FORMAT; } NDR_LGFARRAY_FORMAT;
#include "poppack.h"
/*********************************************************************** /***********************************************************************
* NdrFixedArrayMarshall [RPCRT4.@] * NdrFixedArrayMarshall [RPCRT4.@]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment