From af81d9bb4709f8c03a72c6c70e47dea5f2d8f879 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Fri, 11 Dec 2020 12:58:51 +0100 Subject: [PATCH] Fixed keyboard layout detection for windows --- libfreerdp/locale/keyboard.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libfreerdp/locale/keyboard.c b/libfreerdp/locale/keyboard.c index de202d11a..9891662e5 100644 --- a/libfreerdp/locale/keyboard.c +++ b/libfreerdp/locale/keyboard.c @@ -47,6 +47,10 @@ DWORD X11_KEYCODE_TO_VIRTUAL_SCANCODE[256]; int freerdp_detect_keyboard(DWORD* keyboardLayoutId) { +#if defined(_WIN32) + *keyboardLayoutId = (DWORD)GetKeyboardLayout(0) & 0x0000FFFF; +#endif + #ifdef WITH_X11 if (*keyboardLayoutId == 0) freerdp_detect_keyboard_layout_from_xkb(keyboardLayoutId);