September 2021 - Wine-Commits

Rémi Bernon : hidclass.sys: Don't leak report queues on device removal.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: 9421dd2b3cd7114bf390c3ffcec30ab4bc95b7ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=9421dd2b3cd7114bf390c3ff… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 24 10:07:11 2021 +0200 hidclass.sys: Don't leak report queues on device removal. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 27 ++++++++++++++++++++++++++- dlls/hidclass.sys/hid.h | 2 +- dlls/hidclass.sys/pnp.c | 6 ++++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 848f8da906a..21941a1802e 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -116,9 +116,10 @@ static struct hid_report_queue *hid_report_queue_create( void ) return queue; } -static void hid_report_queue_destroy( struct hid_report_queue *queue ) +void hid_report_queue_destroy( struct hid_report_queue *queue ) { while (queue->length--) hid_report_decref( queue->reports[queue->length] ); + list_remove( &queue->entry ); free( queue ); } @@ -654,10 +655,22 @@ NTSTATUS WINAPI pdo_create(DEVICE_OBJECT *device, IRP *irp) { BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; struct hid_report_queue *queue; + BOOL removed; KIRQL irql; TRACE("Open handle on device %p\n", device); + KeAcquireSpinLock( &ext->u.pdo.lock, &irql ); + removed = ext->u.pdo.removed; + KeReleaseSpinLock( &ext->u.pdo.lock, irql ); + + if (removed) + { + irp->IoStatus.Status = STATUS_DELETE_PENDING; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return STATUS_DELETE_PENDING; + } + if (!(queue = hid_report_queue_create())) irp->IoStatus.Status = STATUS_NO_MEMORY; else { @@ -677,10 +690,22 @@ NTSTATUS WINAPI pdo_close(DEVICE_OBJECT *device, IRP *irp) { struct hid_report_queue *queue = irp->Tail.Overlay.OriginalFileObject->FsContext; BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; + BOOL removed; KIRQL irql; TRACE("Close handle on device %p\n", device); + KeAcquireSpinLock( &ext->u.pdo.lock, &irql ); + removed = ext->u.pdo.removed; + KeReleaseSpinLock( &ext->u.pdo.lock, irql ); + + if (removed) + { + irp->IoStatus.Status = STATUS_DELETE_PENDING; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return STATUS_DELETE_PENDING; + } + if (queue) { KeAcquireSpinLock( &ext->u.pdo.report_queues_lock, &irql ); diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index e65fabb2aea..60f3d0fb57e 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -123,7 +123,7 @@ void call_minidriver( ULONG code, DEVICE_OBJECT *device, void *in_buff, ULONG in /* Internal device functions */ void HID_StartDeviceThread(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; - +void hid_report_queue_destroy( struct hid_report_queue *queue ); IRP *pop_irp_from_queue(BASE_DEVICE_EXTENSION *ext) DECLSPEC_HIDDEN; NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 8755afbce6c..8c0c8adafe6 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -387,6 +387,7 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device, IRP *irp) BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; HIDP_COLLECTION_DESC *desc = ext->u.pdo.device_desc.CollectionDesc; NTSTATUS status = irp->IoStatus.Status; + struct hid_report_queue *queue, *next; KIRQL irql; TRACE("irp %p, minor function %#x.\n", irp, irpsp->MinorFunction); @@ -498,6 +499,11 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device, IRP *irp) } CloseHandle(ext->u.pdo.halt_event); + KeAcquireSpinLock( &ext->u.pdo.report_queues_lock, &irql ); + LIST_FOR_EACH_ENTRY_SAFE( queue, next, &ext->u.pdo.report_queues, struct hid_report_queue, entry ) + hid_report_queue_destroy( queue ); + KeReleaseSpinLock( &ext->u.pdo.report_queues_lock, irql ); + HidP_FreeCollectionDescription(&ext->u.pdo.device_desc); RtlFreeUnicodeString(&ext->u.pdo.link_name);

1 0

Rémi Bernon : hidclass.sys: Rename hid_report_queue into hid_queue.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: 08b01d8271fe15c7680a957778d506221d7d94eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=08b01d8271fe15c7680a9577… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 24 10:07:13 2021 +0200 hidclass.sys: Rename hid_report_queue into hid_queue. As it now also queues IRPs. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 68 +++++++++++++++++++++++----------------------- dlls/hidclass.sys/hid.h | 10 +++---- dlls/hidclass.sys/pnp.c | 22 +++++++-------- 3 files changed, 50 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=08b01d8271fe15c7680a…

1 0

Rémi Bernon : hidclass.sys: Keep pending IRPs with the report queues.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: 561e722a46e9ad178bc3e41b9b4a55ecde609cbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=561e722a46e9ad178bc3e41b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 24 10:07:12 2021 +0200 hidclass.sys: Keep pending IRPs with the report queues. Since d15358518b83384b137e81b71729c4f47fac0665 we only complete one pending IRP per HID report, but there may be more than one IRP queued, from different readers. This causes trouble and report interleaving when more than one reader accesses a device at a time. We need to complete only one for each report queue instead. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 158 ++++++++++++++++++++++++++------------------- dlls/hidclass.sys/hid.h | 6 +- dlls/hidclass.sys/pnp.c | 20 ++---- 3 files changed, 98 insertions(+), 86 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=561e722a46e9ad178bc3…

1 0

Rémi Bernon : dinput: Enumerate output button objects in their declaration order.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: 78207cf4d290b38574c2e1c6572d296d6ccf715b URL: https://source.winehq.org/git/wine.git/?a=commit;h=78207cf4d290b38574c2e1c6… Author: Rémi Bernon <rbernon(a)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(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)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 =

1 0

Rémi Bernon : dinput: Simplify object enumeration by removing special cases.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: 8f1f061349d3bb7339f1f7b6e18baf5bc22ed6fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f1f061349d3bb7339f1f7b6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 29 10:25:01 2021 +0200 dinput: Simplify object enumeration by removing special cases. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 120 ++++++++++++++++----------------------------- 1 file changed, 41 insertions(+), 79 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 7cb2c223121..7c4b637d018 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -205,82 +205,47 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, if (caps->flags & HID_VALUE_CAPS_IS_BUTTON) continue; if (caps->usage_page >= HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN) + { TRACE( "Ignoring input value %s, vendor specific.\n", debugstr_hid_value_caps( caps ) ); - else if (caps->flags & HID_VALUE_CAPS_IS_RANGE) - FIXME( "Ignoring input value %s, usage range not implemented.\n", debugstr_hid_value_caps( caps ) ); - else if (caps->report_count > 1) - FIXME( "Ignoring input value %s, array not implemented.\n", debugstr_hid_value_caps( caps ) ); - else if (caps->usage_page != HID_USAGE_PAGE_GENERIC) - TRACE( "Ignoring input value %s, usage page not implemented.\n", debugstr_hid_value_caps( caps ) ); - else + value_ofs += (caps->usage_max - caps->usage_min + 1) * sizeof(LONG); + } + else for (j = caps->usage_min; j <= caps->usage_max; ++j) { instance.dwOfs = value_ofs; - instance.wUsagePage = caps->usage_page; - instance.wUsage = caps->usage_min; - instance.guidType = *object_usage_to_guid( instance.wUsagePage, instance.wUsage ); - instance.wReportId = caps->report_id; - instance.wCollectionNumber = caps->link_collection; - object++; - - switch (instance.wUsage) + switch (MAKELONG(j, caps->usage_page)) { - case HID_USAGE_GENERIC_X: - set_axis_type( &instance, seen_axis, 0, &axis ); + case MAKELONG(HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC): + case MAKELONG(HID_USAGE_GENERIC_Y, HID_USAGE_PAGE_GENERIC): + case MAKELONG(HID_USAGE_GENERIC_Z, HID_USAGE_PAGE_GENERIC): + case MAKELONG(HID_USAGE_GENERIC_RX, HID_USAGE_PAGE_GENERIC): + case MAKELONG(HID_USAGE_GENERIC_RY, HID_USAGE_PAGE_GENERIC): + case MAKELONG(HID_USAGE_GENERIC_RZ, HID_USAGE_PAGE_GENERIC): + set_axis_type( &instance, seen_axis, j - HID_USAGE_GENERIC_X, &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: - 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: - case HID_USAGE_GENERIC_WHEEL: + case MAKELONG(HID_USAGE_GENERIC_WHEEL, HID_USAGE_PAGE_GENERIC): 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: - 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: - 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: - 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_DIAL: - case HID_USAGE_GENERIC_SLIDER: - 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; - break; - case HID_USAGE_GENERIC_HATSWITCH: + case MAKELONG(HID_USAGE_GENERIC_HATSWITCH, HID_USAGE_PAGE_GENERIC): instance.dwType = DIDFT_POV | DIDFT_MAKEINSTANCE( pov++ ); instance.dwFlags = 0; - ret = enum_object( impl, &filter, flags, callback, caps, &instance, data ); - if (ret != DIENUM_CONTINUE) return ret; break; default: - FIXME( "Ignoring input value %s, usage not implemented.\n", debugstr_hid_value_caps( caps ) ); + instance.dwType = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 6 + axis++ ); + instance.dwFlags = DIDOI_ASPECTPOSITION; break; } + instance.wUsagePage = caps->usage_page; + instance.wUsage = j; + instance.guidType = *object_usage_to_guid( instance.wUsagePage, instance.wUsage ); + instance.wReportId = caps->report_id; + instance.wCollectionNumber = caps->link_collection; + ret = enum_object( impl, &filter, flags, callback, caps, &instance, data ); + if (ret != DIENUM_CONTINUE) return ret; + value_ofs += sizeof(LONG); + object++; } - - value_ofs += sizeof(LONG); } for (caps = HID_INPUT_VALUE_CAPS( preparsed ), caps_end = caps + preparsed->input_caps_count; @@ -290,28 +255,25 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, if (!(caps->flags & HID_VALUE_CAPS_IS_BUTTON)) continue; if (caps->usage_page >= HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN) + { TRACE( "Ignoring input button %s, vendor specific.\n", debugstr_hid_value_caps( caps ) ); - else if (caps->usage_page != HID_USAGE_PAGE_BUTTON) - TRACE( "Ignoring input button %s, usage page not implemented.\n", debugstr_hid_value_caps( caps ) ); - else + button_ofs += caps->usage_max - caps->usage_min + 1; + } + else for (j = caps->usage_min; j <= caps->usage_max; ++j) { - for (j = caps->usage_min; j <= caps->usage_max; ++j) - { - instance.dwOfs = button_ofs + (j - caps->usage_min); - instance.dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( button++ ); - instance.dwFlags = 0; - instance.wUsagePage = caps->usage_page; - instance.wUsage = j; - instance.guidType = *object_usage_to_guid( instance.wUsagePage, instance.wUsage ); - instance.wReportId = caps->report_id; - instance.wCollectionNumber = caps->link_collection; - ret = enum_object( impl, &filter, flags, callback, caps, &instance, data ); - if (ret != DIENUM_CONTINUE) return ret; - object++; - } + instance.dwOfs = button_ofs; + instance.dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( button++ ); + instance.dwFlags = 0; + instance.wUsagePage = caps->usage_page; + instance.wUsage = j; + instance.guidType = *object_usage_to_guid( instance.wUsagePage, instance.wUsage ); + instance.wReportId = caps->report_id; + instance.wCollectionNumber = caps->link_collection; + ret = enum_object( impl, &filter, flags, callback, caps, &instance, data ); + if (ret != DIENUM_CONTINUE) return ret; + button_ofs++; + object++; } - - button_ofs += caps->usage_max - caps->usage_min + 1; } for (caps = HID_OUTPUT_VALUE_CAPS( preparsed ), caps_end = caps + preparsed->output_caps_count;

1 0

Rémi Bernon : dinput: Enumerate HID joystick objects using internal HID caps.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: 58b632b863c40b985d62940f9ced53a2c48bfd8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=58b632b863c40b985d62940f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 29 10:24:58 2021 +0200 dinput: Enumerate HID joystick objects using internal HID caps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 349 ++++++++++++++++----------------------------- 1 file changed, 123 insertions(+), 226 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=58b632b863c40b985d62…

1 0

Rémi Bernon : dinput: Enumerate HID joystick DIDFT_OUTPUT objects.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: b468349ec223425d58ce77d9bb9e1d7d9d75b37f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b468349ec223425d58ce77d9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 29 10:24:59 2021 +0200 dinput: Enumerate HID joystick DIDFT_OUTPUT objects. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 35 ++++++++++++++++++++++++++++++++++- dlls/dinput8/tests/hid.c | 18 ++++-------------- 2 files changed, 38 insertions(+), 15 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 4d6d53b588e..526cfaeb456 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -175,7 +175,7 @@ static void set_axis_type( DIDEVICEOBJECTINSTANCEW *instance, BOOL *seen, DWORD static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, DWORD flags, enum_object_callback callback, void *data ) { - DWORD collection = 0, axis = 0, button = 0, pov = 0, value_ofs = 0, button_ofs = 0, i, j; + 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)}; DIDATAFORMAT *format = impl->base.data_format.wine_df; @@ -220,6 +220,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.guidType = *object_usage_to_guid( instance.wUsagePage, instance.wUsage ); instance.wReportId = caps->report_id; instance.wCollectionNumber = caps->link_collection; + object++; switch (instance.wUsage) { @@ -306,12 +307,44 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, instance.wCollectionNumber = caps->link_collection; ret = enum_object( impl, &filter, flags, callback, caps, &instance, data ); if (ret != DIENUM_CONTINUE) return ret; + object++; } } button_ofs += caps->usage_max - caps->usage_min + 1; } + for (caps = HID_OUTPUT_VALUE_CAPS( preparsed ), caps_end = caps + preparsed->output_caps_count; + caps != caps_end; ++caps) + { + if (!caps->usage_page) continue; + + if (caps->usage_page >= HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN) + { + TRACE( "Ignoring output caps %s, vendor specific.\n", debugstr_hid_value_caps( caps ) ); + 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 for (j = caps->usage_min; j <= caps->usage_max; ++j) + { + if (caps->flags & HID_VALUE_CAPS_IS_BUTTON) instance.dwOfs = button_ofs; + else instance.dwOfs = value_ofs; + + instance.dwType = DIDFT_NODATA | DIDFT_MAKEINSTANCE( object++ ) | DIDFT_OUTPUT; + instance.dwFlags = 0x80008000; + instance.wUsagePage = caps->usage_page; + instance.wUsage = j; + instance.guidType = GUID_Unknown; + instance.wReportId = caps->report_id; + instance.wCollectionNumber = caps->link_collection; + ret = enum_object( impl, &filter, flags, callback, caps, &instance, data ); + if (ret != DIENUM_CONTINUE) return ret; + + if (caps->flags & HID_VALUE_CAPS_IS_BUTTON) button_ofs++; + else value_ofs += sizeof(LONG); + } + } + for (node = HID_COLLECTION_NODES( preparsed ), node_end = node + preparsed->number_link_collection_nodes; node != node_end; ++node) { diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index bd84bac0aca..8f6b568eae9 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3288,13 +3288,9 @@ static BOOL CALLBACK find_test_device( const DIDEVICEINSTANCEW *devinst, void *c struct check_objects_todos { - BOOL ofs; BOOL type; BOOL flags; - BOOL collection_number; - BOOL usage_page; BOOL usage; - BOOL report_id; }; struct check_objects_params @@ -3319,7 +3315,6 @@ static BOOL CALLBACK check_objects( const DIDEVICEOBJECTINSTANCEW *obj, void *ar check_member( *obj, *exp, "%u", dwSize ); check_member_guid( *obj, *exp, guidType ); - todo_wine_if( todo->ofs ) check_member( *obj, *exp, "%#x", dwOfs ); todo_wine_if( todo->type ) check_member( *obj, *exp, "%#x", dwType ); @@ -3328,16 +3323,13 @@ static BOOL CALLBACK check_objects( const DIDEVICEOBJECTINSTANCEW *obj, void *ar if (!localized) todo_wine check_member_wstr( *obj, *exp, tszName ); check_member( *obj, *exp, "%u", dwFFMaxForce ); check_member( *obj, *exp, "%u", dwFFForceResolution ); - todo_wine_if( todo->collection_number ) check_member( *obj, *exp, "%u", wCollectionNumber ); check_member( *obj, *exp, "%u", wDesignatorIndex ); - todo_wine_if( todo->usage_page ) 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 ); - todo_wine_if( todo->report_id ) check_member( *obj, *exp, "%u", wReportId ); winetest_pop_context(); @@ -5198,11 +5190,10 @@ static void test_force_feedback_joystick( void ) {}, {.type = TRUE, .flags = TRUE}, {.type = TRUE, .flags = TRUE}, - {.ofs = TRUE, .type = TRUE, .flags = TRUE, .collection_number = TRUE, .usage_page = TRUE, .usage = TRUE, .report_id = TRUE}, - {.ofs = TRUE, .type = TRUE, .flags = TRUE, .collection_number = TRUE, .usage_page = TRUE, .usage = TRUE, .report_id = TRUE}, - {.ofs = TRUE, .type = TRUE, .flags = TRUE, .collection_number = TRUE, .usage = TRUE, .report_id = TRUE}, - {.ofs = TRUE, .type = TRUE, .flags = TRUE, .collection_number = TRUE, .usage = TRUE, .report_id = TRUE}, - {.ofs = TRUE, .type = TRUE, .flags = TRUE, .usage = TRUE, .report_id = TRUE}, + {}, + {.usage = TRUE}, + {}, + {.usage = TRUE}, }; struct check_objects_params check_objects_params = @@ -5302,7 +5293,6 @@ static void test_force_feedback_joystick( void ) hr = IDirectInputDevice8_EnumObjects( device, check_objects, &check_objects_params, DIDFT_ALL ); ok( hr == DI_OK, "IDirectInputDevice8_EnumObjects returned %#x\n", hr ); - todo_wine ok( check_objects_params.index >= check_objects_params.expect_count, "missing %u objects\n", check_objects_params.expect_count - check_objects_params.index );

1 0

Rémi Bernon : dinput: Improve filtering of HID device state input report.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: 81bef14324be69be190ef3fcfe301a7063e39351 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81bef14324be69be190ef3fc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 29 10:24:57 2021 +0200 dinput: Improve filtering of HID device state input report. Make sure we only read input object from the device state input report and only look for generic and button usage pages to find the report. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 29cb8990689..a20925b6176 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -937,6 +937,8 @@ static BOOL check_device_state_button( struct hid_joystick *impl, struct hid_cap struct parse_device_state_params *params = data; BYTE old_value, value; + if (instance->wReportId != impl->device_state_report_id) return DIENUM_CONTINUE; + value = params->buttons[instance->wUsage - 1]; old_value = params->old_state[instance->dwOfs]; impl->device_state[instance->dwOfs] = value; @@ -1008,6 +1010,8 @@ static BOOL read_device_state_value( struct hid_joystick *impl, struct hid_caps LONG old_value, value; NTSTATUS status; + if (instance->wReportId != impl->device_state_report_id) return DIENUM_CONTINUE; + extra = impl->input_extra_caps + (value_caps - impl->input_value_caps); status = HidP_GetUsageValue( HidP_Input, instance->wUsagePage, 0, instance->wUsage, &logical_value, impl->preparsed, report_buf, report_len ); @@ -1360,10 +1364,15 @@ static BOOL init_objects( struct hid_joystick *impl, struct hid_caps *caps, if (instance->dwType & DIDFT_AXIS) impl->dev_caps.dwAxes++; if (instance->dwType & DIDFT_POV) impl->dev_caps.dwPOVs++; - if (!impl->device_state_report_id) - impl->device_state_report_id = instance->wReportId; - else if (impl->device_state_report_id != instance->wReportId) - FIXME( "multiple device state reports found!\n" ); + if (instance->dwType & (DIDFT_BUTTON|DIDFT_AXIS|DIDFT_POV) && + (instance->wUsagePage == HID_USAGE_PAGE_GENERIC || + instance->wUsagePage == HID_USAGE_PAGE_BUTTON)) + { + if (!impl->device_state_report_id) + impl->device_state_report_id = instance->wReportId; + else if (impl->device_state_report_id != instance->wReportId) + FIXME( "multiple device state reports found!\n" ); + } return DIENUM_CONTINUE; }

1 0

Rémi Bernon : dinput8/tests: Add a new force-feedback capable HID joystick test.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: 6c26901c933dd9f1e101a896282f22ac2e193f34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c26901c933dd9f1e101a896… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 29 10:24:56 2021 +0200 dinput8/tests: Add a new force-feedback capable HID joystick test. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 402 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 402 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6c26901c933dd9f1e101…

1 0

Rémi Bernon : include: Add Wine-specific HID PID usages definitions.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: 3dc21ab03bf79845d62523d5f73267ffe678103d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dc21ab03bf79845d62523d5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 29 10:24:54 2021 +0200 include: Add Wine-specific HID PID usages definitions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/hid.h | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/include/wine/hid.h b/include/wine/hid.h index 1d489a24c88..236888cbdc7 100644 --- a/include/wine/hid.h +++ b/include/wine/hid.h @@ -117,4 +117,114 @@ struct hid_preparsed_data #define HID_FEATURE_VALUE_CAPS(d) ((d)->value_caps + (d)->feature_caps_start) #define HID_COLLECTION_NODES(d) (struct hid_collection_node *)((char *)(d)->value_caps + (d)->caps_size) +/* Wine-specific Physical Interface Device usages */ +/* From USB Device Class Definition for Physical Interface Devices */ +/* https://www.usb.org/sites/default/files/documents/pid1_01.pdf */ +#define PID_USAGE_UNDEFINED ((USAGE) 0x00) +#define PID_USAGE_PID ((USAGE) 0x01) +#define PID_USAGE_NORMAL ((USAGE) 0x20) +#define PID_USAGE_SET_EFFECT_REPORT ((USAGE) 0x21) +#define PID_USAGE_EFFECT_BLOCK_INDEX ((USAGE) 0x22) +#define PID_USAGE_PARAMETER_BLOCK_OFFSET ((USAGE) 0x23) +#define PID_USAGE_ROM_FLAG ((USAGE) 0x24) +#define PID_USAGE_EFFECT_TYPE ((USAGE) 0x25) +#define PID_USAGE_ET_CONSTANT_FORCE ((USAGE) 0x26) +#define PID_USAGE_ET_RAMP ((USAGE) 0x27) +#define PID_USAGE_ET_CUSTOM_FORCE_DATA ((USAGE) 0x28) +#define PID_USAGE_ET_SQUARE ((USAGE) 0x30) +#define PID_USAGE_ET_SINE ((USAGE) 0x31) +#define PID_USAGE_ET_TRIANGLE ((USAGE) 0x32) +#define PID_USAGE_ET_SAWTOOTH_UP ((USAGE) 0x33) +#define PID_USAGE_ET_SAWTOOTH_DOWN ((USAGE) 0x34) +#define PID_USAGE_ET_SPRING ((USAGE) 0x40) +#define PID_USAGE_ET_DAMPER ((USAGE) 0x41) +#define PID_USAGE_ET_INERTIA ((USAGE) 0x42) +#define PID_USAGE_ET_FRICTION ((USAGE) 0x43) +#define PID_USAGE_DURATION ((USAGE) 0x50) +#define PID_USAGE_SAMPLE_PERIOD ((USAGE) 0x51) +#define PID_USAGE_GAIN ((USAGE) 0x52) +#define PID_USAGE_TRIGGER_BUTTON ((USAGE) 0x53) +#define PID_USAGE_TRIGGER_REPEAT_INTERVAL ((USAGE) 0x54) +#define PID_USAGE_AXES_ENABLE ((USAGE) 0x55) +#define PID_USAGE_DIRECTION_ENABLE ((USAGE) 0x56) +#define PID_USAGE_DIRECTION ((USAGE) 0x57) +#define PID_USAGE_TYPE_SPECIFIC_BLOCK_OFFSET ((USAGE) 0x58) +#define PID_USAGE_BLOCK_TYPE ((USAGE) 0x59) +#define PID_USAGE_SET_ENVELOPE_REPORT ((USAGE) 0x5a) +#define PID_USAGE_ATTACK_LEVEL ((USAGE) 0x5b) +#define PID_USAGE_ATTACK_TIME ((USAGE) 0x5c) +#define PID_USAGE_FADE_LEVEL ((USAGE) 0x5d) +#define PID_USAGE_FADE_TIME ((USAGE) 0x5e) +#define PID_USAGE_SET_CONDITION_REPORT ((USAGE) 0x5f) +#define PID_USAGE_CP_OFFSET ((USAGE) 0x60) +#define PID_USAGE_POSITIVE_COEFFICIENT ((USAGE) 0x61) +#define PID_USAGE_NEGATIVE_COEFFICIENT ((USAGE) 0x62) +#define PID_USAGE_POSITIVE_SATURATION ((USAGE) 0x63) +#define PID_USAGE_NEGATIVE_SATURATION ((USAGE) 0x64) +#define PID_USAGE_DEAD_BAND ((USAGE) 0x65) +#define PID_USAGE_DOWNLOAD_FORCE_SAMPLE ((USAGE) 0x66) +#define PID_USAGE_ISOCH_CUSTOM_FORCE_ENABLE ((USAGE) 0x67) +#define PID_USAGE_CUSTOM_FORCE_DATA_REPORT ((USAGE) 0x68) +#define PID_USAGE_CUSTOM_FORCE_DATA ((USAGE) 0x69) +#define PID_USAGE_CUSTOM_FORCE_VENDOR_DEFINED_DATA ((USAGE) 0x6a) +#define PID_USAGE_SET_CUSTOM_FORCE_REPORT ((USAGE) 0x6b) +#define PID_USAGE_CUSTOM_FORCE_DATA_OFFSET ((USAGE) 0x6c) +#define PID_USAGE_SAMPLE_COUNT ((USAGE) 0x6d) +#define PID_USAGE_SET_PERIODIC_REPORT ((USAGE) 0x6e) +#define PID_USAGE_OFFSET ((USAGE) 0x6f) +#define PID_USAGE_MAGNITUDE ((USAGE) 0x70) +#define PID_USAGE_PHASE ((USAGE) 0x71) +#define PID_USAGE_PERIOD ((USAGE) 0x72) +#define PID_USAGE_SET_CONSTANT_FORCE_REPORT ((USAGE) 0x73) +#define PID_USAGE_SET_RAMP_FORCE_REPORT ((USAGE) 0x74) +#define PID_USAGE_RAMP_START ((USAGE) 0x75) +#define PID_USAGE_RAMP_END ((USAGE) 0x76) +#define PID_USAGE_EFFECT_OPERATION_REPORT ((USAGE) 0x77) +#define PID_USAGE_EFFECT_OPERATION ((USAGE) 0x78) +#define PID_USAGE_OP_EFFECT_START ((USAGE) 0x79) +#define PID_USAGE_OP_EFFECT_START_SOLO ((USAGE) 0x7a) +#define PID_USAGE_OP_EFFECT_STOP ((USAGE) 0x7b) +#define PID_USAGE_LOOP_COUNT ((USAGE) 0x7c) +#define PID_USAGE_DEVICE_GAIN_REPORT ((USAGE) 0x7d) +#define PID_USAGE_DEVICE_GAIN ((USAGE) 0x7e) +#define PID_USAGE_POOL_REPORT ((USAGE) 0x7f) +#define PID_USAGE_RAM_POOL_SIZE ((USAGE) 0x80) +#define PID_USAGE_ROM_POOL_SIZE ((USAGE) 0x81) +#define PID_USAGE_ROM_EFFECT_BLOCK_COUNT ((USAGE) 0x82) +#define PID_USAGE_SIMULTANEOUS_EFFECTS_MAX ((USAGE) 0x83) +#define PID_USAGE_POOL_ALIGNMENT ((USAGE) 0x84) +#define PID_USAGE_POOL_MOVE_REPORT ((USAGE) 0x85) +#define PID_USAGE_MOVE_SOURCE ((USAGE) 0x86) +#define PID_USAGE_MOVE_DESTINATION ((USAGE) 0x87) +#define PID_USAGE_MOVE_LENGTH ((USAGE) 0x88) +#define PID_USAGE_BLOCK_LOAD_REPORT ((USAGE) 0x89) +#define PID_USAGE_BLOCK_LOAD_STATUS ((USAGE) 0x8b) +#define PID_USAGE_BLOCK_LOAD_SUCCESS ((USAGE) 0x8c) +#define PID_USAGE_BLOCK_LOAD_FULL ((USAGE) 0x8d) +#define PID_USAGE_BLOCK_LOAD_ERROR ((USAGE) 0x8e) +#define PID_USAGE_BLOCK_HANDLE ((USAGE) 0x8f) +#define PID_USAGE_BLOCK_FREE_REPORT ((USAGE) 0x90) +#define PID_USAGE_TYPE_SPECIFIC_BLOCK_HANDLE ((USAGE) 0x91) +#define PID_USAGE_STATE_REPORT ((USAGE) 0x92) +#define PID_USAGE_EFFECT_PLAYING ((USAGE) 0x94) +#define PID_USAGE_DEVICE_CONTROL_REPORT ((USAGE) 0x95) +#define PID_USAGE_DEVICE_CONTROL ((USAGE) 0x96) +#define PID_USAGE_DC_ENABLE_ACTUATORS ((USAGE) 0x97) +#define PID_USAGE_DC_DISABLE_ACTUATORS ((USAGE) 0x98) +#define PID_USAGE_DC_STOP_ALL_EFFECTS ((USAGE) 0x99) +#define PID_USAGE_DC_DEVICE_RESET ((USAGE) 0x9a) +#define PID_USAGE_DC_DEVICE_PAUSE ((USAGE) 0x9b) +#define PID_USAGE_DC_DEVICE_CONTINUE ((USAGE) 0x9c) +#define PID_USAGE_DEVICE_PAUSED ((USAGE) 0x9f) +#define PID_USAGE_ACTUATORS_ENABLED ((USAGE) 0xa0) +#define PID_USAGE_SAFETY_SWITCH ((USAGE) 0xa4) +#define PID_USAGE_ACTUATOR_OVERRIDE_SWITCH ((USAGE) 0xa5) +#define PID_USAGE_ACTUATOR_POWER ((USAGE) 0xa6) +#define PID_USAGE_START_DELAY ((USAGE) 0xa7) +#define PID_USAGE_PARAMETER_BLOCK_SIZE ((USAGE) 0xa8) +#define PID_USAGE_DEVICE_MANAGED_POOL ((USAGE) 0xa9) +#define PID_USAGE_SHARED_PARAMETER_BLOCKS ((USAGE) 0xaa) +#define PID_USAGE_CREATE_NEW_EFFECT_REPORT ((USAGE) 0xab) +#define PID_USAGE_RAM_POOL_AVAILABLE ((USAGE) 0xac) + #endif /* __WINE_PARSE_H */

1 0