Rebase against a8b5fdda3214e4fd52682aefaa093cd45766580e.

This commit is contained in:
Sebastian Lackner
2017-07-18 11:29:09 +02:00
parent e2dbf3ab7e
commit d9d149f369
3 changed files with 15 additions and 15 deletions

View File

@@ -1,4 +1,4 @@
From 8eecf2d7d5632e0ce4907981f195309a883f6ff6 Mon Sep 17 00:00:00 2001
From 021f484e633dc4cebb04e011fab3a6f2ee8e2336 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.
@@ -9,11 +9,11 @@ Subject: winemp3.acm: Check input format in MPEG3_StreamOpen.
2 files changed, 85 insertions(+), 1 deletion(-)
diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c
index 337e20c4b03..a4aa599fd6f 100644
index 959ec7f0c06..ea98934c198 100644
--- a/dlls/msacm32/tests/msacm.c
+++ b/dlls/msacm32/tests/msacm.c
@@ -1274,6 +1274,76 @@ static void test_acmFormatChoose(void)
afc.pwfx = pwfx;
@@ -1276,6 +1276,76 @@ static void test_acmFormatChoose(void)
HeapFree(GetProcessHeap(), 0, pwfx);
}
+static void test_mp3(void)
@@ -89,7 +89,7 @@ index 337e20c4b03..a4aa599fd6f 100644
static struct
{
struct
@@ -1444,6 +1514,7 @@ START_TEST(msacm)
@@ -1446,6 +1516,7 @@ START_TEST(msacm)
test_acmFormatSuggest();
test_acmFormatTagDetails();
test_acmFormatChoose();