Changeset 8347 for trunk/src

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

Location:

trunk/src/user32

Files:

• USER32.DEF (modified) (3 diffs)
• oslibmsgtranslate.cpp (modified) (6 diffs)
• user32dbg.def (modified) (3 diffs)
• winmouse.cpp (modified) (3 diffs)
• winmouse.h (modified) (2 diffs)

trunk/src/user32/USER32.DEF

@@ -1 @@
-; $Id: USER32.DEF,v 1.71 2002-03-08 11:09:15 sandervl Exp $
+; $Id: USER32.DEF,v 1.72 2002-04-30 14:54:05 sandervl Exp $
 
 LIBRARY USER32 INITINSTANCE TERMINSTANCE
@@ -678 +678 @@
     _OS2ToWin32Handle@4                                          @2012 NONAME
 
-    _MOUSE_Enable@4                                              @2007 NONAME
 ;;    _KeyTranslatePMToWin@4                                       @2008 NONAME
     _KeyTranslatePMToWinBuf@12                                   @2009 NONAME
@@ -685 +684 @@
 ;Export for MSACM32
     _wsnprintfA                                                  @2100 NONAME
-
-    _KEYBOARD_Enable@4                                           @2011 NONAME
 
     ;SvL: Used by GDI32

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?

trunk/src/user32/user32dbg.def

@@ -1 @@
-; $Id: user32dbg.def,v 1.4 2002-03-08 11:09:15 sandervl Exp $
+; $Id: user32dbg.def,v 1.5 2002-04-30 14:54:06 sandervl Exp $
 
 LIBRARY USER32 INITINSTANCE TERMINSTANCE
@@ -677 +677 @@
     _OS2ToWin32Handle@4                                          @2012 NONAME
 
-    _MOUSE_Enable@4                                              @2007 NONAME
 ;;    _KeyTranslatePMToWin@4                                       @2008 NONAME
     _KeyTranslatePMToWinBuf@12                                   @2009 NONAME
@@ -684 +683 @@
 ;Export for MSACM32
     _wsnprintfA                                                  @2100 NONAME
-
-    _KEYBOARD_Enable@4                                           @2011 NONAME
 
     ;SvL: Used by GDI32

trunk/src/user32/winmouse.cpp

@@ -1 @@
-/* $Id: winmouse.cpp,v 1.22 2002-02-11 16:06:00 sandervl Exp $ */
+/* $Id: winmouse.cpp,v 1.23 2002-04-30 14:54:06 sandervl Exp $ */
 /*
  * Win32 mouse functions
@@ -49 +49 @@
  ****************************************************************************/
 
-LPMOUSE_EVENT_PROC mouseHandler = NULL;
-WNDPROC            keyboardHandler = NULL;
-
-
-//******************************************************************************
-//******************************************************************************
-VOID WIN32API MOUSE_Enable(LPMOUSE_EVENT_PROC lpMouseEventProc)
-{
-  if(lpMouseEventProc == (LPMOUSE_EVENT_PROC)-1)
-    mouseHandler = NULL;
-  else  
-    mouseHandler = lpMouseEventProc;
-}
-//******************************************************************************
-//******************************************************************************
-VOID WIN32API KEYBOARD_Enable(WNDPROC handler)
-{
-  keyboardHandler = handler;
-}
-//******************************************************************************
-//******************************************************************************
-BOOL DInputKeyBoardHandler(MSG *msg)
-{
-  if(!ISKDB_CAPTURED())
-        return FALSE;
-
-  return keyboardHandler(msg->hwnd, msg->message, msg->wParam, msg->lParam);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL DInputMouseHandler(HWND hwnd, ULONG msg, ULONG x, ULONG y)
-{
- WINE_MOUSEEVENT mouseEvent;
- DWORD dwFlags = MOUSEEVENTF_ABSOLUTE;
-
-  if(!ISMOUSE_CAPTURED())
-        return FALSE;
-
-  mouseEvent.magic = WINE_MOUSEEVENT_MAGIC;
-  mouseEvent.hWnd  = hwnd;
-  mouseEvent.time  = OSLibWinQueryMsgTime();
-  mouseEvent.keyState = 0; //not used in dinput right now
-  switch(msg) 
-  {
-  case WM_NCLBUTTONDOWN:
-  case WM_LBUTTONDOWN:
-        dwFlags |= MOUSEEVENTF_LEFTDOWN;
-        break;
-  case WM_NCLBUTTONUP:
-  case WM_LBUTTONUP:
-        dwFlags |= MOUSEEVENTF_LEFTUP;
-        break;
-  case WM_NCRBUTTONUP:
-  case WM_RBUTTONUP:
-        dwFlags |= MOUSEEVENTF_RIGHTUP;
-        break;
-  case WM_NCRBUTTONDOWN:
-  case WM_RBUTTONDOWN:
-        dwFlags |= MOUSEEVENTF_RIGHTDOWN;
-        break;
-  case WM_NCMBUTTONUP:
-  case WM_MBUTTONUP:
-        dwFlags |= MOUSEEVENTF_MIDDLEUP;
-        break;
-  case WM_NCMBUTTONDOWN:
-  case WM_MBUTTONDOWN:
-        dwFlags |= MOUSEEVENTF_MIDDLEDOWN;
-        break;
-  case WM_MOUSEMOVE:
-  case WM_NCMOUSEMOVE:
-        dwFlags |= MOUSEEVENTF_MOVE;
-        break;
-  default:
-        //TODO: handle double clicks???
-        return FALSE;
-  }
-
-  x = (((long)x << 16) + ScreenWidth-1)  / ScreenWidth;
-  y = (((long)y << 16) + ScreenHeight-1) / ScreenHeight;
-
-  return mouseHandler(dwFlags, x, y, 0, (DWORD)&mouseEvent);
-}
 //******************************************************************************
 //******************************************************************************
@@ -290 +208 @@
  * Remark    :
  * Status    : UNTESTED STUB
+ *             TODO: call hooks!!
  *
  * Author    : Patrick Haller [Thu, 1998/02/26 11:55]

trunk/src/user32/winmouse.h

@@ -1 @@
-/* $Id: winmouse.h,v 1.7 2000-03-09 21:50:11 sandervl Exp $ */
+/* $Id: winmouse.h,v 1.8 2002-04-30 14:54:07 sandervl Exp $ */
 /*
  * Mouse handler for DINPUT
@@ -12 +12 @@
 #define __WINMOUSE_H__
 
-extern LPMOUSE_EVENT_PROC mouseHandler;
-extern WNDPROC            keyboardHandler;
-
-#define ISMOUSE_CAPTURED()      (mouseHandler!=NULL)
-#define ISKDB_CAPTURED()        (keyboardHandler!=0)
-
-BOOL DInputMouseHandler(HWND hwnd, ULONG msg, ULONG x, ULONG y);
-BOOL DInputKeyBoardHandler(MSG *msg);
-
 #endif //__WINMOUSE_H__