Changeset 8801 for trunk/src

Timestamp:

Jun 28, 2002, 9:45:45 PM (23 years ago)

Author:

sandervl

Message:

Only call ProcessKbdHook from PeekMessage if PM_REMOVE flag is set (otherwise the hook will be called twice)

File:

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

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.57 2002-06-15 17:38:23 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.58 2002-06-28 19:45:45 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -411 +411 @@
         // call the keyboard hook here
         // send keyboard messages to the registered hooks
-        switch (pMsg->message)
-        {
-          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;
+        if(fRemove & PM_REMOVE_W) {
+            switch (pMsg->message)
+            {
+            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;
+            }
         }
     
@@ -493 +495 @@
 
     // send keyboard messages to the registered hooks
-    switch (pMsg->message)
-    {
-    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;
+    if(fRemove & PM_REMOVE_W) {
+        switch (pMsg->message)
+        {
+        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;
+        }
     }