forked from Mirrors/wine-wine
dinput: Support DIDEVICEINSTANCE_DX3 for Mouse GetDeviceInfo.
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>stable
parent
f3259ba66c
commit
381fa00b6a
|
@ -765,11 +765,6 @@ static HRESULT WINAPI SysMouseAImpl_GetDeviceInfo(
|
||||||
SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface);
|
SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface);
|
||||||
TRACE("(this=%p,%p)\n", This, pdidi);
|
TRACE("(this=%p,%p)\n", This, pdidi);
|
||||||
|
|
||||||
if (pdidi->dwSize != sizeof(DIDEVICEINSTANCEA)) {
|
|
||||||
WARN(" dinput3 not supported yet...\n");
|
|
||||||
return DI_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
fill_mouse_dideviceinstanceA(pdidi, This->base.dinput->dwVersion);
|
fill_mouse_dideviceinstanceA(pdidi, This->base.dinput->dwVersion);
|
||||||
|
|
||||||
return DI_OK;
|
return DI_OK;
|
||||||
|
|
|
@ -198,6 +198,35 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd)
|
||||||
DestroyWindow( hwnd2 );
|
DestroyWindow( hwnd2 );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void test_GetDeviceInfo(IDirectInputA *pDI)
|
||||||
|
{
|
||||||
|
HRESULT hr;
|
||||||
|
IDirectInputDeviceA *pMouse = NULL;
|
||||||
|
DIDEVICEINSTANCEA instA;
|
||||||
|
DIDEVICEINSTANCE_DX3A inst3A;
|
||||||
|
|
||||||
|
hr = IDirectInput_CreateDevice(pDI, &GUID_SysMouse, &pMouse, NULL);
|
||||||
|
ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr);
|
||||||
|
if (FAILED(hr)) return;
|
||||||
|
|
||||||
|
instA.dwSize = sizeof(instA);
|
||||||
|
hr = IDirectInputDevice_GetDeviceInfo(pMouse, &instA);
|
||||||
|
ok(SUCCEEDED(hr), "got %08x\n", hr);
|
||||||
|
|
||||||
|
inst3A.dwSize = sizeof(inst3A);
|
||||||
|
hr = IDirectInputDevice_GetDeviceInfo(pMouse, (DIDEVICEINSTANCEA *)&inst3A);
|
||||||
|
ok(SUCCEEDED(hr), "got %08x\n", hr);
|
||||||
|
|
||||||
|
ok(instA.dwSize != inst3A.dwSize, "got %d, %d \n", instA.dwSize, inst3A.dwSize);
|
||||||
|
ok(IsEqualGUID(&instA.guidInstance, &inst3A.guidInstance), "got %s, %s\n",
|
||||||
|
wine_dbgstr_guid(&instA.guidInstance), wine_dbgstr_guid(&inst3A.guidInstance) );
|
||||||
|
ok(IsEqualGUID(&instA.guidProduct, &inst3A.guidProduct), "got %s, %s\n",
|
||||||
|
wine_dbgstr_guid(&instA.guidProduct), wine_dbgstr_guid(&inst3A.guidProduct) );
|
||||||
|
ok(instA.dwDevType == inst3A.dwDevType, "got %d, %d\n", instA.dwDevType, inst3A.dwDevType);
|
||||||
|
|
||||||
|
if (pMouse) IUnknown_Release(pMouse);
|
||||||
|
}
|
||||||
|
|
||||||
static void mouse_tests(void)
|
static void mouse_tests(void)
|
||||||
{
|
{
|
||||||
HRESULT hr;
|
HRESULT hr;
|
||||||
|
@ -224,6 +253,7 @@ static void mouse_tests(void)
|
||||||
|
|
||||||
test_set_coop(pDI, hwnd);
|
test_set_coop(pDI, hwnd);
|
||||||
test_acquire(pDI, hwnd);
|
test_acquire(pDI, hwnd);
|
||||||
|
test_GetDeviceInfo(pDI);
|
||||||
|
|
||||||
DestroyWindow(hwnd);
|
DestroyWindow(hwnd);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue