Module: wine Branch: master Commit: 276701e9b44b7cc789a18394bd75c3a44ed43a2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=276701e9b44b7cc789a18394b...
Author: Gijs Vermeulen gijsvrm@gmail.com Date: Tue Jun 30 19:57:13 2020 -0500
amstream: Lock the entirety of IDirectDrawMediaStream::CreateSample().
Signed-off-by: Gijs Vermeulen gijsvrm@gmail.com Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/amstream/ddrawstream.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index b7196d9fc9..7095e1d49a 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -437,11 +437,16 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_CreateSample(IDirectDrawMedia IDirectDrawStreamSample **sample) { struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); + HRESULT hr;
TRACE("stream %p, surface %p, rect %s, flags %#x, sample %p.\n", stream, surface, wine_dbgstr_rect(rect), flags, sample);
- return ddrawstreamsample_create(stream, surface, rect, sample); + EnterCriticalSection(&stream->cs); + hr = ddrawstreamsample_create(stream, surface, rect, sample); + LeaveCriticalSection(&stream->cs); + + return hr; }
static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetTimePerFrame(IDirectDrawMediaStream *iface, @@ -1163,10 +1168,7 @@ static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDraw object->IDirectDrawStreamSample_iface.lpVtbl = &DirectDrawStreamSample_Vtbl; object->ref = 1; object->parent = parent; - - EnterCriticalSection(&parent->cs); ++parent->sample_refs; - LeaveCriticalSection(&parent->cs);
if (surface) {