[PATCH v2 07/12] mf: Make flushing on sample grabber largely a no-op.

[Brendan McGrath]

From: Brendan McGrath

Testing on Windows seems to show a Flush on the sample grabber doesn't
actually flush.
---
 dlls/mf/samplegrabber.c | 12 ------------
 dlls/mf/tests/mf.c      |  8 +-------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c
index a8c797f25ed..3a1c53968db 100644
--- a/dlls/mf/samplegrabber.c
+++ b/dlls/mf/samplegrabber.c
@@ -520,7 +520,6 @@ static HRESULT WINAPI sample_grabber_stream_PlaceMarker(IMFStreamSink *iface, MF
 static HRESULT WINAPI sample_grabber_stream_Flush(IMFStreamSink *iface)
 {
     struct sample_grabber *grabber = impl_from_IMFStreamSink(iface);
-    struct scheduled_item *item, *next_item;
     HRESULT hr = S_OK;

TRACE("%p.\n", iface);
@@ -529,17 +528,6 @@ static HRESULT WINAPI sample_grabber_stream_Flush(IMFStreamSink *iface)

if (grabber->is_shut_down)
         hr = MF_E_STREAMSINK_REMOVED;
-    else
-    {
-        LIST_FOR_EACH_ENTRY_SAFE(item, next_item, &grabber->items, struct scheduled_item, entry)
-        {
-            /* Samples are discarded, markers are processed immediately. */
-            if (item->type == ITEM_TYPE_MARKER)
-                sample_grabber_stream_report_marker(grabber, &item->u.marker.context, E_ABORT);
-
-            stream_release_pending_item(item);
-        }
-    }

LeaveCriticalSection(&grabber->cs);

diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index 5cbb7ddf485..f167d6e184e 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -4312,15 +4312,11 @@ static HRESULT WINAPI timer_SetTimer(IMFTimer *iface, DWORD flags, LONGLONG time
     struct timer_cancel *tc;
     HRESULT hr;

-    todo_wine_if(time == 83334)
     CHECK_EXPECT(timer_SetTimer);

ok(flags == 0, "Unexpected flags value %#lx\n", flags);
-    todo_wine_if(time == 83334)
     ok(time == expected_pts, "Unexpected time value %I64d\n", time);
-    todo_wine_if(time == 83334)
     ok(pc->callback_result == NULL, "Unexpected callback result value %p\n", pc->callback_result);
-    todo_wine_if(time == 83334)
     ok(pc->cancel_key == NULL, "Unexpected cancel key %p\n", pc->cancel_key);

hr = MFCreateAsyncResult(NULL, callback, state, &pc->callback_result);
@@ -4811,13 +4807,13 @@ static void test_sample_grabber_seek(void)
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

samples_requested = count_samples_requested(stream);
-    todo_wine
     ok(samples_requested == 4, "Unexpected number of samples requested %d\n", samples_requested);

/* test number of new sample requests on seek whilst paused and 3 samples provided */
     sample_pts = expected_pts = 0;
     SET_EXPECT(timer_SetTimer);
     supply_samples(stream, 1);
+    todo_wine
     CHECK_CALLED(timer_SetTimer);
     hr = IMFStreamSink_PlaceMarker(stream, MFSTREAMSINK_MARKER_DEFAULT, NULL, NULL);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
@@ -4871,7 +4867,6 @@ static void test_sample_grabber_seek(void)
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

samples_requested = count_samples_requested(stream);
-    todo_wine
     ok(samples_requested == 0, "Unexpected number of samples requested %d\n", samples_requested);

/* test sample received in the paused state with no samples queued */
@@ -4904,7 +4899,6 @@ static void test_sample_grabber_seek(void)
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

samples_requested = count_samples_requested(stream);
-    todo_wine
     ok(samples_requested == 4, "Unexpected number of samples requested %d\n", samples_requested);

/* check contents of collection */