[PATCH 1/5] amstream: Fix sample refcounting in parent ddraw stream.
Gijs Vermeulen
gijsvrm at gmail.com
Tue Jun 30 10:08:06 CDT 2020
Signed-off-by: Gijs Vermeulen <gijsvrm at gmail.com>
---
dlls/amstream/ddrawstream.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c
index 56230ca4e6..ca9826b14a 100644
--- a/dlls/amstream/ddrawstream.c
+++ b/dlls/amstream/ddrawstream.c
@@ -980,7 +980,6 @@ HRESULT ddraw_stream_create(IUnknown *outer, void **out)
object->IMemInputPin_iface.lpVtbl = &ddraw_meminput_vtbl;
object->IPin_iface.lpVtbl = &ddraw_sink_vtbl;
object->ref = 1;
- object->sample_refs = 0;
InitializeCriticalSection(&object->cs);
@@ -1043,12 +1042,11 @@ static ULONG WINAPI ddraw_sample_Release(IDirectDrawStreamSample *iface)
TRACE("(%p)->(): new ref = %u\n", iface, ref);
- EnterCriticalSection(&sample->parent->cs);
- InterlockedDecrement(&sample->parent->sample_refs);
- LeaveCriticalSection(&sample->parent->cs);
-
if (!ref)
{
+ EnterCriticalSection(&sample->parent->cs);
+ sample->parent->sample_refs--;
+ LeaveCriticalSection(&sample->parent->cs);
if (sample->surface)
IDirectDrawSurface_Release(sample->surface);
HeapFree(GetProcessHeap(), 0, sample);
@@ -1166,7 +1164,7 @@ static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDraw
object->parent = parent;
EnterCriticalSection(&parent->cs);
- InterlockedIncrement(&parent->sample_refs);
+ parent->sample_refs++;
LeaveCriticalSection(&parent->cs);
if (surface)
--
2.27.0
More information about the wine-devel
mailing list