[PATCH v2 1/2] include: Pack WAVEFORMAT structs.

[Andrew Eikum]

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

On Mon, Jun 12, 2017 at 02:36:35PM -0500, Zebediah Figura wrote:
> Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
> ---
>  dlls/msacm32/tests/msacm.c | 14 ++++++++++++++
>  include/mmreg.h            |  4 ++++
>  2 files changed, 18 insertions(+)
> 
> diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c
> index 13494a6e96b..02149646be2 100644
> --- a/dlls/msacm32/tests/msacm.c
> +++ b/dlls/msacm32/tests/msacm.c
> @@ -1139,6 +1139,19 @@ static void test_acmFormatSuggest(void)
>      ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc);
>  }
>  
> +static void test_acmFormatTagDetails(void)
> +{
> +    ACMFORMATTAGDETAILSW aftd = {0};
> +    MMRESULT rc;
> +
> +    aftd.cbStruct = sizeof(aftd);
> +    aftd.dwFormatTag = WAVE_FORMAT_MPEGLAYER3;
> +    rc = acmFormatTagDetailsW(NULL, &aftd, ACM_FORMATTAGDETAILSF_FORMATTAG);
> +    if (rc == MMSYSERR_NOERROR)
> +        ok(aftd.cbFormatSize == sizeof(MPEGLAYER3WAVEFORMAT), "expected %d, got %d\n",
> +           aftd.cbFormatSize, sizeof(MPEGLAYER3WAVEFORMAT));
> +}
> +
>  static struct
>  {
>      struct
> @@ -1306,6 +1319,7 @@ START_TEST(msacm)
>      driver_tests();
>      test_prepareheader();
>      test_acmFormatSuggest();
> +    test_acmFormatTagDetails();
>      /* Test acmDriverAdd in the end as it may conflict
>       * with other tests due to codec lookup order */
>      test_acmDriverAdd();
> diff --git a/include/mmreg.h b/include/mmreg.h
> index 2ee2b00aeb0..8bb581dd792 100644
> --- a/include/mmreg.h
> +++ b/include/mmreg.h
> @@ -23,6 +23,8 @@
>  #ifndef __WINE_MMREG_H
>  #define __WINE_MMREG_H
>  
> +#include <pshpack1.h>
> +
>  /***********************************************************************
>   * Defines/Enums
>   */
> @@ -512,6 +514,8 @@ typedef struct tagEXBMINFOHEADER {
>  
>  #endif
>  
> +#include <poppack.h>
> +
>  #endif /* __WINE_MMREG_H */
>  
>  #else /* __WIDL__ */
> -- 
> 2.13.0
> 
> 
>