Rémi Bernon : mf: Handle MESourceSeeked and MEStreamSeeked state change events.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: c4ab65e146e0a3b30657358591c2c7c1fb7463ab
URL:    https://gitlab.winehq.org/wine/wine/-/commit/c4ab65e146e0a3b30657358591c2c7c...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Fri Feb 11 14:53:07 2022 +0100

mf: Handle MESourceSeeked and MEStreamSeeked state change events.

If a session is paused then started again, or if a start position is
provided we wait forever for the source to send a MESourceStarted event,
when it sends a MESourceSeeked instead.

This causes a deadlock in Bright Memory: Infinite as the game then waits
for the Start command to complete, while the session is stuck in the
SESSION_STATE_STARTING_SOURCES state.

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit 899ae42b206a8c2e462a789249e2c2f143d4a582)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 dlls/mf/session.c          |  8 ++++++++
 dlls/mfplat/tests/mfplat.c | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/dlls/mf/session.c b/dlls/mf/session.c
index c8ec1b5c33f..1de40187eb2 100644
--- a/dlls/mf/session.c
+++ b/dlls/mf/session.c
@@ -2321,6 +2321,8 @@ static enum object_state session_get_object_state_for_event(MediaEventType event
 {
     switch (event)
     {
+        case MESourceSeeked:
+        case MEStreamSeeked:
         case MESourceStarted:
         case MEStreamStarted:
         case MEStreamSinkStarted:
@@ -2497,6 +2499,7 @@ static void session_set_source_object_state(struct media_session *session, IUnkn
 
     switch (event_type)
     {
+        case MESourceSeeked:
         case MESourceStarted:
         case MESourcePaused:
         case MESourceStopped:
@@ -2511,6 +2514,7 @@ static void session_set_source_object_state(struct media_session *session, IUnkn
                 }
             }
             break;
+        case MEStreamSeeked:
         case MEStreamStarted:
         case MEStreamPaused:
         case MEStreamStopped:
@@ -3197,6 +3201,10 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM
 
     switch (event_type)
     {
+        case MESourceSeeked:
+        case MEStreamSeeked:
+            FIXME("Source/stream seeking, semi-stub!\n");
+            /* fallthrough */
         case MESourceStarted:
         case MESourcePaused:
         case MESourceStopped:
diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c
index 21eab6d1172..7030c9eebc4 100644
--- a/dlls/mfplat/tests/mfplat.c
+++ b/dlls/mfplat/tests/mfplat.c
@@ -896,6 +896,44 @@ todo_wine
         video_stream = (IMFMediaStream *)var.punkVal;
     }
 
+    hr = IMFMediaSource_Pause(mediasource);
+    ok(hr == S_OK, "Failed to pause media source, hr %#x.\n", hr);
+    if (get_event((IMFMediaEventGenerator *)mediasource, MESourcePaused, &var))
+        ok(var.vt == VT_EMPTY, "Unexpected value type.\n");
+
+    var.vt = VT_EMPTY;
+    hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var);
+    ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr);
+
+    if (get_event((IMFMediaEventGenerator *)mediasource, MESourceStarted, &var))
+        ok(var.vt == VT_EMPTY, "Unexpected value type.\n");
+
+    hr = IMFMediaSource_Pause(mediasource);
+    ok(hr == S_OK, "Failed to pause media source, hr %#x.\n", hr);
+    if (get_event((IMFMediaEventGenerator *)mediasource, MESourcePaused, &var))
+        ok(var.vt == VT_EMPTY, "Unexpected value type.\n");
+
+    var.vt = VT_I8;
+    var.uhVal.QuadPart = 0;
+    hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var);
+    ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr);
+
+    if (get_event((IMFMediaEventGenerator *)mediasource, MESourceSeeked, &var))
+        ok(var.vt == VT_I8, "Unexpected value type.\n");
+
+    hr = IMFMediaSource_Stop(mediasource);
+    ok(hr == S_OK, "Failed to pause media source, hr %#x.\n", hr);
+    if (get_event((IMFMediaEventGenerator *)mediasource, MESourceStopped, &var))
+        ok(var.vt == VT_EMPTY, "Unexpected value type.\n");
+
+    var.vt = VT_I8;
+    var.uhVal.QuadPart = 0;
+    hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var);
+    ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr);
+
+    if (get_event((IMFMediaEventGenerator *)mediasource, MESourceStarted, &var))
+        ok(var.vt == VT_I8, "Unexpected value type.\n");
+
     sample_count = 10;
 
     for (i = 0; i < sample_count; ++i)