dinput: Set high DIK bit for extended scancodes.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51910Signed-off-by: Rémi Bernon <rbernon@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dinput: Set high DIK bit for extended scancodes.
7c67ebfd · Rémi Bernon · Alexandre Julliard · 231542b3 · 7c67ebfd
Commit 7c67ebfd authored Oct 21, 2021 by Rémi Bernon Committed by Alexandre Julliard Oct 21, 2021
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

keyboard.c dlls/dinput/keyboard.c +6 -4

No files found.
--- a/dlls/dinput/keyboard.c
+++ b/dlls/dinput/keyboard.c
@@ -80,7 +80,8 @@ static BYTE map_dik_code(DWORD scanCode, DWORD vkCode, DWORD subType, DWORD vers
            break;
        }
    }
-    return scanCode;
+    if (scanCode & 0x100) scanCode |= 0x80;
+    return (BYTE)scanCode;
 }
 int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lparam )
@@ -89,6 +90,7 @@ int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lpa
    BYTE new_diks, subtype = GET_DIDEVICE_SUBTYPE( This->base.instance.dwDevType );
    int dik_code, ret = This->base.dwCoopLevel & DISCL_EXCLUSIVE;
    KBDLLHOOKSTRUCT *hook = (KBDLLHOOKSTRUCT *)lparam;
+    DWORD scan_code;
    if (wparam != WM_KEYDOWN && wparam != WM_KEYUP &&
        wparam != WM_SYSKEYDOWN && wparam != WM_SYSKEYUP)
@@ -105,9 +107,9 @@ int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lpa
        case VK_NUMLOCK : dik_code = DIK_NUMLOCK; break;
        case VK_SUBTRACT: dik_code = DIK_SUBTRACT; break;
        default:
-            dik_code = map_dik_code( hook->scanCode & 0xff, hook->vkCode, subtype,
+            scan_code = hook->scanCode & 0xff;
-                                     This->base.dinput->dwVersion );
+            if (hook->flags & LLKHF_EXTENDED) scan_code |= 0x100;
-            if (hook->flags & LLKHF_EXTENDED) dik_code |= 0x80;
+            dik_code = map_dik_code( scan_code, hook->vkCode, subtype, This->base.dinput->dwVersion );
    }
    new_diks = hook->flags & LLKHF_UP ? 0 : 0x80;