system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-02 08:53:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
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>
This commit is contained in:
Anton Baskanov 2020-10-29 11:40:58 +07:00 committed by Alexandre Julliard
parent f2cfd63cda
commit 8492657ab8
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
dlls/amstream/filter.c
View file

@ -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;
}