[PATCH 0/2] MR7173: rtworkq: Support putting work on RTWQ_CALLBACK_QUEUE_UNDEFINED.

[Conor McCarthy (＠cmccarthy)]

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

[PATCH 1/2] mfplat/tests: Add a test for MFASYNC_CALLBACK_QUEUE_UNDEFINED.

[Conor McCarthy]

From: Conor McCarthy <cmccarthy(a)codeweavers.com>

---
 dlls/mfplat/tests/mfplat.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c
index 2b17b069d1d..15c93a7e747 100644
--- a/dlls/mfplat/tests/mfplat.c
+++ b/dlls/mfplat/tests/mfplat.c
@@ -2879,6 +2879,15 @@ static void test_MFCreateMFByteStreamOnStream(void)
     ok(res == 0, "got %#lx\n", res);
     IMFAsyncResult_Release(result);
 
+    hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_UNDEFINED, &test_callback->IMFAsyncCallback_iface, NULL);
+    todo_wine
+    ok(hr == S_OK, "got %#lx\n", hr);
+    res = wait_async_callback_result(&test_callback->IMFAsyncCallback_iface, 100, &result);
+    todo_wine
+    ok(res == 0, "got %#lx\n", res);
+    if (result)
+        IMFAsyncResult_Release(result);
+
     test_stream_complete_read(stream);
     res = wait_async_callback_result(&read_callback->IMFAsyncCallback_iface, 1000, &result);
     ok(res == 0, "got %#lx\n", res);
-- 
GitLab


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

[PATCH 2/2] rtworkq: Support putting work on RTWQ_CALLBACK_QUEUE_UNDEFINED.

[Conor McCarthy]

From: Conor McCarthy <cmccarthy(a)codeweavers.com>

---
 dlls/mfplat/tests/mfplat.c | 5 +----
 dlls/rtworkq/queue.c       | 4 ++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c
index 15c93a7e747..8d033285a02 100644
--- a/dlls/mfplat/tests/mfplat.c
+++ b/dlls/mfplat/tests/mfplat.c
@@ -2880,13 +2880,10 @@ static void test_MFCreateMFByteStreamOnStream(void)
     IMFAsyncResult_Release(result);
 
     hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_UNDEFINED, &test_callback->IMFAsyncCallback_iface, NULL);
-    todo_wine
     ok(hr == S_OK, "got %#lx\n", hr);
     res = wait_async_callback_result(&test_callback->IMFAsyncCallback_iface, 100, &result);
-    todo_wine
     ok(res == 0, "got %#lx\n", res);
-    if (result)
-        IMFAsyncResult_Release(result);
+    IMFAsyncResult_Release(result);
 
     test_stream_complete_read(stream);
     res = wait_async_callback_result(&read_callback->IMFAsyncCallback_iface, 1000, &result);
diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c
index 9046a70b359..8b9bb631202 100644
--- a/dlls/rtworkq/queue.c
+++ b/dlls/rtworkq/queue.c
@@ -298,6 +298,10 @@ static struct queue *get_system_queue(DWORD queue_id)
 {
     switch (queue_id)
     {
+        case RTWQ_CALLBACK_QUEUE_UNDEFINED:
+            /* Works in native Windows. Undocumented, but seems to use standard. */
+            queue_id = RTWQ_CALLBACK_QUEUE_STANDARD;
+            /* fall through */
         case RTWQ_CALLBACK_QUEUE_STANDARD:
         case RTWQ_CALLBACK_QUEUE_RT:
         case RTWQ_CALLBACK_QUEUE_IO:
-- 
GitLab

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

[PATCH 2/2] rtworkq: Support putting work on RTWQ_CALLBACK_QUEUE_UNDEFINED.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=150989

Your paranoid android.


=== w8 (32 bit report) ===

mfplat:
mfplat.c:1324: Test failed: Unexpected refcount 3

=== w1064v1507 (32 bit report) ===

mfplat:
mfplat.c:1324: Test failed: Unexpected refcount 3

=== w864 (64 bit report) ===

mfplat:
mfplat.c:1324: Test failed: Unexpected refcount 1

=== w1064_adm (64 bit report) ===

mfplat:
mfplat.c:1324: Test failed: Unexpected refcount 3

=== debian11b (32 bit WoW report) ===

Report validation errors:
mfplat:mfplat crashed (c0000028)

=== debian11b (64 bit WoW report) ===

winmm:
mci: Timeout

[Nikolay Sivov (＠nsivov)]

I'd like get a test for this at rtworkq level too, to see if we need to apply queue id fixup there instead.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7173#note_92565