Zebediah Figura : include: Pack WAVEFORMAT structs.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d31d656b6f16572025d297b010eba13390deeb3c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d31d656b6f16572025d297b010eba13390deeb3c

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Mon Jun 12 14:36:35 2017 -0500

include: Pack WAVEFORMAT structs.

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/msacm32/tests/msacm.c | 13 +++++++++++++
 include/mmreg.h            |  4 ++++
 2 files changed, 17 insertions(+)

diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c
index 13494a6..44a6feb 100644
--- a/dlls/msacm32/tests/msacm.c
+++ b/dlls/msacm32/tests/msacm.c
@@ -1139,6 +1139,18 @@ 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), "got %d\n", aftd.cbFormatSize);
+}
+
 static struct
 {
     struct
@@ -1306,6 +1318,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 2ee2b00..8bb581d 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__ */