August 2018 - Wine-Commits - list.winehq.org

Jacek Caban : server: Use pipe_end state in FSCTL_PIPE_DISCONNECT implementation.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: a03d0a8eae7d5694e10d767597c2f9ce4c5ee4ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=a03d0a8eae7d5694e10d7675… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 17 17:40:55 2018 +0200 server: Use pipe_end state in FSCTL_PIPE_DISCONNECT implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index bb4ea3b..80a56ae 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1011,31 +1011,26 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as return 1; case FSCTL_PIPE_DISCONNECT: - switch(server->state) + switch(server->pipe_end.state) { - case ps_connected_server: - assert( server->pipe_end.connection ); - + case FILE_PIPE_CONNECTED_STATE: /* dump the client connection - all data is lost */ + assert( server->pipe_end.connection ); release_object( server->pipe_end.connection->pipe ); server->pipe_end.connection->pipe = NULL; - - pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_DISCONNECTED ); - set_server_state( server, ps_wait_connect ); break; - case ps_wait_disconnect: - assert( !server->pipe_end.connection ); - pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_DISCONNECTED ); - set_server_state( server, ps_wait_connect ); + case FILE_PIPE_CLOSING_STATE: break; - case ps_idle_server: - case ps_wait_open: + case FILE_PIPE_LISTENING_STATE: set_error( STATUS_PIPE_LISTENING ); return 0; - case ps_wait_connect: + case FILE_PIPE_DISCONNECTED_STATE: set_error( STATUS_PIPE_DISCONNECTED ); return 0; } + + pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_DISCONNECTED ); + set_server_state( server, ps_wait_connect ); return 1; default:

1 0

Nikolay Sivov : wmp: Improve media items handling.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: cd1c681ee71332e18081730ce7f8794fedb55f5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd1c681ee71332e18081730c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 17 18:05:16 2018 +0300 wmp: Improve media items handling. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/player.c | 98 +++++++++++++++++++++++++------------------------- dlls/wmp/tests/media.c | 77 +++++++++++++++++++++++++++++++++++++++ dlls/wmp/wmp_private.h | 20 +++++++++-- 3 files changed, 144 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cd1c681ee71332e18081…

1 0

Michael Stefaniuc : msvcp60: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: 30905781aa586726bd2b92e553433dacfc2a60d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30905781aa586726bd2b92e5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Aug 16 20:19:27 2018 +0200 msvcp60: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 518c8da..079c4fa 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -2906,10 +2906,10 @@ FILE* __cdecl _Fiopen_wchar(const wchar_t *name, int mode, int prot) TRACE("(%s %d %d)\n", debugstr_w(name), mode, prot); - for(mode_idx=0; mode_idx<sizeof(str_mode)/sizeof(str_mode[0]); mode_idx++) + for(mode_idx=0; mode_idx<ARRAY_SIZE(str_mode); mode_idx++) if(str_mode[mode_idx].mode == real_mode) break; - if(mode_idx == sizeof(str_mode)/sizeof(str_mode[0])) + if(mode_idx == ARRAY_SIZE(str_mode)) return NULL; if((mode & OPENMODE__Nocreate) && !(f = _wfopen(name, rW)))

1 0

Akihiro Sagawa : dinput/tests: Use GET_DIDEVICE_SUBTYPE macro in keyboard type tests.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: 75a2893fca830dd93f506486b26abc07dde06d9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=75a2893fca830dd93f506486… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Aug 17 17:14:51 2018 +0900 dinput/tests: Use GET_DIDEVICE_SUBTYPE macro in keyboard type tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/keyboard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 5542680..535f0bd 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -273,9 +273,9 @@ static void test_capabilities(IDirectInputA *pDI, HWND hwnd) ok (SUCCEEDED(hr), "GetCapabilities failed: 0x%08x\n", hr); ok (caps.dwFlags & DIDC_ATTACHED, "GetCapabilities dwFlags: 0x%08x\n", caps.dwFlags); - ok (LOWORD(LOBYTE(caps.dwDevType)) == DIDEVTYPE_KEYBOARD, + ok (GET_DIDEVICE_TYPE(caps.dwDevType) == DIDEVTYPE_KEYBOARD, "GetCapabilities invalid device type for dwDevType: 0x%08x\n", caps.dwDevType); - ok (LOWORD(HIBYTE(caps.dwDevType)) != DIDEVTYPEKEYBOARD_UNKNOWN, + ok (GET_DIDEVICE_SUBTYPE(caps.dwDevType) != DIDEVTYPEKEYBOARD_UNKNOWN, "GetCapabilities invalid device subtype for dwDevType: 0x%08x\n", caps.dwDevType); IUnknown_Release(pKeyboard);

1 0

Akihiro Sagawa : dinput/tests: Peek messages for the target window only.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: b735a42f1cc440154e394ab5b74d394d018a5623 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b735a42f1cc440154e394ab5… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Aug 17 17:14:56 2018 +0900 dinput/tests: Peek messages for the target window only. This fixes "keyboard.c:365: Tests skipped: failed to queue keyboard event" message on my Win10 PC (real hardware). Since some thread messages and window messages, including IME related, are observed on the thread, they sometimes confuse the message handler. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/keyboard.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 8b29089..151c691 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -374,18 +374,12 @@ static void test_dik_codes(IDirectInputA *dI, HWND hwnd, LANGID langid) n = SendInput(1, &in, sizeof(in)); ok(n == 1, "got %u\n", n); - if (!PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) - { - win_skip("failed to queue keyboard event\n"); - break; - } - ok(msg.message == WM_KEYDOWN || broken(msg.message != WM_KEYDOWN), "expected WM_KEYDOWN, got %04x\n", msg.message); - /* this never happens on real hardware but tesbot VMs seem to have timing issues */ - if (msg.message != WM_KEYDOWN) + if (!PeekMessageA(&msg, hwnd, 0, 0, PM_REMOVE)) { win_skip("failed to queue keyboard event\n"); break; } + ok(msg.message == WM_KEYDOWN, "expected WM_KEYDOWN, got %04x\n", msg.message); DispatchMessageA(&msg); trace("keydown wParam: %#lx (%c) lParam: %#lx, MapVirtualKey(MAPVK_VK_TO_CHAR) = %c\n",

1 0

Jacek Caban : winegcc: Improve heuristics for -m32/ -m64 options in get_lib_dir.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: ce4dde3e9af31f896d34251ec2f47a08363893db URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce4dde3e9af31f896d34251e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 17 16:58:15 2018 +0200 winegcc: Improve heuristics for -m32/-m64 options in get_lib_dir. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 47 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 12 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 931ac53..b586c04 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -448,8 +448,12 @@ static char *get_lib_dir( struct options *opts ) { static const char *stdlibpath[] = { LIBDIR, "/usr/lib", "/usr/local/lib", "/lib" }; static const char libwine[] = "/libwine.so"; + const char *bit_suffix, *other_bit_suffix; unsigned int i; + bit_suffix = opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64 ? "64" : "32"; + other_bit_suffix = opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64 ? "32" : "64"; + for (i = 0; i < sizeof(stdlibpath)/sizeof(stdlibpath[0]); i++) { char *p, *buffer = xmalloc( strlen(stdlibpath[i]) + strlen("/arm-linux-gnueabi") + strlen(libwine) + 1 ); @@ -464,18 +468,9 @@ static char *get_lib_dir( struct options *opts ) strcpy( p, libwine ); if (check_platform( opts, buffer )) goto found; } - if (opts->target_cpu != CPU_x86_64 && opts->target_cpu != CPU_ARM64) - { - strcpy( p, "32" ); - strcat( p, libwine ); - if (check_platform( opts, buffer )) goto found; - } - if (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64) - { - strcpy( p, "64" ); - strcat( p, libwine ); - if (check_platform( opts, buffer )) goto found; - } + strcpy( p, bit_suffix ); + strcat( p, libwine ); + if (check_platform( opts, buffer )) goto found; switch(opts->target_cpu) { case CPU_x86: strcpy( p, "/i386-linux-gnu" ); break; @@ -488,6 +483,34 @@ static char *get_lib_dir( struct options *opts ) } strcat( p, libwine ); if (check_platform( opts, buffer )) goto found; + + strcpy( buffer, stdlibpath[i] ); + p = buffer + strlen(buffer); + while (p > buffer && p[-1] == '/') p--; + strcpy( p, libwine ); + + /* try to fixup each parent dirs named lib, lib32 or lib64 with target bitness suffix */ + while (p > buffer) + { + p--; + while (p > buffer && *p != '/') p--; + if (*p != '/') break; + if (memcmp( p + 1, "lib", 3 )) continue; + if (p[4] == '/') + { + memmove( p + 6, p + 4, strlen( p + 4 ) + 1 ); + memcpy( p + 4, bit_suffix, 2 ); + if (check_platform( opts, buffer )) goto found; + memmove( p + 4, p + 6, strlen( p + 6 ) + 1 ); + } + else if (!memcmp( p + 4, other_bit_suffix, 2 ) && p[6] == '/') + { + memcpy( p + 4, bit_suffix, 2 ); + if (check_platform( opts, buffer )) goto found; + memcpy( p + 4, other_bit_suffix, 2 ); + } + } + free( buffer ); continue;

1 0

Akihiro Sagawa : dinput: Return DIDEVTYPEKEYBOARD_JAPAN106 subtype when it is used.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: 8001dda1172dc0cff3da600d3f327f59f647f722 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8001dda1172dc0cff3da600d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Aug 17 17:14:54 2018 +0900 dinput: Return DIDEVTYPEKEYBOARD_JAPAN106 subtype when it is used. For the further improvments, subtype is a member of SysKeyboardImpl structure. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/keyboard.c | 43 +++++++++++++++++++++++++++++++------------ dlls/dinput/tests/keyboard.c | 2 +- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 8a59ce0..c11cd59 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -48,6 +48,7 @@ struct SysKeyboardImpl { struct IDirectInputDeviceImpl base; BYTE DInputKeyState[WINE_DINPUT_KEYBOARD_MAX_KEYS]; + DWORD subtype; }; static inline SysKeyboardImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface) @@ -121,7 +122,24 @@ const GUID DInput_Wine_Keyboard_GUID = { /* 0ab8648a-7735-11d2-8c73-71df54a96441 0x0ab8648a, 0x7735, 0x11d2, {0x8c, 0x73, 0x71, 0xdf, 0x54, 0xa9, 0x64, 0x41} }; -static void fill_keyboard_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD version) { +static DWORD get_keyboard_subtype(void) +{ + DWORD kbd_type, kbd_subtype, dev_subtype; + kbd_type = GetKeyboardType(0); + kbd_subtype = GetKeyboardType(1); + + if (kbd_type == 4 || (kbd_type == 7 && kbd_subtype == 0)) + dev_subtype = DIDEVTYPEKEYBOARD_PCENH; + else if (kbd_type == 7 && kbd_subtype == 2) + dev_subtype = DIDEVTYPEKEYBOARD_JAPAN106; + else { + FIXME("Unknown keyboard type=%u, subtype=%u\n", kbd_type, kbd_subtype); + dev_subtype = DIDEVTYPEKEYBOARD_PCENH; + } + return dev_subtype; +} + +static void fill_keyboard_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD version, DWORD subtype) { DWORD dwSize; DIDEVICEINSTANCEA ddi; @@ -136,16 +154,16 @@ static void fill_keyboard_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD ver ddi.guidInstance = GUID_SysKeyboard;/* DInput's GUID */ ddi.guidProduct = DInput_Wine_Keyboard_GUID; /* Vendor's GUID */ if (version >= 0x0800) - ddi.dwDevType = DI8DEVTYPE_KEYBOARD | (DI8DEVTYPEKEYBOARD_UNKNOWN << 8); + ddi.dwDevType = DI8DEVTYPE_KEYBOARD | (subtype << 8); else - ddi.dwDevType = DIDEVTYPE_KEYBOARD | (DIDEVTYPEKEYBOARD_UNKNOWN << 8); + ddi.dwDevType = DIDEVTYPE_KEYBOARD | (subtype << 8); strcpy(ddi.tszInstanceName, "Keyboard"); strcpy(ddi.tszProductName, "Wine Keyboard"); memcpy(lpddi, &ddi, (dwSize < sizeof(ddi) ? dwSize : sizeof(ddi))); } -static void fill_keyboard_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD version) { +static void fill_keyboard_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD version, DWORD subtype) { DWORD dwSize; DIDEVICEINSTANCEW ddi; @@ -160,9 +178,9 @@ static void fill_keyboard_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver ddi.guidInstance = GUID_SysKeyboard;/* DInput's GUID */ ddi.guidProduct = DInput_Wine_Keyboard_GUID; /* Vendor's GUID */ if (version >= 0x0800) - ddi.dwDevType = DI8DEVTYPE_KEYBOARD | (DI8DEVTYPEKEYBOARD_UNKNOWN << 8); + ddi.dwDevType = DI8DEVTYPE_KEYBOARD | (subtype << 8); else - ddi.dwDevType = DIDEVTYPE_KEYBOARD | (DIDEVTYPEKEYBOARD_UNKNOWN << 8); + ddi.dwDevType = DIDEVTYPE_KEYBOARD | (subtype << 8); MultiByteToWideChar(CP_ACP, 0, "Keyboard", -1, ddi.tszInstanceName, MAX_PATH); MultiByteToWideChar(CP_ACP, 0, "Wine Keyboard", -1, ddi.tszProductName, MAX_PATH); @@ -179,7 +197,7 @@ static HRESULT keyboarddev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVI (((dwDevType == DI8DEVCLASS_KEYBOARD) || (dwDevType == DI8DEVTYPE_KEYBOARD)) && (version >= 0x0800))) { TRACE("Enumerating the Keyboard device\n"); - fill_keyboard_dideviceinstanceA(lpddi, version); + fill_keyboard_dideviceinstanceA(lpddi, version, get_keyboard_subtype()); return S_OK; } @@ -197,7 +215,7 @@ static HRESULT keyboarddev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVI (((dwDevType == DI8DEVCLASS_KEYBOARD) || (dwDevType == DI8DEVTYPE_KEYBOARD)) && (version >= 0x0800))) { TRACE("Enumerating the Keyboard device\n"); - fill_keyboard_dideviceinstanceW(lpddi, version); + fill_keyboard_dideviceinstanceW(lpddi, version, get_keyboard_subtype()); return S_OK; } @@ -220,6 +238,7 @@ static SysKeyboardImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput) newDevice->base.event_proc = KeyboardCallback; InitializeCriticalSection(&newDevice->base.crit); newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysKeyboardImpl*->base.crit"); + newDevice->subtype = get_keyboard_subtype(); /* Create copy of default data format */ if (!(df = HeapAlloc(GetProcessHeap(), 0, c_dfDIKeyboard.dwSize))) goto failed; @@ -362,9 +381,9 @@ static HRESULT WINAPI SysKeyboardWImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W ifa devcaps.dwSize = lpDIDevCaps->dwSize; devcaps.dwFlags = DIDC_ATTACHED | DIDC_EMULATED; if (This->base.dinput->dwVersion >= 0x0800) - devcaps.dwDevType = DI8DEVTYPE_KEYBOARD | (DI8DEVTYPEKEYBOARD_PCENH << 8); + devcaps.dwDevType = DI8DEVTYPE_KEYBOARD | (This->subtype << 8); else - devcaps.dwDevType = DIDEVTYPE_KEYBOARD | (DIDEVTYPEKEYBOARD_PCENH << 8); + devcaps.dwDevType = DIDEVTYPE_KEYBOARD | (This->subtype << 8); devcaps.dwAxes = 0; devcaps.dwButtons = This->base.data_format.wine_df->dwNumObjs; devcaps.dwPOVs = 0; @@ -448,7 +467,7 @@ static HRESULT WINAPI SysKeyboardAImpl_GetDeviceInfo( return DI_OK; } - fill_keyboard_dideviceinstanceA(pdidi, This->base.dinput->dwVersion); + fill_keyboard_dideviceinstanceA(pdidi, This->base.dinput->dwVersion, This->subtype); return DI_OK; } @@ -463,7 +482,7 @@ static HRESULT WINAPI SysKeyboardWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface return DI_OK; } - fill_keyboard_dideviceinstanceW(pdidi, This->base.dinput->dwVersion); + fill_keyboard_dideviceinstanceW(pdidi, This->base.dinput->dwVersion, This->subtype); return DI_OK; } diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index f7923d3..8b29089 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -284,7 +284,7 @@ static void test_capabilities(IDirectInputA *pDI, HWND hwnd) "GetCapabilities invalid device subtype for dwDevType: 0x%08x (%04x:%04x)\n", caps.dwDevType, kbd_type, kbd_subtype); else if (kbd_type == 7 && kbd_subtype == 2) - todo_wine ok (dev_subtype == DIDEVTYPEKEYBOARD_JAPAN106, + ok (dev_subtype == DIDEVTYPEKEYBOARD_JAPAN106, "GetCapabilities invalid device subtype for dwDevType: 0x%08x (%04x:%04x)\n", caps.dwDevType, kbd_type, kbd_subtype); else

1 0

Akihiro Sagawa : dinput/tests: Skip DIK code tests if the keyboard type doesn't match.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: 93b0080ba333afde8f4492ddde0250d0f8ce454d URL: https://source.winehq.org/git/wine.git/?a=commit;h=93b0080ba333afde8f4492dd… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Aug 17 17:14:58 2018 +0900 dinput/tests: Skip DIK code tests if the keyboard type doesn't match. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/keyboard.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 151c691..e88cfea 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -316,17 +316,23 @@ static void test_dik_codes(IDirectInputA *dI, HWND hwnd, LANGID langid) { LANGID langid; const struct key2dik *map; + DWORD type; } expected[] = { - { MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT), key2dik_en }, - { MAKELANGID(LANG_FRENCH, SUBLANG_FRENCH), key2dik_fr }, - { MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), key2dik_de }, - { MAKELANGID(LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN), key2dik_en } + { MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT), + key2dik_en, DIDEVTYPEKEYBOARD_PCENH }, + { MAKELANGID(LANG_FRENCH, SUBLANG_FRENCH), + key2dik_fr, DIDEVTYPEKEYBOARD_PCENH }, + { MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), + key2dik_de, DIDEVTYPEKEYBOARD_PCENH }, + { MAKELANGID(LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN), + key2dik_en, DIDEVTYPEKEYBOARD_JAPAN106 } }; const struct key2dik *map = NULL; UINT i; HRESULT hr; IDirectInputDeviceA *device; + DIDEVCAPS caps; HKL hkl, hkl_orig; MSG msg; @@ -347,6 +353,14 @@ static void test_dik_codes(IDirectInputA *dI, HWND hwnd, LANGID langid) ok(hr == S_OK, "SetDataFormat() failed: %08x\n", hr); hr = IDirectInputDevice_Acquire(device); ok(hr == S_OK, "Acquire() failed: %08x\n", hr); + caps.dwSize = sizeof( caps ); + hr = IDirectInputDevice_GetCapabilities(device, &caps); + ok(hr == S_OK, "GetDeviceInstance() failed: %08x\n", hr); + if (expected[i].type != GET_DIDEVICE_SUBTYPE(caps.dwDevType)) { + skip("Keyboard type(%u) doesn't match for lang %04x\n", + GET_DIDEVICE_SUBTYPE(caps.dwDevType), langid); + goto fail; + } hkl = activate_keyboard_layout(langid, &hkl_orig); if (!hkl) goto fail;

1 0

Akihiro Sagawa : dinput/tests: Add DIK code tests for symbols and punctuations.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: d88a2086d1bece7f8255a4102e001ca274f34e91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d88a2086d1bece7f8255a410… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Aug 17 17:15:00 2018 +0900 dinput/tests: Add DIK code tests for symbols and punctuations. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/keyboard.c | 50 ++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index e88cfea..0a7c647 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -299,18 +299,26 @@ static void test_dik_codes(IDirectInputA *dI, HWND hwnd, LANGID langid) { static const struct key2dik { - BYTE key, dik; + BYTE key, dik, todo; } key2dik_en[] = { - {'Q',DIK_Q}, {'W',DIK_W}, {'E',DIK_E}, {'R',DIK_R}, {'T',DIK_T}, {'Y',DIK_Y} + {'Q',DIK_Q}, {'W',DIK_W}, {'E',DIK_E}, {'R',DIK_R}, {'T',DIK_T}, {'Y',DIK_Y}, + {'[',DIK_LBRACKET}, {']',DIK_RBRACKET}, {'.',DIK_PERIOD} }, key2dik_fr[] = { - {'A',DIK_Q}, {'Z',DIK_W}, {'E',DIK_E}, {'R',DIK_R}, {'T',DIK_T}, {'Y',DIK_Y} + {'A',DIK_Q}, {'Z',DIK_W}, {'E',DIK_E}, {'R',DIK_R}, {'T',DIK_T}, {'Y',DIK_Y}, + {'^',DIK_LBRACKET}, {'$',DIK_RBRACKET}, {':',DIK_PERIOD} }, key2dik_de[] = { - {'Q',DIK_Q}, {'W',DIK_W}, {'E',DIK_E}, {'R',DIK_R}, {'T',DIK_T}, {'Z',DIK_Y} + {'Q',DIK_Q}, {'W',DIK_W}, {'E',DIK_E}, {'R',DIK_R}, {'T',DIK_T}, {'Z',DIK_Y}, + {'\xfc',DIK_LBRACKET,1}, {'+',DIK_RBRACKET}, {'.',DIK_PERIOD} + }, + key2dik_ja[] = + { + {'Q',DIK_Q}, {'W',DIK_W}, {'E',DIK_E}, {'R',DIK_R}, {'T',DIK_T}, {'Y',DIK_Y}, + {'@',DIK_AT,2}, {']',DIK_RBRACKET,2}, {'.',DIK_PERIOD} }; static const struct { @@ -326,7 +334,7 @@ static void test_dik_codes(IDirectInputA *dI, HWND hwnd, LANGID langid) { MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), key2dik_de, DIDEVTYPEKEYBOARD_PCENH }, { MAKELANGID(LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN), - key2dik_en, DIDEVTYPEKEYBOARD_JAPAN106 } + key2dik_ja, DIDEVTYPEKEYBOARD_JAPAN106 } }; const struct key2dik *map = NULL; UINT i; @@ -372,16 +380,29 @@ static void test_dik_codes(IDirectInputA *dI, HWND hwnd, LANGID langid) { BYTE kbd_state[256]; UINT n; + WORD vkey, scan; INPUT in; - n = MapVirtualKeyA(map[i].key, MAPVK_VK_TO_CHAR); - ok(n == map[i].key, "%u: expected %c, got %c\n", i, map[i].key, n); - n = MapVirtualKeyA(map[i].key, MAPVK_VK_TO_VSC); - ok(n == map[i].dik, "%u: expected %02x, got %02x\n", i, map[i].dik, n); + n = VkKeyScanExW(map[i].key, hkl); + todo_wine_if(map[i].todo & 1) + ok(n != 0xffff, "%u: failed to get virtual key value for %c(%02x)\n", i, map[i].key, map[i].key); + vkey = LOBYTE(n); + n = MapVirtualKeyExA(vkey, MAPVK_VK_TO_CHAR, hkl) & 0xff; + todo_wine_if(map[i].todo & 1) + ok(n == map[i].key, "%u: expected %c(%02x), got %c(%02x)\n", i, map[i].key, map[i].key, n, n); + scan = MapVirtualKeyExA(vkey, MAPVK_VK_TO_VSC, hkl); + /* scan codes match the DIK_ codes on US keyboard. + however, it isn't true for symbols and punctuations in other layouts. */ + if (isalpha(map[i].key) || langid == MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT)) + ok(scan == map[i].dik, "%u: expected %02x, got %02x\n", i, map[i].dik, n); + else + todo_wine_if(map[i].todo & 1) + ok(scan, "%u: fail to get scan code value, expected %02x (vkey=%02x)\n", + i, map[i].dik, vkey); in.type = INPUT_KEYBOARD; - U(in).ki.wVk = map[i].key; - U(in).ki.wScan = map[i].dik; /* scan codes match the DIK_ codes */ + U(in).ki.wVk = vkey; + U(in).ki.wScan = scan; U(in).ki.dwFlags = 0; U(in).ki.dwExtraInfo = 0; U(in).ki.time = 0; @@ -396,8 +417,10 @@ static void test_dik_codes(IDirectInputA *dI, HWND hwnd, LANGID langid) ok(msg.message == WM_KEYDOWN, "expected WM_KEYDOWN, got %04x\n", msg.message); DispatchMessageA(&msg); - trace("keydown wParam: %#lx (%c) lParam: %#lx, MapVirtualKey(MAPVK_VK_TO_CHAR) = %c\n", - msg.wParam, LOWORD(msg.wParam), msg.lParam, MapVirtualKeyA(msg.wParam, MAPVK_VK_TO_CHAR)); + n = MapVirtualKeyExA(msg.wParam, MAPVK_VK_TO_CHAR, hkl); + trace("keydown wParam: %#08lx (%c) lParam: %#08lx, MapVirtualKey(MAPVK_VK_TO_CHAR) = %c\n", + msg.wParam, isprint(LOWORD(msg.wParam)) ? LOWORD(msg.wParam) : '?', + msg.lParam, isprint(n) ? n : '?'); pump_messages(); @@ -411,6 +434,7 @@ static void test_dik_codes(IDirectInputA *dI, HWND hwnd, LANGID langid) break; } + todo_wine_if(map[i].todo) ok(kbd_state[map[i].dik] == 0x80, "DI key %#x has state %#x\n", map[i].dik, kbd_state[map[i].dik]); U(in).ki.dwFlags = KEYEVENTF_KEYUP;

1 0

Akihiro Sagawa : dinput: Fix DIK code mappings on Japanese 106 keyboard.
by Alexandre Julliard Aug. 17, 2018

Aug. 17, 2018

Module: wine Branch: master Commit: 6be7d14fb95734528a57abe885c60f200d6a071e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6be7d14fb95734528a57abe8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Aug 17 17:15:02 2018 +0900 dinput: Fix DIK code mappings on Japanese 106 keyboard. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45475 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/keyboard.c | 37 +++++++++++++++++++++++++++++++++---- dlls/dinput/tests/keyboard.c | 2 +- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index c11cd59..c810515 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -68,11 +68,38 @@ static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(SysKeyboardIm return &This->base.IDirectInputDevice8W_iface; } -static BYTE map_dik_code(DWORD scanCode, DWORD vkCode) +static BYTE map_dik_code(DWORD scanCode, DWORD vkCode, DWORD subType) { if (!scanCode) scanCode = MapVirtualKeyW(vkCode, MAPVK_VK_TO_VSC); + if (subType == DIDEVTYPEKEYBOARD_JAPAN106) + { + switch (scanCode) + { + case 0x0d: /* ^ */ + scanCode = DIK_CIRCUMFLEX; + break; + case 0x1a: /* @ */ + scanCode = DIK_AT; + break; + case 0x1b: /* [ */ + scanCode = DIK_LBRACKET; + break; + case 0x28: /* : */ + scanCode = DIK_COLON; + break; + case 0x29: /* Hankaku/Zenkaku */ + scanCode = DIK_KANJI; + break; + case 0x2b: /* ] */ + scanCode = DIK_RBRACKET; + break; + case 0x73: /* \ */ + scanCode = DIK_BACKSLASH; + break; + } + } return scanCode; } @@ -98,7 +125,7 @@ static int KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM 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); + dik_code = map_dik_code(hook->scanCode & 0xff, hook->vkCode, This->subtype); if (hook->flags & LLKHF_EXTENDED) dik_code |= 0x80; } new_diks = hook->flags & LLKHF_UP ? 0 : 0x80; @@ -248,12 +275,14 @@ static SysKeyboardImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput) for (i = 0; i < df->dwNumObjs; i++) { char buf[MAX_PATH]; + BYTE dik_code; if (!GetKeyNameTextA(((i & 0x7f) << 16) | ((i & 0x80) << 17), buf, sizeof(buf))) continue; - memcpy(&df->rgodf[idx], &c_dfDIKeyboard.rgodf[i], df->dwObjSize); - df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(i) | DIDFT_PSHBUTTON; + dik_code = map_dik_code(i, 0, newDevice->subtype); + memcpy(&df->rgodf[idx], &c_dfDIKeyboard.rgodf[dik_code], df->dwObjSize); + df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(dik_code) | DIDFT_PSHBUTTON; } df->dwNumObjs = idx; diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 0a7c647..8ee22fa 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -318,7 +318,7 @@ static void test_dik_codes(IDirectInputA *dI, HWND hwnd, LANGID langid) key2dik_ja[] = { {'Q',DIK_Q}, {'W',DIK_W}, {'E',DIK_E}, {'R',DIK_R}, {'T',DIK_T}, {'Y',DIK_Y}, - {'@',DIK_AT,2}, {']',DIK_RBRACKET,2}, {'.',DIK_PERIOD} + {'@',DIK_AT}, {']',DIK_RBRACKET}, {'.',DIK_PERIOD} }; static const struct {

1 0