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

dinput: Add an instance number to HID joystick collection objects. 

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:37 +02:00 committed by Alexandre Julliard
parent aa60766259
commit eab7819d7a
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/dinput/joystick_hid.c
View File

@ -379,8 +379,8 @@ static BOOL enum_collections_objects( struct hid_joystick *impl, const DIPROPHEA
{
DIDEVICEOBJECTINSTANCEW instance = {.dwSize = sizeof(DIDEVICEOBJECTINSTANCEW)};
struct hid_caps caps = {.type = LINK_COLLECTION_NODE};
DWORD collection = 0, i;
BOOL ret;
DWORD i;
for (i = 0; i < impl->caps.NumberLinkCollectionNodes; ++i)
{
@ -393,7 +393,7 @@ static BOOL enum_collections_objects( struct hid_joystick *impl, const DIPROPHEA
else
{
instance.dwOfs = 0;
instance.dwType = DIDFT_COLLECTION | DIDFT_NODATA;
instance.dwType = DIDFT_COLLECTION | DIDFT_MAKEINSTANCE( collection++ ) | DIDFT_NODATA;
instance.dwFlags = 0;
instance.wUsagePage = caps.node->LinkUsagePage;
instance.wUsage = caps.node->LinkUsage;

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

@ -3572,8 +3572,6 @@ static void test_simple_joystick(void)
{.ofs = TRUE},
{.ofs = TRUE},
{.ofs = TRUE},
{},
{.type = TRUE},
};
struct check_objects_params check_objects_params =