[PATCH v3 11/13] qedit: Use the first pin's media type for filters without a filename.

Gabriel Ivăncescu gabrielopcode at gmail.com
Fri Apr 17 11:09:11 CDT 2020


Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
---

The IFileSourceFilter is not queried for filters placed via put_Filter
(as shown by tests later), so obtain the media type from the first pin to
use for finding a matching splitter.

 dlls/qedit/mediadet.c       | 45 +++++++++++++++++++++++++++----------
 dlls/qedit/tests/mediadet.c |  2 +-
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c
index dfafc93..7c57722 100644
--- a/dlls/qedit/mediadet.c
+++ b/dlls/qedit/mediadet.c
@@ -150,22 +150,43 @@ static HRESULT get_splitter(MediaDetImpl *This)
     if (FAILED(hr))
         return hr;
 
-    hr = IBaseFilter_QueryInterface(This->source, &IID_IFileSourceFilter,
-                                    (void **) &file);
-    if (FAILED(hr))
+    if (This->filename)
     {
-        IFilterMapper2_Release(map);
-        return hr;
-    }
+        hr = IBaseFilter_QueryInterface(This->source, &IID_IFileSourceFilter,
+                                        (void **) &file);
+        if (FAILED(hr))
+        {
+            IFilterMapper2_Release(map);
+            return hr;
+        }
 
-    hr = IFileSourceFilter_GetCurFile(file, &name, &mt);
-    IFileSourceFilter_Release(file);
-    CoTaskMemFree(name);
-    if (FAILED(hr))
+        hr = IFileSourceFilter_GetCurFile(file, &name, &mt);
+        IFileSourceFilter_Release(file);
+        CoTaskMemFree(name);
+        if (FAILED(hr))
+        {
+            IFilterMapper2_Release(map);
+            return hr;
+        }
+    }
+    else
     {
-        IFilterMapper2_Release(map);
-        return hr;
+        mt.majortype = GUID_NULL;
+        mt.subtype = GUID_NULL;
+        mt.pbFormat = NULL;
+
+        hr = IBaseFilter_EnumPins(This->source, &pins);
+        if (SUCCEEDED(hr))
+        {
+            if (IEnumPins_Next(pins, 1, &source_pin, NULL) == S_OK)
+            {
+                get_pin_media_type(source_pin, &mt);
+                IPin_Release(source_pin);
+            }
+            IEnumPins_Release(pins);
+        }
     }
+
     type[0] = mt.majortype;
     type[1] = mt.subtype;
     CoTaskMemFree(mt.pbFormat);
diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c
index cb2477b..04efc18 100644
--- a/dlls/qedit/tests/mediadet.c
+++ b/dlls/qedit/tests/mediadet.c
@@ -481,7 +481,7 @@ static HRESULT WINAPI testfilter_QueryInterface(IBaseFilter *iface, REFIID iid,
     }
     else
     {
-        if (IsEqualGUID(iid, &IID_IFileSourceFilter)) todo_wine ok(0, "Filter queried for IFileSourceFilter\n");
+        if (IsEqualGUID(iid, &IID_IFileSourceFilter)) ok(0, "Filter queried for IFileSourceFilter\n");
 
         *out = NULL;
         return E_NOINTERFACE;
-- 
2.21.0




More information about the wine-devel mailing list