wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against abaddc871842ba4ec0156f4bfed9939b44052ee4.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-06-20 13:55:21 +02:00
parent 0a16521c7e
commit 83a65ef99b
20 changed files with 171 additions and 1088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From a9e9bf9a348ddd771fd405dae8dcbe9fcb42ddb3 Mon Sep 17 00:00:00 2001
From 4e90e07da9b0880527ac5aed3d2d27b2ba094d83 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,10 +9,10 @@ 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 44a6febb662..21cc10bd45e 100644
index a485f9a197..13532a4980 100644
--- a/dlls/msacm32/tests/msacm.c
+++ b/dlls/msacm32/tests/msacm.c
@@ -1151,6 +1151,76 @@ static void test_acmFormatTagDetails(void)
@@ -1249,6 +1249,76 @@ static void test_acmFormatTagDetails(void)
ok(aftd.cbFormatSize == sizeof(MPEGLAYER3WAVEFORMAT), "got %d\n", aftd.cbFormatSize);
}
@@ -89,8 +89,8 @@ index 44a6febb662..21cc10bd45e 100644
static struct
{
struct
@@ -1319,6 +1389,7 @@ START_TEST(msacm)
test_prepareheader();
@@ -1418,6 +1488,7 @@ START_TEST(msacm)
test_convert();
test_acmFormatSuggest();
test_acmFormatTagDetails();
+ test_mp3();
@@ -98,7 +98,7 @@ index 44a6febb662..21cc10bd45e 100644
* 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 13a6109a77a..b5ba4c6d834 100644
index 13a6109a77..b5ba4c6d83 100644
--- a/dlls/winemp3.acm/mpegl3.c
+++ b/dlls/winemp3.acm/mpegl3.c
@@ -215,6 +215,7 @@ static void MPEG3_Reset(PACMDRVSTREAMINSTANCE adsi, AcmMpeg3Data* aad)