amstream: Release filter critical section before calling upstream seeking methods.

Otherwise a seek might deadlock when the stream calls the filter methods (e.g. WaitUntil) from streaming thread. Signed-off-by: Anton Baskanov <baskanov@gmail.com> Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

amstream: Release filter critical section before calling upstream seeking methods.
8492657a · Anton Baskanov · Alexandre Julliard · f2cfd63c · 8492657a
Commit 8492657a authored Oct 29, 2020 by Anton Baskanov Committed by Alexandre Julliard Nov 04, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 15 deletions

filter.c dlls/amstream/filter.c +14 -15

No files found.
--- a/dlls/amstream/filter.c
+++ b/dlls/amstream/filter.c
@@ -795,15 +795,16 @@ static HRESULT WINAPI filter_seeking_GetDuration(IMediaSeeking *iface, LONGLONG 

    EnterCriticalSection(&filter->cs);

-    if (!(seeking = get_seeking(filter->seekable_stream)))
-    {
-        LeaveCriticalSection(&filter->cs);
+    seeking = get_seeking(filter->seekable_stream);
+
+    LeaveCriticalSection(&filter->cs);
+
+    if (!seeking)
        return E_NOTIMPL;
-    }
+
    hr = IMediaSeeking_GetDuration(seeking, duration);
    IMediaSeeking_Release(seeking);

-    LeaveCriticalSection(&filter->cs);
    return hr;
 }

@@ -817,15 +818,16 @@ static HRESULT WINAPI filter_seeking_GetStopPosition(IMediaSeeking *iface, LONGL

    EnterCriticalSection(&filter->cs);

-    if (!(seeking = get_seeking(filter->seekable_stream)))
-    {
-        LeaveCriticalSection(&filter->cs);
+    seeking = get_seeking(filter->seekable_stream);
+
+    LeaveCriticalSection(&filter->cs);
+
+    if (!seeking)
        return E_NOTIMPL;
-    }
+
    hr = IMediaSeeking_GetStopPosition(seeking, stop);
    IMediaSeeking_Release(seeking);

-    LeaveCriticalSection(&filter->cs);
    return hr;
 }

@@ -860,18 +862,15 @@ static HRESULT WINAPI filter_seeking_SetPositions(IMediaSeeking *iface, LONGLONG

    seeking = get_seeking(filter->seekable_stream);

+    LeaveCriticalSection(&filter->cs);
+
    if (!seeking)
-    {
-        LeaveCriticalSection(&filter->cs);
        return E_NOTIMPL;
-    }

    hr = IMediaSeeking_SetPositions(seeking, current_ptr, current_flags, stop_ptr, stop_flags);

    IMediaSeeking_Release(seeking);

-    LeaveCriticalSection(&filter->cs);
-
    return hr;
 }