Changeset 6859

Timestamp:

Sep 28, 2001, 4:08:17 PM (24 years ago)

Author:

phaller

Message:

.

Location:

trunk

Files:

• changelog (modified) (1 diff)
• include/win/hook.h (modified) (2 diffs)
• include/win/winuser.h (modified) (2 diffs)
• src/user32/HOOK.CPP (modified) (2 diffs)

trunk/changelog

@@ -1 @@
-/* $Id: changelog,v 1.1703 2001-09-28 07:51:55 phaller Exp $ */
+/* $Id: changelog,v 1.1704 2001-09-28 14:08:02 phaller Exp $ */
+
+ 2001-09-28: Patrick Haller <patrick.haller@innotek.de>
+    - USER32:   o added experimental support for WH_KEYBOARD_LL hook
 
  2001-09-28: Sander van Leeuwen <sandervl@xs4all.nl>

trunk/include/win/hook.h

@@ -1 @@
-/* $Id: hook.h,v 1.3 2000-02-29 19:09:25 sandervl Exp $ */
+/* $Id: hook.h,v 1.4 2001-09-28 14:06:39 phaller Exp $ */
 
 /*
@@ -30 +30 @@
 
 extern BOOL ProcessKbdHook(LPMSG msg, BOOL remove );
+extern BOOL ProcessKbdHookLL(LPMSG msg, BOOL remove );
 
 #endif  /* __WINE_HOOK_H */

trunk/include/win/winuser.h

@@ -82 +82 @@
     INT       code;
 } DEBUGHOOKINFO, *LPDEBUGHOOKINFO;
+
+/*
+ * Low level hook flags
+ */
+#define LLKHF_EXTENDED       0x00000001
+#define LLKHF_INJECTED       0x00000010
+#define LLKHF_ALTDOWN        0x00000020
+#define LLKHF_UP             0x00000080
+
+#define LLMHF_INJECTED       0x00000001
+
+/*
+ * Structure used by WH_KEYBOARD_LL
+ */
+typedef struct tagKBDLLHOOKSTRUCT {
+    DWORD   vkCode;
+    DWORD   scanCode;
+    DWORD   flags;
+    DWORD   time;
+    DWORD   dwExtraInfo;
+} KBDLLHOOKSTRUCT, *LPKBDLLHOOKSTRUCT, *PKBDLLHOOKSTRUCT;
+
+/*
+ * Structure used by WH_MOUSE_LL
+ */
+typedef struct tagMSLLHOOKSTRUCT {
+    POINT   pt;
+    DWORD   mouseData;
+    DWORD   flags;
+    DWORD   time;
+    DWORD   dwExtraInfo;
+} MSLLHOOKSTRUCT, *LPMSLLHOOKSTRUCT, *PMSLLHOOKSTRUCT;
+
 
 #define HKL_PREV   0
@@ -234 +267 @@
 #define WPF_SETMINPOSITION      0x0001
 #define WPF_RESTORETOMAXIMIZED  0x0002
+
 
 /***** Dialogs *****/

trunk/src/user32/HOOK.CPP

@@ -1 @@
-/* $Id: HOOK.CPP,v 1.23 2001-09-19 15:39:47 sandervl Exp $ */
+/* $Id: HOOK.CPP,v 1.24 2001-09-28 14:08:17 phaller Exp $ */
 
 /*
@@ -805 +805 @@
                              ? TRUE : FALSE);
 }
+
+
+
+/***
+ * ProcessKbdHookLL
+ * this is a low-level version of the keyboard hook
+ * present under NT/2000/XP.
+ * It is supposed to be called for any keyboard event of the
+ * system-input queue AFAIK.
+ */
+BOOL ProcessKbdHookLL(LPMSG msg, BOOL remove )
+{
+  // @@@PH
+  // format KBDLLHOOKSTRUCT and pass it in as msg->lParam
+  KBDLLHOOKSTRUCT kbhs;
+  
+  // check if alt is currently pressed
+  BOOL fAltDown = GetKeyState(VK_LMENU);
+  
+  kbhs.vkCode      = msg->wParam;
+  kbhs.scanCode    = ( (msg->lParam & 0x00ff0000) >> 16);
+  kbhs.flags       = ( (msg->lParam & (1 << 24)) ? LLKHF_EXTENDED : 0 ) |
+                     // LLKHF_INJECTED currently not supported (SendInput)
+                     fAltDown ? LLKHF_ALTDOWN : 0 |
+                     ( (msg->lParam & (1 << 31)) ? LLKHF_UP : 0);
+  kbhs.time        = msg->time;
+  kbhs.dwExtraInfo = 0; // @@@PH not supported?
+  
+  return (HOOK_CallHooksA(WH_KEYBOARD_LL,
+                          remove ? HC_ACTION : HC_NOREMOVE,
+                          msg->message,
+                          (LPARAM)&kbhs )
+                          ? TRUE : FALSE);
+}