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

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

Aug. 16, 2021

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

Rémi Bernon : winebus.sys: Unlink device before releasing it.
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: wine Branch: master Commit: db410052a397d257dbbe88903336285741d8cb0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=db410052a397d257dbbe8890… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 16 09:04:28 2021 +0200 winebus.sys: Unlink device before releasing it. Otherwise the device will still be linked in the device list and any thread iterating it to find a matching device will access stale pointer. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 23c40e6895e..a60e3cc9a2c 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -712,6 +712,7 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) remove_pending_irps(device); + bus_unlink_hid_device(device); ext->vtbl->free_device(device); ext->cs.DebugInfo->Spare[0] = 0;

1 0

Rémi Bernon : winebus.sys: Return NTSTATUS from build_report_descriptor.
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: wine Branch: master Commit: d3885f92fc71ae8330935fe880d7524ab7385b6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3885f92fc71ae8330935fe8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 16 08:56:26 2021 +0200 winebus.sys: Return NTSTATUS from build_report_descriptor. 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 | 56 ++++++++++++++++++++++----------------------- dlls/winebus.sys/bus_udev.c | 22 +++++++++--------- 2 files changed, 39 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d3885f92fc71ae833093…

1 0

Rémi Bernon : winebus.sys: Parse udev device version and input number from uevent.
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: wine Branch: master Commit: fd73402ce6dc5dec568e17d33c45e7e203fa01e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd73402ce6dc5dec568e17d3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 16 08:56:24 2021 +0200 winebus.sys: Parse udev device version and input number from uevent. And try parsing it from the hid or input and usb parent nodes, but not beyond. 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 | 64 ++++++++++++++++----------------------------- 1 file changed, 23 insertions(+), 41 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 8086b76b287..bcf3267e9f4 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -995,27 +995,30 @@ static int check_device_syspath(DEVICE_OBJECT *device, void* context) return strcmp(get_device_syspath(private->udev_device), context); } -static void parse_uevent_info(struct udev_device *dev, DWORD *vendor_id, DWORD *product_id, - DWORD *input, WCHAR **serial_number) +static void get_device_subsystem_info(struct udev_device *dev, char const *subsystem, DWORD *vendor_id, + DWORD *product_id, DWORD *input, DWORD *version, WCHAR **serial_number) { + struct udev_device *parent = NULL; const char *ptr, *next, *tmp; char buffer[256]; DWORD bus = 0; - if ((next = udev_device_get_sysattr_value(dev, "uevent"))) + if (!(parent = udev_device_get_parent_with_subsystem_devtype(dev, subsystem, NULL))) return; + + if ((next = udev_device_get_sysattr_value(parent, "uevent"))) { while ((ptr = next) && *ptr) { if ((next = strchr(next, '\n'))) next += 1; else next = ptr + strlen(ptr); - TRACE("uevent %s\n", debugstr_an(ptr, next - ptr - 1)); + TRACE("%s uevent %s\n", subsystem, debugstr_an(ptr, next - ptr - 1)); if (!strncmp(ptr, "HID_UNIQ=", 9)) { if (sscanf(ptr, "HID_UNIQ=%256s\n", buffer) != 1 || !*buffer) continue; if (!*serial_number) *serial_number = strdupAtoW(buffer); } - if (!strncmp(ptr, "HID_PHYS=", 9)) + if (!strncmp(ptr, "HID_PHYS=", 9) || !strncmp(ptr, "PHYS=\"", 6)) { if (!(tmp = strstr(ptr, "/input")) || tmp >= next) continue; if (*input == -1) sscanf(tmp, "/input%d\n", input); @@ -1025,27 +1028,21 @@ static void parse_uevent_info(struct udev_device *dev, DWORD *vendor_id, DWORD * if (bus || *vendor_id || *product_id) continue; sscanf(ptr, "HID_ID=%x:%x:%x\n", &bus, vendor_id, product_id); } + if (!strncmp(ptr, "PRODUCT=", 8)) + { + if (*version) continue; + if (!strcmp(subsystem, "usb")) + sscanf(ptr, "PRODUCT=%x/%x/%x\n", vendor_id, product_id, version); + else + sscanf(ptr, "PRODUCT=%x/%x/%x/%x\n", &bus, vendor_id, product_id, version); + } } } } -static DWORD a_to_bcd(const char *s) -{ - DWORD r = 0; - const char *c; - int shift = strlen(s) - 1; - for (c = s; *c; ++c) - { - r |= (*c - '0') << (shift * 4); - --shift; - } - return r; -} - static void try_add_device(struct udev_device *dev) { DWORD vid = 0, pid = 0, version = 0, input = -1; - struct udev_device *hiddev = NULL, *walk_device; DEVICE_OBJECT *device = NULL; const char *subsystem; const char *devnode; @@ -1076,25 +1073,9 @@ static void try_add_device(struct udev_device *dev) } #endif - hiddev = udev_device_get_parent_with_subsystem_devtype(dev, "hid", NULL); - if (hiddev) - { - const char *bcdDevice = NULL; - parse_uevent_info(hiddev, &vid, &pid, &input, &serial); - if (serial == NULL) - serial = strdupAtoW(base_serial); - - walk_device = dev; - while (walk_device && !bcdDevice) - { - bcdDevice = udev_device_get_sysattr_value(walk_device, "bcdDevice"); - walk_device = udev_device_get_parent(walk_device); - } - if (bcdDevice) - { - version = a_to_bcd(bcdDevice); - } - } + get_device_subsystem_info(dev, "hid", &vid, &pid, &input, &version, &serial); + get_device_subsystem_info(dev, "input", &vid, &pid, &input, &version, &serial); + get_device_subsystem_info(dev, "usb", &vid, &pid, &input, &version, &serial); subsystem = udev_device_get_subsystem(dev); #ifdef HAS_PROPER_INPUT_HEADER @@ -1118,6 +1099,8 @@ static void try_add_device(struct udev_device *dev) } #endif + if (serial == NULL) serial = strdupAtoW(base_serial); + if (is_xbox_gamepad(vid, pid)) is_gamepad = TRUE; #ifdef HAS_PROPER_INPUT_HEADER @@ -1132,9 +1115,8 @@ static void try_add_device(struct udev_device *dev) if (input == (WORD)-1 && is_gamepad) input = 0; - - TRACE("Found udev device %s (vid %04x, pid %04x, version %u, serial %s)\n", - debugstr_a(devnode), vid, pid, version, debugstr_w(serial)); + TRACE("Found udev device %s (vid %04x, pid %04x, version %04x, input %d, serial %s)\n", + debugstr_a(devnode), vid, pid, version, input, debugstr_w(serial)); if (strcmp(subsystem, "hidraw") == 0) {

1 0

Rémi Bernon : winebus.sys: Simplify parsing udev device info from uevent.
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: wine Branch: master Commit: c2fc919e04199326d1e9d5bcb40fa7ddd71831f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2fc919e04199326d1e9d5bc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 16 08:56:23 2021 +0200 winebus.sys: Simplify parsing udev device info from uevent. 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 | 84 +++++++++++++++------------------------------ 1 file changed, 27 insertions(+), 57 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 174311b87ef..8086b76b287 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -995,66 +995,38 @@ static int check_device_syspath(DEVICE_OBJECT *device, void* context) return strcmp(get_device_syspath(private->udev_device), context); } -static int parse_uevent_info(const char *uevent, DWORD *vendor_id, - DWORD *product_id, WORD *input, WCHAR **serial_number) +static void parse_uevent_info(struct udev_device *dev, DWORD *vendor_id, DWORD *product_id, + DWORD *input, WCHAR **serial_number) { - DWORD bus_type; - char *tmp; - char *saveptr = NULL; - char *line; - char *key; - char *value; - - int found_id = 0; - int found_serial = 0; - - tmp = heap_alloc(strlen(uevent) + 1); - strcpy(tmp, uevent); - line = strtok_r(tmp, "\n", &saveptr); - while (line != NULL) - { - /* line: "KEY=value" */ - key = line; - value = strchr(line, '='); - if (!value) - { - goto next_line; - } - *value = '\0'; - value++; + const char *ptr, *next, *tmp; + char buffer[256]; + DWORD bus = 0; - if (strcmp(key, "HID_ID") == 0) - { - /** - * type vendor product - * HID_ID=0003:000005AC:00008242 - **/ - int ret = sscanf(value, "%x:%x:%x", &bus_type, vendor_id, product_id); - if (ret == 3) - found_id = 1; - } - else if (strcmp(key, "HID_UNIQ") == 0) + if ((next = udev_device_get_sysattr_value(dev, "uevent"))) + { + while ((ptr = next) && *ptr) { - /* The caller has to free the serial number */ - if (*value) + if ((next = strchr(next, '\n'))) next += 1; + else next = ptr + strlen(ptr); + TRACE("uevent %s\n", debugstr_an(ptr, next - ptr - 1)); + + if (!strncmp(ptr, "HID_UNIQ=", 9)) { - *serial_number = strdupAtoW(value); - found_serial = 1; + if (sscanf(ptr, "HID_UNIQ=%256s\n", buffer) != 1 || !*buffer) continue; + if (!*serial_number) *serial_number = strdupAtoW(buffer); + } + if (!strncmp(ptr, "HID_PHYS=", 9)) + { + if (!(tmp = strstr(ptr, "/input")) || tmp >= next) continue; + if (*input == -1) sscanf(tmp, "/input%d\n", input); + } + if (!strncmp(ptr, "HID_ID=", 7)) + { + if (bus || *vendor_id || *product_id) continue; + sscanf(ptr, "HID_ID=%x:%x:%x\n", &bus, vendor_id, product_id); } } - else if (strcmp(key, "HID_PHYS") == 0) - { - const char *input_no = strstr(value, "input"); - if (input_no) - *input = atoi(input_no+5 ); - } - -next_line: - line = strtok_r(NULL, "\n", &saveptr); } - - heap_free(tmp); - return (found_id && found_serial); } static DWORD a_to_bcd(const char *s) @@ -1072,14 +1044,13 @@ static DWORD a_to_bcd(const char *s) static void try_add_device(struct udev_device *dev) { - DWORD vid = 0, pid = 0, version = 0; + DWORD vid = 0, pid = 0, version = 0, input = -1; struct udev_device *hiddev = NULL, *walk_device; DEVICE_OBJECT *device = NULL; const char *subsystem; const char *devnode; WCHAR *serial = NULL; BOOL is_gamepad = FALSE; - WORD input = -1; int fd; static const CHAR *base_serial = "0000"; @@ -1109,8 +1080,7 @@ static void try_add_device(struct udev_device *dev) if (hiddev) { const char *bcdDevice = NULL; - parse_uevent_info(udev_device_get_sysattr_value(hiddev, "uevent"), - &vid, &pid, &input, &serial); + parse_uevent_info(hiddev, &vid, &pid, &input, &serial); if (serial == NULL) serial = strdupAtoW(base_serial);

1 0

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

Aug. 16, 2021

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 : hidparse.sys: Introduce new driver library.
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

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 : hidclass.sys: Factor poll / non-polled read loops together.
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

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 : hidclass.sys: Use hidparse.sys instead of internal parser.
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

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: Use bus_find_hid_device to find SDL devices from id.
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

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