amstream: Validate the format type in check_media_type().

Signed-off-by: Gijs Vermeulen <gijsvrm@gmail.com> Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

amstream: Validate the format type in check_media_type().
fddae90d · Gijs Vermeulen · Alexandre Julliard · 83bdfb78 · fddae90d · fddae90d
Commit fddae90d authored Jun 30, 2020 by Gijs Vermeulen Committed by Alexandre Julliard Jul 01, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

ddrawstream.c dlls/amstream/ddrawstream.c +2 -1

amstream.c dlls/amstream/tests/amstream.c +1 -2

No files found.
--- a/dlls/amstream/ddrawstream.c
+++ b/dlls/amstream/ddrawstream.c
@@ -634,7 +634,8 @@ static HRESULT WINAPI ddraw_sink_Connect(IPin *iface, IPin *peer, const AM_MEDIA

 static BOOL check_media_type(const AM_MEDIA_TYPE *media_type)
 {
-    if (IsEqualGUID(&media_type->majortype, &MEDIATYPE_Video))
+    if (IsEqualGUID(&media_type->majortype, &MEDIATYPE_Video)
+            && IsEqualGUID(&media_type->formattype, &FORMAT_VideoInfo))
    {
        if (IsEqualGUID(&media_type->subtype, &MEDIASUBTYPE_RGB1) ||
            IsEqualGUID(&media_type->subtype, &MEDIASUBTYPE_RGB4) ||

--- a/dlls/amstream/tests/amstream.c
+++ b/dlls/amstream/tests/amstream.c
@@ -1946,8 +1946,7 @@ static void test_media_types(void)
        pmt->cbFormat = tests[i].size;
        pmt->pbFormat = tests[i].format;
        hr = IPin_QueryAccept(pin, pmt);
-        todo_wine_if (i != 6)
-            ok(hr == (i == 6) ? S_OK : VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr);
+        ok(hr == (i == 6) ? S_OK : VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr);
    }

    pmt->bFixedSizeSamples = FALSE;