Zebediah Figura : strmbase: Make the pin_get_media_type() callback optional.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 38f5f364629650cba3ee90f326c2bb4f1c0f19c1
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=38f5f364629650cba3ee90f32...

Author: Zebediah Figura <z.figura12(a)gmail.com>
Date:   Thu Apr 16 20:29:33 2020 -0500

strmbase: Make the pin_get_media_type() callback optional.

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

---

 dlls/strmbase/pin.c      | 36 ++++++++++++++++++++++++++----------
 dlls/strmbase/renderer.c |  1 -
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c
index 4676c9d82b..d9d25f7627 100644
--- a/dlls/strmbase/pin.c
+++ b/dlls/strmbase/pin.c
@@ -57,10 +57,13 @@ static HRESULT enum_media_types_create(struct strmbase_pin *pin, IEnumMediaTypes
     object->pin = pin;
     IPin_AddRef(&pin->IPin_iface);
 
-    while (pin->ops->pin_get_media_type(pin, object->count, &mt) == S_OK)
+    if (pin->ops->pin_get_media_type)
     {
-        FreeMediaType(&mt);
-        ++object->count;
+        while (pin->ops->pin_get_media_type(pin, object->count, &mt) == S_OK)
+        {
+            FreeMediaType(&mt);
+            ++object->count;
+        }
     }
 
     TRACE("Created enumerator %p.\n", object);
@@ -121,6 +124,13 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count,
 
     TRACE("enummt %p, count %u, mts %p, ret_count %p.\n", enummt, count, mts, ret_count);
 
+    if (!enummt->pin->ops->pin_get_media_type)
+    {
+        if (ret_count)
+            *ret_count = 0;
+        return count ? S_FALSE : S_OK;
+    }
+
     for (i = 0; i < count; ++i)
     {
         if ((mts[i] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE))))
@@ -169,10 +179,13 @@ static HRESULT WINAPI enum_media_types_Reset(IEnumMediaTypes *iface)
     TRACE("enummt %p.\n", enummt);
 
     enummt->count = 0;
-    while (enummt->pin->ops->pin_get_media_type(enummt->pin, enummt->count, &mt) == S_OK)
+    if (enummt->pin->ops->pin_get_media_type)
     {
-        FreeMediaType(&mt);
-        ++enummt->count;
+        while (enummt->pin->ops->pin_get_media_type(enummt->pin, enummt->count, &mt) == S_OK)
+        {
+            FreeMediaType(&mt);
+            ++enummt->count;
+        }
     }
 
     enummt->index = 0;
@@ -397,10 +410,13 @@ static HRESULT WINAPI pin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **enum_med
     TRACE("pin %p %s:%s, enum_media_types %p.\n", pin, debugstr_w(pin->filter->name),
             debugstr_w(pin->name), enum_media_types);
 
-    if (FAILED(hr = pin->ops->pin_get_media_type(pin, 0, &mt)))
-        return hr;
-    if (hr == S_OK)
-        FreeMediaType(&mt);
+    if (pin->ops->pin_get_media_type)
+    {
+        if (FAILED(hr = pin->ops->pin_get_media_type(pin, 0, &mt)))
+            return hr;
+        if (hr == S_OK)
+            FreeMediaType(&mt);
+    }
 
     return enum_media_types_create(pin, enum_media_types);
 }
diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c
index fd999d3ae9..f1e74f6476 100644
--- a/dlls/strmbase/renderer.c
+++ b/dlls/strmbase/renderer.c
@@ -257,7 +257,6 @@ static const struct strmbase_sink_ops sink_ops =
 {
     .base.pin_query_accept = sink_query_accept,
     .base.pin_query_interface = sink_query_interface,
-    .base.pin_get_media_type = strmbase_pin_get_media_type,
     .pfnReceive = BaseRenderer_Receive,
     .sink_connect = sink_connect,
     .sink_disconnect = sink_disconnect,