Zebediah Figura : quartz/dsoundrender: Don't check the subtype in DSoundRender_CheckMediaType().
Alexandre Julliard
julliard at winehq.org
Thu Jul 16 19:01:20 CDT 2020
Module: wine
Branch: master
Commit: 3d54a77af8c7fbc1aefb3182fc6e3d902314a38a
URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d54a77af8c7fbc1aefb3182fc6e3d902314a38a
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Wed Jul 15 22:57:16 2020 -0500
quartz/dsoundrender: Don't check the subtype in DSoundRender_CheckMediaType().
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/quartz/dsoundrender.c | 3 ---
dlls/quartz/tests/dsoundrender.c | 7 +++----
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c
index 8e6379da8c..225c1e07b9 100644
--- a/dlls/quartz/dsoundrender.c
+++ b/dlls/quartz/dsoundrender.c
@@ -384,9 +384,6 @@ static HRESULT WINAPI DSoundRender_CheckMediaType(struct strmbase_renderer *ifac
if (!IsEqualIID(&pmt->majortype, &MEDIATYPE_Audio))
return S_FALSE;
- if (!IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_PCM))
- return S_FALSE;
-
return S_OK;
}
diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c
index 3add14d043..0b45d712dc 100644
--- a/dlls/quartz/tests/dsoundrender.c
+++ b/dlls/quartz/tests/dsoundrender.c
@@ -789,10 +789,9 @@ static void test_media_types(void)
expect_hr = does_dsound_support_format(&wfx);
hr = IPin_QueryAccept(pin, &req_mt);
- todo_wine_if (expect_hr == S_OK)
- ok(hr == expect_hr, "Expected hr %#x, got %#x, for %d channels, %d-bit %s, %d Hz.\n",
- expect_hr, hr, channels, formats[i].depth,
- formats[i].tag == WAVE_FORMAT_PCM ? "integer" : "float", sample_rates[j]);
+ ok(hr == expect_hr, "Expected hr %#x, got %#x, for %d channels, %d-bit %s, %d Hz.\n",
+ expect_hr, hr, channels, formats[i].depth,
+ formats[i].tag == WAVE_FORMAT_PCM ? "integer" : "float", sample_rates[j]);
}
}
}
More information about the wine-cvs
mailing list