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

dinput: Use fixed axis object instance number for common 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-09-23 10:51:38 +02:00 committed by Alexandre Julliard
parent eab7819d7a
commit 1316142b62
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/dinput/joystick_hid.c
View File

@ -220,13 +220,20 @@ static BOOL enum_object( struct hid_joystick *impl, const DIPROPHEADER *filter,
return DIENUM_CONTINUE;
}
static void set_axis_type( DIDEVICEOBJECTINSTANCEW *instance, BOOL *seen, DWORD i, DWORD *count )
{
if (!seen[i]) instance->dwType = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( i );
else instance->dwType = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 6 + *count++ );
seen[i] = TRUE;
}
static BOOL enum_value_objects( struct hid_joystick *impl, const DIPROPHEADER *filter,
DWORD flags, enum_object_callback callback, void *data )
{
DIDEVICEOBJECTINSTANCEW instance = {.dwSize = sizeof(DIDEVICEOBJECTINSTANCEW)};
struct hid_caps caps = {.type = VALUE_CAPS};
BOOL ret, seen_axis[6] = {0};
DWORD axis = 0, pov = 0, i;
BOOL ret;
for (i = 0; i < impl->caps.NumberInputValueCaps; ++i)
{
@ -254,49 +261,49 @@ static BOOL enum_value_objects( struct hid_joystick *impl, const DIPROPHEADER *f
{
case HID_USAGE_GENERIC_X:
instance.dwOfs = DIJOFS_X;
instance.dwType = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( axis++ );
set_axis_type( &instance, seen_axis, 0, &axis );
instance.dwFlags = DIDOI_ASPECTPOSITION;
ret = enum_object( impl, filter, flags, callback, &caps, &instance, data );
if (ret != DIENUM_CONTINUE) return ret;
break;
case HID_USAGE_GENERIC_Y:
instance.dwOfs = DIJOFS_Y;
instance.dwType = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( axis++ );
set_axis_type( &instance, seen_axis, 1, &axis );
instance.dwFlags = DIDOI_ASPECTPOSITION;
ret = enum_object( impl, filter, flags, callback, &caps, &instance, data );
if (ret != DIENUM_CONTINUE) return ret;
break;
case HID_USAGE_GENERIC_Z:
instance.dwOfs = DIJOFS_Z;
instance.dwType = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( axis++ );
set_axis_type( &instance, seen_axis, 2, &axis );
instance.dwFlags = DIDOI_ASPECTPOSITION;
ret = enum_object( impl, filter, flags, callback, &caps, &instance, data );
if (ret != DIENUM_CONTINUE) return ret;
break;
case HID_USAGE_GENERIC_RX:
instance.dwOfs = DIJOFS_RX;
instance.dwType = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( axis++ );
set_axis_type( &instance, seen_axis, 3, &axis );
instance.dwFlags = DIDOI_ASPECTPOSITION;
ret = enum_object( impl, filter, flags, callback, &caps, &instance, data );
if (ret != DIENUM_CONTINUE) return ret;
break;
case HID_USAGE_GENERIC_RY:
instance.dwOfs = DIJOFS_RY;
instance.dwType = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( axis++ );
set_axis_type( &instance, seen_axis, 4, &axis );
instance.dwFlags = DIDOI_ASPECTPOSITION;
ret = enum_object( impl, filter, flags, callback, &caps, &instance, data );
if (ret != DIENUM_CONTINUE) return ret;
break;
case HID_USAGE_GENERIC_RZ:
instance.dwOfs = DIJOFS_RZ;
instance.dwType = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( axis++ );
set_axis_type( &instance, seen_axis, 5, &axis );
instance.dwFlags = DIDOI_ASPECTPOSITION;
ret = enum_object( impl, filter, flags, callback, &caps, &instance, data );
if (ret != DIENUM_CONTINUE) return ret;
break;
case HID_USAGE_GENERIC_SLIDER:
instance.dwOfs = DIJOFS_SLIDER( 0 );
instance.dwType = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( axis++ );
instance.dwType = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 6 + axis++ );
instance.dwFlags = DIDOI_ASPECTPOSITION;
ret = enum_object( impl, filter, flags, callback, &caps, &instance, data );
if (ret != DIENUM_CONTINUE) return ret;

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

@ -3567,8 +3567,8 @@ static void test_simple_joystick(void)
};
const struct check_objects_todos objects_todos[ARRAY_SIZE(expect_objects)] =
{
{.ofs = TRUE, .type = TRUE},
{.ofs = TRUE, .type = TRUE},
{.ofs = TRUE},
{.ofs = TRUE},
{.ofs = TRUE},
{.ofs = TRUE},
{.ofs = TRUE},
@ -3960,7 +3960,6 @@ static void test_simple_joystick(void)
check_member_guid( objinst, expect_objects[1], guidType );
todo_wine
check_member( objinst, expect_objects[1], "%#x", dwOfs );
todo_wine
check_member( objinst, expect_objects[1], "%#x", dwType );
check_member( objinst, expect_objects[1], "%#x", dwFlags );
if (!localized) todo_wine check_member_wstr( objinst, expect_objects[1], tszName );
@ -4025,7 +4024,6 @@ static void test_simple_joystick(void)
check_member_guid( objinst, expect_objects[0], guidType );
todo_wine
check_member( objinst, expect_objects[0], "%#x", dwOfs );
todo_wine
check_member( objinst, expect_objects[0], "%#x", dwType );
check_member( objinst, expect_objects[0], "%#x", dwFlags );
if (!localized) todo_wine check_member_wstr( objinst, expect_objects[0], tszName );