From 26c1f46d89cb279e72dd1685627f7d370bdc6b8d Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 27 Jun 2025 08:16:31 +1000 Subject: [PATCH] Rebase against 80bc1338bea7d9dac78ab449b4505e5bb91e7ba3. --- ...f-tests-Add-network-bytestream-tests.patch | 15 +++---- ...ing-of-GetMessage-after-previous-Pee.patch | 40 +++++++++---------- staging/upstream-commit | 2 +- 3 files changed, 29 insertions(+), 28 deletions(-) diff --git a/patches/mf_http_support/0002-mf-tests-Add-network-bytestream-tests.patch b/patches/mf_http_support/0002-mf-tests-Add-network-bytestream-tests.patch index 4e198905..80711951 100644 --- a/patches/mf_http_support/0002-mf-tests-Add-network-bytestream-tests.patch +++ b/patches/mf_http_support/0002-mf-tests-Add-network-bytestream-tests.patch @@ -1,4 +1,4 @@ -From 0d4a7cf6b9bb3a57a098762113ca1750c43a810e Mon Sep 17 00:00:00 2001 +From e27b26f100bedf8f8374333ce9026fd96ed9102b Mon Sep 17 00:00:00 2001 From: Torge Matthies Date: Fri, 25 Oct 2024 10:47:30 +0200 Subject: [PATCH] mf/tests: Add network bytestream tests. @@ -8,10 +8,10 @@ Subject: [PATCH] mf/tests: Add network bytestream tests. 1 file changed, 347 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c -index d0f1f1cf0a4..61daaf35741 100644 +index 1070e9c1b2d..9d41b05fad3 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c -@@ -4726,6 +4726,7 @@ static void test_evr(void) +@@ -4908,6 +4908,7 @@ static void test_evr(void) hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -19,8 +19,8 @@ index d0f1f1cf0a4..61daaf35741 100644 check_interface(sink, &IID_IMFMediaSinkPreroll, TRUE); check_interface(sink, &IID_IMFVideoRenderer, TRUE); -@@ -6803,6 +6804,351 @@ static void test_media_session_Close(void) - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); +@@ -7130,6 +7131,351 @@ static void test_media_session_thinning(void) + ok(hr == S_OK, "Shutdown failure, hr %#lx.\n", hr); } +static void test_network_bytestream(void) @@ -371,13 +371,14 @@ index d0f1f1cf0a4..61daaf35741 100644 START_TEST(mf) { init_functions(); -@@ -6838,5 +7184,6 @@ START_TEST(mf) +@@ -7165,6 +7511,7 @@ START_TEST(mf) test_media_session_Start(); test_MFEnumDeviceSources(); test_media_session_Close(); + test_network_bytestream(); test_media_session_source_shutdown(); + test_media_session_thinning(); } -- -2.45.2 +2.47.2 diff --git a/patches/server-PeekMessage/0001-server-Fix-handling-of-GetMessage-after-previous-Pee.patch b/patches/server-PeekMessage/0001-server-Fix-handling-of-GetMessage-after-previous-Pee.patch index f77b68c7..54bac436 100644 --- a/patches/server-PeekMessage/0001-server-Fix-handling-of-GetMessage-after-previous-Pee.patch +++ b/patches/server-PeekMessage/0001-server-Fix-handling-of-GetMessage-after-previous-Pee.patch @@ -1,4 +1,4 @@ -From 31eece6eff95baed8c1d9404d2cfc05834df9753 Mon Sep 17 00:00:00 2001 +From da9b85d2993598eb6153d5e1610ba327284715a6 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 15 Mar 2015 01:05:48 +0100 Subject: [PATCH] server: Fix handling of GetMessage after previous PeekMessage @@ -93,26 +93,26 @@ index a5f7318dffd..e50ddc45038 100644 * because both messages are in the same queue. */ diff --git a/server/queue.c b/server/queue.c -index cfbc9e6c89b..f07b73e3ce9 100644 +index 3845a86c962..ed5ebf6996e 100644 --- a/server/queue.c +++ b/server/queue.c -@@ -134,6 +134,7 @@ struct msg_queue - timeout_t last_get_msg; /* time of last get message call */ +@@ -136,6 +136,7 @@ struct msg_queue int keystate_lock; /* owns an input keystate lock */ + int waiting; /* is thread waiting on queue */ queue_shm_t *shared; /* queue in session shared memory */ + unsigned int ignore_post_msg; /* ignore post messages newer than this unique id */ }; struct hotkey -@@ -313,6 +314,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ +@@ -318,6 +319,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ queue->hooks = NULL; queue->last_get_msg = current_time; queue->keystate_lock = 0; + queue->ignore_post_msg = 0; + queue->waiting = 0; list_init( &queue->send_result ); list_init( &queue->callback_result ); - list_init( &queue->pending_timers ); -@@ -793,13 +795,21 @@ static inline struct msg_queue *get_current_queue(void) +@@ -812,13 +814,21 @@ static inline struct msg_queue *get_current_queue(void) } /* get a (pseudo-)unique id to tag hardware messages */ @@ -135,7 +135,7 @@ index cfbc9e6c89b..f07b73e3ce9 100644 /* lookup an already queued mouse message that matches the message, window and type */ static struct message *find_mouse_message( struct thread_input *input, const struct message *msg ) { -@@ -1150,7 +1160,7 @@ static int match_window( user_handle_t win, user_handle_t msg_win ) +@@ -1169,7 +1179,7 @@ static int match_window( user_handle_t win, user_handle_t msg_win ) } /* retrieve a posted message */ @@ -144,7 +144,7 @@ index cfbc9e6c89b..f07b73e3ce9 100644 unsigned int first, unsigned int last, unsigned int flags, struct get_message_reply *reply ) { -@@ -1161,6 +1171,7 @@ static int get_posted_message( struct msg_queue *queue, user_handle_t win, +@@ -1180,6 +1190,7 @@ static int get_posted_message( struct msg_queue *queue, user_handle_t win, { if (!match_window( win, msg->win )) continue; if (!check_msg_filter( msg->msg, first, last )) continue; @@ -152,7 +152,7 @@ index cfbc9e6c89b..f07b73e3ce9 100644 goto found; /* found one */ } return 0; -@@ -1841,6 +1852,7 @@ found: +@@ -1858,6 +1869,7 @@ found: msg->msg = WM_HOTKEY; msg->wparam = hotkey->id; msg->lparam = ((hotkey->vkey & 0xffff) << 16) | modifiers; @@ -160,7 +160,7 @@ index cfbc9e6c89b..f07b73e3ce9 100644 free( msg->data ); msg->data = NULL; -@@ -2827,7 +2839,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user +@@ -2844,7 +2856,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user } /* now we can return it */ @@ -169,7 +169,7 @@ index cfbc9e6c89b..f07b73e3ce9 100644 reply->type = MSG_HARDWARE; reply->win = win; reply->msg = msg_code; -@@ -2934,6 +2946,7 @@ void post_message( user_handle_t win, unsigned int message, lparam_t wparam, lpa +@@ -2951,6 +2963,7 @@ void post_message( user_handle_t win, unsigned int message, lparam_t wparam, lpa msg->result = NULL; msg->data = NULL; msg->data_size = 0; @@ -177,7 +177,7 @@ index cfbc9e6c89b..f07b73e3ce9 100644 get_message_defaults( thread->queue, &msg->x, &msg->y, &msg->time ); -@@ -3251,6 +3264,7 @@ DECL_HANDLER(send_message) +@@ -3259,6 +3272,7 @@ DECL_HANDLER(send_message) set_queue_bits( recv_queue, QS_SENDMESSAGE ); break; case MSG_POSTED: @@ -185,7 +185,7 @@ index cfbc9e6c89b..f07b73e3ce9 100644 list_add_tail( &recv_queue->msg_list[POST_MESSAGE], &msg->entry ); set_queue_bits( recv_queue, QS_POSTMESSAGE|QS_ALLPOSTMESSAGE ); if (msg->msg == WM_HOTKEY) -@@ -3385,12 +3399,12 @@ DECL_HANDLER(get_message) +@@ -3395,12 +3409,12 @@ DECL_HANDLER(get_message) /* then check for posted messages */ if ((filter & QS_POSTMESSAGE) && @@ -200,7 +200,7 @@ index cfbc9e6c89b..f07b73e3ce9 100644 return; /* only check for quit messages if not posted messages pending */ -@@ -3401,7 +3415,7 @@ DECL_HANDLER(get_message) +@@ -3411,7 +3425,7 @@ DECL_HANDLER(get_message) if ((filter & QS_INPUT) && filter_contains_hw_range( req->get_first, req->get_last ) && get_hardware_message( current, req->hw_id, get_win, req->get_first, req->get_last, req->flags, reply )) @@ -209,7 +209,7 @@ index cfbc9e6c89b..f07b73e3ce9 100644 /* now check for WM_PAINT */ if ((filter & QS_PAINT) && -@@ -3414,7 +3428,7 @@ DECL_HANDLER(get_message) +@@ -3424,7 +3438,7 @@ DECL_HANDLER(get_message) reply->wparam = 0; reply->lparam = 0; get_message_defaults( queue, &reply->x, &reply->y, &reply->time ); @@ -218,7 +218,7 @@ index cfbc9e6c89b..f07b73e3ce9 100644 } /* now check for timer */ -@@ -3430,9 +3444,19 @@ DECL_HANDLER(get_message) +@@ -3440,9 +3454,19 @@ DECL_HANDLER(get_message) get_message_defaults( queue, &reply->x, &reply->y, &reply->time ); if (!(req->flags & PM_NOYIELD) && current->process->idle_event) set_event( current->process->idle_event ); @@ -239,9 +239,9 @@ index cfbc9e6c89b..f07b73e3ce9 100644 if (get_win == -1 && current->process->idle_event) set_event( current->process->idle_event ); SHARED_WRITE_BEGIN( queue_shm, queue_shm_t ) -@@ -3443,6 +3467,13 @@ DECL_HANDLER(get_message) - SHARED_WRITE_END; +@@ -3454,6 +3478,13 @@ DECL_HANDLER(get_message) + reset_queue_sync( queue ); set_error( STATUS_PENDING ); /* FIXME */ + return; + @@ -253,7 +253,7 @@ index cfbc9e6c89b..f07b73e3ce9 100644 } -@@ -3460,7 +3491,10 @@ DECL_HANDLER(reply_message) +@@ -3471,7 +3502,10 @@ DECL_HANDLER(reply_message) DECL_HANDLER(accept_hardware_message) { if (current->queue) diff --git a/staging/upstream-commit b/staging/upstream-commit index a79184cd..e771d631 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -1c586991c802a7368137ae2c0470880bb359de78 +80bc1338bea7d9dac78ab449b4505e5bb91e7ba3