quartz/videorenderer: Avoid calling IPin::ConnectionMediaType() on our own pin.

Avoids leaking the format block. Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

quartz/videorenderer: Avoid calling IPin::ConnectionMediaType() on our own pin.
bcb05ad2 · Zebediah Figura · Alexandre Julliard · 31bd0a6a · bcb05ad2
Commit bcb05ad2 authored Nov 18, 2019 by Zebediah Figura Committed by Alexandre Julliard Nov 19, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 13 deletions

videorenderer.c dlls/quartz/videorenderer.c +6 -13

No files found.
--- a/dlls/quartz/videorenderer.c
+++ b/dlls/quartz/videorenderer.c
@@ -136,30 +136,23 @@ static void VideoRenderer_AutoShowWindow(VideoRendererImpl *This)
 static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, DWORD size)
 {
-    AM_MEDIA_TYPE amt;
+    const AM_MEDIA_TYPE *amt = &This->renderer.sink.pin.mt;
-    HRESULT hr = S_OK;
    BITMAPINFOHEADER *bmiHeader;
    HDC dc;
    TRACE("(%p)->(%p, %d)\n", This, data, size);
-    hr = IPin_ConnectionMediaType(&This->renderer.sink.pin.IPin_iface, &amt);
+    if (IsEqualGUID(&amt->formattype, &FORMAT_VideoInfo))
-    if (FAILED(hr)) {
-        ERR("Unable to retrieve media type\n");
-        return hr;
-    }
-    if (IsEqualIID(&amt.formattype, &FORMAT_VideoInfo))
    {
-        bmiHeader = &((VIDEOINFOHEADER *)amt.pbFormat)->bmiHeader;
+        bmiHeader = &((VIDEOINFOHEADER *)amt->pbFormat)->bmiHeader;
    }
-    else if (IsEqualIID(&amt.formattype, &FORMAT_VideoInfo2))
+    else if (IsEqualGUID(&amt->formattype, &FORMAT_VideoInfo2))
    {
-        bmiHeader = &((VIDEOINFOHEADER2 *)amt.pbFormat)->bmiHeader;
+        bmiHeader = &((VIDEOINFOHEADER2 *)amt->pbFormat)->bmiHeader;
    }
    else
    {
-        FIXME("Unknown type %s\n", debugstr_guid(&amt.subtype));
+        FIXME("Unknown subtype %s.\n", debugstr_guid(&amt->subtype));
        return VFW_E_RUNTIME_ERROR;
    }