[PATCH 0/2] MR3043: server: Fix hardware message filter check for non-mouse messages.

[PATCH 1/2] server: Pass the message code to get_hardware_msg_bit.

[Rémi Bernon]

From: Rémi Bernon

---
 server/queue.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/server/queue.c b/server/queue.c
index 1e2647aac27..c3c3d595d00 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -574,12 +574,12 @@ static inline int filter_contains_hw_range( unsigned int first, unsigned int las
 }

/* get the QS_* bit corresponding to a given hardware message */
-static inline int get_hardware_msg_bit( struct message *msg )
+static inline int get_hardware_msg_bit( unsigned int message )
 {
-    if (msg->msg == WM_INPUT_DEVICE_CHANGE || msg->msg == WM_INPUT) return QS_RAWINPUT;
-    if (msg->msg == WM_MOUSEMOVE || msg->msg == WM_NCMOUSEMOVE) return QS_MOUSEMOVE;
-    if (msg->msg >= WM_KEYFIRST && msg->msg <= WM_KEYLAST) return QS_KEY;
-    if (msg->msg == WM_WINE_CLIPCURSOR) return QS_RAWINPUT;
+    if (message == WM_INPUT_DEVICE_CHANGE || message == WM_INPUT) return QS_RAWINPUT;
+    if (message == WM_MOUSEMOVE || message == WM_NCMOUSEMOVE) return QS_MOUSEMOVE;
+    if (message >= WM_KEYFIRST && message <= WM_KEYLAST) return QS_KEY;
+    if (message == WM_WINE_CLIPCURSOR) return QS_RAWINPUT;
     return QS_MOUSEBUTTON;
 }

@@ -1494,10 +1494,10 @@ static void release_hardware_message( struct msg_queue *queue, unsigned int hw_i
     if (&msg->entry == &input->msg_list) return;  /* not found */

/* clear the queue bit for that message */
-    clr_bit = get_hardware_msg_bit( msg );
+    clr_bit = get_hardware_msg_bit( msg->msg );
     LIST_FOR_EACH_ENTRY( other, &input->msg_list, struct message, entry )
     {
-        if (other != msg && get_hardware_msg_bit( other ) == clr_bit)
+        if (other != msg && get_hardware_msg_bit( other->msg ) == clr_bit)
         {
             clr_bit = 0;
             break;
@@ -1556,7 +1556,7 @@ static user_handle_t find_hardware_message_window( struct desktop *desktop, stru

*thread = NULL;
     *msg_code = msg->msg;
-    switch (get_hardware_msg_bit( msg ))
+    switch (get_hardware_msg_bit( msg->msg ))
     {
     case QS_RAWINPUT:
         if (!(win = msg->win) && input) win = input->focus;
@@ -1620,7 +1620,7 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg
     last_input_time = get_tick_count();
     if (msg->msg != WM_MOUSEMOVE) always_queue = 1;

-    switch (get_hardware_msg_bit( msg ))
+    switch (get_hardware_msg_bit( msg->msg ))
     {
     case QS_KEY:
         if (queue_hotkey_message( desktop, msg )) return;
@@ -1669,7 +1669,7 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg
     {
         msg->unique_id = 0;  /* will be set once we return it to the app */
         list_add_tail( &input->msg_list, &msg->entry );
-        set_queue_bits( thread->queue, get_hardware_msg_bit(msg) );
+        set_queue_bits( thread->queue, get_hardware_msg_bit( msg->msg ) );
     }
     release_object( thread );
 }
@@ -2195,7 +2195,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user
             if (win_thread->queue->input == input)
             {
                 /* wake the other thread */
-                set_queue_bits( win_thread->queue, get_hardware_msg_bit(msg) );
+                set_queue_bits( win_thread->queue, get_hardware_msg_bit( msg->msg ) );
                 got_one = 1;
             }
             else
@@ -2214,7 +2214,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user
          * match the filter we skip it */
         if (got_one || !check_hw_message_filter( win, msg_code, filter_win, first, last ))
         {
-            clear_bits &= ~get_hardware_msg_bit( msg );
+            clear_bits &= ~get_hardware_msg_bit( msg->msg );
             continue;
         }

@@ -2238,7 +2238,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user

data->hw_id = msg->unique_id;
         set_reply_data( msg->data, msg->data_size );
-        if (get_hardware_msg_bit( msg ) == QS_RAWINPUT && (flags & PM_REMOVE))
+        if (get_hardware_msg_bit( msg->msg ) == QS_RAWINPUT && (flags & PM_REMOVE))
             release_hardware_message( current->queue, data->hw_id );
         return 1;
     }

[PATCH 2/2] server: Use hardware message category when checking filter.

[Rémi Bernon]

From: Rémi Bernon

---
 server/queue.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/server/queue.c b/server/queue.c
index c3c3d595d00..57067dd6f51 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -2114,19 +2114,19 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_
 static int check_hw_message_filter( user_handle_t win, unsigned int msg_code,
                                     user_handle_t filter_win, unsigned int first, unsigned int last )
 {
-    if (msg_code >= WM_KEYFIRST && msg_code <= WM_KEYLAST)
+    switch (get_hardware_msg_bit( msg_code ))
     {
+    case QS_KEY:
         /* we can only test the window for a keyboard message since the
          * dest window for a mouse message depends on hittest */
         if (filter_win && win != filter_win && !is_child_window( filter_win, win ))
             return 0;
         /* the message code is final for a keyboard message, we can simply check it */
         return check_msg_filter( msg_code, first, last );
-    }
-    else  /* mouse message */
-    {
-        /* we need to check all possible values that the message can have in the end */

+    case QS_MOUSEMOVE:
+    case QS_MOUSEBUTTON:
+        /* we need to check all possible values that the message can have in the end */
         if (check_msg_filter( msg_code, first, last )) return 1;
         if (msg_code == WM_MOUSEWHEEL) return 0;  /* no other possible value for this one */

@@ -2141,6 +2141,9 @@ static int check_hw_message_filter( user_handle_t win, unsigned int msg_code,
             if (check_msg_filter( msg_code + (WM_NCLBUTTONDBLCLK - WM_LBUTTONDOWN), first, last )) return 1;
         }
         return 0;
+
+    default:
+        return check_msg_filter( msg_code, first, last );
     }
 }