commit b9e4b5a28ca6178d5988dc63e098c523015b5bab
author Alexandre Julliard <julliard@winehq.org> Mon Feb 28 21:37:09 2011 +0100
committer Alexandre Julliard <julliard@winehq.org> Mon Feb 28 21:37:09 2011 +0100
tree 0846baa654770bb8fb49e24e1ed09c62d9006319
parent c7089361b2e565f3c0a48c53627aef2a7180549c

server: Fill the key state in mouse events from the server-side state.

server/queue.c

diff --git a/server/queue.c b/server/queue.c
index 281c8bc..690687e 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -1280,11 +1280,23 @@
     unsigned int msg_code;
     struct hardware_msg_data *data = msg->data;
 
-    if (msg->msg == WM_MOUSEMOVE) set_cursor_pos( desktop, data->x, data->y );
-    data->x = desktop->cursor_x;
-    data->y = desktop->cursor_y;
     update_input_key_state( desktop->keystate, msg );
     last_input_time = get_tick_count();
+
+    if (!is_keyboard_msg( msg ))
+    {
+        if (msg->msg == WM_MOUSEMOVE) set_cursor_pos( desktop, data->x, data->y );
+        if (desktop->keystate[VK_LBUTTON] & 0x80)  msg->wparam |= MK_LBUTTON;
+        if (desktop->keystate[VK_MBUTTON] & 0x80)  msg->wparam |= MK_MBUTTON;
+        if (desktop->keystate[VK_RBUTTON] & 0x80)  msg->wparam |= MK_RBUTTON;
+        if (desktop->keystate[VK_SHIFT] & 0x80)    msg->wparam |= MK_SHIFT;
+        if (desktop->keystate[VK_CONTROL] & 0x80)  msg->wparam |= MK_CONTROL;
+        if (desktop->keystate[VK_XBUTTON1] & 0x80) msg->wparam |= MK_XBUTTON1;
+        if (desktop->keystate[VK_XBUTTON2] & 0x80) msg->wparam |= MK_XBUTTON2;
+    }
+    data->x = desktop->cursor_x;
+    data->y = desktop->cursor_y;
+
     win = find_hardware_message_window( input, msg, &msg_code );
     if (!win || !(thread = get_window_thread(win)))
     {