Changeset 8347 for trunk/src/user32/oslibmsgtranslate.cpp

Timestamp:

Apr 30, 2002, 4:54:07 PM (23 years ago)

Author:

sandervl

Message:

Implemented WH_MOUSE_LL hook; removed DInput hack for keyboard & mouse message translation

File:

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

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.84 2002-03-28 11:25:59 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.85 2002-04-30 14:54:06 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -37 +37 @@
 #include <winscan.h>
 #include <winkeyboard.h>
+#include "hook.h"
 
 #define DBG_LOCALLOG    DBG_oslibmsgtranslate
@@ -341 +342 @@
         }
         EnableLogging();
-        if((fMsgRemoved == MSG_REMOVE) && ISMOUSE_CAPTURED())
-        {
-            if(DInputMouseHandler(win32wnd->getWindowHandle(), winMsg->message, winMsg->pt.x, winMsg->pt.y)) {
-                goto dummymessage; //dinput swallowed message
-            }
-        }
 
         if(fWasDisabled) {
@@ -385 +380 @@
         EnableLogging();
 
+        if(fMsgRemoved == MSG_REMOVE)
+        {
+            MSLLHOOKSTRUCT hook;
+
+            hook.pt.x        = os2Msg->ptl.x & 0xFFFF;
+            hook.pt.y        = mapScreenY(os2Msg->ptl.y);
+            hook.mouseData   = 0;  //todo: XBUTTON1/2 (XP feature) or wheel data
+            hook.flags       = 0;  //todo: injected (LLMHF_INJECTED)
+            hook.time        = winMsg->time;
+            hook.dwExtraInfo = 0;
+
+            if(HOOK_CallHooksW( WH_MOUSE_LL, HC_ACTION, winMsg->message, (LPARAM)&hook)) {
+                goto dummymessage; //hook swallowed message
+            }
+        }
         break;
     }
@@ -453 +463 @@
         }
         EnableLogging();
-        if((fMsgRemoved == MSG_REMOVE) && ISMOUSE_CAPTURED())
-        {
-            if(DInputMouseHandler(win32wnd->getWindowHandle(), winMsg->message, winMsg->pt.x, winMsg->pt.y)) {
-                goto dummymessage; //dinput swallowed message
-            }
-        }
         if(fWasDisabled) {
-                if(win32wnd) {
-                    winMsg->hwnd = win32wnd->getWindowHandle();
-                }
-                else {
-                    goto dummymessage; //don't send mouse messages to disabled windows
-                }
-        }
-        //OS/2 Window coordinates -> Win32 Window coordinates
+            if(win32wnd) {
+                winMsg->hwnd = win32wnd->getWindowHandle();
+            }
+            else {
+                goto dummymessage; //don't send mouse messages to disabled windows
+            }
+        }
+        if(fMsgRemoved == MSG_REMOVE)
+        {
+            MSLLHOOKSTRUCT hook;
+
+            hook.pt.x        = os2Msg->ptl.x & 0xFFFF;
+            hook.pt.y        = mapScreenY(os2Msg->ptl.y);
+            hook.mouseData   = 0;
+            hook.flags       = 0;  //todo: injected (LLMHF_INJECTED)
+            hook.time        = winMsg->time;
+            hook.dwExtraInfo = 0;
+
+            if(HOOK_CallHooksW( WH_MOUSE_LL, HC_ACTION, winMsg->message, (LPARAM)&hook)) {
+                goto dummymessage; //hook swallowed message
+            }
+        }
         break;
     }
 
     case WM_CONTROL:
-      goto dummymessage;
+        goto dummymessage;
 
     case WM_COMMAND:
@@ -742 +760 @@
         }
 
-        if (ISKDB_CAPTURED())
-        {
-            if (DInputKeyBoardHandler(winMsg)) {
-                goto dummymessage; //dinput swallowed message
-            }
-        }
-
 #ifdef ALTGR_HACK
         // it's a PMSCAN_ALTRIGHT WM_CHAR message?