quartz/filesource: Accept any non-null subtype.

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

quartz/filesource: Accept any non-null subtype.
76b6bcbf · Zebediah Figura · Alexandre Julliard · f31815f7 · 76b6bcbf · 76b6bcbf
Commit 76b6bcbf authored Feb 03, 2020 by Zebediah Figura Committed by Alexandre Julliard Feb 04, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

filesource.c dlls/quartz/filesource.c +2 -1

filesource.c dlls/quartz/tests/filesource.c +1 -1

No files found.
--- a/dlls/quartz/filesource.c
+++ b/dlls/quartz/filesource.c
@@ -591,7 +591,8 @@ static HRESULT source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TY
    AsyncReader *filter = impl_from_strmbase_pin(iface);

    if (IsEqualGUID(&mt->majortype, &filter->mt.majortype)
-            && IsEqualGUID(&mt->subtype, &filter->mt.subtype))
+            && (!IsEqualGUID(&mt->subtype, &GUID_NULL)
+            || IsEqualGUID(&filter->mt.subtype, &GUID_NULL)))
        return S_OK;

    return S_FALSE;

--- a/dlls/quartz/tests/filesource.c
+++ b/dlls/quartz/tests/filesource.c
@@ -389,7 +389,7 @@ static void test_file_source_filter(void)
        mt.formattype = FORMAT_VideoInfo;
        mt.subtype = MEDIASUBTYPE_RGB32;
        hr = IPin_QueryAccept(pin, &mt);
-        todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr);
+        ok(hr == S_OK, "Got hr %#x.\n", hr);

        mt.majortype = MEDIATYPE_Video;
        hr = IPin_QueryAccept(pin, &mt);