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

dinput: Keyboard device doesn't support property DIPROP_VIDPID. 

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Alistair Leslie-Hughes 2019-11-10 08:58:47 +00:00 committed by Alexandre Julliard
parent ecb2c8dd2e
commit f10f98cfa2
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/dinput/keyboard.c
View File

@ -577,6 +577,7 @@ static HRESULT WINAPI SysKeyboardWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface,
memcpy(ps->wsz, didoi.tszName, sizeof(ps->wsz));
return hr;
}
case (DWORD_PTR) DIPROP_VIDPID:
case (DWORD_PTR) DIPROP_RANGE:
return DIERR_UNSUPPORTED;
default:

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

@ -258,6 +258,7 @@ static void test_get_prop(IDirectInputA *pDI, HWND hwnd)
HRESULT hr;
IDirectInputDeviceA *pKeyboard = NULL;
DIPROPRANGE diprg;
DIPROPDWORD vidpid;
hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &pKeyboard, NULL);
ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr);
@ -272,6 +273,15 @@ static void test_get_prop(IDirectInputA *pDI, HWND hwnd)
hr = IDirectInputDevice_GetProperty(pKeyboard, DIPROP_RANGE, &diprg.diph);
ok(hr == DIERR_UNSUPPORTED, "IDirectInputDevice_GetProperty() did not return DIPROP_RANGE but: %08x\n", hr);
memset(&vidpid, 0, sizeof(vidpid));
vidpid.diph.dwSize = sizeof(DIPROPDWORD);
vidpid.diph.dwHeaderSize = sizeof(DIPROPHEADER);
vidpid.diph.dwHow = DIPH_DEVICE;
vidpid.diph.dwObj = 0;
hr = IDirectInputDevice_GetProperty(pKeyboard, DIPROP_VIDPID, &vidpid.diph);
ok(hr == DIERR_UNSUPPORTED, "got %08x\n", hr);
IUnknown_Release(pKeyboard);
}