Module: wine Branch: master Commit: 78207cf4d290b38574c2e1c6572d296d6ccf715b URL: https://source.winehq.org/git/wine.git/?a=commit;h=78207cf4d290b38574c2e1c65...
Author: Rémi Bernon rbernon@codeweavers.com Date: Wed Sep 29 10:25:00 2021 +0200
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
---
dlls/dinput/joystick_hid.c | 22 +++++++++++++++++++++- dlls/dinput8/tests/hid.c | 6 ------ 2 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 526cfaeb456..7cb2c223121 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -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; diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 8f6b568eae9..ce2a3792593 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -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 =