April 2020 - Wine-Devel - list.winehq.org

[PATCH] winex11.drv: Implement ActivateKeyboardLayout() using XKB extension.
by Dmitry Timoshkov April 10, 2020

April 10, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/winex11.drv/keyboard.c | 200 ++++++++++++++++++++++++++---------- 1 file changed, 146 insertions(+), 54 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 48da12c029..c8c6ef3478 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -867,73 +867,73 @@ static const char main_key_NL[MAIN_LEN][4] = static const struct { LCID lcid; /* input locale identifier, look for LOCALE_ILANGUAGE in the appropriate dlls/kernel/nls/.nls file */ - const char *comment; + const char *xkb_group_name; const char (*key)[MAIN_LEN][4]; const WORD (*scan)[MAIN_LEN]; /* scan codes mapping */ const WORD (*vkey)[MAIN_LEN]; /* virtual key codes mapping */ } main_key_tab[]={ - {0x0409, "United States keyboard layout", &main_key_US, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0409, "United States keyboard layout (phantom key version)", &main_key_US_phantom, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0409, "United States keyboard layout (dvorak)", &main_key_US_dvorak, &main_key_scan_dvorak, &main_key_vkey_dvorak}, - {0x0409, "United States International keyboard layout", &main_key_US_intl, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0809, "British keyboard layout", &main_key_UK, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0407, "German keyboard layout", &main_key_DE, &main_key_scan_qwerty, &main_key_vkey_qwertz}, - {0x0807, "Swiss German keyboard layout", &main_key_SG, &main_key_scan_qwerty, &main_key_vkey_qwertz}, - {0x100c, "Swiss French keyboard layout", &main_key_SF, &main_key_scan_qwerty, &main_key_vkey_qwertz}, - {0x041d, "Swedish keyboard layout", &main_key_SE, &main_key_scan_qwerty, &main_key_vkey_qwerty_v2}, - {0x0425, "Estonian keyboard layout", &main_key_ET, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0414, "Norwegian keyboard layout", &main_key_NO, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0406, "Danish keyboard layout", &main_key_DA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0409, "English (US)", &main_key_US, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0409, "English (US)", &main_key_US_phantom, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0409, "English (Dvorak)", &main_key_US_dvorak, &main_key_scan_dvorak, &main_key_vkey_dvorak}, + {0x0409, "English (US, international with dead keys)", &main_key_US_intl, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0809, "English (UK)", &main_key_UK, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0407, "German", &main_key_DE, &main_key_scan_qwerty, &main_key_vkey_qwertz}, + {0x0807, "German (Switzerland)", &main_key_SG, &main_key_scan_qwerty, &main_key_vkey_qwertz}, + {0x100c, "French (Switzerland)", &main_key_SF, &main_key_scan_qwerty, &main_key_vkey_qwertz}, + {0x041d, "Swedish", &main_key_SE, &main_key_scan_qwerty, &main_key_vkey_qwerty_v2}, + {0x0425, "Estonian", &main_key_ET, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0414, "Norwegian", &main_key_NO, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0406, "Danish", &main_key_DA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x040c, "French keyboard layout", &main_key_FR, &main_key_scan_qwerty, &main_key_vkey_azerty}, - {0x0c0c, "Canadian French keyboard layout", &main_key_CF, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0c0c, "Canadian French keyboard layout (CA_fr)", &main_key_CA_fr, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0c0c, "Canadian keyboard layout", &main_key_CA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x080c, "Belgian keyboard layout", &main_key_BE, &main_key_scan_qwerty, &main_key_vkey_azerty}, - {0x0816, "Portuguese keyboard layout", &main_key_PT, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0416, "Brazilian ABNT-2 keyboard layout", &main_key_PT_br, &main_key_scan_abnt_qwerty, &main_key_vkey_abnt_qwerty}, - {0x0416, "Brazilian ABNT-2 keyboard layout ALT GR", &main_key_PT_br_alt_gr,&main_key_scan_abnt_qwerty, &main_key_vkey_abnt_qwerty}, + {0x0c0c, "French (Canada, legacy)", &main_key_CF, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0c0c, "French (Canada)", &main_key_CA_fr, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0c0c, "English (Canada)", &main_key_CA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x080c, "Belgian", &main_key_BE, &main_key_scan_qwerty, &main_key_vkey_azerty}, + {0x0816, "Portuguese", &main_key_PT, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0416, "Portuguese (Brazil)", &main_key_PT_br, &main_key_scan_abnt_qwerty, &main_key_vkey_abnt_qwerty}, + {0x0416, "Portuguese (Brazil, eliminate dead keys)", &main_key_PT_br_alt_gr,&main_key_scan_abnt_qwerty, &main_key_vkey_abnt_qwerty}, {0x040b, "Finnish keyboard layout", &main_key_FI, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0402, "Bulgarian bds keyboard layout", &main_key_BG_bds, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0402, "Bulgarian phonetic keyboard layout", &main_key_BG_phonetic, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0423, "Belarusian keyboard layout", &main_key_BY, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0419, "Russian keyboard layout", &main_key_RU, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0419, "Russian keyboard layout (phantom key version)", &main_key_RU_phantom, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0402, "Bulgarian", &main_key_BG_bds, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0402, "Bulgarian (traditional phonetic)", &main_key_BG_phonetic, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0423, "Belarusian", &main_key_BY, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0419, "Russian", &main_key_RU, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0419, "Russian (legacy)", &main_key_RU_phantom, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x0419, "Russian keyboard layout KOI8-R", &main_key_RU_koi8r, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x0419, "Russian keyboard layout cp1251", &main_key_RU_cp1251, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0419, "Russian phonetic keyboard layout", &main_key_RU_phonetic, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0422, "Ukrainian keyboard layout KOI8-U", &main_key_UA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0422, "Ukrainian keyboard layout (standard)", &main_key_UA_std, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x0419, "Russian keyboard layout (standard)", &main_key_RU_std, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x040a, "Spanish keyboard layout", &main_key_ES, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0410, "Italian keyboard layout", &main_key_IT, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x040f, "Icelandic keyboard layout", &main_key_IS, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x040e, "Hungarian keyboard layout", &main_key_HU, &main_key_scan_qwerty, &main_key_vkey_qwertz}, - {0x0415, "Polish (programmer's) keyboard layout", &main_key_PL, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0424, "Slovenian keyboard layout", &main_key_SI, &main_key_scan_qwerty, &main_key_vkey_qwertz}, - {0x0c1a, "Serbian keyboard layout sr", &main_key_SR, &main_key_scan_qwerty, &main_key_vkey_qwerty}, /* LANG_SERBIAN,SUBLANG_SERBIAN_CYRILLIC */ + {0x0419, "Russian (phonetic)", &main_key_RU_phonetic, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0422, "Ukrainian", &main_key_UA_std, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0422, "Ukrainian keyboard layout KOI8-U", &main_key_UA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x040a, "Spanish", &main_key_ES, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0410, "Italian", &main_key_IT, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x040f, "Icelandic", &main_key_IS, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x040e, "Hungarian", &main_key_HU, &main_key_scan_qwerty, &main_key_vkey_qwertz}, + {0x0415, "Polish", &main_key_PL, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0424, "Slovenian", &main_key_SI, &main_key_scan_qwerty, &main_key_vkey_qwertz}, + {0x0c1a, "Serbian", &main_key_SR, &main_key_scan_qwerty, &main_key_vkey_qwerty}, /* LANG_SERBIAN,SUBLANG_SERBIAN_CYRILLIC */ {0x0c1a, "Serbian keyboard layout us,sr", &main_key_US_SR, &main_key_scan_qwerty, &main_key_vkey_qwerty}, /* LANG_SERBIAN,SUBLANG_SERBIAN_CYRILLIC */ - {0x041a, "Croatian keyboard layout", &main_key_HR, &main_key_scan_qwerty, &main_key_vkey_qwertz}, + {0x041a, "Croatian", &main_key_HR, &main_key_scan_qwerty, &main_key_vkey_qwertz}, {0x041a, "Croatian keyboard layout (specific)", &main_key_HR_jelly, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0411, "Japanese 106 keyboard layout", &main_key_JA_jp106, &main_key_scan_qwerty_jp106, &main_key_vkey_qwerty_jp106}, - {0x0411, "Japanese Mac keyboard layout", &main_key_JA_macjp, &main_key_scan_qwerty_jp106, &main_key_vkey_qwerty_jp106}, + {0x0411, "Japanese", &main_key_JA_jp106, &main_key_scan_qwerty_jp106, &main_key_vkey_qwerty_jp106}, + {0x0411, "Japanese (Macintosh)", &main_key_JA_macjp, &main_key_scan_qwerty_jp106, &main_key_vkey_qwerty_jp106}, {0x0411, "Japanese pc98x1 keyboard layout", &main_key_JA_pc98x1, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x041b, "Slovak keyboard layout", &main_key_SK, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x041b, "Slovak", &main_key_SK, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x041b, "Slovak and Czech keyboard layout without dead keys", &main_key_SK_prog, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0405, "Czech", &main_key_CZ, &main_key_scan_qwerty, &main_key_vkey_qwertz}, + {0x0405, "Czech (qwerty)", &main_key_CZ_qwerty, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x0405, "Czech keyboard layout", &main_key_CS, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0405, "Czech keyboard layout cz", &main_key_CZ, &main_key_scan_qwerty, &main_key_vkey_qwertz}, - {0x0405, "Czech keyboard layout cz_qwerty", &main_key_CZ_qwerty, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x040a, "Latin American keyboard layout", &main_key_LA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0427, "Lithuanian (Baltic) keyboard layout", &main_key_LT_B, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x040a, "Spanish (Latin American)", &main_key_LA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0427, "Lithuanian", &main_key_LT_B, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x041f, "Turkish", &main_key_TR, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x041f, "Turkish (F)", &main_key_TR_F, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x041f, "Turkish keyboard layout", &main_key_TK, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x041f, "Turkish keyboard layout tr", &main_key_TR, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x041f, "Turkish keyboard layout trf", &main_key_TR_F, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x040d, "Israelian keyboard layout", &main_key_IL, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x040d, "Israelian phonetic keyboard layout", &main_key_IL_phonetic, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x040d, "Hebrew", &main_key_IL, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x040d, "Hebrew (phonetic)", &main_key_IL_phonetic, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x040d, "Israelian Saharon keyboard layout", &main_key_IL_saharon, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x0409, "VNC keyboard layout", &main_key_vnc, &main_key_scan_vnc, &main_key_vkey_vnc}, - {0x0408, "Greek keyboard layout", &main_key_EL, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x041e, "Thai (Kedmanee) keyboard layout", &main_key_th, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0413, "Dutch keyboard layout", &main_key_NL, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0408, "Greek", &main_key_EL, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x041e, "Thai", &main_key_th, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0413, "Dutch", &main_key_NL, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0, NULL, NULL, NULL, NULL} /* sentinel */ }; @@ -1468,8 +1468,8 @@ X11DRV_KEYBOARD_DetectLayout( Display *display ) } } - for (current = 0; main_key_tab[current].comment; current++) { - TRACE("Attempting to match against \"%s\"\n", main_key_tab[current].comment); + for (current = 0; main_key_tab[current].xkb_group_name; current++) { + TRACE("Attempting to match against \"%s\"\n", main_key_tab[current].xkb_group_name); match = 0; mismatch = 0; score = 0; @@ -1526,9 +1526,9 @@ X11DRV_KEYBOARD_DetectLayout( Display *display ) /* we're done, report results if necessary */ if (!ismatch) WARN("Using closest match (%s) for scan/virtual codes mapping.\n", - main_key_tab[kbd_layout].comment); + main_key_tab[kbd_layout].xkb_group_name); - TRACE("detected layout is \"%s\"\n", main_key_tab[kbd_layout].comment); + TRACE("detected layout is \"%s\"\n", main_key_tab[kbd_layout].xkb_group_name); } static HKL get_locale_kbd_layout(void) @@ -1927,6 +1927,94 @@ BOOL CDECL X11DRV_UnloadKeyboardLayout(HKL hkl) return FALSE; } +#ifdef HAVE_XKB +static HKL XKB_activate_layout(HKL hkl, UINT flags) +{ + struct x11drv_thread_data *thread_data = x11drv_init_thread_data(); + Display *display = thread_init_display(); + HKL old_hkl; + XkbDescRec *xkb_desc; + XkbStateRec xkb_state; + int hkl_idx[16], hkl_count, i, j, group_count; + BOOL activated; + + TRACE("%p, %04x\n", hkl, flags); + + old_hkl = thread_data->kbd_layout; + if (!old_hkl) old_hkl = get_locale_kbd_layout(); + + hkl_count = 0; + for (i = 0; main_key_tab[i].xkb_group_name; i++) + { + if (hkl == (HKL)main_key_tab[i].lcid || LOWORD(hkl) == LOWORD(main_key_tab[i].lcid)) + { + if (hkl_count < ARRAY_SIZE(hkl_idx)) + hkl_idx[hkl_count++] = i; + } + } + + if (!hkl_count) + { + FIXME("can't find layout for %p\n", hkl); + return 0; + } + + XkbGetState(display, XkbUseCoreKbd, &xkb_state); + TRACE("current group: %d\n", xkb_state.locked_group); + + xkb_desc = XkbAllocKeyboard(); + if (xkb_desc == NULL) + return old_hkl; + + XkbGetControls(display, XkbAllControlsMask, xkb_desc); + XkbGetNames(display, XkbGroupNamesMask, xkb_desc); + + /* count groups */ + if (xkb_desc->ctrls != NULL) + group_count = xkb_desc->ctrls->num_groups; + else + { + group_count = 0; + while (group_count < XkbNumKbdGroups && xkb_desc->names->groups[group_count] != 0) + group_count++; + } + + TRACE("group count: %d\n", group_count); + + activated = FALSE; + + /* get group names */ + for (i = 0; i < group_count && !activated; i++) + { + if (xkb_desc->names->groups[i] != None) + { + char *group_name = XGetAtomName(display, xkb_desc->names->groups[i]); + if (group_name == NULL) + continue; + + TRACE("%d: %s", i, group_name); + + for (j = 0; j < hkl_count; j++) + { + if (!strcmp(group_name, main_key_tab[hkl_idx[j]].xkb_group_name)) + { + TRACE("activating %s\n", debugstr_a(group_name)); + XkbLockGroup(display, XkbUseCoreKbd, i); + activated = TRUE; + break; + } + } + + XFree(group_name); + } + } + + XkbFreeKeyboard(xkb_desc, 0, True); + + thread_data->kbd_layout = hkl; + return old_hkl; +} +#endif /*********************************************************************** * ActivateKeyboardLayout (X11DRV.@) @@ -1936,6 +2024,10 @@ HKL CDECL X11DRV_ActivateKeyboardLayout(HKL hkl, UINT flags) HKL oldHkl = 0; struct x11drv_thread_data *thread_data = x11drv_init_thread_data(); +#ifdef HAVE_XKB + return XKB_activate_layout(hkl, flags); +#endif + FIXME("%p, %04x: semi-stub!\n", hkl, flags); if (flags & KLF_SETFORPROCESS) { -- 2.25.2

1 0

[PATCH 1/3] dinput8/tests: Test injecting keyboard events.
by Brendan Shanks April 10, 2020

April 10, 2020

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/dinput8/tests/device.c | 107 ++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index f3e7b54235..a621a46229 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -742,6 +742,112 @@ static void test_mouse_keyboard(void) DestroyWindow(hwnd); } +static void test_keyboard_events(void) +{ + HRESULT hr; + HWND hwnd = INVALID_HANDLE_VALUE; + IDirectInput8A *di; + IDirectInputDevice8A *di_keyboard; + DIPROPDWORD dp; + DIDEVICEOBJECTDATA obj_data[10]; + DWORD data_size; + BYTE kbdata[256]; + + hwnd = CreateWindowExA(WS_EX_TOPMOST, "static", "dinput", WS_POPUP | WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindowExA failed\n"); + + hr = CoCreateInstance(&CLSID_DirectInput8, 0, CLSCTX_INPROC_SERVER, &IID_IDirectInput8A, (LPVOID*)&di); + if (hr == DIERR_OLDDIRECTINPUTVERSION || + hr == DIERR_BETADIRECTINPUTVERSION || + hr == REGDB_E_CLASSNOTREG) + { + win_skip("test_keyboard_events requires dinput8\n"); + return; + } + ok(SUCCEEDED(hr), "DirectInput8Create failed: %08x\n", hr); + + hr = IDirectInput8_Initialize(di, GetModuleHandleA(NULL), DIRECTINPUT_VERSION); + if (hr == DIERR_OLDDIRECTINPUTVERSION || hr == DIERR_BETADIRECTINPUTVERSION) + { + win_skip("test_keyboard_events requires dinput8\n"); + return; + } + ok(SUCCEEDED(hr), "IDirectInput8_Initialize failed: %08x\n", hr); + + hr = IDirectInput8_CreateDevice(di, &GUID_SysKeyboard, &di_keyboard, NULL); + ok(SUCCEEDED(hr), "IDirectInput8_CreateDevice failed: %08x\n", hr); + hr = IDirectInputDevice8_SetCooperativeLevel(di_keyboard, hwnd, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE); + ok(SUCCEEDED(hr), "IDirectInput8_SetCooperativeLevel failed: %08x\n", hr); + hr = IDirectInputDevice8_SetDataFormat(di_keyboard, &c_dfDIKeyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice8_SetDataFormat failed: %08x\n", hr); + dp.diph.dwSize = sizeof(DIPROPDWORD); + dp.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dp.diph.dwObj = 0; + dp.diph.dwHow = DIPH_DEVICE; + dp.dwData = ARRAY_SIZE(obj_data); + IDirectInputDevice8_SetProperty(di_keyboard, DIPROP_BUFFERSIZE, &(dp.diph)); + + hr = IDirectInputDevice8_Acquire(di_keyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice8_Acquire failed: %08x\n", hr); + + /* Test injecting keyboard events with both VK and scancode given. */ + keybd_event(VK_SPACE, DIK_SPACE, 0, 0); + flush_events(); + IDirectInputDevice8_Poll(di_keyboard); + data_size = ARRAY_SIZE(obj_data); + hr = IDirectInputDevice8_GetDeviceData(di_keyboard, sizeof(DIDEVICEOBJECTDATA), obj_data, &data_size, 0); + ok(SUCCEEDED(hr), "Failed to get data hr=%08x\n", hr); + todo_wine + ok(data_size == 1, "Expected 1 element, received %d\n", data_size); + + hr = IDirectInputDevice8_GetDeviceState(di_keyboard, sizeof(kbdata), kbdata); + ok(SUCCEEDED(hr), "IDirectInputDevice8_GetDeviceState failed: %08x\n", hr); + todo_wine + ok(kbdata[DIK_SPACE], "Expected DIK_SPACE key state down\n"); + + keybd_event(VK_SPACE, DIK_SPACE, KEYEVENTF_KEYUP, 0); + flush_events(); + IDirectInputDevice8_Poll(di_keyboard); + data_size = ARRAY_SIZE(obj_data); + hr = IDirectInputDevice8_GetDeviceData(di_keyboard, sizeof(DIDEVICEOBJECTDATA), obj_data, &data_size, 0); + ok(SUCCEEDED(hr), "Failed to get data hr=%08x\n", hr); + todo_wine + ok(data_size == 1, "Expected 1 element, received %d\n", data_size); + + /* Test injecting keyboard events with scancode=0. + * Windows DInput ignores the VK, sets scancode 0 to be pressed, and GetDeviceData returns no elements. */ + keybd_event(VK_SPACE, 0, 0, 0); + flush_events(); + IDirectInputDevice8_Poll(di_keyboard); + data_size = ARRAY_SIZE(obj_data); + hr = IDirectInputDevice8_GetDeviceData(di_keyboard, sizeof(DIDEVICEOBJECTDATA), obj_data, &data_size, 0); + ok(SUCCEEDED(hr), "Failed to get data hr=%08x\n", hr); + todo_wine + ok(data_size == 0, "Expected 0 elements, received %d\n", data_size); + + hr = IDirectInputDevice8_GetDeviceState(di_keyboard, sizeof(kbdata), kbdata); + ok(SUCCEEDED(hr), "IDirectInputDevice8_GetDeviceState failed: %08x\n", hr); + todo_wine + ok(kbdata[0], "Expected key 0 state down\n"); + + keybd_event(VK_SPACE, 0, KEYEVENTF_KEYUP, 0); + flush_events(); + IDirectInputDevice8_Poll(di_keyboard); + data_size = ARRAY_SIZE(obj_data); + hr = IDirectInputDevice8_GetDeviceData(di_keyboard, sizeof(DIDEVICEOBJECTDATA), obj_data, &data_size, 0); + ok(SUCCEEDED(hr), "Failed to get data hr=%08x\n", hr); + todo_wine + ok(data_size == 0, "Expected 0 elements, received %d\n", data_size); + + hr = IDirectInputDevice8_Unacquire(di_keyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice8_Unacquire failed: %08x\n", hr); + + IDirectInputDevice8_Release(di_keyboard); + IDirectInput8_Release(di); + + DestroyWindow(hwnd); +} + START_TEST(device) { CoInitialize(NULL); @@ -749,6 +855,7 @@ START_TEST(device) test_action_mapping(); test_save_settings(); test_mouse_keyboard(); + test_keyboard_events(); CoUninitialize(); } -- 2.24.1

3 5

[PATCH 1/4] maintainers: Add Paul Gofman to the Staging branch section.
by Zebediah Figura April 10, 2020

April 10, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 93e89193b7..82f434af2b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -313,5 +313,6 @@ W: https://wiki.winehq.org/StableRules Staging Branch M: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> P: Zebediah Figura <z.figura12(a)gmail.com> +P: Paul Gofman <gofmanp(a)gmail.com> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> W: https://wine-staging.com/ -- 2.26.0

1 3

[PATCH v4 1/3] user32: Rename the "hid_device" structure to "device".
by Zebediah Figura April 9, 2020

April 9, 2020

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v4: Attempt to split up the patch somewhat. dlls/user32/rawinput.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 85ff0c5e809..54d836b22b2 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(rawinput); -struct hid_device +struct device { WCHAR *path; HANDLE file; @@ -47,7 +47,7 @@ struct hid_device PHIDP_PREPARSED_DATA data; }; -static struct hid_device *hid_devices; +static struct device *hid_devices; static unsigned int hid_devices_count, hid_devices_max; static CRITICAL_SECTION hid_devices_cs; @@ -86,10 +86,10 @@ static BOOL array_reserve(void **elements, unsigned int *capacity, unsigned int return TRUE; } -static struct hid_device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) +static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) { SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail; - struct hid_device *device; + struct device *device; HANDLE file; WCHAR *path; DWORD size; @@ -147,7 +147,7 @@ static void find_hid_devices(void) static ULONGLONG last_check; SP_DEVICE_INTERFACE_DATA iface = { sizeof(iface) }; - struct hid_device *device; + struct device *device; HIDD_ATTRIBUTES attr; HIDP_CAPS caps; GUID hid_guid; @@ -398,7 +398,7 @@ UINT WINAPI GetRawInputDeviceInfoA(HANDLE device, UINT command, void *data, UINT /*********************************************************************** * GetRawInputDeviceInfoW (USER32.@) */ -UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT *data_size) +UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT *data_size) { /* FIXME: Most of this is made up. */ static const WCHAR keyboard_name[] = {'\\','\\','?','\\','W','I','N','E','_','K','E','Y','B','O','A','R','D',0}; @@ -407,12 +407,12 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT static const RID_DEVICE_INFO_MOUSE mouse_info = {1, 5, 0, FALSE}; RID_DEVICE_INFO info; - struct hid_device *hid_device = device; + struct device *device = handle; const void *to_copy; UINT to_copy_bytes, avail_bytes; - TRACE("device %p, command %#x, data %p, data_size %p.\n", - device, command, data, data_size); + TRACE("handle %p, command %#x, data %p, data_size %p.\n", + handle, command, data, data_size); if (!data_size) return ~0U; @@ -427,20 +427,20 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT case RIDI_DEVICENAME: /* for RIDI_DEVICENAME, data_size is in characters, not bytes */ avail_bytes = *data_size * sizeof(WCHAR); - if (device == WINE_MOUSE_HANDLE) + if (handle == WINE_MOUSE_HANDLE) { *data_size = ARRAY_SIZE(mouse_name); to_copy = mouse_name; } - else if (device == WINE_KEYBOARD_HANDLE) + else if (handle == WINE_KEYBOARD_HANDLE) { *data_size = ARRAY_SIZE(keyboard_name); to_copy = keyboard_name; } else { - *data_size = strlenW(hid_device->path) + 1; - to_copy = hid_device->path; + *data_size = strlenW(device->path) + 1; + to_copy = device->path; } to_copy_bytes = *data_size * sizeof(WCHAR); break; @@ -448,12 +448,12 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT case RIDI_DEVICEINFO: avail_bytes = *data_size; info.cbSize = sizeof(info); - if (device == WINE_MOUSE_HANDLE) + if (handle == WINE_MOUSE_HANDLE) { info.dwType = RIM_TYPEMOUSE; info.u.mouse = mouse_info; } - else if (device == WINE_KEYBOARD_HANDLE) + else if (handle == WINE_KEYBOARD_HANDLE) { info.dwType = RIM_TYPEKEYBOARD; info.u.keyboard = keyboard_info; @@ -461,7 +461,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT else { info.dwType = RIM_TYPEHID; - info.u.hid = hid_device->info; + info.u.hid = device->info; } to_copy_bytes = sizeof(info); *data_size = to_copy_bytes; @@ -470,8 +470,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT case RIDI_PREPARSEDDATA: avail_bytes = *data_size; - if (device == WINE_MOUSE_HANDLE || - device == WINE_KEYBOARD_HANDLE) + if (handle == WINE_MOUSE_HANDLE || handle == WINE_KEYBOARD_HANDLE) { to_copy_bytes = 0; *data_size = 0; @@ -479,9 +478,9 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT } else { - to_copy_bytes = ((WINE_HIDP_PREPARSED_DATA*)hid_device->data)->dwSize; + to_copy_bytes = ((WINE_HIDP_PREPARSED_DATA*)device->data)->dwSize; *data_size = to_copy_bytes; - to_copy = hid_device->data; + to_copy = device->data; } break; -- 2.26.0

2 4

[PATCH 5/5] ntdll: Directly use server_select in send_debug_event.
by Jacek Caban April 9, 2020

April 9, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/exception.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 4/5] ntdll: Directly use server_select in wait_suspend.
by Jacek Caban April 9, 2020

April 9, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/exception.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)

1 0

[PATCH 3/5] ntdll: Use server_select in RtlWaitOnAddress.
by Jacek Caban April 9, 2020

April 9, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/ntdll_misc.h | 4 ++- dlls/ntdll/server.c | 14 ++++------ dlls/ntdll/sync.c | 59 +++++++++-------------------------------- 3 files changed, 20 insertions(+), 57 deletions(-)

1 0

[PATCH 2/5] ntdll: Factor out server_select.
by Jacek Caban April 9, 2020

April 9, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/critsection.c | 2 +- dlls/ntdll/exception.c | 4 +-- dlls/ntdll/ntdll_misc.h | 4 +-- dlls/ntdll/server.c | 71 ++++++++++++++++++++++++++-------------- dlls/ntdll/sync.c | 10 +++--- 5 files changed, 56 insertions(+), 35 deletions(-)

1 0

[PATCH 1/5] server: Introduce a separated type for user APCs.
by Jacek Caban April 9, 2020

April 9, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This is a resend on top of recent git. I think the series is good to have on its own, but, to give more context, it's also a preparation for improving CPU context transfers between client and server. With my WIP patches, select can optionally send and receive a context, eliminating need for separated get_suspend_context and set_suspend_context and reducing SIGUSR1 handling overhead. We can also change exception event handling to use the same mechanism, leading to nice server simplification. The above is not strictly needed for other changes, but server simplification makes them much easier. I changed context to be a server object, so that get_thread_context can use proper wait instead of polling for suspend. This reliably fixes bug 48052 and probably bug 45546 (at least in cases when it's really Wine bug). dlls/ntdll/server.c | 34 ++++++++++++++++++++++++---------- dlls/ntdll/thread.c | 10 +++++----- server/async.c | 10 +++++----- server/protocol.def | 6 ++++++ server/timer.c | 8 ++++---- server/trace.c | 12 ++++++------ 6 files changed, 50 insertions(+), 30 deletions(-)

1 0

[PATCH v2] include : Add dvdif.idl
by Vijay Kiran Kamuju April 9, 2020

April 9, 2020

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 2