[PATCH 1/4] include: Pack WAVEFORMAT structs.

Andrew Eikum aeikum at codeweavers.com
Mon Jun 12 10:08:31 CDT 2017


This looks OK to me, and fixes the size of the MPEGLAYER3WAVEFORMAT
structure to match native, but I don't know how to use our packing
headers well enough to be confident.

Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>

On Fri, Jun 09, 2017 at 01:49:34PM -0500, Zebediah Figura wrote:
> Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
> ---
>  include/mmreg.h | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/include/mmreg.h b/include/mmreg.h
> index 2ee2b00aeb0..3cf24b10a0f 100644
> --- a/include/mmreg.h
> +++ b/include/mmreg.h
> @@ -379,6 +379,8 @@ typedef struct csimaadpcmwaveformat_tag {
>  typedef CSIMAADPCMWAVEFORMAT *PCSIMAADPCMWAVEFORMAT,
>  	*NPCSIMAADPCMWAVEFORMAT, *LPCSIMAADPCMWAVEFORMAT;
>  
> +#include "pshpack2.h"
> +
>  typedef struct mpeg1waveformat_tag {
>  	WAVEFORMATEX	wfx;
>  	WORD		fwHeadLayer;
> @@ -442,6 +444,8 @@ typedef struct {
>  
>  #endif /* GUID_DEFINED */
>  
> +#include "poppack.h"
> +
>  typedef WAVEFORMATEXTENSIBLE    WAVEFORMATPCMEX;
>  typedef WAVEFORMATPCMEX*        PWAVEFORMATPCMEX;
>  typedef WAVEFORMATPCMEX*        NPWAVEFORMATPCMEX;
> -- 
> 2.13.0
> 
> 
> 



More information about the wine-patches mailing list