Nikolay Sivov : mf/samglegrabber: Dump pending items on shutdown.

[Alexandre Julliard]

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

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Fri May 15 18:32:53 2020 +0300

mf/samglegrabber: Dump pending items on shutdown.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mf/samplegrabber.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c
index adb4ded54f..eb116d81ed 100644
--- a/dlls/mf/samplegrabber.c
+++ b/dlls/mf/samplegrabber.c
@@ -802,11 +802,20 @@ static ULONG WINAPI sample_grabber_sink_AddRef(IMFMediaSink *iface)
     return refcount;
 }
 
+static void sample_grabber_release_pending_items(struct sample_grabber *grabber)
+{
+    struct scheduled_item *item, *next_item;
+
+    LIST_FOR_EACH_ENTRY_SAFE(item, next_item, &grabber->items, struct scheduled_item, entry)
+    {
+        stream_release_pending_item(item);
+    }
+}
+
 static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface)
 {
     struct sample_grabber *grabber = impl_from_IMFMediaSink(iface);
     ULONG refcount = InterlockedDecrement(&grabber->refcount);
-    struct scheduled_item *item, *next_item;
 
     TRACE("%p, refcount %u.\n", iface, refcount);
 
@@ -836,10 +845,7 @@ static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface)
         }
         if (grabber->sample_attributes)
             IMFAttributes_Release(grabber->sample_attributes);
-        LIST_FOR_EACH_ENTRY_SAFE(item, next_item, &grabber->items, struct scheduled_item, entry)
-        {
-            stream_release_pending_item(item);
-        }
+        sample_grabber_release_pending_items(grabber);
         DeleteCriticalSection(&grabber->cs);
         heap_free(grabber);
     }
@@ -1031,6 +1037,7 @@ static HRESULT WINAPI sample_grabber_sink_Shutdown(IMFMediaSink *iface)
 
     EnterCriticalSection(&grabber->cs);
     grabber->is_shut_down = TRUE;
+    sample_grabber_release_pending_items(grabber);
     if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnShutdown(sample_grabber_get_callback(grabber))))
     {
         sample_grabber_set_presentation_clock(grabber, NULL);