Changeset 2948 for trunk/src

Timestamp:

Feb 29, 2000, 8:16:12 PM (25 years ago)

Author:

sandervl

Message:

kdb hook change

Location:

trunk/src/user32

Files:

• HOOK.CPP (modified) (2 diffs)
• oslibmsg.cpp (modified) (4 diffs)
• win32wbase.cpp (modified) (2 diffs)

trunk/src/user32/HOOK.CPP

@@ -1 @@
-/* $Id: HOOK.CPP,v 1.11 2000-02-16 14:34:02 sandervl Exp $ */
+/* $Id: HOOK.CPP,v 1.12 2000-02-29 19:16:11 sandervl Exp $ */
 
 /*
@@ -697 +697 @@
 }
 
+
+BOOL ProcessKbdHook(LPMSG msg, BOOL remove )
+{
+    return (HOOK_CallHooksA( WH_KEYBOARD, remove ? HC_ACTION : HC_NOREMOVE,
+                             LOWORD (msg->wParam), msg->lParam )
+                             ? TRUE : FALSE);
+}

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.28 2000-02-16 14:34:26 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.29 2000-02-29 19:16:11 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -32 +32 @@
 #include "pmwindow.h"
 #include "oslibwin.h"
+#include <win\hook.h>
 
 #define DBG_LOCALLOG    DBG_oslibmsg
@@ -248 +249 @@
   OS2ToWinMsgTranslate((PVOID)thdb, &os2msg, pMsg, isUnicode, MSG_REMOVE);
   memcpy(MsgThreadPtr, &os2msg, sizeof(QMSG));
+
+  if(pMsg->message <= WINWM_KEYLAST && pMsg->message >= WINWM_KEYDOWN)
+  {
+        if(ProcessKbdHook(pMsg, TRUE))
+                goto continuegetmsg;
+  }
   return rc;
 }
@@ -315 +322 @@
         memcpy(MsgThreadPtr, &os2msg, sizeof(QMSG));
   }
+
+  if(pMsg->message <= WINWM_KEYLAST && pMsg->message >= WINWM_KEYDOWN)
+  {
+        if(ProcessKbdHook(pMsg, fRemove))
+                goto continuepeekmsg;
+  }
+
   return rc;
 }

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.169 2000-02-24 19:19:08 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.170 2000-02-29 19:16:12 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2569 +2569 @@
 {
  HWND hwndActive;
- Win32BaseWindow  *win32wnd;
- ULONG         magic;
 
     dprintf(("SetActiveWindow %x", getWindowHandle()));
-    hwndActive = OSLibWinSetActiveWindow(OS2HwndFrame);
-    win32wnd = (Win32BaseWindow *)OSLibWinGetWindowULong(hwndActive, OFFSET_WIN32WNDPTR);
-    magic    = OSLibWinGetWindowULong(hwndActive, OFFSET_WIN32PM_MAGIC);
-    if(CheckMagicDword(magic) && win32wnd)
-    {
-        return win32wnd->getWindowHandle();
-    }
-    return windowDesktop->getWindowHandle(); //pretend the desktop was active
+    if(OSLibWinSetActiveWindow(OS2HwndFrame) == FALSE) {
+        dprintf(("OSLibWinSetActiveWindow %x returned FALSE!", OS2HwndFrame));
+    }
+    hwndActive = GetActiveWindow();
+    return (hwndActive) ? hwndActive : windowDesktop->getWindowHandle(); //pretend the desktop was active
 }
 //******************************************************************************