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>

amstream: Lock the entirety of IDirectDrawMediaStream::CreateSample().
276701e9 · Gijs Vermeulen · Alexandre Julliard · c80d5c15 · 276701e9
Commit 276701e9 authored Jun 30, 2020 by Gijs Vermeulen Committed by Alexandre Julliard Jul 01, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

ddrawstream.c dlls/amstream/ddrawstream.c +6 -4

No files found.
--- 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)
    {