commit 242e395bbc1fe9e0b574bea5ac959fedfa2854fa
author Alexandre Julliard <julliard@winehq.org> Wed Jan 08 00:27:58 2003 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Jan 08 00:27:58 2003 +0000
tree 3d051d7bbcaec98780670bd2652fe76b48a13f4d
parent ae4311c71c76fa9b8da70febd4d12c821ce9f9dc

Store the hardware messages in the thread input structure, not in the
thread queue. Get rid of the cooked messages queue.

windows/message.c

diff --git a/windows/message.c b/windows/message.c
index c3f76ec..a59724b 100644
--- a/windows/message.c
+++ b/windows/message.c
@@ -107,11 +107,12 @@
  *
  * store a hardware message in the thread queue
  */
-static void queue_hardware_message( MSG *msg, ULONG_PTR extra_info, enum message_type type )
+#if 0
+static void queue_hardware_message( MSG *msg, ULONG_PTR extra_info )
 {
     SERVER_START_REQ( send_message )
     {
-        req->type   = type;
+        req->type   = MSG_HARDWARE;
         req->id     = GetWindowThreadProcessId( msg->hwnd, NULL );
         req->win    = msg->hwnd;
         req->msg    = msg->message;
@@ -126,6 +127,7 @@
     }
     SERVER_END_REQ;
 }
+#endif
 
 
 /***********************************************************************
@@ -274,7 +276,7 @@
                 msg.lParam |= 0x01000000;
 
             msg.pt.x = msg.pt.y = 0;
-            queue_hardware_message( &msg, 0, MSG_HARDWARE_RAW );
+            queue_hardware_message( &msg, 0 );
         }
         else if ((tmpMsg.message>= WM_MOUSEFIRST) && (tmpMsg.message <= WM_MOUSELAST))
         {
@@ -311,7 +313,7 @@
 
             msg.pt.x = tmpMsg.paramL;
             msg.pt.y = tmpMsg.paramH;
-            queue_hardware_message( &msg, 0, MSG_HARDWARE_RAW );
+            queue_hardware_message( &msg, 0 );
         }
         HOOK_CallHooks( WH_JOURNALPLAYBACK, HC_SKIP, 0, (LPARAM)&tmpMsg, TRUE );
     }
@@ -399,7 +401,7 @@
  *
  * returns TRUE if the contents of 'msg' should be passed to the application
  */
-static BOOL process_raw_mouse_message( MSG *msg, ULONG_PTR extra_info )
+static BOOL process_raw_mouse_message( MSG *msg, ULONG_PTR extra_info, BOOL remove )
 {
     static MSG clk_msg;
 
@@ -407,6 +409,7 @@
     INT hittest;
     EVENTMSG event;
     GUITHREADINFO info;
+    HWND hWndScope = msg->hwnd;
 
     /* find the window to dispatch this mouse message to */
 
@@ -416,8 +419,6 @@
     {
         /* If no capture HWND, find window which contains the mouse position.
          * Also find the position of the cursor hot spot (hittest) */
-        HWND hWndScope = (HWND)extra_info;
-
         if (!IsWindow(hWndScope)) hWndScope = 0;
         if (!(msg->hwnd = WINPOS_WindowFromPoint( hWndScope, msg->pt, &hittest )))
             msg->hwnd = GetDesktopWindow();
@@ -436,7 +437,7 @@
         (msg->message == WM_RBUTTONDOWN) ||
         (msg->message == WM_MBUTTONDOWN))
     {
-        BOOL update = TRUE;
+        BOOL update = remove;
         /* translate double clicks -
 	 * note that ...MOUSEMOVEs can slip in between
 	 * ...BUTTONDOWN and ...BUTTONDBLCLK messages */
@@ -452,8 +453,11 @@
                (abs(msg->pt.y - clk_msg.pt.y) < GetSystemMetrics(SM_CYDOUBLECLK)/2))
            {
                msg->message += (WM_LBUTTONDBLCLK - WM_LBUTTONDOWN);
-               clk_msg.message = 0;
-               update = FALSE;
+               if (remove)
+               {
+                   clk_msg.message = 0;
+                   update = FALSE;
+               }
            }
         }
         /* update static double click conditions */
@@ -602,26 +606,14 @@
     }
     else if (is_mouse_message( msg->message ))
     {
-        if (!process_raw_mouse_message( msg, extra_info )) return FALSE;
+        if (!process_raw_mouse_message( msg, extra_info, remove )) return FALSE;
     }
     else
     {
         ERR( "unknown message type %x\n", msg->message );
         return FALSE;
     }
-
-    /* check destination thread and filters */
-    if (!check_message_filter( msg, hwnd_filter, first, last ) ||
-        !WIN_IsCurrentThread( msg->hwnd ))
-    {
-        /* queue it for later, or for another thread */
-        queue_hardware_message( msg, extra_info, MSG_HARDWARE_COOKED );
-        return FALSE;
-    }
-
-    /* save the message in the cooked queue if we didn't want to remove it */
-    if (!remove) queue_hardware_message( msg, extra_info, MSG_HARDWARE_COOKED );
-    return TRUE;
+    return check_message_filter( msg, hwnd_filter, first, last );
 }