[PATCH 1/2] winebus.sys: Only use SDL_JoystickRumble as a fallback.
If nothing else is supported, and pass the duration_ms parameter too. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 119c1b0116d..056f8fe285b 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -195,7 +195,8 @@ static BOOL descriptor_add_haptic(struct sdl_device *impl) pSDL_HapticRumbleInit(impl->sdl_haptic); } - if (pSDL_JoystickRumble && !pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0)) + if (!(impl->effect_support & EFFECT_SUPPORT_HAPTICS) && pSDL_JoystickRumble && + !pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0)) impl->effect_support |= WINE_SDL_JOYSTICK_RUMBLE; if (impl->effect_support & EFFECT_SUPPORT_HAPTICS) @@ -397,9 +398,10 @@ NTSTATUS sdl_device_haptics_start(struct unix_device *iface, DWORD duration_ms, effect.leftright.large_magnitude = rumble_intensity; effect.leftright.small_magnitude = buzz_intensity; - if (impl->sdl_haptic) pSDL_HapticStopAll(impl->sdl_haptic); if (impl->effect_support & WINE_SDL_JOYSTICK_RUMBLE) pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0); + else if (impl->sdl_haptic) + pSDL_HapticStopAll(impl->sdl_haptic); if (!effect.leftright.large_magnitude && !effect.leftright.small_magnitude) return STATUS_SUCCESS; @@ -419,7 +421,7 @@ NTSTATUS sdl_device_haptics_start(struct unix_device *iface, DWORD duration_ms, else if (impl->effect_support & WINE_SDL_JOYSTICK_RUMBLE) { pSDL_JoystickRumble(impl->sdl_joystick, effect.leftright.large_magnitude, - effect.leftright.small_magnitude, -1); + effect.leftright.small_magnitude, duration_ms); } return STATUS_SUCCESS; -- 2.33.0
Based on a Proton patch from Andrew Eikum <aeikum(a)codeweavers.com>. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- It's not ideal but input won't work at all with these devices over hidraw otherwise. dlls/winebus.sys/bus_udev.c | 33 +++++++++++++++++++++++++++++++-- dlls/winebus.sys/unix_private.h | 1 + dlls/winebus.sys/unixlib.c | 9 +++++++++ 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 3e1ac3c0d77..1cad63f0275 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -120,9 +120,12 @@ static inline struct base_device *impl_from_unix_device(struct unix_device *ifac return CONTAINING_RECORD(iface, struct base_device, unix_device); } +#define QUIRK_DS4_BT 0x1 + struct hidraw_device { struct base_device base; + DWORD quirks; }; static inline struct hidraw_device *hidraw_impl_from_unix_device(struct unix_device *iface) @@ -283,7 +286,7 @@ static NTSTATUS hidraw_device_get_report_descriptor(struct unix_device *iface, B static void hidraw_device_read_report(struct unix_device *iface) { struct hidraw_device *impl = hidraw_impl_from_unix_device(iface); - BYTE report_buffer[1024]; + BYTE report_buffer[1024], *buff = report_buffer; int size = read(impl->base.device_fd, report_buffer, sizeof(report_buffer)); if (size == -1) @@ -291,7 +294,26 @@ static void hidraw_device_read_report(struct unix_device *iface) else if (size == 0) TRACE_(hid_report)("Failed to read report\n"); else - bus_event_queue_input_report(&event_queue, iface, report_buffer, size); + { + /* As described in the Linux kernel driver, when connected over bluetooth, DS4 controllers + * start sending input through report #17 as soon as they receive a feature report #2, which + * the kernel sends anyway for calibration. + * + * Input report #17 is the same as the default input report #1, with additional gyro data and + * two additional bytes in front, but is only described as vendor specific in the report descriptor, + * and applications aren't expecting it. + * + * We have to translate it to input report #1, like native driver does. + */ + if ((impl->quirks & QUIRK_DS4_BT) && report_buffer[0] == 0x11 && size >= 12) + { + size = 10; + buff += 2; + buff[0] = 1; + } + + bus_event_queue_input_report(&event_queue, iface, buff, size); + } } static void hidraw_device_set_output_report(struct unix_device *iface, HID_XFER_PACKET *packet, IO_STATUS_BLOCK *io) @@ -1167,6 +1189,12 @@ static void get_device_subsystem_info(struct udev_device *dev, char const *subsy ntdll_umbstowcs(tmp, strlen(tmp) + 1, desc->serialnumber, ARRAY_SIZE(desc->serialnumber)); } +static void hidraw_set_quirks(struct hidraw_device *impl, DWORD bus_type, WORD vid, WORD pid) +{ + if (bus_type == BUS_BLUETOOTH && is_dualshock4_gamepad(vid, pid)) + impl->quirks |= QUIRK_DS4_BT; +} + static void udev_add_device(struct udev_device *dev) { struct device_desc desc = @@ -1257,6 +1285,7 @@ static void udev_add_device(struct udev_device *dev) impl->read_report = hidraw_device_read_report; impl->udev_device = udev_device_ref(dev); impl->device_fd = fd; + hidraw_set_quirks((struct hidraw_device *)impl, bus, desc.vid, desc.pid); bus_event_queue_device_created(&event_queue, &impl->unix_device, &desc); } diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 2673741f540..493eab9edac 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -264,5 +264,6 @@ extern void hid_device_drop_report(struct unix_device *iface) DECLSPEC_HIDDEN; extern void hid_device_set_effect_state(struct unix_device *iface, BYTE index, BYTE flags) DECLSPEC_HIDDEN; BOOL is_xbox_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; +BOOL is_dualshock4_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; #endif /* __WINEBUS_UNIX_PRIVATE_H */ diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index f66fd78d176..6cf58570c76 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -61,6 +61,15 @@ BOOL is_xbox_gamepad(WORD vid, WORD pid) return FALSE; } +BOOL is_dualshock4_gamepad(WORD vid, WORD pid) +{ + if (vid != 0x054c) return FALSE; + if (pid == 0x05c4) return TRUE; /* DualShock 4 [CUH-ZCT1x] */ + if (pid == 0x09cc) return TRUE; /* DualShock 4 [CUH-ZCT2x] */ + if (pid == 0x0ba0) return TRUE; /* Dualshock 4 Wireless Adaptor */ + return FALSE; +} + struct mouse_device { struct unix_device unix_device; -- 2.33.0
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=100372 Your paranoid android. === debiant2 (build log) === error: patch failed: dlls/winebus.sys/unix_private.h:264 Task: Patch failed to apply === debiant2 (build log) === error: patch failed: dlls/winebus.sys/unix_private.h:264 Task: Patch failed to apply
participants (2)
-
Marvin -
Rémi Bernon