strmbase: Swap the lock order in IPin::EndFlush().

This more closely resembles the threading model prescribed by the DirectX SDK documentation. In particular, the page "Flushing Data" recommends that IPin::BeginFlush() do the following steps in order: 1. take the filter lock 2. signal the streaming thread to complete 3. take the streaming lock, if necessary Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

strmbase: Swap the lock order in IPin::EndFlush().
a4131ca6 · Zebediah Figura · Alexandre Julliard · 63a6b308 · a4131ca6
Commit a4131ca6 authored Nov 28, 2019 by Zebediah Figura Committed by Alexandre Julliard Nov 29, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

No files found.
--- a/dlls/strmbase/renderer.c
+++ b/dlls/strmbase/renderer.c
@@ -133,8 +133,8 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndFlush(IPin * iface)

    TRACE("iface %p.\n", iface);

-    EnterCriticalSection(&pFilter->csRenderLock);
    EnterCriticalSection(&pFilter->filter.csFilter);
+    EnterCriticalSection(&pFilter->csRenderLock);
    pFilter->eos = FALSE;
    hr = BaseInputPinImpl_EndFlush(iface);
    if (SUCCEEDED(hr))
@@ -146,8 +146,8 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndFlush(IPin * iface)
        if (pFilter->pFuncsTable->pfnEndFlush)
            hr = pFilter->pFuncsTable->pfnEndFlush(pFilter);
    }
-    LeaveCriticalSection(&pFilter->filter.csFilter);
    LeaveCriticalSection(&pFilter->csRenderLock);
+    LeaveCriticalSection(&pFilter->filter.csFilter);
    return hr;
 }