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

Timestamp:

Sep 11, 2003, 2:57:53 PM (22 years ago)

Author:

sandervl

Message:

check if keyboard hook dll must be loaded

File:

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

trunk/src/user32/inituser32.cpp

@@ -1 @@
-/* $Id: inituser32.cpp,v 1.11 2002-04-07 14:36:59 sandervl Exp $ */
+/* $Id: inituser32.cpp,v 1.12 2003-09-11 12:57:53 sandervl Exp $ */
 /*
  * USER32 DLL entry point
@@ -97 +97 @@
 {
   APIRET rc;
-  
-  if (pmkbdhk_installed == FALSE)
+
+  if (pmkbdhk_installed == FALSE && PMKBDHK_MODULE[0])
   {
     CHAR szBuf[260];
-    
+
     // load the DLL
     rc = DosLoadModule(szBuf,
@@ -112 +112 @@
                _hab,
                rc));
-      
+
       return;
     }
-    
+
     // get the entry points
     rc = DosQueryProcAddr(hmodPMKBDHK,
@@ -126 +126 @@
                             PMKBDHK_HOOK_TERM,
                             (PFN*)&pfnHookTerm);
-    
+
     if (NO_ERROR != rc)
     {
@@ -132 +132 @@
                _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;
@@ -155 +155 @@
     // call the terminator function
     pfnHookTerm();
-    
+
     // OK, hook is disarmed
-    pmkbdhk_installed = TRUE;
+    pmkbdhk_installed = FALSE;
   }
-  
+
   // unload the dll
   if (NULLHANDLE != hmodPMKBDHK)
@@ -168 +168 @@
       dprintf(("USER32: pmkbdhk_terminate() failed rc=%d\n",
                rc));
-    
+
       hmodPMKBDHK = NULLHANDLE;
     }
@@ -215 +215 @@
          if (FALSE == InitPM())
            return 0UL;
-     
+
          // try to install the keyboard hook
          pmkbdhk_initialize(hab);
@@ -229 +229 @@
 
          break;
-     
-     
+
+
        case 1 :
          if(hInstanceUser32) {
@@ -250 +250 @@
 {
   dprintf(("user32 exit\n"));
-  
+
   // try to unistall the keyboard hook
   pmkbdhk_terminate();