Changeset 7155 for trunk/src

Timestamp:

Oct 23, 2001, 1:17:18 AM (24 years ago)

Author:

phaller

Message:

added PM hook

Location:

trunk/src

Files:

• pmkbdhk (added)
• pmkbdhk/makefile (added)
• pmkbdhk/pmkbdhk.cpp (added)
• pmkbdhk/pmkbdhk.def (added)
• pmkbdhk/pmkbdhkp.h (added)
• user32/HOOK.CPP (modified) (2 diffs)
• user32/inituser32.cpp (modified) (6 diffs)
• user32/oslibmsgtranslate.cpp (modified) (3 diffs)

trunk/src/user32/HOOK.CPP

@@ -1 @@
-/* $Id: HOOK.CPP,v 1.26 2001-10-22 17:00:58 phaller Exp $ */
+/* $Id: HOOK.CPP,v 1.27 2001-10-22 23:14:32 phaller Exp $ */
 
 /*
@@ -825 +825 @@
   
   // check if alt is currently pressed
-  BOOL fAltDown = GetKeyState(VK_LMENU);
+  // Note: ALT seems to stick sometimes
+  // BOOL fAltDown = GetKeyState(VK_LMENU);
+  BOOL fAltDown = GetAsyncKeyState(VK_LMENU);
   
   kbhs.vkCode      = msg->wParam;

trunk/src/user32/inituser32.cpp

@@ -1 @@
-/* $Id: inituser32.cpp,v 1.5 2001-09-05 13:53:50 bird Exp $ */
+/* $Id: inituser32.cpp,v 1.6 2001-10-22 23:13:58 phaller Exp $ */
 /*
  * USER32 DLL entry point
@@ -28 +28 @@
 #define  INCL_DOSSEMAPHORES
 #define  INCL_DOSMISC
+#define  INCL_DOSERRORS
 #include <os2wrap.h>    //Odin32 OS/2 api wrappers
 #include <stdlib.h>
@@ -64 +65 @@
 DWORD hInstanceUser32 = 0;
 
+
+/**************************************************************/
+/* Try to load the Presentation Manager Keyboard Hook module. */
+/* If this fails, some hotkeys may not arrive properly at the */
+/* targetted window, but no more harmful things will happen.  */
+/**************************************************************/
+#define PMKBDHK_MODULE "PMKBDHK"
+#define PMKBDHK_HOOK_INIT "hookInit"
+#define PMKBDHK_HOOK_TERM "hookKill"
+
+static BOOL pmkbdhk_installed = FALSE;
+static HMODULE hmodPMKBDHK;
+
+static PVOID (*APIENTRY pfnHookInit)(HAB);
+static BOOL  (*APIENTRY pfnHookTerm)(void);
+
+// defined initialized in pmwindow.cpp: InitPM()
+extern HAB hab;
+
+void pmkbdhk_initialize(HAB _hab)
+{
+  APIRET rc;
+  
+  if (pmkbdhk_installed == FALSE)
+  {
+    CHAR szBuf[260];
+    
+    // load the DLL
+    rc = DosLoadModule(szBuf,
+                       sizeof(szBuf),
+                       PMKBDHK_MODULE,
+                       &hmodPMKBDHK);
+    if (NO_ERROR != rc)
+    {
+      dprintf(("USER32: pmkbdhk_initalize(%08xh) failed rc=%d\n",
+               _hab,
+               rc));
+      
+      return;
+    }
+    
+    // get the entry points
+    rc = DosQueryProcAddr(hmodPMKBDHK,
+                          0,
+                          PMKBDHK_HOOK_INIT,
+                          (PFN*)&pfnHookInit);
+    if (NO_ERROR == rc)
+      rc = DosQueryProcAddr(hmodPMKBDHK,
+                            0,
+                            PMKBDHK_HOOK_TERM,
+                            (PFN*)&pfnHookTerm);
+    
+    if (NO_ERROR != rc)
+    {
+      dprintf(("USER32: pmkbdhk_initalize(%08xh) failed importing functions, rc=%d\n",
+               _hab,
+               rc));
+      
+      // free the DLL again
+      DosFreeModule(hmodPMKBDHK);
+      hmodPMKBDHK = NULLHANDLE;
+      
+      return;
+    }
+    
+    // now finally call the initializer function
+    pfnHookInit(_hab);
+    
+    // OK, hook is armed
+    pmkbdhk_installed = TRUE;
+  }
+}
+
+void pmkbdhk_terminate(void)
+{
+  if (pmkbdhk_installed == TRUE)
+  {
+    // call the terminator function
+    pfnHookTerm();
+    
+    // OK, hook is disarmed
+    pmkbdhk_installed = TRUE;
+  }
+  
+  // unload the dll
+  if (NULLHANDLE != hmodPMKBDHK)
+  {
+    APIRET rc = DosFreeModule(hmodPMKBDHK);
+    if (NO_ERROR != rc)
+    {
+      dprintf(("USER32: pmkbdhk_terminate() failed rc=%d\n",
+               rc));
+    
+      hmodPMKBDHK = NULLHANDLE;
+    }
+  }
+}
+
+
 /****************************************************************************/
 /* _DLL_InitTerm is the function that gets called by the operating system   */
@@ -103 +203 @@
 
          //SvL: Init win32 PM classes
-         if(InitPM() == FALSE) {
-                return 0UL;
-         }
+         //PH:  initializes HAB!
+         if (FALSE == InitPM())
+           return 0UL;
+     
+         // try to install the keyboard hook
+         pmkbdhk_initialize(hab);
 
          //SvL: 18-7-'98, Register system window classes (button, listbox etc etc)
@@ -114 +217 @@
          MONITOR_Initialize(&MONITOR_PrimaryMonitor);
 
-         break;
-      case 1 :
+       break;
+     
+     
+       case 1 :
          if(hInstanceUser32) {
             UnregisterLxDll(hInstanceUser32);
@@ -132 +237 @@
 void APIENTRY cleanupUser32(ULONG ulReason)
 {
-   dprintf(("user32 exit\n"));
+  dprintf(("user32 exit\n"));
+  
+  // try to unistall the keyboard hook
+  pmkbdhk_terminate();
+
 //SvL: Causes PM hangs on some (a lot?) machines. Reason unknown.
 ////   RestoreCursor();

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.60 2001-09-17 13:31:29 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.61 2001-10-22 23:14:32 phaller Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -33 +33 @@
 #include "oslibwin.h"
 #include "winmouse.h"
+#include <pmkbdhk.h>
 
 #define DBG_LOCALLOG    DBG_oslibmsgtranslate
@@ -600 +601 @@
         break;
     }
+      
+    case WM_CHAR_SPECIAL:
+        // @@@PH
+        // special char message from the keyboard hook
+        dprintf(("PM: WM_CHAR_SPECIAL\n"));
+        // NO BREAK! FALLTHRU CASE!
+      
     case WM_CHAR:
     {