Changeset 10284 for trunk/src/user32/inituser32.cpp

Timestamp:

Oct 22, 2003, 2:43:14 PM (22 years ago)

Author:

sandervl

Message:

Use WC_FRAME for the Odin frame window and subclass it; Updates for new keyboard hook

File:

• trunk/src/user32/inituser32.cpp (modified) (5 diffs)

trunk/src/user32/inituser32.cpp

@@ -1 @@
-/* $Id: inituser32.cpp,v 1.15 2003-10-20 17:18:30 sandervl Exp $ */
+/* $Id: inituser32.cpp,v 1.16 2003-10-22 12:43:13 sandervl Exp $ */
 /*
  * USER32 DLL entry point
@@ -42 +42 @@
 #include <spy.h>
 #include <monitor.h>
+#include <kbdhook.h>
 #include "pmwindow.h"
 #include "win32wdesktop.h"
@@ -70 +71 @@
 extern INT __cdecl wsnprintfA(LPSTR,UINT,LPCSTR,...);
 
-/**************************************************************/
-/* 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.  */
-/**************************************************************/
-static char PMKBDHK_MODULE[16] = "PMKBDHK";
-#define PMKBDHK_HOOK_INIT "hookInit"
-#define PMKBDHK_HOOK_TERM "hookKill"
+static char PMKBDHK_MODULE[16] = STD_PMKBDHK_MODULE;
 
 static BOOL pmkbdhk_installed = FALSE;
 static HMODULE hmodPMKBDHK;
 
-static PVOID (*APIENTRY pfnHookInit)(HAB);
-static BOOL  (*APIENTRY pfnHookTerm)(void);
+static PFN_HOOKINIT pfnHookInit = NULL;
+static PFN_HOOKTERM pfnHookTerm = NULL;
 
 // defined initialized in pmwindow.cpp: InitPM()
@@ -94 +88 @@
    strcpy(PMKBDHK_MODULE, pszKbdDllName);
 }
-
+//******************************************************************************
+//******************************************************************************
+void pmkbdhk_initialize(HAB _hab)
+{
+  APIRET rc;
+
+  if ((pmkbdhk_installed == FALSE) && PMKBDHK_MODULE[0])
+  {
+    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
+    if(pfnHookInit(_hab, WIN32_STDCLASS) == FALSE) DebugInt3();
+
+    // 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 = FALSE;
+  }
+
+  // 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;
+    }
+  }
+}
+//******************************************************************************
 #define FONTSDIRECTORY "Fonts"
 #define REGPATH "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts"
-
-//******************************************************************************
 //******************************************************************************
 void MigrateWindowsFonts()
@@ -145 +218 @@
   }
 }
-
-//******************************************************************************
-//******************************************************************************
-void pmkbdhk_initialize(HAB _hab)
-{
-  APIRET rc;
-
-  if ((pmkbdhk_installed == FALSE) && PMKBDHK_MODULE[0])
-  {
-    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 = FALSE;
-  }
-
-  // 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   */