marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dinput/tests: Skip DIK code tests if the keyboard type doesn't match. 

Signed-off-by: Akihiro Sagawa <sagawa.aki@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Akihiro Sagawa 2018-08-17 17:14:58 +09:00 committed by Alexandre Julliard
parent b735a42f1c
commit 93b0080ba3
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/dinput/tests/keyboard.c
View File

@ -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;