strmbase: Allow NULL pin_get_media_type() callback in source_Connect().

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

strmbase: Allow NULL pin_get_media_type() callback in source_Connect().
b9dc3324 · Akihiro Sagawa · Alexandre Julliard · 5ab64243 · b9dc3324
Commit b9dc3324 authored May 20, 2020 by Akihiro Sagawa Committed by Alexandre Julliard May 20, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 7 deletions

pin.c dlls/strmbase/pin.c +10 -7

No files found.
--- a/dlls/strmbase/pin.c
+++ b/dlls/strmbase/pin.c
@@ -516,17 +516,20 @@ static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYP
        return hr;
    }
-    for (i = 0; pin->pFuncsTable->base.pin_get_media_type(&pin->pin, i, &candidate) == S_OK; ++i)
+    if (pin->pFuncsTable->base.pin_get_media_type)
    {
-        strmbase_dump_media_type(&candidate);
+        for (i = 0; pin->pFuncsTable->base.pin_get_media_type(&pin->pin, i, &candidate) == S_OK; ++i)
-        if (compare_media_types(mt, &candidate)
-                && pin->pFuncsTable->pfnAttemptConnection(pin, peer, &candidate) == S_OK)
        {
-            LeaveCriticalSection(&pin->pin.filter->csFilter);
+            strmbase_dump_media_type(&candidate);
+            if (compare_media_types(mt, &candidate)
+                    && pin->pFuncsTable->pfnAttemptConnection(pin, peer, &candidate) == S_OK)
+            {
+                LeaveCriticalSection(&pin->pin.filter->csFilter);
+                FreeMediaType(&candidate);
+                return S_OK;
+            }
            FreeMediaType(&candidate);
-            return S_OK;
        }
-        FreeMediaType(&candidate);
    }
    if (SUCCEEDED(IPin_EnumMediaTypes(peer, &enummt)))