wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

Jacek Caban : win32u: Move DWP object implementation from user32.
by Alexandre Julliard 15 Mar '22

15 Mar '22

Module: wine Branch: master Commit: 5cc5fdfffda088579cfe525cefffcf990d1d8026 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cc5fdfffda088579cfe525c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 15 14:27:28 2022 +0100 win32u: Move DWP object implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 162 ++----------------------------------------- dlls/win32u/gdiobj.c | 2 + dlls/win32u/sysparams.c | 4 +- dlls/win32u/win32u.spec | 4 +- dlls/win32u/win32u_private.h | 5 ++ dlls/win32u/window.c | 160 ++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/wrappers.c | 15 ++++ include/ntuser.h | 4 ++ 8 files changed, 196 insertions(+), 160 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5cc5fdfffda088579cfe…

1 0

Jacek Caban : win32u: Move NtUserSetWindowPos implementation from user32.
by Alexandre Julliard 15 Mar '22

15 Mar '22

Module: wine Branch: master Commit: 08b2fbcbd6e5ff59c856e13dee3aed44138cdfed URL: https://source.winehq.org/git/wine.git/?a=commit;h=08b2fbcbd6e5ff59c856e13d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 15 14:27:14 2022 +0100 win32u: Move NtUserSetWindowPos implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 36 +-- dlls/user32/defwnd.c | 4 +- dlls/user32/dialog.c | 4 +- dlls/user32/focus.c | 4 +- dlls/user32/icontitle.c | 2 +- dlls/user32/listbox.c | 6 +- dlls/user32/mdi.c | 24 +- dlls/user32/menu.c | 12 +- dlls/user32/message.c | 3 - dlls/user32/msgbox.c | 18 +- dlls/user32/painting.c | 6 +- dlls/user32/scroll.c | 4 +- dlls/user32/static.c | 9 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 1 - dlls/user32/user_private.h | 6 - dlls/user32/win.c | 10 +- dlls/user32/winpos.c | 123 ++------- dlls/win32u/message.c | 3 + dlls/win32u/ntuser_private.h | 7 +- dlls/win32u/win32u_private.h | 5 + dlls/win32u/window.c | 606 ++++++++++++++++++++++++++++++++++++++++++- 22 files changed, 707 insertions(+), 188 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=08b2fbcbd6e5ff59c856…

1 0

Jacek Caban : win32u: Fix name comparison in find_class.
by Alexandre Julliard 15 Mar '22

15 Mar '22

Module: wine Branch: master Commit: d402df31966d73f7f120b4a4d90f22bcffd79b26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d402df31966d73f7f120b4a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 15 14:26:39 2022 +0100 win32u: Fix name comparison in find_class. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52654 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/class.c | 5 +++++ dlls/win32u/class.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 64fc3c014e3..eed90b8adc9 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1049,6 +1049,11 @@ if (0) { /* crashes under XP */ ok(ret, "GetClassInfoExA() error %ld\n", GetLastError()); ok(wcx.cbSize == sizeof(wcx) + 1, "expected sizeof(wcx)+1, got %u\n", wcx.cbSize); ok(wcx.lpfnWndProc != NULL, "got null proc\n"); + + wcx.cbSize = sizeof(wcx); + ret = GetClassInfoExA(0, "stati", &wcx); + ok(!ret && GetLastError() == ERROR_CLASS_DOES_NOT_EXIST, + "GetClassInfoExA() returned %x %ld\n", ret, GetLastError()); } static void test_icons(void) diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index 74d06ee04de..3113ef357cf 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -259,7 +259,8 @@ static CLASS *find_class( HINSTANCE module, UNICODE_STRING *name ) } else { - if (wcsnicmp( class->name, name->Buffer, name->Length / sizeof(WCHAR) )) continue; + if (wcsnicmp( class->name, name->Buffer, name->Length / sizeof(WCHAR) ) || + class->name[name->Length / sizeof(WCHAR)]) continue; } if (!class->local || !module || (class->instance & ~0xffff) == instance) {

1 0

Hans Leidekker : crypt32: Add support for decoding signed OCSP responses.
by Alexandre Julliard 15 Mar '22

15 Mar '22

Module: wine Branch: master Commit: 0b350ab96761d0aa8d5c4349cec5ce4213310578 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b350ab96761d0aa8d5c4349… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 15 14:14:42 2022 +0100 crypt32: Add support for decoding signed OCSP responses. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/decode.c | 55 ++++++++++++++++++++- dlls/crypt32/tests/encode.c | 117 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 171 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0b350ab96761d0aa8d5c…

1 0

Rémi Bernon : winegstreamer: Return S_OK from WMA decoder ProcessMessage.
by Alexandre Julliard 15 Mar '22

15 Mar '22

Module: wine Branch: master Commit: e4258d529342cc1dc486a136d0f715520b3dd5da URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4258d529342cc1dc486a136… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 14 14:43:23 2022 +0100 winegstreamer: Return S_OK from WMA decoder ProcessMessage. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wma_decoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 6ee43e19414..57b0f204f9e 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -515,7 +515,7 @@ static HRESULT WINAPI transform_ProcessEvent(IMFTransform *iface, DWORD id, IMFM static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param) { FIXME("iface %p, message %#x, param %p stub!\n", iface, message, (void *)param); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags)

1 0

Rémi Bernon : winegstreamer: Introduce new wg_transform_(push|read)_data functions.
by Alexandre Julliard 15 Mar '22

15 Mar '22

Module: wine Branch: master Commit: 651e4002ceeb9a15b11a184b5f47a732e26b7e00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=651e4002ceeb9a15b11a184b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 14 14:43:22 2022 +0100 winegstreamer: Introduce new wg_transform_(push|read)_data functions. And use it to implement WMA decoder Process(Input|Output). The test output is different because ffmpeg WMA decoder outputs data in a different way as native. The data seems valid audio nonetheless, and it shouldn't matter too much. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 50 +++++----------- dlls/winegstreamer/gst_private.h | 5 ++ dlls/winegstreamer/main.c | 30 ++++++++++ dlls/winegstreamer/mfplat.c | 49 ++++++++++++++++ dlls/winegstreamer/unix_private.h | 2 + dlls/winegstreamer/unixlib.h | 30 ++++++++++ dlls/winegstreamer/wg_parser.c | 3 + dlls/winegstreamer/wg_transform.c | 119 +++++++++++++++++++++++++++++++++++++- dlls/winegstreamer/wma_decoder.c | 33 +++++++++-- 9 files changed, 278 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=651e4002ceeb9a15b11a…

1 0

Rémi Bernon : windows.gaming.input: Implement HID simple haptics controllers support.
by Alexandre Julliard 15 Mar '22

15 Mar '22

Module: wine Branch: master Commit: befeea424e1d2dd9aa5563574f8c19f37aafa504 URL: https://source.winehq.org/git/wine.git/?a=commit;h=befeea424e1d2dd9aa556357… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 15 10:08:28 2022 +0100 windows.gaming.input: Implement HID simple haptics controllers support. Adding support for trigger rumble on supported controllers and drivers. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/gamepad.c | 30 +++++- dlls/windows.gaming.input/provider.c | 189 +++++++++++++++++++++++++++++++++ dlls/windows.gaming.input/provider.idl | 11 ++ 3 files changed, 226 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=befeea424e1d2dd9aa55…

1 0

Rémi Bernon : winebus.sys: Implement trigger rumble using SDL_JoystickRumbleTriggers.
by Alexandre Julliard 15 Mar '22

15 Mar '22

Module: wine Branch: master Commit: 634d380e4c9e8f7ac3fb82e6bbed1e1b1c2a62df URL: https://source.winehq.org/git/wine.git/?a=commit;h=634d380e4c9e8f7ac3fb82e6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 15 10:08:27 2022 +0100 winebus.sys: Implement trigger rumble using SDL_JoystickRumbleTriggers. 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 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index dbc9ce6a858..07fdd9d3fa2 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -114,6 +114,7 @@ MAKE_FUNCPTR(SDL_RegisterEvents); MAKE_FUNCPTR(SDL_PushEvent); MAKE_FUNCPTR(SDL_GetTicks); static int (*pSDL_JoystickRumble)(SDL_Joystick *joystick, Uint16 low_frequency_rumble, Uint16 high_frequency_rumble, Uint32 duration_ms); +static int (*pSDL_JoystickRumbleTriggers)(SDL_Joystick *joystick, Uint16 left_rumble, Uint16 right_rumble, Uint32 duration_ms); static Uint16 (*pSDL_JoystickGetProduct)(SDL_Joystick * joystick); static Uint16 (*pSDL_JoystickGetProductVersion)(SDL_Joystick * joystick); static Uint16 (*pSDL_JoystickGetVendor)(SDL_Joystick * joystick); @@ -442,7 +443,11 @@ static NTSTATUS sdl_device_haptics_start(struct unix_device *iface, UINT duratio if (!(impl->effect_support & EFFECT_SUPPORT_HAPTICS)) return STATUS_NOT_SUPPORTED; if (impl->effect_support & WINE_SDL_JOYSTICK_RUMBLE) + { pSDL_JoystickRumble(impl->sdl_joystick, rumble_intensity, buzz_intensity, duration_ms); + if (pSDL_JoystickRumbleTriggers) + pSDL_JoystickRumbleTriggers(impl->sdl_joystick, left_intensity, right_intensity, duration_ms); + } else if (impl->effect_support & SDL_HAPTIC_LEFTRIGHT) { SDL_HapticEffect effect; @@ -475,7 +480,11 @@ static NTSTATUS sdl_device_haptics_stop(struct unix_device *iface) TRACE("iface %p.\n", iface); if (impl->effect_support & WINE_SDL_JOYSTICK_RUMBLE) + { pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0); + if (pSDL_JoystickRumbleTriggers) + pSDL_JoystickRumbleTriggers(impl->sdl_joystick, 0, 0, 0); + } else if (impl->effect_support & SDL_HAPTIC_LEFTRIGHT) pSDL_HapticStopAll(impl->sdl_haptic); else if (impl->effect_support & WINE_SDL_HAPTIC_RUMBLE) @@ -1050,6 +1059,7 @@ NTSTATUS sdl_bus_init(void *args) LOAD_FUNCPTR(SDL_GetTicks); #undef LOAD_FUNCPTR pSDL_JoystickRumble = dlsym(sdl_handle, "SDL_JoystickRumble"); + pSDL_JoystickRumbleTriggers = dlsym(sdl_handle, "SDL_JoystickRumbleTriggers"); pSDL_JoystickGetProduct = dlsym(sdl_handle, "SDL_JoystickGetProduct"); pSDL_JoystickGetProductVersion = dlsym(sdl_handle, "SDL_JoystickGetProductVersion"); pSDL_JoystickGetVendor = dlsym(sdl_handle, "SDL_JoystickGetVendor");

1 0

Rémi Bernon : winebus.sys: Prefer SDL_JoystickRumble over SDL_HAPTIC_LEFTRIGHT.
by Alexandre Julliard 15 Mar '22

15 Mar '22

Module: wine Branch: master Commit: 76cbdaa0da900c5526e31642a53ec44dd30b369c URL: https://source.winehq.org/git/wine.git/?a=commit;h=76cbdaa0da900c5526e31642… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 15 10:08:26 2022 +0100 winebus.sys: Prefer SDL_JoystickRumble over SDL_HAPTIC_LEFTRIGHT. The SDL_HAPTIC_LEFTRIGHT effect usually involves re-starting the effect on every update, possibly causing intermittent rumble waves instead of a continuous effect. We will also use the newer SDL_JoystickRumbleTriggers function when available, in order to support trigger rumble on the XBox One and DualSense controllers. 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 | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index aab629de5da..dbc9ce6a858 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -195,8 +195,7 @@ static BOOL descriptor_add_haptic(struct sdl_device *impl) impl->effect_support |= WINE_SDL_HAPTIC_RUMBLE; } - if (!(impl->effect_support & EFFECT_SUPPORT_HAPTICS) && pSDL_JoystickRumble && - !pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0)) + if (pSDL_JoystickRumble && !pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0)) impl->effect_support |= WINE_SDL_JOYSTICK_RUMBLE; if (impl->effect_support & EFFECT_SUPPORT_HAPTICS) @@ -436,21 +435,24 @@ static NTSTATUS sdl_device_haptics_start(struct unix_device *iface, UINT duratio USHORT left_intensity, USHORT right_intensity) { struct sdl_device *impl = impl_from_unix_device(iface); - SDL_HapticEffect effect; TRACE("iface %p, duration_ms %u, rumble_intensity %u, buzz_intensity %u, left_intensity %u, right_intensity %u.\n", iface, duration_ms, rumble_intensity, buzz_intensity, left_intensity, right_intensity); if (!(impl->effect_support & EFFECT_SUPPORT_HAPTICS)) return STATUS_NOT_SUPPORTED; - memset(&effect, 0, sizeof(SDL_HapticEffect)); - effect.type = SDL_HAPTIC_LEFTRIGHT; - effect.leftright.length = duration_ms; - effect.leftright.large_magnitude = rumble_intensity; - effect.leftright.small_magnitude = buzz_intensity; - - if (impl->effect_support & SDL_HAPTIC_LEFTRIGHT) + if (impl->effect_support & WINE_SDL_JOYSTICK_RUMBLE) + pSDL_JoystickRumble(impl->sdl_joystick, rumble_intensity, buzz_intensity, duration_ms); + else if (impl->effect_support & SDL_HAPTIC_LEFTRIGHT) { + SDL_HapticEffect effect; + + memset(&effect, 0, sizeof(SDL_HapticEffect)); + effect.type = SDL_HAPTIC_LEFTRIGHT; + effect.leftright.length = duration_ms; + effect.leftright.large_magnitude = rumble_intensity; + effect.leftright.small_magnitude = buzz_intensity; + if (impl->haptic_effect_id >= 0) pSDL_HapticDestroyEffect(impl->sdl_haptic, impl->haptic_effect_id); impl->haptic_effect_id = pSDL_HapticNewEffect(impl->sdl_haptic, &effect); @@ -459,13 +461,8 @@ static NTSTATUS sdl_device_haptics_start(struct unix_device *iface, UINT duratio } else if (impl->effect_support & WINE_SDL_HAPTIC_RUMBLE) { - float magnitude = (effect.leftright.large_magnitude + effect.leftright.small_magnitude) / 2.0 / 32767.0; - pSDL_HapticRumblePlay(impl->sdl_haptic, magnitude, effect.leftright.length); - } - else if (impl->effect_support & WINE_SDL_JOYSTICK_RUMBLE) - { - pSDL_JoystickRumble(impl->sdl_joystick, effect.leftright.large_magnitude, - effect.leftright.small_magnitude, duration_ms); + float magnitude = (rumble_intensity + buzz_intensity) / 2.0 / 32767.0; + pSDL_HapticRumblePlay(impl->sdl_haptic, magnitude, duration_ms); } return STATUS_SUCCESS; @@ -477,12 +474,12 @@ static NTSTATUS sdl_device_haptics_stop(struct unix_device *iface) TRACE("iface %p.\n", iface); - if (impl->effect_support & SDL_HAPTIC_LEFTRIGHT) + if (impl->effect_support & WINE_SDL_JOYSTICK_RUMBLE) + pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0); + else if (impl->effect_support & SDL_HAPTIC_LEFTRIGHT) pSDL_HapticStopAll(impl->sdl_haptic); else if (impl->effect_support & WINE_SDL_HAPTIC_RUMBLE) pSDL_HapticRumbleStop(impl->sdl_haptic); - else if (impl->effect_support & WINE_SDL_JOYSTICK_RUMBLE) - pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0); return STATUS_SUCCESS; }

1 0

Rémi Bernon : winebus.sys: Add HID haptics simple controllers for the triggers.
by Alexandre Julliard 15 Mar '22

15 Mar '22

Module: wine Branch: master Commit: d272fc76c17098d582337aa88c7019cc4d29a06c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d272fc76c17098d582337aa8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 15 10:08:25 2022 +0100 winebus.sys: Add HID haptics simple controllers for the triggers. 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 | 7 ++++--- dlls/winebus.sys/bus_udev.c | 7 ++++--- dlls/winebus.sys/hid.c | 44 +++++++++++++++++++++++++++++++++++++++-- dlls/winebus.sys/unix_private.h | 5 ++++- dlls/winebus.sys/unixlib.c | 6 ++++-- 5 files changed, 58 insertions(+), 11 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index aedef50d3f7..aab629de5da 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -432,13 +432,14 @@ static void sdl_device_stop(struct unix_device *iface) } static NTSTATUS sdl_device_haptics_start(struct unix_device *iface, UINT duration_ms, - USHORT rumble_intensity, USHORT buzz_intensity) + USHORT rumble_intensity, USHORT buzz_intensity, + USHORT left_intensity, USHORT right_intensity) { struct sdl_device *impl = impl_from_unix_device(iface); SDL_HapticEffect effect; - TRACE("iface %p, duration_ms %u, rumble_intensity %u, buzz_intensity %u.\n", iface, duration_ms, - rumble_intensity, buzz_intensity); + TRACE("iface %p, duration_ms %u, rumble_intensity %u, buzz_intensity %u, left_intensity %u, right_intensity %u.\n", + iface, duration_ms, rumble_intensity, buzz_intensity, left_intensity, right_intensity); if (!(impl->effect_support & EFFECT_SUPPORT_HAPTICS)) return STATUS_NOT_SUPPORTED; diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index db173b63fb5..6b4bf09a773 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -867,7 +867,8 @@ static void lnxev_device_read_report(struct unix_device *iface) } static NTSTATUS lnxev_device_haptics_start(struct unix_device *iface, UINT duration_ms, - USHORT rumble_intensity, USHORT buzz_intensity) + USHORT rumble_intensity, USHORT buzz_intensity, + USHORT left_intensity, USHORT right_intensity) { struct lnxev_device *impl = lnxev_impl_from_unix_device(iface); struct ff_effect effect = @@ -877,8 +878,8 @@ static NTSTATUS lnxev_device_haptics_start(struct unix_device *iface, UINT durat }; struct input_event event; - TRACE("iface %p, duration_ms %u, rumble_intensity %u, buzz_intensity %u.\n", iface, - duration_ms, rumble_intensity, buzz_intensity); + TRACE("iface %p, duration_ms %u, rumble_intensity %u, buzz_intensity %u, left_intensity %u, right_intensity %u.\n", + iface, duration_ms, rumble_intensity, buzz_intensity, left_intensity, right_intensity); effect.replay.length = duration_ms; effect.u.rumble.strong_magnitude = rumble_intensity; diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 5b18da5d8ed..de0c3bb0848 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -335,6 +335,8 @@ struct hid_haptics_intensity { UINT16 rumble_intensity; UINT16 buzz_intensity; + UINT16 left_intensity; + UINT16 right_intensity; }; #include "poppack.h" @@ -389,6 +391,15 @@ BOOL hid_device_add_haptics(struct unix_device *iface) OUTPUT(1, Data|Var|Abs), END_COLLECTION, }; + const BYTE trigger_template_begin[] = + { + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + COLLECTION(1, Physical), + }; + const BYTE trigger_template_end[] = + { + END_COLLECTION, + }; iface->hid_haptics.features_report = haptics_features_report; iface->hid_haptics.intensity_report = haptics_intensity_report; @@ -398,12 +409,36 @@ BOOL hid_device_add_haptics(struct unix_device *iface) iface->hid_haptics.features.buzz.waveform = HID_USAGE_HAPTICS_WAVEFORM_BUZZ; iface->hid_haptics.features.buzz.duration = 0; iface->hid_haptics.features.buzz.cutoff_time_ms = 1000; + iface->hid_haptics.features.left.waveform = HID_USAGE_HAPTICS_WAVEFORM_RUMBLE; + iface->hid_haptics.features.left.duration = 0; + iface->hid_haptics.features.left.cutoff_time_ms = 1000; + iface->hid_haptics.features.right.waveform = HID_USAGE_HAPTICS_WAVEFORM_RUMBLE; + iface->hid_haptics.features.right.duration = 0; + iface->hid_haptics.features.right.cutoff_time_ms = 1000; if (!hid_report_descriptor_append(desc, haptics_template, sizeof(haptics_template))) return FALSE; if (!hid_report_descriptor_append(desc, haptics_template, sizeof(haptics_template))) return FALSE; + if (!hid_report_descriptor_append_usage(desc, HID_USAGE_GENERIC_Z)) + return FALSE; + if (!hid_report_descriptor_append(desc, trigger_template_begin, sizeof(trigger_template_begin))) + return FALSE; + if (!hid_report_descriptor_append(desc, haptics_template, sizeof(haptics_template))) + return FALSE; + if (!hid_report_descriptor_append(desc, trigger_template_end, sizeof(trigger_template_end))) + return FALSE; + + if (!hid_report_descriptor_append_usage(desc, HID_USAGE_GENERIC_RZ)) + return FALSE; + if (!hid_report_descriptor_append(desc, trigger_template_begin, sizeof(trigger_template_begin))) + return FALSE; + if (!hid_report_descriptor_append(desc, haptics_template, sizeof(haptics_template))) + return FALSE; + if (!hid_report_descriptor_append(desc, trigger_template_end, sizeof(trigger_template_end))) + return FALSE; + return TRUE; } @@ -1071,12 +1106,15 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC io->Information = sizeof(*report) + 1; assert(packet->reportBufferLen == io->Information); - if (!report->rumble_intensity && !report->buzz_intensity) + if (!report->rumble_intensity && !report->buzz_intensity && !report->left_intensity && !report->right_intensity) io->Status = iface->hid_vtbl->haptics_stop(iface); else { duration_ms = min(haptics->features.rumble.cutoff_time_ms, haptics->features.buzz.cutoff_time_ms); - io->Status = iface->hid_vtbl->haptics_start(iface, duration_ms, report->rumble_intensity, report->buzz_intensity); + duration_ms = min(duration_ms, haptics->features.left.cutoff_time_ms); + duration_ms = min(duration_ms, haptics->features.right.cutoff_time_ms); + io->Status = iface->hid_vtbl->haptics_start(iface, duration_ms, report->rumble_intensity, report->buzz_intensity, + report->left_intensity, report->right_intensity); } } else if (packet->reportId == physical->device_control_report) @@ -1287,6 +1325,8 @@ static void hid_device_set_feature_report(struct unix_device *iface, HID_XFER_PA haptics->features.rumble.cutoff_time_ms = features->rumble.cutoff_time_ms; haptics->features.buzz.cutoff_time_ms = features->buzz.cutoff_time_ms; + haptics->features.left.cutoff_time_ms = features->left.cutoff_time_ms; + haptics->features.right.cutoff_time_ms = features->right.cutoff_time_ms; io->Status = STATUS_SUCCESS; } else diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 0763d084823..ab8060611a4 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -107,7 +107,8 @@ struct hid_device_vtbl NTSTATUS (*start)(struct unix_device *iface); void (*stop)(struct unix_device *iface); NTSTATUS (*haptics_start)(struct unix_device *iface, UINT duration_ms, - USHORT rumble_intensity, USHORT buzz_intensity); + USHORT rumble_intensity, USHORT buzz_intensity, + USHORT left_intensity, USHORT right_intensity); NTSTATUS (*haptics_stop)(struct unix_device *iface); NTSTATUS (*physical_device_control)(struct unix_device *iface, USAGE control); NTSTATUS (*physical_device_set_gain)(struct unix_device *iface, BYTE percent); @@ -135,6 +136,8 @@ struct hid_haptics_features { struct hid_haptics_feature rumble; struct hid_haptics_feature buzz; + struct hid_haptics_feature left; + struct hid_haptics_feature right; }; #include "poppack.h" diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index 88cc513125a..1edd90627e5 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -103,7 +103,8 @@ static void mouse_stop(struct unix_device *iface) } static NTSTATUS mouse_haptics_start(struct unix_device *iface, UINT duration, - USHORT rumble_intensity, USHORT buzz_intensity) + USHORT rumble_intensity, USHORT buzz_intensity, + USHORT left_intensity, USHORT right_intensity) { return STATUS_NOT_SUPPORTED; } @@ -193,7 +194,8 @@ static void keyboard_stop(struct unix_device *iface) } static NTSTATUS keyboard_haptics_start(struct unix_device *iface, UINT duration, - USHORT rumble_intensity, USHORT buzz_intensity) + USHORT rumble_intensity, USHORT buzz_intensity, + USHORT left_intensity, USHORT right_intensity) { return STATUS_NOT_SUPPORTED; }

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 March 2022