August 2021 - Wine-commits - list.winehq.org

Rémi Bernon : hidclass.sys: Enforce POLL_FREQUENCY_MSEC value range.
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: wine Branch: master Commit: 286999a9ea79d8c84201756709eb6bc0a82cf6e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=286999a9ea79d8c842017567… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 16 10:07:48 2021 +0200 hidclass.sys: Enforce POLL_FREQUENCY_MSEC value range. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 9 ++------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 27 ++++++++++++++++++++++++--- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 6e82608aa2e..ed59a7794a3 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -535,13 +535,8 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) break; } poll_interval = *(ULONG *)irp->AssociatedIrp.SystemBuffer; - if (poll_interval <= MAX_POLL_INTERVAL_MSEC) - { - ext->u.pdo.poll_interval = poll_interval; - irp->IoStatus.Status = STATUS_SUCCESS; - } - else - irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + if (poll_interval) ext->u.pdo.poll_interval = min(poll_interval, MAX_POLL_INTERVAL_MSEC); + irp->IoStatus.Status = STATUS_SUCCESS; break; } case IOCTL_HID_GET_PRODUCT_STRING: diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 50e381c8983..f11dce1cc93 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2833,7 +2833,21 @@ static void test_hid_device(DWORD report_id, DWORD polled) poll_freq = 500; SetLastError(0xdeadbeef); ret = sync_ioctl(file, IOCTL_HID_SET_POLL_FREQUENCY_MSEC, &poll_freq, sizeof(ULONG), NULL, &out_len); - ok(ret, "IOCTL_HID_GET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError()); + ok(ret, "IOCTL_HID_SET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError()); + ok(out_len == 0, "got out_len %u, expected 0\n", out_len); + + out_len = 0; + poll_freq = 10001; + SetLastError(0xdeadbeef); + ret = sync_ioctl(file, IOCTL_HID_SET_POLL_FREQUENCY_MSEC, &poll_freq, sizeof(ULONG), NULL, &out_len); + ok(ret, "IOCTL_HID_SET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError()); + ok(out_len == 0, "got out_len %u, expected 0\n", out_len); + + out_len = 0; + poll_freq = 0; + SetLastError(0xdeadbeef); + ret = sync_ioctl(file, IOCTL_HID_SET_POLL_FREQUENCY_MSEC, &poll_freq, sizeof(ULONG), NULL, &out_len); + ok(ret, "IOCTL_HID_SET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError()); ok(out_len == 0, "got out_len %u, expected 0\n", out_len); out_len = sizeof(ULONG); @@ -2841,14 +2855,21 @@ static void test_hid_device(DWORD report_id, DWORD polled) ret = sync_ioctl(file, IOCTL_HID_GET_POLL_FREQUENCY_MSEC, NULL, 0, &poll_freq, &out_len); ok(ret, "IOCTL_HID_GET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError()); ok(out_len == sizeof(ULONG), "got out_len %u, expected sizeof(ULONG)\n", out_len); - ok(poll_freq == 500, "got poll_freq %u, expected 100\n", poll_freq); + ok(poll_freq == 10000, "got poll_freq %u, expected 10000\n", poll_freq); + + out_len = 0; + poll_freq = 500; + SetLastError(0xdeadbeef); + ret = sync_ioctl(file, IOCTL_HID_SET_POLL_FREQUENCY_MSEC, &poll_freq, sizeof(ULONG), NULL, &out_len); + ok(ret, "IOCTL_HID_SET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError()); + ok(out_len == 0, "got out_len %u, expected 0\n", out_len); out_len = sizeof(ULONG); SetLastError(0xdeadbeef); ret = sync_ioctl(async_file, IOCTL_HID_GET_POLL_FREQUENCY_MSEC, NULL, 0, &poll_freq, &out_len); ok(ret, "IOCTL_HID_GET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError()); ok(out_len == sizeof(ULONG), "got out_len %u, expected sizeof(ULONG)\n", out_len); - ok(poll_freq == 500, "got poll_freq %u, expected 100\n", poll_freq); + ok(poll_freq == 500, "got poll_freq %u, expected 500\n", poll_freq); } test_hidp(file, async_file, report_id, polled);

1 0

Rémi Bernon : hidclass.sys: Remove unnecessary poll_interval == 0 cases.
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: wine Branch: master Commit: 6f9bec436cde6c45ee23fc09b54053b9f2fb1f49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f9bec436cde6c45ee23fc09… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 16 10:07:49 2021 +0200 hidclass.sys: Remove unnecessary poll_interval == 0 cases. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 57 +++++++++++----------------------------------- 1 file changed, 13 insertions(+), 44 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index ed59a7794a3..006b19ffa32 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -32,7 +32,6 @@ #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(hid); -WINE_DECLARE_DEBUG_CHANNEL(hid_report); IRP *pop_irp_from_queue(BASE_DEVICE_EXTENSION *ext) { @@ -282,8 +281,7 @@ static DWORD CALLBACK hid_device_thread(void *args) hid_device_queue_input( device, packet ); } - rc = WaitForSingleObject(ext->u.pdo.halt_event, - ext->u.pdo.poll_interval ? ext->u.pdo.poll_interval : DEFAULT_POLL_INTERVAL); + rc = WaitForSingleObject(ext->u.pdo.halt_event, ext->u.pdo.poll_interval); if (rc == WAIT_OBJECT_0) break; @@ -616,7 +614,6 @@ NTSTATUS WINAPI pdo_read(DEVICE_OBJECT *device, IRP *irp) BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; struct hid_preparsed_data *preparsed = ext->u.pdo.preparsed_data; IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); - BYTE report_id = HID_INPUT_VALUE_CAPS( preparsed )->report_id; struct hid_report *report; NTSTATUS status; BOOL removed; @@ -650,50 +647,22 @@ NTSTATUS WINAPI pdo_read(DEVICE_OBJECT *device, IRP *irp) } else { - if (ext->u.pdo.poll_interval) - { - KIRQL old_irql; - TRACE_(hid_report)("Queue irp\n"); - - KeAcquireSpinLock(&ext->u.pdo.irp_queue_lock, &old_irql); - - IoSetCancelRoutine(irp, read_cancel_routine); - if (irp->Cancel && !IoSetCancelRoutine(irp, NULL)) - { - /* IRP was canceled before we set cancel routine */ - InitializeListHead(&irp->Tail.Overlay.ListEntry); - KeReleaseSpinLock(&ext->u.pdo.irp_queue_lock, old_irql); - return STATUS_CANCELLED; - } + KeAcquireSpinLock(&ext->u.pdo.irp_queue_lock, &irql); - InsertTailList(&ext->u.pdo.irp_queue, &irp->Tail.Overlay.ListEntry); - irp->IoStatus.Status = STATUS_PENDING; - IoMarkIrpPending(irp); - - KeReleaseSpinLock(&ext->u.pdo.irp_queue_lock, old_irql); - } - else + IoSetCancelRoutine(irp, read_cancel_routine); + if (irp->Cancel && !IoSetCancelRoutine(irp, NULL)) { - HID_XFER_PACKET packet; - BYTE *buffer = irp->AssociatedIrp.SystemBuffer; - ULONG buffer_len = irpsp->Parameters.Read.Length; - - TRACE("No packet, but opportunistic reads enabled\n"); - - packet.reportId = buffer[0]; - packet.reportBuffer = buffer; - packet.reportBufferLen = buffer_len; + /* IRP was canceled before we set cancel routine */ + InitializeListHead(&irp->Tail.Overlay.ListEntry); + KeReleaseSpinLock(&ext->u.pdo.irp_queue_lock, irql); + return STATUS_CANCELLED; + } - if (!report_id) - { - packet.reportId = 0; - packet.reportBuffer++; - packet.reportBufferLen--; - } + InsertTailList(&ext->u.pdo.irp_queue, &irp->Tail.Overlay.ListEntry); + irp->IoStatus.Status = STATUS_PENDING; + IoMarkIrpPending(irp); - call_minidriver( IOCTL_HID_GET_INPUT_REPORT, ext->u.pdo.parent_fdo, NULL, 0, &packet, - sizeof(packet), &irp->IoStatus ); - } + KeReleaseSpinLock(&ext->u.pdo.irp_queue_lock, irql); } status = irp->IoStatus.Status;

1 0

Rémi Bernon : hidclass.sys: Factor poll / non-polled read loops together.
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: wine Branch: master Commit: 7a47a1f5d2ec66a645b75f0e94155aaceee2e4ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a47a1f5d2ec66a645b75f0e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 16 10:07:50 2021 +0200 hidclass.sys: Factor poll / non-polled read loops together. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 89 ++++++++++++++-------------------------------- 1 file changed, 26 insertions(+), 63 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 006b19ffa32..84eda78019c 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -246,87 +246,50 @@ static DWORD CALLBACK hid_device_thread(void *args) struct hid_preparsed_data *preparsed = ext->u.pdo.preparsed_data; BYTE report_id = HID_INPUT_VALUE_CAPS( preparsed )->report_id; ULONG buffer_len = preparsed->caps.InputReportByteLength; - IO_STATUS_BLOCK io; HID_XFER_PACKET *packet; + ULONG poll_interval = 0; + IO_STATUS_BLOCK io; BYTE *buffer; - DWORD rc; + DWORD res; packet = malloc( sizeof(*packet) + buffer_len ); buffer = (BYTE *)(packet + 1); packet->reportBuffer = buffer; - if (ext->u.pdo.information.Polled) - { - while(1) - { - packet->reportId = buffer[0] = report_id; - packet->reportBufferLen = buffer_len; - - if (!report_id) - { - packet->reportBuffer++; - packet->reportBufferLen--; - } - - call_minidriver( IOCTL_HID_GET_INPUT_REPORT, ext->u.pdo.parent_fdo, NULL, 0, packet, - sizeof(*packet), &io ); + if (ext->u.pdo.information.Polled) poll_interval = ext->u.pdo.poll_interval; - if (io.Status == STATUS_SUCCESS) - { - if (!report_id) io.Information++; - packet->reportId = buffer[0]; - packet->reportBuffer = buffer; - packet->reportBufferLen = io.Information; - - hid_device_queue_input( device, packet ); - } - - rc = WaitForSingleObject(ext->u.pdo.halt_event, ext->u.pdo.poll_interval); - - if (rc == WAIT_OBJECT_0) - break; - else if (rc != WAIT_TIMEOUT) - ERR("Wait returned unexpected value %x\n",rc); - } - } - else + do { - INT exit_now = FALSE; + packet->reportId = buffer[0] = report_id; + packet->reportBufferLen = buffer_len; - while(1) + if (!report_id) { - packet->reportId = buffer[0] = report_id; - packet->reportBufferLen = buffer_len; - - if (!report_id) - { - packet->reportBuffer++; - packet->reportBufferLen--; - } + packet->reportBuffer++; + packet->reportBufferLen--; + } + if (!poll_interval) call_minidriver( IOCTL_HID_READ_REPORT, ext->u.pdo.parent_fdo, NULL, 0, packet->reportBuffer, packet->reportBufferLen, &io ); + else + call_minidriver( IOCTL_HID_GET_INPUT_REPORT, ext->u.pdo.parent_fdo, NULL, 0, + packet, sizeof(*packet), &io ); - rc = WaitForSingleObject(ext->u.pdo.halt_event, 0); - if (rc == WAIT_OBJECT_0) - exit_now = TRUE; - - if (!exit_now && io.Status == STATUS_SUCCESS) - { - if (!report_id) io.Information++; - packet->reportId = buffer[0]; - packet->reportBuffer = buffer; - packet->reportBufferLen = io.Information; - - hid_device_queue_input( device, packet ); - } + if (io.Status == STATUS_SUCCESS) + { + if (!report_id) io.Information++; + packet->reportId = buffer[0]; + packet->reportBuffer = buffer; + packet->reportBufferLen = io.Information; - if (exit_now) - break; + hid_device_queue_input( device, packet ); } - } - TRACE("Device thread exiting\n"); + res = WaitForSingleObject(ext->u.pdo.halt_event, poll_interval); + } while (res == WAIT_TIMEOUT); + + TRACE("device thread exiting, res %#x\n", res); return 1; }

1 0

Rémi Bernon : hidparse.sys: Introduce new driver library.
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: wine Branch: master Commit: 1ca788e036d843c28ac7a7923c271bf6e3c17a0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ca788e036d843c28ac7a792… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 16 10:07:51 2021 +0200 hidparse.sys: Introduce new driver library. Sharing the HidP_* functions with dlls/hid/hidp.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/hidparse.sys/Makefile.in | 8 +++++ dlls/hidparse.sys/hidparse.sys.spec | 32 +++++++++++++++++ dlls/hidparse.sys/main.c | 49 ++++++++++++++++++++++++++ include/ddk/hidpddi.h | 69 +++++++++++++++++++++++++++++++++++++ include/ddk/hidpi.h | 2 ++ 7 files changed, 163 insertions(+) diff --git a/configure b/configure index 43acba7bf22..46eadaa4c5a 100755 --- a/configure +++ b/configure @@ -1381,6 +1381,7 @@ enable_hal enable_hhctrl_ocx enable_hid enable_hidclass_sys +enable_hidparse_sys enable_hlink enable_hnetcfg enable_http_sys @@ -20632,6 +20633,7 @@ wine_fn_config_makefile dlls/hhctrl.ocx enable_hhctrl_ocx wine_fn_config_makefile dlls/hid enable_hid wine_fn_config_makefile dlls/hid/tests enable_tests wine_fn_config_makefile dlls/hidclass.sys enable_hidclass_sys +wine_fn_config_makefile dlls/hidparse.sys enable_hidparse_sys wine_fn_config_makefile dlls/hlink enable_hlink wine_fn_config_makefile dlls/hlink/tests enable_tests wine_fn_config_makefile dlls/hnetcfg enable_hnetcfg diff --git a/configure.ac b/configure.ac index 065b3f231bf..7237289a2ad 100644 --- a/configure.ac +++ b/configure.ac @@ -3292,6 +3292,7 @@ WINE_CONFIG_MAKEFILE(dlls/hhctrl.ocx) WINE_CONFIG_MAKEFILE(dlls/hid) WINE_CONFIG_MAKEFILE(dlls/hid/tests) WINE_CONFIG_MAKEFILE(dlls/hidclass.sys) +WINE_CONFIG_MAKEFILE(dlls/hidparse.sys) WINE_CONFIG_MAKEFILE(dlls/hlink) WINE_CONFIG_MAKEFILE(dlls/hlink/tests) WINE_CONFIG_MAKEFILE(dlls/hnetcfg) diff --git a/dlls/hidparse.sys/Makefile.in b/dlls/hidparse.sys/Makefile.in new file mode 100644 index 00000000000..3bebabb9878 --- /dev/null +++ b/dlls/hidparse.sys/Makefile.in @@ -0,0 +1,8 @@ +MODULE = hidparse.sys +IMPORTLIB = hidparse +EXTRADLLFLAGS = -mno-cygwin +PARENTSRC = ../hid + +C_SRCS = \ + hidp.c \ + main.c diff --git a/dlls/hidparse.sys/hidparse.sys.spec b/dlls/hidparse.sys/hidparse.sys.spec new file mode 100644 index 00000000000..c723b51bed5 --- /dev/null +++ b/dlls/hidparse.sys/hidparse.sys.spec @@ -0,0 +1,32 @@ +@ stub DllInitialize +@ stub DllUnload +@ stdcall HidP_FreeCollectionDescription(ptr) +@ stdcall HidP_GetButtonCaps(long ptr ptr ptr) +@ stdcall HidP_GetCaps(ptr ptr) +@ stdcall HidP_GetCollectionDescription(ptr long long ptr) +@ stdcall HidP_GetData(long ptr ptr ptr ptr long) +@ stub HidP_GetExtendedAttributes +@ stdcall HidP_GetLinkCollectionNodes(ptr ptr ptr) +@ stdcall HidP_GetScaledUsageValue(long long long long ptr ptr ptr long) +@ stdcall HidP_GetSpecificButtonCaps(long long long long ptr ptr ptr) +@ stdcall HidP_GetSpecificValueCaps(long long long long ptr ptr ptr) +@ stdcall HidP_GetUsages(long long long ptr ptr ptr ptr long) +@ stdcall HidP_GetUsagesEx(long long ptr ptr ptr ptr long) +@ stdcall HidP_GetUsageValue(long long long long ptr ptr ptr long) +@ stdcall HidP_GetUsageValueArray(long long long long ptr long ptr ptr long) +@ stdcall HidP_GetValueCaps(long ptr ptr ptr) +@ stdcall HidP_InitializeReportForID(long long ptr ptr long) +@ stdcall HidP_MaxDataListLength(long ptr) +@ stdcall HidP_MaxUsageListLength(long long ptr) +@ stub HidP_SetData +@ stub HidP_SetScaledUsageValue +@ stdcall HidP_SetUsages(long long long ptr ptr ptr ptr long) +@ stdcall HidP_SetUsageValue(long long long long long ptr ptr long) +@ stdcall HidP_SetUsageValueArray(long long long long ptr long ptr ptr long) +@ stub HidP_SysPowerCaps +@ stub HidP_SysPowerEvent +@ stub HidP_TranslateUsageAndPagesToI8042ScanCodes +@ stdcall HidP_TranslateUsagesToI8042ScanCodes(ptr long long ptr ptr ptr) +@ stub HidP_UnsetUsages +@ stub HidP_UsageAndPageListDifference +@ stub HidP_UsageListDifference diff --git a/dlls/hidparse.sys/main.c b/dlls/hidparse.sys/main.c new file mode 100644 index 00000000000..b8edc3e1f6a --- /dev/null +++ b/dlls/hidparse.sys/main.c @@ -0,0 +1,49 @@ +/* + * HID parsing library + * + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" + +#include <ddk/wdm.h> +#include <ddk/hidpddi.h> + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hidp); + +NTSTATUS WINAPI HidP_GetCollectionDescription( PHIDP_REPORT_DESCRIPTOR report_desc, ULONG report_desc_len, + POOL_TYPE pool_type, HIDP_DEVICE_DESC *device_desc ) +{ + FIXME( "report_desc %p, report_desc_len %u, pool_type %u, device_desc %p stub!\n", + report_desc, report_desc_len, pool_type, device_desc ); + + return STATUS_NOT_IMPLEMENTED; +} + +void WINAPI HidP_FreeCollectionDescription( HIDP_DEVICE_DESC *device_desc ) +{ + FIXME( "device_desc %p stub!\n", device_desc ); +} diff --git a/include/ddk/hidpddi.h b/include/ddk/hidpddi.h new file mode 100644 index 00000000000..87e68e31869 --- /dev/null +++ b/include/ddk/hidpddi.h @@ -0,0 +1,69 @@ +/* + * Copyright (C) the Wine project + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_HIDPDDI_H +#define __WINE_HIDPDDI_H + +#include <hidusage.h> +#include <ddk/hidpi.h> + +typedef struct _HIDP_COLLECTION_DESC +{ + USAGE UsagePage; + USAGE Usage; + UCHAR CollectionNumber; + UCHAR Reserved[15]; + USHORT InputLength; + USHORT OutputLength; + USHORT FeatureLength; + USHORT PreparsedDataLength; + PHIDP_PREPARSED_DATA PreparsedData; +} HIDP_COLLECTION_DESC, *PHIDP_COLLECTION_DESC; + +typedef struct _HIDP_REPORT_IDS +{ + UCHAR ReportID; + UCHAR CollectionNumber; + USHORT InputLength; + USHORT OutputLength; + USHORT FeatureLength; +} HIDP_REPORT_IDS, *PHIDP_REPORT_IDS; + +typedef struct _HIDP_GETCOLDESC_DBG +{ + ULONG BreakOffset; + ULONG ErrorCode; + ULONG Args[6]; +} HIDP_GETCOLDESC_DBG, *PHIDP_GETCOLDESC_DBG; + +typedef struct _HIDP_DEVICE_DESC +{ + HIDP_COLLECTION_DESC *CollectionDesc; + ULONG CollectionDescLength; + + HIDP_REPORT_IDS *ReportIDs; + ULONG ReportIDsLength; + + HIDP_GETCOLDESC_DBG Dbg; +} HIDP_DEVICE_DESC, *PHIDP_DEVICE_DESC; + +NTSTATUS WINAPI HidP_GetCollectionDescription(PHIDP_REPORT_DESCRIPTOR report_desc, ULONG report_desc_len, + POOL_TYPE pool_type, HIDP_DEVICE_DESC *device_desc); +void WINAPI HidP_FreeCollectionDescription(HIDP_DEVICE_DESC *device_desc); + +#endif /* __WINE_HIDPDDI_H */ diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index 8c970673ec1..6dfe5919b4f 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -19,6 +19,8 @@ #ifndef __HIDPI_H__ #define __HIDPI_H__ +typedef UCHAR *PHIDP_REPORT_DESCRIPTOR; + typedef enum _HIDP_REPORT_TYPE { HidP_Input,

1 0

Rémi Bernon : hidparse.sys: Implement HidP_(Get|Free)CollectionDescription.
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: wine Branch: master Commit: a290c5bf7c9ddc92af56231693c6d8f00c3efd7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a290c5bf7c9ddc92af562316… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 16 10:07:52 2021 +0200 hidparse.sys: Implement HidP_(Get|Free)CollectionDescription. Copying HID report parsing code from hidclass.sys, and supporting only one collection descriptor for now. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidparse.sys/Makefile.in | 1 + dlls/hidparse.sys/main.c | 665 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 662 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a290c5bf7c9ddc92af56…

1 0

Rémi Bernon : hidclass.sys: Use hidparse.sys instead of internal parser.
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: wine Branch: master Commit: de0fb2adfd7e68970c7131eaf10c82684065a400 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de0fb2adfd7e68970c7131ea… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 16 10:07:53 2021 +0200 hidclass.sys: Use hidparse.sys instead of internal parser. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/Makefile.in | 3 +- dlls/hidclass.sys/descriptor.c | 602 ----------------------------------------- dlls/hidclass.sys/device.c | 88 +++--- dlls/hidclass.sys/hid.h | 6 +- dlls/hidclass.sys/pnp.c | 27 +- 5 files changed, 65 insertions(+), 661 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=de0fb2adfd7e68970c71…

1 0

Rémi Bernon : winebus.sys: Pass bus id instead of vtbl to lookup functions.
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: wine Branch: master Commit: 5703d5c0b3209c93779a3fe9f27487d8ad8efcf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5703d5c0b3209c93779a3fe9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 16 08:56:19 2021 +0200 winebus.sys: Pass bus id instead of vtbl to lookup functions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 4 ++-- dlls/winebus.sys/bus_iohid.c | 2 +- dlls/winebus.sys/bus_sdl.c | 6 +++--- dlls/winebus.sys/bus_udev.c | 9 ++++----- dlls/winebus.sys/main.c | 12 ++++++------ 5 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index bf2e157af4d..72bd071135b 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -53,11 +53,11 @@ void *get_platform_private(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, WORD input, DWORD version, DWORD uid, const WCHAR *serialW, BOOL is_gamepad, const platform_vtbl *vtbl, DWORD platform_data_size) DECLSPEC_HIDDEN; -DEVICE_OBJECT *bus_find_hid_device(const platform_vtbl *vtbl, void *platform_dev) DECLSPEC_HIDDEN; +DEVICE_OBJECT *bus_find_hid_device(const WCHAR *bus_id, void *platform_dev) DECLSPEC_HIDDEN; void bus_unlink_hid_device(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; void bus_remove_hid_device(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) DECLSPEC_HIDDEN; -DEVICE_OBJECT* bus_enumerate_hid_devices(const platform_vtbl *vtbl, enum_func function, void* context) DECLSPEC_HIDDEN; +DEVICE_OBJECT *bus_enumerate_hid_devices(const WCHAR *bus_id, enum_func function, void *context) DECLSPEC_HIDDEN; /* General Bus Functions */ DWORD check_bus_option(const UNICODE_STRING *option, DWORD default_value) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index f660a3c789a..eb6765d6aac 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -377,7 +377,7 @@ static void handle_RemovalCallback(void *context, IOReturn result, void *sender, safe way to deallocate that buffer. */ IOHIDDeviceUnscheduleFromRunLoop(IOHIDDevice, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode); IOHIDDeviceClose(IOHIDDevice, 0); - device = bus_find_hid_device(&iohid_vtbl, IOHIDDevice); + device = bus_find_hid_device(busidW, IOHIDDevice); if (device) { bus_unlink_hid_device(device); diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 8c9886c7d3c..3607634b7a0 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -617,7 +617,7 @@ static BOOL set_report_from_event(SDL_Event *event) struct platform_private *private; /* All the events coming in will have 'which' as a 3rd field */ SDL_JoystickID id = ((SDL_JoyButtonEvent*)event)->which; - device = bus_enumerate_hid_devices(&sdl_vtbl, compare_joystick_id, ULongToPtr(id)); + device = bus_enumerate_hid_devices(sdl_busidW, compare_joystick_id, ULongToPtr(id)); if (!device) { ERR("Failed to find device at index %i\n",id); @@ -681,7 +681,7 @@ static BOOL set_mapped_report_from_event(SDL_Event *event) struct platform_private *private; /* All the events coming in will have 'which' as a 3rd field */ SDL_JoystickID id = ((SDL_ControllerButtonEvent*)event)->which; - device = bus_enumerate_hid_devices(&sdl_vtbl, compare_joystick_id, ULongToPtr(id)); + device = bus_enumerate_hid_devices(sdl_busidW, compare_joystick_id, ULongToPtr(id)); if (!device) { ERR("Failed to find device at index %i\n",id); @@ -748,7 +748,7 @@ static void try_remove_device(SDL_JoystickID id) { DEVICE_OBJECT *device = NULL; - device = bus_enumerate_hid_devices(&sdl_vtbl, compare_joystick_id, ULongToPtr(id)); + device = bus_enumerate_hid_devices(sdl_busidW, compare_joystick_id, ULongToPtr(id)); if (!device) return; bus_unlink_hid_device(device); diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 887996daf49..864ffc0bf09 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1095,8 +1095,8 @@ static void try_add_device(struct udev_device *dev) TRACE("udev %s syspath %s\n", debugstr_a(devnode), udev_device_get_syspath(dev)); #ifdef HAS_PROPER_INPUT_HEADER - device = bus_enumerate_hid_devices(&lnxev_vtbl, check_device_syspath, (void *)get_device_syspath(dev)); - if (!device) device = bus_enumerate_hid_devices(&hidraw_vtbl, check_device_syspath, (void *)get_device_syspath(dev)); + device = bus_enumerate_hid_devices(lnxev_busidW, check_device_syspath, (void *)get_device_syspath(dev)); + if (!device) device = bus_enumerate_hid_devices(hidraw_busidW, check_device_syspath, (void *)get_device_syspath(dev)); if (device) { TRACE("duplicate device found, not adding the new one\n"); @@ -1212,10 +1212,9 @@ static void try_remove_device(struct udev_device *dev) { DEVICE_OBJECT *device = NULL; - device = bus_find_hid_device(&hidraw_vtbl, dev); + device = bus_find_hid_device(hidraw_busidW, dev); #ifdef HAS_PROPER_INPUT_HEADER - if (device == NULL) - device = bus_find_hid_device(&lnxev_vtbl, dev); + if (device == NULL) device = bus_find_hid_device(lnxev_busidW, dev); #endif if (!device) return; diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index b7230cf2e33..23c40e6895e 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -312,18 +312,18 @@ DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, return device; } -DEVICE_OBJECT *bus_find_hid_device(const platform_vtbl *vtbl, void *platform_dev) +DEVICE_OBJECT *bus_find_hid_device(const WCHAR *bus_id, void *platform_dev) { struct pnp_device *dev; DEVICE_OBJECT *ret = NULL; - TRACE("(%p, %p)\n", vtbl, platform_dev); + TRACE("bus_id %s, platform_dev %p\n", debugstr_w(bus_id), platform_dev); EnterCriticalSection(&device_list_cs); LIST_FOR_EACH_ENTRY(dev, &pnp_devset, struct pnp_device, entry) { struct device_extension *ext = (struct device_extension *)dev->device->DeviceExtension; - if (ext->vtbl != vtbl) continue; + if (strcmpW(ext->busid, bus_id)) continue; if (ext->vtbl->compare_platform_device(dev->device, platform_dev) == 0) { ret = dev->device; @@ -336,19 +336,19 @@ DEVICE_OBJECT *bus_find_hid_device(const platform_vtbl *vtbl, void *platform_dev return ret; } -DEVICE_OBJECT* bus_enumerate_hid_devices(const platform_vtbl *vtbl, enum_func function, void* context) +DEVICE_OBJECT *bus_enumerate_hid_devices(const WCHAR *bus_id, enum_func function, void *context) { struct pnp_device *dev, *dev_next; DEVICE_OBJECT *ret = NULL; int cont; - TRACE("(%p)\n", vtbl); + TRACE("bus_id %p\n", debugstr_w(bus_id)); EnterCriticalSection(&device_list_cs); LIST_FOR_EACH_ENTRY_SAFE(dev, dev_next, &pnp_devset, struct pnp_device, entry) { struct device_extension *ext = (struct device_extension *)dev->device->DeviceExtension; - if (ext->vtbl != vtbl) continue; + if (strcmpW(ext->busid, bus_id)) continue; LeaveCriticalSection(&device_list_cs); cont = function(dev->device, context); EnterCriticalSection(&device_list_cs);

1 0

Rémi Bernon : winebus.sys: Use bus_find_hid_device to find SDL devices from id.
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: wine Branch: master Commit: 5c3f2f88a6e518cc8c2cc4ff6d0c1ef5d92218be URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c3f2f88a6e518cc8c2cc4ff… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 16 08:56:20 2021 +0200 winebus.sys: Use bus_find_hid_device to find SDL devices from id. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 64 +++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 38 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 3607634b7a0..676010c38c3 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -482,11 +482,9 @@ static void free_device(DEVICE_OBJECT *device) pSDL_HapticClose(ext->sdl_haptic); } -static int compare_platform_device(DEVICE_OBJECT *device, void *platform_dev) +static int compare_platform_device(DEVICE_OBJECT *device, void *context) { - SDL_JoystickID id1 = impl_from_DEVICE_OBJECT(device)->id; - SDL_JoystickID id2 = PtrToUlong(platform_dev); - return (id1 != id2); + return impl_from_DEVICE_OBJECT(device)->id - PtrToUlong(context); } static NTSTATUS get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *out_length) @@ -606,23 +604,9 @@ static const platform_vtbl sdl_vtbl = set_feature_report, }; -static int compare_joystick_id(DEVICE_OBJECT *device, void* context) +static BOOL set_report_from_event(DEVICE_OBJECT *device, SDL_Event *event) { - return impl_from_DEVICE_OBJECT(device)->id - PtrToUlong(context); -} - -static BOOL set_report_from_event(SDL_Event *event) -{ - DEVICE_OBJECT *device; struct platform_private *private; - /* All the events coming in will have 'which' as a 3rd field */ - SDL_JoystickID id = ((SDL_JoyButtonEvent*)event)->which; - device = bus_enumerate_hid_devices(sdl_busidW, compare_joystick_id, ULongToPtr(id)); - if (!device) - { - ERR("Failed to find device at index %i\n",id); - return FALSE; - } private = impl_from_DEVICE_OBJECT(device); if (private->sdl_controller) { @@ -675,18 +659,9 @@ static BOOL set_report_from_event(SDL_Event *event) return FALSE; } -static BOOL set_mapped_report_from_event(SDL_Event *event) +static BOOL set_mapped_report_from_event(DEVICE_OBJECT *device, SDL_Event *event) { - DEVICE_OBJECT *device; struct platform_private *private; - /* All the events coming in will have 'which' as a 3rd field */ - SDL_JoystickID id = ((SDL_ControllerButtonEvent*)event)->which; - device = bus_enumerate_hid_devices(sdl_busidW, compare_joystick_id, ULongToPtr(id)); - if (!device) - { - ERR("Failed to find device at index %i\n",id); - return FALSE; - } private = impl_from_DEVICE_OBJECT(device); switch(event->type) @@ -744,13 +719,8 @@ static BOOL set_mapped_report_from_event(SDL_Event *event) return FALSE; } -static void try_remove_device(SDL_JoystickID id) +static void try_remove_device(DEVICE_OBJECT *device) { - DEVICE_OBJECT *device = NULL; - - device = bus_enumerate_hid_devices(sdl_busidW, compare_joystick_id, ULongToPtr(id)); - if (!device) return; - bus_unlink_hid_device(device); IoInvalidateDeviceRelations(bus_pdo, BusRelations); } @@ -850,16 +820,34 @@ static void try_add_device(unsigned int index) static void process_device_event(SDL_Event *event) { + DEVICE_OBJECT *device; + SDL_JoystickID id; + TRACE_(hid_report)("Received action %x\n", event->type); if (event->type == SDL_JOYDEVICEADDED) try_add_device(((SDL_JoyDeviceEvent*)event)->which); else if (event->type == SDL_JOYDEVICEREMOVED) - try_remove_device(((SDL_JoyDeviceEvent*)event)->which); + { + id = ((SDL_JoyDeviceEvent *)event)->which; + device = bus_find_hid_device(sdl_busidW, ULongToPtr(id)); + if (device) try_remove_device(device); + else WARN("failed to find device with id %d\n", id); + } else if (event->type >= SDL_JOYAXISMOTION && event->type <= SDL_JOYBUTTONUP) - set_report_from_event(event); + { + id = ((SDL_JoyButtonEvent *)event)->which; + device = bus_find_hid_device(sdl_busidW, ULongToPtr(id)); + if (device) set_report_from_event(device, event); + else WARN("failed to find device with id %d\n", id); + } else if (event->type >= SDL_CONTROLLERAXISMOTION && event->type <= SDL_CONTROLLERBUTTONUP) - set_mapped_report_from_event(event); + { + id = ((SDL_ControllerButtonEvent *)event)->which; + device = bus_find_hid_device(sdl_busidW, ULongToPtr(id)); + if (device) set_mapped_report_from_event(device, event); + else WARN("failed to find device with id %d\n", id); + } } static void sdl_load_mappings(void)

1 0

Rémi Bernon : winebus.sys: Always call the EVDEV ioctls for input UDEV subsystem.
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: wine Branch: master Commit: acff5b41910af0fc91724e224317508e8f4a98b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acff5b41910af0fc91724e22… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 16 08:56:21 2021 +0200 winebus.sys: Always call the EVDEV ioctls for input UDEV subsystem. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 864ffc0bf09..5db1014c09f 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1105,7 +1105,6 @@ static void try_add_device(struct udev_device *dev) } #endif - subsystem = udev_device_get_subsystem(dev); hiddev = udev_device_get_parent_with_subsystem_devtype(dev, "hid", NULL); if (hiddev) { @@ -1126,8 +1125,10 @@ static void try_add_device(struct udev_device *dev) version = a_to_bcd(bcdDevice); } } + + subsystem = udev_device_get_subsystem(dev); #ifdef HAS_PROPER_INPUT_HEADER - else + if (!strcmp(subsystem, "input")) { struct input_id device_id = {0}; char device_uid[255]; @@ -1142,9 +1143,6 @@ static void try_add_device(struct udev_device *dev) pid = device_id.product; version = device_id.version; } -#else - else - WARN("Could not get device to query VID, PID, Version and Serial\n"); #endif if (is_xbox_gamepad(vid, pid))

1 0

Rémi Bernon : winebus.sys: Only read EVIOCGID result if the ioctl succeeded.
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: wine Branch: master Commit: aa40700f9f46d7e04a6263582718669c5d0f5639 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa40700f9f46d7e04a626358… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 16 08:56:22 2021 +0200 winebus.sys: Only read EVIOCGID result if the ioctl succeeded. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 5db1014c09f..174311b87ef 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1135,13 +1135,16 @@ static void try_add_device(struct udev_device *dev) if (ioctl(fd, EVIOCGID, &device_id) < 0) WARN("ioctl(EVIOCGID) failed: %d %s\n", errno, strerror(errno)); + else + { + vid = device_id.vendor; + pid = device_id.product; + version = device_id.version; + } + device_uid[0] = 0; if (ioctl(fd, EVIOCGUNIQ(254), device_uid) >= 0 && device_uid[0]) serial = strdupAtoW(device_uid); - - vid = device_id.vendor; - pid = device_id.product; - version = device_id.version; } #endif

1 0