[PATCH 1/5] strmbase: Make the pin_get_media_type callback optional.
Zebediah Figura
z.figura12 at gmail.com
Thu Apr 16 17:52:18 CDT 2020
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/strmbase/pin.c | 27 ++++++++++++++++++++-------
dlls/strmbase/renderer.c | 1 -
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c
index 4676c9d82b..297d04d261 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,7 +410,7 @@ 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)))
+ if (pin->ops->pin_get_media_type && FAILED(hr = pin->ops->pin_get_media_type(pin, 0, &mt)))
return hr;
if (hr == S_OK)
FreeMediaType(&mt);
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,
--
2.26.0
More information about the wine-devel
mailing list