Skip to content

W
wine-cw
Commit ba889f2c authored by Florian Will's avatar Florian Will Committed by Alexandre Julliard
Browse files
Options

dinput: Set guidType = GUID_Unknown for HID collections.

Fixes an issue in Zusi 3 where DIDFT_COLLECTION objects would be passed to SetDataFormat.
parent 4413356d
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 17 deletions
dlls/dinput/joystick_hid.c
View file @ ba889f2c
......@@ -728,7 +728,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter,
instance.dwFlags = 0;
instance.wUsagePage = node->usage_page;
instance.wUsage = node->usage;
instance.guidType = *object_usage_to_guid( instance.wUsagePage, instance.wUsage );
instance.guidType = GUID_Unknown;
instance.wReportId = 0;
instance.wCollectionNumber = node->parent;
instance.dwDimension = 0;
......
dlls/dinput/tests/joystick8.c
View file @ ba889f2c
......@@ -1777,21 +1777,6 @@ static void test_simple_joystick( DWORD version )
.wReportId = 1,
},
};
struct check_object_todo todo_objects[ARRAY_SIZE(expect_objects)] =
{
{0},
{0},
{0},
{0},
{0},
{0},
{0},
{0},
{0},
{0},
{0},
{ .guid = TRUE },
};
struct check_object_todo todo_objects_5[ARRAY_SIZE(expect_objects_5)] =
{
{.guid = TRUE, .type = TRUE, .flags = TRUE, .usage = TRUE, .usage_page = TRUE, .name = TRUE},
......@@ -1808,7 +1793,7 @@ static void test_simple_joystick( DWORD version )
.version = version,
.expect_count = version < 0x700 ? ARRAY_SIZE(expect_objects_5) : ARRAY_SIZE(expect_objects),
.expect_objs = version < 0x700 ? expect_objects_5 : expect_objects,
.todo_objs = version < 0x700 ? todo_objects_5 : todo_objects,
.todo_objs = version < 0x700 ? todo_objects_5 : NULL,
.todo_extra = version < 0x700,
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment