Rebase against 4c7f3f8af856888f5ab020b2a32d0b01db0c82f7.

patches/winemp3.acm-MPEG3_StreamOpen/0001-winemp3.acm-Check-input-format-in-MPEG3_StreamOpen.patch

@@ -1,21 +1,22 @@
-From 46192b44294e309aa90131cd00f44127cbd9a49f Mon Sep 17 00:00:00 2001
+From 3dfc0d56bc199c915455a83cc21085a6dd24a4bc Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 21 Aug 2016 02:36:47 +0200
 Subject: winemp3.acm: Check input format in MPEG3_StreamOpen.
 
 ---
- dlls/msacm32/tests/msacm.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++
+ dlls/msacm32/tests/msacm.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++
  dlls/winemp3.acm/mpegl3.c  | 15 +++++++++-
- 2 files changed, 85 insertions(+), 1 deletion(-)
+ 2 files changed, 86 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c
-index 812a1bb..efe34b1 100644
+index 0816cb0..783d155 100644
 --- a/dlls/msacm32/tests/msacm.c
 +++ b/dlls/msacm32/tests/msacm.c
-@@ -826,9 +826,80 @@ todo_wine
+@@ -830,6 +830,77 @@ todo_wine
      ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc);
  }
  
++
 +void test_mp3(void)
 +{
 +    MPEGLAYER3WAVEFORMAT src;
@@ -86,13 +87,17 @@ index 812a1bb..efe34b1 100644
 +    ok(mr == MMSYSERR_NOERROR, "failed with error 0x%x\n", mr);
 +}
 +
- START_TEST(msacm)
+ static struct
  {
+     struct
+@@ -997,6 +1068,7 @@ START_TEST(msacm)
      driver_tests();
      test_prepareheader();
      test_acmFormatSuggest();
 +    test_mp3();
- }
+     /* Test acmDriverAdd in the end as it may conflict
+      * with other tests due to codec lookup order */
+     test_acmDriverAdd();
 diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c
 index 37993b4..b6595e6 100644
 --- a/dlls/winemp3.acm/mpegl3.c