Changeset 7212 for trunk/src/user32/oslibmsg.cpp

Timestamp:

Oct 26, 2001, 12:04:13 PM (24 years ago)

Author:

phaller

Message:

.

File:

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

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.47 2001-10-26 09:10:12 phaller Exp $ */
+/* $Id: oslibmsg.cpp,v 1.48 2001-10-26 10:03:34 phaller Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -248 +248 @@
         // if this is a keyup or keydown message, we've got to
         // call the keyboard hook here
-        if(pMsg->message <= WINWM_KEYLAST && pMsg->message >= WINWM_KEYDOWN)
+        // send keyboard messages to the registered hooks
+        switch (pMsg->message)
         {
-          ProcessKbdHook(pMsg, TRUE);
+          case WINWM_KEYDOWN:
+          case WINWM_KEYUP:
+          case WINWM_SYSKEYDOWN:
+          case WINWM_SYSKEYUP:
+            // only supposed to be called upon WM_KEYDOWN
+            // and WM_KEYUP according to docs.
+            if(ProcessKbdHook(pMsg, TRUE))
+              goto continuegetmsg;
+            break;
         }
     
@@ -300 +309 @@
   
   // send keyboard messages to the registered hooks
-  if(pMsg->message <= WINWM_KEYLAST && pMsg->message >= WINWM_KEYDOWN)
+  switch (pMsg->message)
   {
-    // only supposed to be called upon WM_KEYDOWN
-    // and WM_KEYUP according to docs.
-    if(ProcessKbdHook(pMsg, TRUE))
-      goto continuegetmsg;
-  }
+    case WINWM_KEYDOWN:
+    case WINWM_KEYUP:
+    case WINWM_SYSKEYDOWN:
+    case WINWM_SYSKEYUP:
+      // only supposed to be called upon WM_KEYDOWN
+      // and WM_KEYUP according to docs.
+      if(ProcessKbdHook(pMsg, TRUE))
+        goto continuegetmsg;
+      break;
+  }
+  
   return rc;
 }
@@ -374 +389 @@
         // if this is a keyup or keydown message, we've got to
         // call the keyboard hook here
-        if(pMsg->message <= WINWM_KEYLAST && pMsg->message >= WINWM_KEYDOWN)
+        // send keyboard messages to the registered hooks
+        switch (pMsg->message)
         {
-          ProcessKbdHook(pMsg, fRemove);
-        }
+          case WINWM_KEYDOWN:
+          case WINWM_KEYUP:
+          case WINWM_SYSKEYDOWN:
+          case WINWM_SYSKEYUP:
+            // only supposed to be called upon WM_KEYDOWN
+            // and WM_KEYUP according to docs.
+            if(ProcessKbdHook(pMsg, fRemove))
+              goto continuepeekmsg;
+            break;
+        }
+    
         return TRUE;
   }
@@ -419 +444 @@
 
   // send keyboard messages to the registered hooks
-  if(pMsg->message <= WINWM_KEYLAST && pMsg->message >= WINWM_KEYDOWN)
+  switch (pMsg->message)
   {
-    // only supposed to be called upon WM_KEYDOWN
-    // and WM_KEYUP according to docs.
-    if(ProcessKbdHook(pMsg, fRemove))
-      goto continuepeekmsg;
+    case WINWM_KEYDOWN:
+    case WINWM_KEYUP:
+    case WINWM_SYSKEYDOWN:
+    case WINWM_SYSKEYUP:
+      // only supposed to be called upon WM_KEYDOWN
+      // and WM_KEYUP according to docs.
+      if(ProcessKbdHook(pMsg, fRemove))
+        goto continuepeekmsg;
+      break;
   }