Gijs Vermeulen : amstream: Decrement "sample_refs" only when the object is being released.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c80d5c1507d2853e659c3647410c4cd20cc7b2d5
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=c80d5c1507d2853e659c36474...

Author: Gijs Vermeulen <gijsvrm(a)gmail.com>
Date:   Tue Jun 30 19:57:12 2020 -0500

amstream: Decrement "sample_refs" only when the object is being released.

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com>
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/amstream/ddrawstream.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c
index 56230ca4e6..b7196d9fc9 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,12 @@ 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 +1165,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)