[PATCH 0/3] MR1887: dinput: Return WHEEL_DELTA for the granularity of the mouse z-axis.
From: Tim Clem <tclem(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53627 --- dlls/dinput/tests/device8.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index b98a24df080..6542baa88f0 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -1819,6 +1819,12 @@ static void test_sys_mouse( DWORD version ) ok( hr == DIERR_UNSUPPORTED, "GetProperty DIPROP_SATURATION returned %#lx\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_CALIBRATIONMODE, &prop_dword.diph ); ok( hr == DIERR_UNSUPPORTED, "GetProperty DIPROP_CALIBRATIONMODE returned %#lx\n", hr ); + prop_dword.diph.dwObj = DIMOFS_Z; + prop_dword.dwData = 0xdeadbeef; + hr = IDirectInputDevice8_GetProperty( device, DIPROP_GRANULARITY, &prop_dword.diph ); + ok( hr == DI_OK, "GetProperty DIPROP_GRANULARITY returned %#lx\n", hr ); + todo_wine + ok( prop_dword.dwData == WHEEL_DELTA, "got %ld expected %ld\n", prop_dword.dwData, (DWORD)WHEEL_DELTA ); prop_range.lMin = 0xdeadbeef; prop_range.lMax = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1887
From: Tim Clem <tclem(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53627 --- dlls/dinput/device.c | 3 ++- dlls/dinput/mouse.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index b85d97d1b95..d0a5fd0ea1c 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1063,7 +1063,8 @@ static HRESULT check_property( struct dinput_device *impl, const GUID *guid, con case (DWORD_PTR)DIPROP_DEADZONE: case (DWORD_PTR)DIPROP_SATURATION: case (DWORD_PTR)DIPROP_CALIBRATIONMODE: - if (!impl->object_properties) return DIERR_UNSUPPORTED; + /* not supported on the mouse or keyboard */ + if (!(impl->caps.dwDevType & DIDEVTYPE_HID)) return DIERR_UNSUPPORTED; break; case (DWORD_PTR)DIPROP_FFLOAD: diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 1572e73bac2..d855172d3b0 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -91,6 +91,17 @@ HRESULT mouse_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, return DI_OK; } +static BOOL init_object_properties( const DIDEVICEOBJECTINSTANCEW *instance, void *data ) +{ + struct mouse *impl = (struct mouse *)data; + struct object_properties *properties = impl->base.object_properties + instance->dwOfs / sizeof(LONG); + + properties->range_min = DIPROPRANGE_NOMIN; + properties->range_max = DIPROPRANGE_NOMAX; + + return DIENUM_CONTINUE; +} + HRESULT mouse_create_device( struct dinput *dinput, const GUID *guid, IDirectInputDevice8W **out ) { struct mouse *impl; @@ -112,6 +123,15 @@ HRESULT mouse_create_device( struct dinput *dinput, const GUID *guid, IDirectInp impl->base.caps.dwHardwareRevision = 100; impl->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; + /* One object_properties per axis */ + impl->base.object_properties = calloc( 3, sizeof(struct object_properties) ); + if (!impl->base.object_properties) + { + IDirectInputDevice_Release( &impl->base.IDirectInputDevice8W_iface ); + return E_OUTOFMEMORY; + } + IDirectInputDevice8_EnumObjects( &impl->base.IDirectInputDevice8W_iface, init_object_properties, impl, DIDFT_RELAXIS ); + get_app_key(&hkey, &appkey); if (!get_config_key( hkey, appkey, L"MouseWarpOverride", buffer, sizeof(buffer) )) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1887
From: Tim Clem <tclem(a)codeweavers.com> Return WHEEL_DELTA for the granularity of the mouse z-axis. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53627 --- dlls/dinput/device.c | 3 ++- dlls/dinput/device_private.h | 1 + dlls/dinput/joystick_hid.c | 1 + dlls/dinput/mouse.c | 6 ++++++ dlls/dinput/tests/device8.c | 1 - 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index d0a5fd0ea1c..590151483c9 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1103,6 +1103,7 @@ static BOOL CALLBACK get_object_property( const DIDEVICEOBJECTINSTANCEW *instanc { .range_min = DIPROPRANGE_NOMIN, .range_max = DIPROPRANGE_NOMAX, + .granularity = 1, }; struct get_object_property_params *params = context; struct dinput_device *impl = impl_from_IDirectInputDevice8W( params->iface ); @@ -1155,7 +1156,7 @@ static BOOL CALLBACK get_object_property( const DIDEVICEOBJECTINSTANCEW *instanc case (DWORD_PTR)DIPROP_GRANULARITY: { DIPROPDWORD *value = (DIPROPDWORD *)params->header; - value->dwData = 1; + value->dwData = properties->granularity; return DIENUM_STOP; } case (DWORD_PTR)DIPROP_KEYNAME: diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 31696f00536..be5d7861fd1 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -67,6 +67,7 @@ struct object_properties LONG deadzone; LONG saturation; DWORD calibration_mode; + DWORD granularity; }; enum device_status diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 311e5903878..41fd0e24963 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1696,6 +1696,7 @@ static BOOL init_object_properties( struct hid_joystick *impl, struct hid_value_ } properties->saturation = 10000; + properties->granularity = 1; return DIENUM_CONTINUE; } diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index d855172d3b0..8e86ccbfb12 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -99,6 +99,12 @@ static BOOL init_object_properties( const DIDEVICEOBJECTINSTANCEW *instance, voi properties->range_min = DIPROPRANGE_NOMIN; properties->range_max = DIPROPRANGE_NOMAX; + /* The z-axis (wheel) has a different granularity */ + if ( instance->dwOfs == DIMOFS_Z ) + properties->granularity = WHEEL_DELTA; + else + properties->granularity = 1; + return DIENUM_CONTINUE; } diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index 6542baa88f0..86f0360c0f1 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -1823,7 +1823,6 @@ static void test_sys_mouse( DWORD version ) prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_GRANULARITY, &prop_dword.diph ); ok( hr == DI_OK, "GetProperty DIPROP_GRANULARITY returned %#lx\n", hr ); - todo_wine ok( prop_dword.dwData == WHEEL_DELTA, "got %ld expected %ld\n", prop_dword.dwData, (DWORD)WHEEL_DELTA ); prop_range.lMin = 0xdeadbeef; prop_range.lMax = 0xdeadbeef; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1887
Rémi Bernon (@rbernon) commented about dlls/dinput/mouse.c:
return DI_OK; }
+static BOOL init_object_properties( const DIDEVICEOBJECTINSTANCEW *instance, void *data ) +{ + struct mouse *impl = (struct mouse *)data; + struct object_properties *properties = impl->base.object_properties + instance->dwOfs / sizeof(LONG); + + properties->range_min = DIPROPRANGE_NOMIN; + properties->range_max = DIPROPRANGE_NOMAX; + + /* The z-axis (wheel) has a different granularity */ + if ( instance->dwOfs == DIMOFS_Z )
Mind removing the spaces in the if paren there?
From a very quick glance it looks good otherwise, except for the pipeline failure.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/1887#note_20134
participants (3)
-
Rémi Bernon -
Tim Clem
-
Tim Clem (＠tclem)