Changeset 3631

Timestamp:

May 29, 2000, 11:30:17 PM (25 years ago)

Author:

mike

Message:

Discard messages received multiple times.

Location:

trunk

Files:

• changelog (modified) (3 diffs)
• src/dinput/dinput.cpp (modified) (2 diffs)

trunk/changelog

@@ -1 @@
- /* $Id: changelog,v 1.964 2000-05-28 19:50:13 sandervl Exp $ */
+ /* $Id: changelog,v 1.965 2000-05-29 21:30:14 mike Exp $ */
 
  2000-05-28: Michal Necasek <mike@mendelu.cz>
-    - USER32:   MapVirtualKeyA fix for game Commandos (not complete)
+    - DINPUT:   Discard messages received multiple times. Fixes keyboard
+                in Fallout 1/2.
 
  2000-05-28: Sander van Leeuwen <sandervl@xs4all.nl>
     - SHELL32:  Merged ShellExecuteA/W of latest Wine release (old version
                 did not return process handle)
-    - KERNEL32/USER32: 
+    - KERNEL32/USER32:
                 Rewrote and cleaned up resource handling. FindResource(Ex)
                 now returns IMAGE_RESOURCE_DATA_ENTRY pointer.
@@ -58 +59 @@
                 FindResource(Ex)A/W: if resource not found, then try:
                        - resource with user default language
-                       - resource with system default language 
+                       - resource with system default language
                        - first available resource (any language)
                 (TODO: Need to check what NT really does)
@@ -78 +79 @@
                 redrawing of toolbar window in mIRC32) in SetWindowPos &
                 ShowWindow
-    - KERNEL32: Partly implemented GetDiskFreeSpaceExA/W; need to add support  
+    - KERNEL32: Partly implemented GetDiskFreeSpaceExA/W; need to add support
                 for 64 bits values!
 

trunk/src/dinput/dinput.cpp

@@ -1 @@
-/* $Id: dinput.cpp,v 1.6 2000-05-09 18:58:40 sandervl Exp $ */
+/* $Id: dinput.cpp,v 1.7 2000-05-29 21:30:17 mike Exp $ */
 /*              DirectInput
  *
@@ -626 +626 @@
    SysKeyboardAImpl* This = (SysKeyboardAImpl*) current_keylock;
    BYTE  scan = (lParam >> 16) & 0xFF;
+
+   /* messages may arrive mustiple times; we need to check for duplicates */
+   static HWND   oldhwnd = NULL;
+   static UINT   oldmsg  = 0;
+   static WPARAM oldwParam = 0;
+   static LPARAM oldlParam = 0;
+
+   if ((hwnd == oldhwnd) && (msg == oldmsg) && (wParam == oldwParam) && (lParam == oldlParam)) {
+      // we already saw this message
+      return TRUE;
+   }
+   oldhwnd = hwnd; oldmsg = msg; oldwParam = wParam; oldlParam = lParam;
 
    // fake a key up transition for typematic repeat