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

dinput: Enumerate output button objects in their declaration order. 

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-29 10:25:00 +02:00 committed by Alexandre Julliard
parent b468349ec2
commit 78207cf4d2
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/dinput/joystick_hid.c
View File

@ -178,10 +178,10 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header,
DWORD collection = 0, object = 0, axis = 0, button = 0, pov = 0, value_ofs = 0, button_ofs = 0, i, j;
struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)impl->preparsed;
DIDEVICEOBJECTINSTANCEW instance = {.dwSize = sizeof(DIDEVICEOBJECTINSTANCEW)};
struct hid_value_caps *caps, *caps_end, *nary, *nary_end;
DIDATAFORMAT *format = impl->base.data_format.wine_df;
int *offsets = impl->base.data_format.offsets;
struct hid_collection_node *node, *node_end;
struct hid_value_caps *caps, *caps_end;
DIPROPHEADER filter = *header;
BOOL ret, seen_axis[6] = {0};
@ -325,6 +325,26 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header,
if (caps->flags & HID_VALUE_CAPS_IS_BUTTON) button_ofs += caps->usage_max - caps->usage_min + 1;
else value_ofs += (caps->usage_max - caps->usage_min + 1) * sizeof(LONG);
}
else if (caps->flags & HID_VALUE_CAPS_ARRAY_HAS_MORE)
{
for (nary_end = caps - 1; caps != caps_end; caps++)
if (!(caps->flags & HID_VALUE_CAPS_ARRAY_HAS_MORE)) break;
for (nary = caps; nary != nary_end; nary--)
{
instance.dwOfs = button_ofs;
instance.dwType = DIDFT_NODATA | DIDFT_MAKEINSTANCE( object++ ) | DIDFT_OUTPUT;
instance.dwFlags = 0x80008000;
instance.wUsagePage = nary->usage_page;
instance.wUsage = nary->usage_min;
instance.guidType = GUID_Unknown;
instance.wReportId = nary->report_id;
instance.wCollectionNumber = nary->link_collection;
ret = enum_object( impl, &filter, flags, callback, nary, &instance, data );
if (ret != DIENUM_CONTINUE) return ret;
button_ofs++;
}
}
else for (j = caps->usage_min; j <= caps->usage_max; ++j)
{
if (caps->flags & HID_VALUE_CAPS_IS_BUTTON) instance.dwOfs = button_ofs;

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

@ -3290,7 +3290,6 @@ struct check_objects_todos
{
BOOL type;
BOOL flags;
BOOL usage;
};
struct check_objects_params
@ -3326,7 +3325,6 @@ static BOOL CALLBACK check_objects( const DIDEVICEOBJECTINSTANCEW *obj, void *ar
check_member( *obj, *exp, "%u", wCollectionNumber );
check_member( *obj, *exp, "%u", wDesignatorIndex );
check_member( *obj, *exp, "%#04x", wUsagePage );
todo_wine_if( todo->usage )
check_member( *obj, *exp, "%#04x", wUsage );
check_member( *obj, *exp, "%#04x", dwDimension );
check_member( *obj, *exp, "%#04x", wExponent );
@ -5190,10 +5188,6 @@ static void test_force_feedback_joystick( void )
{},
{.type = TRUE, .flags = TRUE},
{.type = TRUE, .flags = TRUE},
{},
{.usage = TRUE},
{},
{.usage = TRUE},
};
struct check_objects_params check_objects_params =