Zebediah Figura : quartz/filesource: Accept any non-null subtype.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 76b6bcbf9857c63b5955f458c8a63ed314cfce8e
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=76b6bcbf9857c63b5955f458c...

Author: Zebediah Figura <z.figura12(a)gmail.com>
Date:   Mon Feb  3 14:15:51 2020 -0600

quartz/filesource: Accept any non-null subtype.

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

---

 dlls/quartz/filesource.c       | 3 ++-
 dlls/quartz/tests/filesource.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c
index 2b7e9d58b1..4855f9834c 100644
--- 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;
diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c
index 16322902f5..6fe19bf2c9 100644
--- 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);