wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Rémi Bernon : winebus.sys: Move SDL function loading to a separate helper.
by Alexandre Julliard 13 Aug '21

13 Aug '21

Module: wine Branch: master Commit: 90b8a972376952099814b68fb426d4ba5a1cf948 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90b8a972376952099814b68f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 13 09:46:17 2021 +0200 winebus.sys: Move SDL function loading to a separate helper. 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 | 116 +++++++++++++++++++++++++-------------------- 1 file changed, 64 insertions(+), 52 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 572b46b4114..d866fb0d8bb 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -968,6 +968,69 @@ void sdl_driver_unload( void ) dlclose(sdl_handle); } +static BOOL sdl_initialize(void) +{ + if (!(sdl_handle = dlopen(SONAME_LIBSDL2, RTLD_NOW))) + { + WARN("could not load %s\n", SONAME_LIBSDL2); + return FALSE; + } +#define LOAD_FUNCPTR(f) \ + if ((p##f = dlsym(sdl_handle, #f)) == NULL) \ + { \ + WARN("could not find symbol %s\n", #f); \ + goto failed; \ + } + LOAD_FUNCPTR(SDL_GetError); + LOAD_FUNCPTR(SDL_Init); + LOAD_FUNCPTR(SDL_JoystickClose); + LOAD_FUNCPTR(SDL_JoystickEventState); + LOAD_FUNCPTR(SDL_JoystickGetGUID); + LOAD_FUNCPTR(SDL_JoystickGetGUIDString); + LOAD_FUNCPTR(SDL_JoystickInstanceID); + LOAD_FUNCPTR(SDL_JoystickName); + LOAD_FUNCPTR(SDL_JoystickNumAxes); + LOAD_FUNCPTR(SDL_JoystickOpen); + LOAD_FUNCPTR(SDL_WaitEvent); + LOAD_FUNCPTR(SDL_JoystickNumButtons); + LOAD_FUNCPTR(SDL_JoystickNumBalls); + LOAD_FUNCPTR(SDL_JoystickNumHats); + LOAD_FUNCPTR(SDL_JoystickGetAxis); + LOAD_FUNCPTR(SDL_JoystickGetHat); + LOAD_FUNCPTR(SDL_IsGameController); + LOAD_FUNCPTR(SDL_GameControllerClose); + LOAD_FUNCPTR(SDL_GameControllerGetAxis); + LOAD_FUNCPTR(SDL_GameControllerGetButton); + LOAD_FUNCPTR(SDL_GameControllerName); + LOAD_FUNCPTR(SDL_GameControllerOpen); + LOAD_FUNCPTR(SDL_GameControllerEventState); + LOAD_FUNCPTR(SDL_HapticClose); + LOAD_FUNCPTR(SDL_HapticDestroyEffect); + LOAD_FUNCPTR(SDL_HapticNewEffect); + LOAD_FUNCPTR(SDL_HapticOpenFromJoystick); + LOAD_FUNCPTR(SDL_HapticQuery); + LOAD_FUNCPTR(SDL_HapticRumbleInit); + LOAD_FUNCPTR(SDL_HapticRumblePlay); + LOAD_FUNCPTR(SDL_HapticRumbleSupported); + LOAD_FUNCPTR(SDL_HapticRunEffect); + LOAD_FUNCPTR(SDL_HapticStopAll); + LOAD_FUNCPTR(SDL_JoystickIsHaptic); + LOAD_FUNCPTR(SDL_memset); + LOAD_FUNCPTR(SDL_GameControllerAddMapping); + LOAD_FUNCPTR(SDL_RegisterEvents); + LOAD_FUNCPTR(SDL_PushEvent); +#undef LOAD_FUNCPTR + pSDL_JoystickGetProduct = dlsym(sdl_handle, "SDL_JoystickGetProduct"); + pSDL_JoystickGetProductVersion = dlsym(sdl_handle, "SDL_JoystickGetProductVersion"); + pSDL_JoystickGetVendor = dlsym(sdl_handle, "SDL_JoystickGetVendor"); + return TRUE; + +failed: + dlclose(sdl_handle); + sdl_handle = NULL; + return FALSE; +} + NTSTATUS sdl_driver_init(void) { static const WCHAR controller_modeW[] = {'M','a','p',' ','C','o','n','t','r','o','l','l','e','r','s',0}; @@ -976,57 +1039,7 @@ NTSTATUS sdl_driver_init(void) HANDLE events[2]; DWORD result; - if (sdl_handle == NULL) - { - sdl_handle = dlopen(SONAME_LIBSDL2, RTLD_NOW); - if (!sdl_handle) { - WARN("could not load %s\n", SONAME_LIBSDL2); - return STATUS_UNSUCCESSFUL; - } -#define LOAD_FUNCPTR(f) if((p##f = dlsym(sdl_handle, #f)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} - LOAD_FUNCPTR(SDL_GetError); - LOAD_FUNCPTR(SDL_Init); - LOAD_FUNCPTR(SDL_JoystickClose); - LOAD_FUNCPTR(SDL_JoystickEventState); - LOAD_FUNCPTR(SDL_JoystickGetGUID); - LOAD_FUNCPTR(SDL_JoystickGetGUIDString); - LOAD_FUNCPTR(SDL_JoystickInstanceID); - LOAD_FUNCPTR(SDL_JoystickName); - LOAD_FUNCPTR(SDL_JoystickNumAxes); - LOAD_FUNCPTR(SDL_JoystickOpen); - LOAD_FUNCPTR(SDL_WaitEvent); - LOAD_FUNCPTR(SDL_JoystickNumButtons); - LOAD_FUNCPTR(SDL_JoystickNumBalls); - LOAD_FUNCPTR(SDL_JoystickNumHats); - LOAD_FUNCPTR(SDL_JoystickGetAxis); - LOAD_FUNCPTR(SDL_JoystickGetHat); - LOAD_FUNCPTR(SDL_IsGameController); - LOAD_FUNCPTR(SDL_GameControllerClose); - LOAD_FUNCPTR(SDL_GameControllerGetAxis); - LOAD_FUNCPTR(SDL_GameControllerGetButton); - LOAD_FUNCPTR(SDL_GameControllerName); - LOAD_FUNCPTR(SDL_GameControllerOpen); - LOAD_FUNCPTR(SDL_GameControllerEventState); - LOAD_FUNCPTR(SDL_HapticClose); - LOAD_FUNCPTR(SDL_HapticDestroyEffect); - LOAD_FUNCPTR(SDL_HapticNewEffect); - LOAD_FUNCPTR(SDL_HapticOpenFromJoystick); - LOAD_FUNCPTR(SDL_HapticQuery); - LOAD_FUNCPTR(SDL_HapticRumbleInit); - LOAD_FUNCPTR(SDL_HapticRumblePlay); - LOAD_FUNCPTR(SDL_HapticRumbleSupported); - LOAD_FUNCPTR(SDL_HapticRunEffect); - LOAD_FUNCPTR(SDL_HapticStopAll); - LOAD_FUNCPTR(SDL_JoystickIsHaptic); - LOAD_FUNCPTR(SDL_memset); - LOAD_FUNCPTR(SDL_GameControllerAddMapping); - LOAD_FUNCPTR(SDL_RegisterEvents); - LOAD_FUNCPTR(SDL_PushEvent); -#undef LOAD_FUNCPTR - pSDL_JoystickGetProduct = dlsym(sdl_handle, "SDL_JoystickGetProduct"); - pSDL_JoystickGetProductVersion = dlsym(sdl_handle, "SDL_JoystickGetProductVersion"); - pSDL_JoystickGetVendor = dlsym(sdl_handle, "SDL_JoystickGetVendor"); - } + if (!sdl_handle && !sdl_initialize()) return STATUS_UNSUCCESSFUL; map_controllers = check_bus_option(&controller_mode, 1); @@ -1052,7 +1065,6 @@ NTSTATUS sdl_driver_init(void) } CloseHandle(events[1]); -sym_not_found: dlclose(sdl_handle); sdl_handle = NULL; return STATUS_UNSUCCESSFUL;

1 0

Rémi Bernon : winebus.sys: Fix duplicate lnxev / hidraw device lookup.
by Alexandre Julliard 13 Aug '21

13 Aug '21

Module: wine Branch: master Commit: 5d6419a53c325b5e5b02d5862a0c1f9d87c1b98e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d6419a53c325b5e5b02d586… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 13 09:46:16 2021 +0200 winebus.sys: Fix duplicate lnxev / hidraw device lookup. The comparison result was wrong, and the device syspath always differs anyway between two different subsystems. We need to compare the parent device syspath. The input subsystem devices also needs to be deduplicated between eventX devices and jsX devices. 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 | 48 +++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index b9466b0178b..887996daf49 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -976,9 +976,23 @@ static const platform_vtbl lnxev_vtbl = { }; #endif -static int check_same_device(DEVICE_OBJECT *device, void* context) +static const char *get_device_syspath(struct udev_device *dev) { - return !compare_platform_device(device, context); + struct udev_device *parent; + + if ((parent = udev_device_get_parent_with_subsystem_devtype(dev, "hid", NULL))) + return udev_device_get_syspath(parent); + + if ((parent = udev_device_get_parent_with_subsystem_devtype(dev, "usb", "usb_device"))) + return udev_device_get_syspath(parent); + + return ""; +} + +static int check_device_syspath(DEVICE_OBJECT *device, void* context) +{ + struct platform_private *private = impl_from_DEVICE_OBJECT(device); + return strcmp(get_device_syspath(private->udev_device), context); } static int parse_uevent_info(const char *uevent, DWORD *vendor_id, @@ -1078,28 +1092,24 @@ static void try_add_device(struct udev_device *dev) return; } + 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)); + if (device) + { + TRACE("duplicate device found, not adding the new one\n"); + close(fd); + return; + } +#endif + subsystem = udev_device_get_subsystem(dev); hiddev = udev_device_get_parent_with_subsystem_devtype(dev, "hid", NULL); if (hiddev) { const char *bcdDevice = NULL; -#ifdef HAS_PROPER_INPUT_HEADER - const platform_vtbl *other_vtbl = NULL; - DEVICE_OBJECT *dup = NULL; - if (strcmp(subsystem, "hidraw") == 0) - other_vtbl = &lnxev_vtbl; - else if (strcmp(subsystem, "input") == 0) - other_vtbl = &hidraw_vtbl; - - if (other_vtbl) - dup = bus_enumerate_hid_devices(other_vtbl, check_same_device, dev); - if (dup) - { - TRACE("Duplicate cross bus device (%p) found, not adding the new one\n", dup); - close(fd); - return; - } -#endif parse_uevent_info(udev_device_get_sysattr_value(hiddev, "uevent"), &vid, &pid, &input, &serial); if (serial == NULL)

1 0

Rémi Bernon : winebus.sys: Make hidraw report callbacks consistent.
by Alexandre Julliard 13 Aug '21

13 Aug '21

Module: wine Branch: master Commit: 3fb4eec6c36b1139c3a2631f4514d54bcb35a3e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fb4eec6c36b1139c3a2631f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 13 09:46:15 2021 +0200 winebus.sys: Make hidraw report callbacks consistent. This was inconsistently forcing the first report byte to the report id. The report ids are stripped when they aren't used, in the packet hidclass.sys provides, but hidraw API wants them all the time, so we need to use an intermediate buffer. Also ioctl length argument have a lower size capacity, so we have to check for it as well. 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 | 83 ++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 43 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 816adcc6539..b9466b0178b 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -720,32 +720,27 @@ static NTSTATUS begin_report_processing(DEVICE_OBJECT *device) static NTSTATUS hidraw_set_output_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *written) { struct platform_private* ext = impl_from_DEVICE_OBJECT(device); - int rc; + BYTE buffer[8192]; + int count = 0; - if (id != 0) - rc = write(ext->device_fd, report, length); + if ((buffer[0] = id)) + count = write(ext->device_fd, report, length); + else if (length > sizeof(buffer) - 1) + ERR_(hid_report)("id %d length %u >= 8192, cannot write\n", id, length); else { - BYTE report_buffer[1024]; - - if (length + 1 > sizeof(report_buffer)) - { - ERR("Output report buffer too small\n"); - return STATUS_UNSUCCESSFUL; - } - - report_buffer[0] = 0; - memcpy(&report_buffer[1], report, length); - rc = write(ext->device_fd, report_buffer, length + 1); + memcpy(buffer + 1, report, length); + count = write(ext->device_fd, buffer, length + 1); } - if (rc > 0) + + if (count > 0) { - *written = rc; + *written = count; return STATUS_SUCCESS; } else { - TRACE("write failed: %d %d %s\n", rc, errno, strerror(errno)); + ERR_(hid_report)("id %d write failed error: %d %s\n", id, errno, strerror(errno)); *written = 0; return STATUS_UNSUCCESSFUL; } @@ -754,19 +749,28 @@ static NTSTATUS hidraw_set_output_report(DEVICE_OBJECT *device, UCHAR id, BYTE * static NTSTATUS hidraw_get_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *read) { #if defined(HAVE_LINUX_HIDRAW_H) && defined(HIDIOCGFEATURE) - int rc; struct platform_private* ext = impl_from_DEVICE_OBJECT(device); - report[0] = id; - length = min(length, 0x1fff); - rc = ioctl(ext->device_fd, HIDIOCGFEATURE(length), report); - if (rc >= 0) + BYTE buffer[8192]; + int count = 0; + + if ((buffer[0] = id) && length <= 0x1fff) + count = ioctl(ext->device_fd, HIDIOCGFEATURE(length), report); + else if (length > sizeof(buffer) - 1) + ERR_(hid_report)("id %d length %u >= 8192, cannot read\n", id, length); + else { - *read = rc; + count = ioctl(ext->device_fd, HIDIOCGFEATURE(length + 1), buffer); + memcpy(report, buffer + 1, length); + } + + if (count > 0) + { + *read = count; return STATUS_SUCCESS; } else { - TRACE_(hid_report)("ioctl(HIDIOCGFEATURE(%d)) failed: %d %s\n", length, errno, strerror(errno)); + ERR_(hid_report)("id %d read failed, error: %d %s\n", id, errno, strerror(errno)); *read = 0; return STATUS_UNSUCCESSFUL; } @@ -779,35 +783,28 @@ static NTSTATUS hidraw_get_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE static NTSTATUS hidraw_set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *written) { #if defined(HAVE_LINUX_HIDRAW_H) && defined(HIDIOCSFEATURE) - int rc; struct platform_private* ext = impl_from_DEVICE_OBJECT(device); - BYTE *feature_buffer; BYTE buffer[8192]; + int count = 0; - if (id == 0) + if ((buffer[0] = id) && length <= 0x1fff) + count = ioctl(ext->device_fd, HIDIOCSFEATURE(length), report); + else if (length > sizeof(buffer) - 1) + ERR_(hid_report)("id %d length %u >= 8192, cannot write\n", id, length); + else { - if (length + 1 > sizeof(buffer)) - { - ERR("Output feature buffer too small\n"); - return STATUS_UNSUCCESSFUL; - } - buffer[0] = 0; - memcpy(&buffer[1], report, length); - feature_buffer = buffer; - length = length + 1; + memcpy(buffer + 1, report, length); + count = ioctl(ext->device_fd, HIDIOCSFEATURE(length + 1), buffer); } - else - feature_buffer = report; - length = min(length, 0x1fff); - rc = ioctl(ext->device_fd, HIDIOCSFEATURE(length), feature_buffer); - if (rc >= 0) + + if (count > 0) { - *written = rc; + *written = count; return STATUS_SUCCESS; } else { - TRACE_(hid_report)("ioctl(HIDIOCSFEATURE(%d)) failed: %d %s\n", length, errno, strerror(errno)); + ERR_(hid_report)("id %d write failed, error: %d %s\n", id, errno, strerror(errno)); *written = 0; return STATUS_UNSUCCESSFUL; }

1 0

Rémi Bernon : winebus.sys: Report lnxev axes individually in the descriptor.
by Alexandre Julliard 13 Aug '21

13 Aug '21

Module: wine Branch: master Commit: f884ee46fb4169ecbf631dc29e42aa6f526c7974 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f884ee46fb4169ecbf631dc2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 13 09:46:14 2021 +0200 winebus.sys: Report lnxev axes individually in the descriptor. Fixing invalid axis range when they differ between two axis of the same usage page. 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 | 140 +++++++++++++++----------------------------- 1 file changed, 48 insertions(+), 92 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 4a494abac09..816adcc6539 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -62,6 +62,7 @@ #include "winternl.h" #include "ddk/wdm.h" #include "ddk/hidtypes.h" +#include "ddk/hidsdi.h" #include "wine/debug.h" #include "wine/heap.h" #include "wine/unicode.h" @@ -345,10 +346,9 @@ static INT count_abs_axis(int device_fd) static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_device *dev) { struct input_absinfo abs_info[HID_ABS_MAX]; - int abs_pages[TOP_ABS_PAGE][HID_ABS_MAX+1]; - int rel_pages[TOP_REL_PAGE][HID_REL_MAX+1]; BYTE absbits[(ABS_MAX+7)/8]; BYTE relbits[(REL_MAX+7)/8]; + USAGE_AND_PAGE usage; INT i; INT report_size; INT button_count, abs_count, rel_count, hat_count; @@ -367,106 +367,46 @@ static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_ report_size = 0; + if (!hid_descriptor_begin(&ext->desc, device_usage[0], device_usage[1])) + return FALSE; + abs_count = 0; - memset(abs_pages, 0, sizeof(abs_pages)); for (i = 0; i < HID_ABS_MAX; i++) - if (test_bit(absbits, i)) - { - abs_pages[ABS_TO_HID_MAP[i][0]][0]++; - abs_pages[ABS_TO_HID_MAP[i][0]][abs_pages[ABS_TO_HID_MAP[i][0]][0]] = i; + { + if (!test_bit(absbits, i)) continue; + ioctl(ext->base.device_fd, EVIOCGABS(i), abs_info + i); - ioctl(ext->base.device_fd, EVIOCGABS(i), abs_info + i); - } - /* Skip page 0, aka HID_USAGE_PAGE_UNDEFINED */ - for (i = 1; i < TOP_ABS_PAGE; i++) - if (abs_pages[i][0] > 0) - { - int j; - for (j = 1; j <= abs_pages[i][0]; j++) - { - ext->abs_map[abs_pages[i][j]] = report_size; - report_size+=4; - } - abs_count++; - } + if (!(usage.UsagePage = ABS_TO_HID_MAP[i][0])) continue; + if (!(usage.Usage = ABS_TO_HID_MAP[i][1])) continue; - rel_count = 0; - memset(rel_pages, 0, sizeof(rel_pages)); - for (i = 0; i < HID_REL_MAX; i++) - if (test_bit(relbits, i)) - { - rel_pages[REL_TO_HID_MAP[i][0]][0]++; - rel_pages[REL_TO_HID_MAP[i][0]][rel_pages[REL_TO_HID_MAP[i][0]][0]] = i; - } - /* Skip page 0, aka HID_USAGE_PAGE_UNDEFINED */ - for (i = 1; i < TOP_REL_PAGE; i++) - if (rel_pages[i][0] > 0) - { - int j; - for (j = 1; j <= rel_pages[i][0]; j++) - { - ext->rel_map[rel_pages[i][j]] = report_size; - report_size++; - } - rel_count++; - } + if (!hid_descriptor_add_axes(&ext->desc, 1, usage.UsagePage, &usage.Usage, FALSE, 32, + LE_DWORD(abs_info[i].minimum), LE_DWORD(abs_info[i].maximum))) + return FALSE; - /* For now lump all buttons just into incremental usages, Ignore Keys */ - ext->button_start = report_size; - button_count = count_buttons(ext->base.device_fd, ext->button_map); - if (button_count) - { - report_size += (button_count + 7) / 8; + ext->abs_map[i] = report_size; + report_size += 4; + abs_count++; } - hat_count = 0; - for (i = ABS_HAT0X; i <=ABS_HAT3X; i+=2) - if (test_bit(absbits, i)) - { - ext->hat_map[i - ABS_HAT0X] = report_size; - ext->hat_values[i - ABS_HAT0X] = 0; - ext->hat_values[i - ABS_HAT0X + 1] = 0; - report_size++; - hat_count++; - } - - TRACE("Report will be %i bytes\n", report_size); + rel_count = 0; + for (i = 0; i < HID_REL_MAX; i++) + { + if (!test_bit(relbits, i)) continue; + if (!(usage.UsagePage = REL_TO_HID_MAP[i][0])) continue; + if (!(usage.Usage = REL_TO_HID_MAP[i][1])) continue; - if (!hid_descriptor_begin(&ext->desc, device_usage[0], device_usage[1])) - return FALSE; + if (!hid_descriptor_add_axes(&ext->desc, 1, usage.UsagePage, &usage.Usage, TRUE, 8, + 0x81, 0x7f)) + return FALSE; - if (abs_count) - { - for (i = 1; i < TOP_ABS_PAGE; i++) - { - if (abs_pages[i][0]) - { - USAGE usages[HID_ABS_MAX]; - int j; - for (j = 0; j < abs_pages[i][0]; j++) - usages[j] = ABS_TO_HID_MAP[abs_pages[i][j+1]][1]; - if (!hid_descriptor_add_axes(&ext->desc, abs_pages[i][0], i, usages, FALSE, 32, - LE_DWORD(abs_info[abs_pages[i][1]].minimum), - LE_DWORD(abs_info[abs_pages[i][1]].maximum))) - return FALSE; - } - } - } - if (rel_count) - { - for (i = 1; i < TOP_REL_PAGE; i++) - { - if (rel_pages[i][0]) - { - USAGE usages[HID_REL_MAX]; - int j; - for (j = 0; j < rel_pages[i][0]; j++) - usages[j] = REL_TO_HID_MAP[rel_pages[i][j+1]][1]; - if (!hid_descriptor_add_axes(&ext->desc, rel_pages[i][0], i, usages, TRUE, 8, 0x81, 0x7f)) - return FALSE; - } - } + ext->rel_map[i] = report_size; + report_size++; + rel_count++; } + + /* For now lump all buttons just into incremental usages, Ignore Keys */ + ext->button_start = report_size; + button_count = count_buttons(ext->base.device_fd, ext->button_map); if (button_count) { if (!hid_descriptor_add_buttons(&ext->desc, HID_USAGE_PAGE_BUTTON, 1, button_count)) @@ -478,7 +418,21 @@ static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_ if (!hid_descriptor_add_padding(&ext->desc, padding)) return FALSE; } + + report_size += (button_count + 7) / 8; } + + hat_count = 0; + for (i = ABS_HAT0X; i <=ABS_HAT3X; i+=2) + { + if (!test_bit(absbits, i)) continue; + ext->hat_map[i - ABS_HAT0X] = report_size; + ext->hat_values[i - ABS_HAT0X] = 0; + ext->hat_values[i - ABS_HAT0X + 1] = 0; + report_size++; + hat_count++; + } + if (hat_count) { if (!hid_descriptor_add_hatswitch(&ext->desc, hat_count)) @@ -488,6 +442,8 @@ static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_ if (!hid_descriptor_end(&ext->desc)) return FALSE; + TRACE("Report will be %i bytes\n", report_size); + ext->buffer_length = report_size; if (!(ext->current_report_buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, report_size))) goto failed;

1 0

Rémi Bernon : winebus.sys: Only keep lnxev absolute axis info locally.
by Alexandre Julliard 13 Aug '21

13 Aug '21

Module: wine Branch: master Commit: dba263756cc056cb52b9118a21a31ae6c257a2a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dba263756cc056cb52b9118a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 13 09:46:13 2021 +0200 winebus.sys: Only keep lnxev absolute axis info locally. 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 | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index c411e9e3929..4a494abac09 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -166,11 +166,6 @@ static const BYTE REL_TO_HID_MAP[][2] = { #define HID_REL_MAX (REL_MISC+1) #define TOP_REL_PAGE (HID_USAGE_PAGE_CONSUMER+1) -struct wine_input_absinfo { - struct input_absinfo info; - BYTE report_index; -}; - struct wine_input_private { struct platform_private base; @@ -186,7 +181,7 @@ struct wine_input_private { BYTE rel_map[HID_REL_MAX]; BYTE hat_map[8]; int hat_values[8]; - struct wine_input_absinfo abs_map[HID_ABS_MAX]; + int abs_map[HID_ABS_MAX]; }; #define test_bit(arr,bit) (((BYTE*)(arr))[(bit)>>3]&(1<<((bit)&7))) @@ -287,7 +282,7 @@ static void set_abs_axis_value(struct wine_input_private *ext, int code, int val } else if (code < HID_ABS_MAX && ABS_TO_HID_MAP[code][0] != 0) { - index = ext->abs_map[code].report_index; + index = ext->abs_map[code]; *((DWORD*)&ext->current_report_buffer[index]) = LE_DWORD(value); } } @@ -349,6 +344,7 @@ static INT count_abs_axis(int device_fd) static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_device *dev) { + struct input_absinfo abs_info[HID_ABS_MAX]; int abs_pages[TOP_ABS_PAGE][HID_ABS_MAX+1]; int rel_pages[TOP_REL_PAGE][HID_REL_MAX+1]; BYTE absbits[(ABS_MAX+7)/8]; @@ -379,7 +375,7 @@ static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_ abs_pages[ABS_TO_HID_MAP[i][0]][0]++; abs_pages[ABS_TO_HID_MAP[i][0]][abs_pages[ABS_TO_HID_MAP[i][0]][0]] = i; - ioctl(ext->base.device_fd, EVIOCGABS(i), &(ext->abs_map[i])); + ioctl(ext->base.device_fd, EVIOCGABS(i), abs_info + i); } /* Skip page 0, aka HID_USAGE_PAGE_UNDEFINED */ for (i = 1; i < TOP_ABS_PAGE; i++) @@ -388,7 +384,7 @@ static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_ int j; for (j = 1; j <= abs_pages[i][0]; j++) { - ext->abs_map[abs_pages[i][j]].report_index = report_size; + ext->abs_map[abs_pages[i][j]] = report_size; report_size+=4; } abs_count++; @@ -450,8 +446,8 @@ static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_ for (j = 0; j < abs_pages[i][0]; j++) usages[j] = ABS_TO_HID_MAP[abs_pages[i][j+1]][1]; if (!hid_descriptor_add_axes(&ext->desc, abs_pages[i][0], i, usages, FALSE, 32, - LE_DWORD(ext->abs_map[abs_pages[i][1]].info.minimum), - LE_DWORD(ext->abs_map[abs_pages[i][1]].info.maximum))) + LE_DWORD(abs_info[abs_pages[i][1]].minimum), + LE_DWORD(abs_info[abs_pages[i][1]].maximum))) return FALSE; } } @@ -502,7 +498,7 @@ static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_ /* Initialize axis in the report */ for (i = 0; i < HID_ABS_MAX; i++) if (test_bit(absbits, i)) - set_abs_axis_value(ext, i, ext->abs_map[i].info.value); + set_abs_axis_value(ext, i, abs_info[i].value); return TRUE;

1 0

Rémi Bernon : winebus.sys: Read irp->IoStatus.Status before leaving the CS.
by Alexandre Julliard 13 Aug '21

13 Aug '21

Module: wine Branch: master Commit: 28f797ec8b90ab6baf7a322d2f83a1fd9f69a53d URL: https://source.winehq.org/git/wine.git/?a=commit;h=28f797ec8b90ab6baf7a322d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 13 09:46:12 2021 +0200 winebus.sys: Read irp->IoStatus.Status before leaving the CS. Or we may have a race condition where a pending IRP may be completed after we left the CS but before we read its status. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 001f775e230..b7230cf2e33 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -982,9 +982,9 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) break; } + status = irp->IoStatus.Status; LeaveCriticalSection(&ext->cs); - status = irp->IoStatus.Status; if (status != STATUS_PENDING) IoCompleteRequest(irp, IO_NO_INCREMENT); return status; }

1 0

Alexandre Julliard : ntdll: Make get_builtin_unix_funcs() static.
by Alexandre Julliard 13 Aug '21

13 Aug '21

Module: wine Branch: master Commit: faaad364297e45b968b534560c139c91fb81e056 URL: https://source.winehq.org/git/wine.git/?a=commit;h=faaad364297e45b968b53456… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 13 11:38:25 2021 +0200 ntdll: Make get_builtin_unix_funcs() static. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 2cca90ac952..8a1e35b6387 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -660,7 +660,7 @@ void *get_builtin_so_handle( void *module ) /*********************************************************************** * get_builtin_unix_funcs */ -NTSTATUS get_builtin_unix_funcs( void *module, BOOL wow, void **funcs ) +static NTSTATUS get_builtin_unix_funcs( void *module, BOOL wow, void **funcs ) { const char *ptr_name = wow ? "__wine_unix_call_wow64_funcs" : "__wine_unix_call_funcs"; sigset_t sigset;

1 0

Huw Davies : iphlpapi: Implement GetTcpStatisticsEx() on top of nsi.
by Alexandre Julliard 13 Aug '21

13 Aug '21

Module: wine Branch: master Commit: 4716138d0724cf52251ee6b780131f32940722af URL: https://source.winehq.org/git/wine.git/?a=commit;h=4716138d0724cf52251ee6b7… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 13 08:35:50 2021 +0100 iphlpapi: Implement GetTcpStatisticsEx() on top of nsi. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 62 ++++++++++++++++ dlls/iphlpapi/ipstats.c | 161 ----------------------------------------- dlls/iphlpapi/tests/iphlpapi.c | 4 +- dlls/nsi/tests/nsi.c | 3 - 4 files changed, 64 insertions(+), 166 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4716138d0724cf52251e…

1 0

Huw Davies : nsiproxy: Implement TCP stats get_all_parameters.
by Alexandre Julliard 13 Aug '21

13 Aug '21

Module: wine Branch: master Commit: c9680e899198076f756f64bbc697d742f98292b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9680e899198076f756f64bb… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 13 08:35:49 2021 +0100 nsiproxy: Implement TCP stats get_all_parameters. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/tests/nsi.c | 59 +++++++++++ dlls/nsiproxy.sys/Makefile.in | 3 +- dlls/nsiproxy.sys/nsi.c | 1 + dlls/nsiproxy.sys/nsiproxy_private.h | 1 + dlls/nsiproxy.sys/tcp.c | 190 +++++++++++++++++++++++++++++++++++ include/wine/nsi.h | 29 ++++++ 6 files changed, 282 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c9680e899198076f756f…

1 0

Huw Davies : nsiproxy: Add an #ifdef guard for SIN_ROUTER.
by Alexandre Julliard 13 Aug '21

13 Aug '21

Module: wine Branch: master Commit: ab31bf5d8c5f8bcd818134b11cc34a1e23b915a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab31bf5d8c5f8bcd818134b1… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 13 08:35:48 2021 +0100 nsiproxy: Add an #ifdef guard for SIN_ROUTER. It's not defined in FreeBSD. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/ip.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index c5d98fa93f2..e2e292f4b59 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -962,7 +962,11 @@ static NTSTATUS ipv4_neighbour_enumerate_all( void *key_data, DWORD key_size, vo memcpy( entry.phys_addr, &sdl->sdl_data[sdl->sdl_nlen], entry.phys_addr_len ); if (rtm->rtm_rmx.rmx_expire == 0) entry.state = NlnsPermanent; else entry.state = NlnsReachable; +#ifdef SIN_ROUTER entry.is_router = sinarp->sin_other & SIN_ROUTER; +#else + entry.is_router = 0; +#endif entry.is_unreachable = 0; /* FIXME */ if (num < *count)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2021