[PATCH v2 0/3] MR607: mf: Fix session command handling and SESSION_CMD_END.

[Rémi Bernon (＠rbernon)]

--
  v2: mf: Actually implement SESSION_CMD_END internal command.
      mf: Use session_submit_command to put SESSION_CMD_END ahead of the queue.
      mf: Keep pending session command out of the queued commands list.

https://gitlab.winehq.org/wine/wine/-/merge_requests/607

[PATCH v2 1/3] mf: Keep pending session command out of the queued commands list.

[Rémi Bernon]

From: R��mi Bernon

---
 dlls/mf/session.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/dlls/mf/session.c b/dlls/mf/session.c
index 87fe77a730f..b98a8907f1a 100644
--- a/dlls/mf/session.c
+++ b/dlls/mf/session.c
@@ -258,7 +258,10 @@ struct media_session
         float rate;
     } presentation;
     struct list topologies;
+
+    struct session_op *pending_command;
     struct list commands;
+
     enum session_state state;
     DWORD caps;
     CRITICAL_SECTION cs;
@@ -469,7 +472,7 @@ static HRESULT session_submit_command(struct media_session *session, struct sess
     EnterCriticalSection(&session->cs);
     if (SUCCEEDED(hr = session_is_shut_down(session)))
     {
-        if (list_empty(&session->commands))
+        if (!session->pending_command && list_empty(&session->commands))
             hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &session->commands_callback, &op->IUnknown_iface);
         list_add_tail(&session->commands, &op->entry);
         IUnknown_AddRef(&op->IUnknown_iface);
@@ -735,6 +738,12 @@ static void session_clear_command_list(struct media_session *session)
 {
     struct session_op *op, *op2;

+    if ((op = session->pending_command))
+    {
+        IUnknown_Release(&op->IUnknown_iface);
+        session->pending_command = NULL;
+    }
+
     LIST_FOR_EACH_ENTRY_SAFE(op, op2, &session->commands, struct session_op, entry)
     {
         list_remove(&op->entry);
@@ -801,12 +810,10 @@ static void session_command_complete(struct media_session *session)
     struct session_op *op;
     struct list *e;

-    /* Pop current command, submit next. */
-    if ((e = list_head(&session->commands)))
+    if ((op = session->pending_command))
     {
-        op = LIST_ENTRY(e, struct session_op, entry);
-        list_remove(&op->entry);
         IUnknown_Release(&op->IUnknown_iface);
+        session->pending_command = NULL;
     }

if ((e = list_head(&session->commands)))
@@ -2384,6 +2391,9 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface,

EnterCriticalSection(&session->cs);

+    list_remove(&op->entry);
+    session->pending_command = op;
+
     switch (op->command)
     {
         case SESSION_CMD_CLEAR_TOPOLOGIES:

[PATCH v2 2/3] mf: Use session_submit_command to put SESSION_CMD_END ahead of the queue.

[Rémi Bernon]

From: R��mi Bernon

---
 dlls/mf/session.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/dlls/mf/session.c b/dlls/mf/session.c
index b98a8907f1a..f87d49c09ed 100644
--- a/dlls/mf/session.c
+++ b/dlls/mf/session.c
@@ -457,14 +457,6 @@ static HRESULT session_is_shut_down(struct media_session *session)
     return session->state == SESSION_STATE_SHUT_DOWN ? MF_E_SHUTDOWN : S_OK;
 }

-static void session_push_back_command(struct media_session *session, enum session_command command)
-{
-    struct session_op *op;
-
-    if (SUCCEEDED(create_session_op(command, &op)))
-        list_add_head(&session->commands, &op->entry);
-}
-
 static HRESULT session_submit_command(struct media_session *session, struct session_op *op)
 {
     HRESULT hr;
@@ -474,7 +466,10 @@ static HRESULT session_submit_command(struct media_session *session, struct sess
     {
         if (!session->pending_command && list_empty(&session->commands))
             hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &session->commands_callback, &op->IUnknown_iface);
-        list_add_tail(&session->commands, &op->entry);
+        if (op->command == SESSION_CMD_END)
+            list_add_head(&session->commands, &op->entry);
+        else
+            list_add_tail(&session->commands, &op->entry);
         IUnknown_AddRef(&op->IUnknown_iface);
     }
     LeaveCriticalSection(&session->cs);
@@ -3303,7 +3298,7 @@ static void session_raise_end_of_presentation(struct media_session *session)
         if (session_nodes_is_mask_set(session, MF_TOPOLOGY_MAX, SOURCE_FLAG_END_OF_PRESENTATION))
         {
             session->presentation.flags |= SESSION_FLAG_END_OF_PRESENTATION;
-            session_push_back_command(session, SESSION_CMD_END);
+            session_submit_simple_command(session, SESSION_CMD_END);
             IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MEEndOfPresentation, &GUID_NULL, S_OK, NULL);
         }
     }

[PATCH v2 3/3] mf: Actually implement SESSION_CMD_END internal command.

[Rémi Bernon]

From: R��mi Bernon

---
 dlls/mf/session.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/mf/session.c b/dlls/mf/session.c
index f87d49c09ed..95aecf13540 100644
--- a/dlls/mf/session.c
+++ b/dlls/mf/session.c
@@ -2404,6 +2404,10 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface,
         case SESSION_CMD_PAUSE:
             session_pause(session);
             break;
+        case SESSION_CMD_END:
+            session_set_topo_status(session, S_OK, MF_TOPOSTATUS_ENDED);
+            session_set_caps(session, session->caps & ~MFSESSIONCAP_PAUSE);
+            /* fallthrough */
         case SESSION_CMD_STOP:
             session_stop(session);
             break;
@@ -2429,8 +2433,6 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface,
         case SESSION_CMD_SET_RATE:
             session_set_rate(session, op->set_rate.thin, op->set_rate.rate);
             break;
-        default:
-            ;
     }

LeaveCriticalSection(&session->cs);

[Rémi Bernon (＠rbernon)]

I've missed the `SESSION_CMD_SA_READY` command which currently uses MFPutWorkItem directly, I'll make an update.