[PATCH 2/5] amstream: Lock CreateSample instead of only the sample ref increase.
Gijs Vermeulen
gijsvrm at gmail.com
Tue Jun 30 10:08:07 CDT 2020
Signed-off-by: Gijs Vermeulen <gijsvrm at gmail.com>
---
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 ca9826b14a..4cbde7ac78 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,
@@ -1162,10 +1167,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)
{
--
2.27.0
More information about the wine-devel
mailing list