Changeset 10505 for trunk/src

Timestamp:

Mar 11, 2004, 2:42:00 PM (21 years ago)

Author:

sandervl

Message:

More WH_MOUSE changes

File:

• trunk/src/user32/oslibmsgtranslate.cpp (modified) (7 diffs)

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.120 2004-03-10 09:21:09 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.121 2004-03-11 13:42:00 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -482 +482 @@
         {
             MSLLHOOKSTRUCT hook;
-            MOUSEHOOKSTRUCT mousehk;
             ULONG          msg;
 
@@ -503 +502 @@
 
             // First the low-level mouse hook
-            hook.pt.x        = os2Msg->ptl.x & 0xFFFF;
-            hook.pt.y        = mapScreenY(os2Msg->ptl.y);
+            hook.pt          = winMsg->pt;
             hook.mouseData   = 0;  //todo: XBUTTON1/2 (XP feature) or wheel data
             hook.flags       = 0;  //todo: injected (LLMHF_INJECTED)
@@ -513 +511 @@
                 goto dummymessage; //hook swallowed message
             }
-
-            // Now inform the WH_MOUSE hook
-            mousehk.pt           = hook.pt;
-            mousehk.hwnd         = winMsg->hwnd;
-            mousehk.wHitTestCode = win32wnd->getLastHitTestVal();
-            mousehk.dwExtraInfo  = 0;
-
-            if(HOOK_CallHooksW( WH_MOUSE_W, HC_ACTION, msg, (LPARAM)&mousehk)) {
-                goto dummymessage; //hook swallowed message
-            }
+        }
+        MOUSEHOOKSTRUCT mousehk;
+
+        // Now inform the WH_MOUSE hook
+        mousehk.pt           = winMsg->pt;
+        mousehk.hwnd         = winMsg->hwnd;
+        mousehk.wHitTestCode = win32wnd->getLastHitTestVal();
+        mousehk.dwExtraInfo  = 0;
+
+        if(HOOK_CallHooksW( WH_MOUSE_W, (fMsgRemoved == MSG_REMOVE) ? HC_ACTION : HC_NOREMOVE, winMsg->message, (LPARAM)&mousehk)) {
+            //TODO: WH_CBT HCBT_CLICKSKIPPED
+            goto dummymessage; //hook swallowed message
         }
         break;
@@ -600 +600 @@
             }
         }
+        MSLLHOOKSTRUCT hook;
         if(fMsgRemoved == MSG_REMOVE)
         {
-            MSLLHOOKSTRUCT hook;
-
-            hook.pt.x        = os2Msg->ptl.x & 0xFFFF;
-            hook.pt.y        = mapScreenY(os2Msg->ptl.y);
+            hook.pt          = winMsg->pt;
             hook.mouseData   = 0;
             hook.flags       = 0;  //todo: injected (LLMHF_INJECTED)
@@ -614 +612 @@
                 goto dummymessage; //hook swallowed message
             }
+        }
+        MOUSEHOOKSTRUCT mousehk;
+
+        // Now inform the WH_MOUSE hook
+        mousehk.pt           = winMsg->pt;
+        mousehk.hwnd         = winMsg->hwnd;
+        mousehk.wHitTestCode = win32wnd->getLastHitTestVal();
+        mousehk.dwExtraInfo  = 0;
+
+        if(HOOK_CallHooksW( WH_MOUSE_W, (fMsgRemoved == MSG_REMOVE) ? HC_ACTION : HC_NOREMOVE, winMsg->message, (LPARAM)&mousehk)) 
+        {
+            goto dummymessage; //hook swallowed message
         }
         break;
@@ -1041 +1051 @@
             {
                     MSLLHOOKSTRUCT hook;
+                    MOUSEHOOKSTRUCT mousehk;
 
                     hook.pt.x       = os2Msg->ptl.x & 0xFFFF;