ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dinput: Add DIDFT_FFACTUATOR flag on PID effect axes. 

Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Rémi Bernon 2021-10-06 10:21:58 +02:00 committed by Alexandre Julliard
parent e9539722d1
commit 1285bbfa43
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/dinput/joystick_hid.c
View File

@ -255,6 +255,23 @@ static BOOL enum_object( struct hid_joystick *impl, const DIPROPHEADER *filter,
return DIENUM_CONTINUE;
}
static void check_pid_effect_axis_caps( struct hid_joystick *impl, DIDEVICEOBJECTINSTANCEW *instance )
{
struct pid_effect_update *effect_update = &impl->pid_effect_update;
ULONG i;
for (i = 0; i < effect_update->axis_count; ++i)
{
if (effect_update->axis_caps[i]->usage_page != instance->wUsagePage) continue;
if (effect_update->axis_caps[i]->usage_min > instance->wUsage) continue;
if (effect_update->axis_caps[i]->usage_max >= instance->wUsage) break;
}
if (i == effect_update->axis_count) return;
instance->dwType |= DIDFT_FFACTUATOR;
instance->dwFlags |= DIDOI_FFACTUATOR;
}
static void set_axis_type( DIDEVICEOBJECTINSTANCEW *instance, BOOL *seen, DWORD i, DWORD *count )
{
if (!seen[i]) instance->dwType = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( i );
@ -331,6 +348,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header,
instance.guidType = *object_usage_to_guid( instance.wUsagePage, instance.wUsage );
instance.wReportId = caps->report_id;
instance.wCollectionNumber = caps->link_collection;
check_pid_effect_axis_caps( impl, &instance );
ret = enum_object( impl, &filter, flags, callback, caps, &instance, data );
if (ret != DIENUM_CONTINUE) return ret;
value_ofs += sizeof(LONG);

6
dlls/dinput8/tests/hid.c
View File

@ -6392,9 +6392,9 @@ static void test_force_feedback_joystick( void )
};
const struct check_objects_todos objects_todos[ARRAY_SIZE(expect_objects)] =
{
{.type = TRUE, .flags = TRUE},
{.type = TRUE, .flags = TRUE},
{.type = TRUE, .flags = TRUE},
{},
{},
{},
{.type = TRUE, .flags = TRUE},
{.type = TRUE, .flags = TRUE},
{},