strmbase: Avoid leaking references to the sink's peer in IVideoWindow::SetWindowForeground().

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

strmbase: Avoid leaking references to the sink's peer in IVideoWindow::SetWindowForeground().
d2b2e60a · Zebediah Figura · Alexandre Julliard · cc3f73be · d2b2e60a · d2b2e60a
Commit d2b2e60a authored Oct 08, 2019 by Zebediah Figura Committed by Alexandre Julliard Oct 09, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

videorenderer.c dlls/quartz/tests/videorenderer.c +1 -1

window.c dlls/strmbase/window.c +1 -4

No files found.
--- a/dlls/quartz/tests/videorenderer.c
+++ b/dlls/quartz/tests/videorenderer.c
@@ -2076,7 +2076,7 @@ static void test_video_window(void)
    ref = IBaseFilter_Release(filter);
    ok(!ref, "Got outstanding refcount %d.\n", ref);
    ref = IBaseFilter_Release(&source.filter.IBaseFilter_iface);
-    todo_wine ok(!ref, "Got outstanding refcount %d.\n", ref);
+    ok(!ref, "Got outstanding refcount %d.\n", ref);
    DestroyWindow(our_hwnd);
 }


--- a/dlls/strmbase/window.c
+++ b/dlls/strmbase/window.c
@@ -658,16 +658,13 @@ HRESULT WINAPI BaseControlWindowImpl_SetWindowForeground(IVideoWindow *iface, LO
 {
    BaseControlWindow *window = impl_from_IVideoWindow(iface);
    UINT flags = SWP_NOMOVE | SWP_NOSIZE;
-    IPin* pPin;
-    HRESULT hr;

    TRACE("window %p, focus %d.\n", window, focus);

    if (focus != OAFALSE && focus != OATRUE)
        return E_INVALIDARG;

-    hr = IPin_ConnectedTo(&window->pPin->IPin_iface, &pPin);
-    if ((hr != S_OK) || !pPin)
+    if (!window->pPin->peer)
        return VFW_E_NOT_CONNECTED;

    if (!focus)