quartz/dsoundrender: Avoid taking the filter lock in IPin::EndOfStream().

IPin::EndOfStream() is called from a streaming thread. The streaming thread should never take the filter lock. Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

quartz/dsoundrender: Avoid taking the filter lock in IPin::EndOfStream().
09b39646 · Zebediah Figura · Alexandre Julliard · 4ccdf3e5 · 09b39646 · 09b39646
Commit 09b39646 authored Nov 27, 2019 by Zebediah Figura Committed by Alexandre Julliard Nov 28, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

dsoundrender.c dlls/quartz/dsoundrender.c +0 -2

renderer.c dlls/strmbase/renderer.c +0 -2

No files found.
--- a/dlls/quartz/dsoundrender.c
+++ b/dlls/quartz/dsoundrender.c
@@ -236,11 +236,9 @@ static HRESULT DSoundRender_HandleEndOfStream(DSoundRenderImpl *This)
            break;

        This->in_loop = 1;
-        LeaveCriticalSection(&This->renderer.filter.csFilter);
        LeaveCriticalSection(&This->renderer.csRenderLock);
        WaitForSingleObject(This->renderer.flush_event, 10);
        EnterCriticalSection(&This->renderer.csRenderLock);
-        EnterCriticalSection(&This->renderer.filter.csFilter);
        This->in_loop = 0;
    }


--- a/dlls/strmbase/renderer.c
+++ b/dlls/strmbase/renderer.c
@@ -88,13 +88,11 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndOfStream(IPin * iface)
    TRACE("iface %p.\n", iface);

    EnterCriticalSection(&pFilter->csRenderLock);
-    EnterCriticalSection(&pFilter->filter.csFilter);
    pFilter->eos = TRUE;
    if (pFilter->pFuncsTable->pfnEndOfStream)
        hr = pFilter->pFuncsTable->pfnEndOfStream(pFilter);
    else
        hr = BaseRendererImpl_EndOfStream(pFilter);
-    LeaveCriticalSection(&pFilter->filter.csFilter);
    LeaveCriticalSection(&pFilter->csRenderLock);
    return hr;
 }