wine-commits September 2021

wine-commits@winehq.org

2 participants
1030 discussions

Rémi Bernon : winebus.sys: Add support for joystick device rumble.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 777a8fbda8baa565ee39ed9587a12806e1b90d6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=777a8fbda8baa565ee39ed95… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 23 08:55:29 2021 +0200 winebus.sys: Add support for joystick device rumble. Some devices, such as the DualShock 4 only have support for haptics through the SDL_JoystickRumble API. Let's use it as a fallback if none of the more detailed API are supported. 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 | 108 ++++++++++++++++++++++++++------------------- 1 file changed, 63 insertions(+), 45 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 72cdf8ae605..c6d58635382 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -102,6 +102,7 @@ MAKE_FUNCPTR(SDL_HapticRumbleSupported); MAKE_FUNCPTR(SDL_HapticRunEffect); MAKE_FUNCPTR(SDL_HapticStopAll); MAKE_FUNCPTR(SDL_JoystickIsHaptic); +MAKE_FUNCPTR(SDL_JoystickRumble); MAKE_FUNCPTR(SDL_memset); MAKE_FUNCPTR(SDL_GameControllerAddMapping); MAKE_FUNCPTR(SDL_RegisterEvents); @@ -110,6 +111,12 @@ static Uint16 (*pSDL_JoystickGetProduct)(SDL_Joystick * joystick); static Uint16 (*pSDL_JoystickGetProductVersion)(SDL_Joystick * joystick); static Uint16 (*pSDL_JoystickGetVendor)(SDL_Joystick * joystick); +/* internal bits for extended rumble support, SDL_Haptic types are 16-bits */ +#define WINE_SDL_JOYSTICK_RUMBLE 0x40000000 /* using SDL_JoystickRumble API */ +#define WINE_SDL_HAPTIC_RUMBLE 0x80000000 /* using SDL_HapticRumble API */ + +#define EFFECT_SUPPORT_HAPTICS (SDL_HAPTIC_LEFTRIGHT|WINE_SDL_HAPTIC_RUMBLE|WINE_SDL_JOYSTICK_RUMBLE) + struct sdl_device { struct unix_device unix_device; @@ -118,6 +125,7 @@ struct sdl_device SDL_GameController *sdl_controller; SDL_JoystickID id; + DWORD effect_support; SDL_Haptic *sdl_haptic; int haptic_effect_id; BYTE vendor_rumble_report_id; @@ -159,26 +167,31 @@ static void set_hat_value(struct unix_device *iface, int index, int value) static BOOL descriptor_add_haptic(struct sdl_device *impl) { - if (pSDL_JoystickIsHaptic(impl->sdl_joystick)) + unsigned int haptics_mask = SDL_HAPTIC_LEFTRIGHT; + + if (!pSDL_JoystickIsHaptic(impl->sdl_joystick) || + !(impl->sdl_haptic = pSDL_HapticOpenFromJoystick(impl->sdl_joystick))) + impl->effect_support = 0; + else { - impl->sdl_haptic = pSDL_HapticOpenFromJoystick(impl->sdl_joystick); - if (impl->sdl_haptic && - ((pSDL_HapticQuery(impl->sdl_haptic) & SDL_HAPTIC_LEFTRIGHT) != 0 || - pSDL_HapticRumbleSupported(impl->sdl_haptic))) - { - pSDL_HapticStopAll(impl->sdl_haptic); - pSDL_HapticRumbleInit(impl->sdl_haptic); - if (!hid_device_add_haptics(&impl->unix_device, &impl->vendor_rumble_report_id)) - return FALSE; - impl->haptic_effect_id = -1; - } - else - { - pSDL_HapticClose(impl->sdl_haptic); - impl->sdl_haptic = NULL; - } + impl->effect_support = pSDL_HapticQuery(impl->sdl_haptic) & haptics_mask; + if (pSDL_HapticRumbleSupported(impl->sdl_haptic)) + impl->effect_support |= WINE_SDL_HAPTIC_RUMBLE; + + pSDL_HapticStopAll(impl->sdl_haptic); + pSDL_HapticRumbleInit(impl->sdl_haptic); } + if (!pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0)) + impl->effect_support |= WINE_SDL_JOYSTICK_RUMBLE; + + if (impl->effect_support & EFFECT_SUPPORT_HAPTICS) + { + if (!hid_device_add_haptics(&impl->unix_device, &impl->vendor_rumble_report_id)) + return FALSE; + } + + impl->haptic_effect_id = -1; return TRUE; } @@ -338,39 +351,18 @@ static void sdl_device_stop(struct unix_device *iface) static void sdl_device_set_output_report(struct unix_device *iface, HID_XFER_PACKET *packet, IO_STATUS_BLOCK *io) { struct sdl_device *impl = impl_from_unix_device(iface); + SDL_HapticEffect effect; - if (impl->sdl_haptic && packet->reportId == impl->vendor_rumble_report_id) + if (packet->reportId == impl->vendor_rumble_report_id) { WORD left = packet->reportBuffer[2] * 128; WORD right = packet->reportBuffer[3] * 128; - if (impl->haptic_effect_id >= 0) - { - pSDL_HapticDestroyEffect(impl->sdl_haptic, impl->haptic_effect_id); - impl->haptic_effect_id = -1; - } - pSDL_HapticStopAll(impl->sdl_haptic); - if (left != 0 || right != 0) - { - SDL_HapticEffect effect; - - pSDL_memset( &effect, 0, sizeof(SDL_HapticEffect) ); - effect.type = SDL_HAPTIC_LEFTRIGHT; - effect.leftright.length = -1; - effect.leftright.large_magnitude = left; - effect.leftright.small_magnitude = right; - - impl->haptic_effect_id = pSDL_HapticNewEffect(impl->sdl_haptic, &effect); - if (impl->haptic_effect_id >= 0) - { - pSDL_HapticRunEffect(impl->sdl_haptic, impl->haptic_effect_id, 1); - } - else - { - float i = (float)((left + right)/2.0) / 32767.0; - pSDL_HapticRumblePlay(impl->sdl_haptic, i, -1); - } - } + pSDL_memset(&effect, 0, sizeof(SDL_HapticEffect)); + effect.type = SDL_HAPTIC_LEFTRIGHT; + effect.leftright.length = -1; + effect.leftright.large_magnitude = left; + effect.leftright.small_magnitude = right; io->Information = packet->reportBufferLen; io->Status = STATUS_SUCCESS; @@ -379,6 +371,31 @@ static void sdl_device_set_output_report(struct unix_device *iface, HID_XFER_PAC { io->Information = 0; io->Status = STATUS_NOT_IMPLEMENTED; + return; + } + + 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); + if (!effect.leftright.large_magnitude && !effect.leftright.small_magnitude) return; + + if (impl->effect_support & SDL_HAPTIC_LEFTRIGHT) + { + 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); + if (impl->haptic_effect_id >= 0) + pSDL_HapticRunEffect(impl->sdl_haptic, impl->haptic_effect_id, 1); + } + 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, -1); } } @@ -662,6 +679,7 @@ NTSTATUS sdl_bus_init(void *args) LOAD_FUNCPTR(SDL_HapticRunEffect); LOAD_FUNCPTR(SDL_HapticStopAll); LOAD_FUNCPTR(SDL_JoystickIsHaptic); + LOAD_FUNCPTR(SDL_JoystickRumble); LOAD_FUNCPTR(SDL_memset); LOAD_FUNCPTR(SDL_GameControllerAddMapping); LOAD_FUNCPTR(SDL_RegisterEvents);

1 0

Rémi Bernon : winebus.sys: Use report ids in crafted HID reports.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 04b19a969b8ea89898662a5a964248d05172e6fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=04b19a969b8ea89898662a5a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 23 08:55:28 2021 +0200 winebus.sys: Use report ids in crafted HID reports. 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 | 18 ++++++++-- dlls/winebus.sys/bus_udev.c | 6 ++++ dlls/winebus.sys/hid.c | 80 +++++++++++++++++++++++++++++++---------- dlls/winebus.sys/unix_private.h | 6 +++- dlls/xinput1_3/main.c | 2 +- 5 files changed, 89 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=04b19a969b8ea8989866…

1 0

Rémi Bernon : winebus.sys: Factor out setting HID report values.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 9cf1e8353cf05af1009e3e5d40b62f0e70761f3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cf1e8353cf05af1009e3e5d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 23 08:55:27 2021 +0200 winebus.sys: Factor out setting HID report values. 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 | 141 ++++++++++-------------------------- dlls/winebus.sys/bus_udev.c | 154 +++++++++++----------------------------- dlls/winebus.sys/hid.c | 87 +++++++++++++++++++++++ dlls/winebus.sys/unix_private.h | 6 ++ 4 files changed, 172 insertions(+), 216 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9cf1e8353cf05af1009e…

1 0

Rémi Bernon : winebus.sys: Factor out HID report buffers allocation.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: c6df23fed3f43bbb331e51f2ec56be56d7ba23e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6df23fed3f43bbb331e51f2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 23 08:55:26 2021 +0200 winebus.sys: Factor out HID report buffers allocation. 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 | 44 ++++++++++--------------------- dlls/winebus.sys/bus_udev.c | 58 +++++++++-------------------------------- dlls/winebus.sys/hid.c | 27 ++++++++++++++++++- dlls/winebus.sys/unix_private.h | 6 +++++ 4 files changed, 59 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c6df23fed3f43bbb331e…

1 0

Guillaume Charifi : ntdll: Implement exclusive flag for IOCTL_AFD_POLL.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 5990f19bdc174032a4c6b459204c32ba0f1f3354 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5990f19bdc174032a4c6b459… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Thu Sep 23 00:48:03 2021 -0500 ntdll: Implement exclusive flag for IOCTL_AFD_POLL. Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 2 +- dlls/ws2_32/tests/afd.c | 10 +++---- include/wine/server_protocol.h | 4 +-- server/protocol.def | 1 + server/request.h | 1 + server/sock.c | 66 ++++++++++++++++++++++++++++++++++++++++-- server/trace.c | 3 +- 7 files changed, 75 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5990f19bdc174032a4c6…

1 0

Zebediah Figura : server: Factor out a complete_async_poll() helper.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: c3b32dbccf412c7f351876e4ff4cc307f12f334e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3b32dbccf412c7f351876e4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 23 00:48:02 2021 -0500 server: Factor out a complete_async_poll() helper. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/server/sock.c b/server/sock.c index fc234e89865..e426019d558 100644 --- a/server/sock.c +++ b/server/sock.c @@ -832,6 +832,12 @@ static int get_poll_flags( struct sock *sock, int event ) return flags; } +static void complete_async_poll( struct poll_req *req, unsigned int status ) +{ + /* pass 0 as result; client will set actual result size */ + async_request_complete( req->async, status, 0, req->count * sizeof(*req->output), req->output ); +} + static void complete_async_polls( struct sock *sock, int event, int error ) { int flags = get_poll_flags( sock, event ); @@ -855,8 +861,7 @@ static void complete_async_polls( struct sock *sock, int event, int error ) req->output[i].flags = req->sockets[i].flags & flags; req->output[i].status = sock_get_ntstatus( error ); - async_request_complete( req->async, STATUS_SUCCESS, 0, - req->count * sizeof(*req->output), req->output ); + complete_async_poll( req, STATUS_SUCCESS ); break; } } @@ -870,7 +875,7 @@ static void async_poll_timeout( void *private ) if (req->iosb->status != STATUS_PENDING) return; - async_request_complete( req->async, STATUS_TIMEOUT, 0, req->count * sizeof(*req->output), req->output ); + complete_async_poll( req, STATUS_TIMEOUT ); } static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) @@ -1320,12 +1325,7 @@ static int sock_close_handle( struct object *obj, struct process *process, obj_h } } - if (signaled) - { - /* pass 0 as result; client will set actual result size */ - async_request_complete( poll_req->async, STATUS_SUCCESS, 0, - poll_req->count * sizeof(*poll_req->output), poll_req->output ); - } + if (signaled) complete_async_poll( poll_req, STATUS_SUCCESS ); } } @@ -2913,7 +2913,7 @@ static void poll_socket( struct sock *poll_sock, struct async *async, timeout_t } if (!timeout || signaled) - async_request_complete( req->async, STATUS_SUCCESS, 0, count * sizeof(*output), output ); + complete_async_poll( req, STATUS_SUCCESS ); for (i = 0; i < req->count; ++i) sock_reselect( req->sockets[i].sock );

1 0

Guillaume Charifi : ws2_32: Add tests for IOCTL_AFD_POLL exclusive flag.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: a215324c6b47f4cc9a7904d541be72c973534e28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a215324c6b47f4cc9a7904d5… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Thu Sep 23 00:48:01 2021 -0500 ws2_32: Add tests for IOCTL_AFD_POLL exclusive flag. Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 6 +- dlls/ws2_32/tests/afd.c | 349 +++++++++++++++++++++++++++++++++++++++++++++++ include/wine/afd.h | 2 +- 3 files changed, 353 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a215324c6b47f4cc9a79…

1 0

Zebediah Figura : ntdll: Return STATUS_DEVICE_NOT_READY instead of STATUS_PENDING from try_transmit().
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 4f4fee53a61c231d21a9ba0669f200b9f60a5de4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f4fee53a61c231d21a9ba06… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 23 00:48:00 2021 -0500 ntdll: Return STATUS_DEVICE_NOT_READY instead of STATUS_PENDING from try_transmit(). async_transmit_proc() expects the former. Fixes: 1eb56b20baefcdccaafbb622cadc71670c149e18 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 73d61c0d4e6..ec6aa02d14a 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1017,7 +1017,7 @@ static NTSTATUS try_transmit( int sock_fd, int file_fd, struct async_transmit_io if (ret < read_size || (async->file_len && async->file_cursor == async->file_len)) async->file = NULL; - return STATUS_PENDING; /* still more data to send */ + return STATUS_DEVICE_NOT_READY; /* still more data to send */ } while (async->tail_cursor < async->buffers.TailLength)

1 0

Zebediah Figura : ntdll: Return STATUS_PENDING when restarting asyncs.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 455b707ea2fbbfdc84a4bb6e140d694dc30981cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=455b707ea2fbbfdc84a4bb6e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 23 00:47:59 2021 -0500 ntdll: Return STATUS_PENDING when restarting asyncs. Fixes: 1eb56b20baefcdccaafbb622cadc71670c149e18 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 050824a1440..53d34e1858a 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -390,6 +390,7 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO /* the server will pass us NULL if a call failed synchronously */ set_async_iosb( call->async_io.sb, result->async_io.status, info ); } + else result->async_io.status = STATUS_PENDING; /* restart it */ break; } case APC_VIRTUAL_ALLOC:

1 0

Zebediah Figura : ndis.sys: Return STATUS_INVALID_PARAMETER for unknown OIDs.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 2bec828af49059196e24c10fb1a5a547e3a6528b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bec828af49059196e24c10f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 22 23:00:39 2021 -0500 ndis.sys: Return STATUS_INVALID_PARAMETER for unknown OIDs. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ndis.sys/main.c | 2 +- dlls/ndis.sys/tests/ndis.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ndis.sys/main.c b/dlls/ndis.sys/main.c index e1517f77700..a0d2581aaa9 100644 --- a/dlls/ndis.sys/main.c +++ b/dlls/ndis.sys/main.c @@ -89,7 +89,7 @@ static void query_global_stats(IRP *irp, const MIB_IF_ROW2 *netdev) } default: FIXME( "Unsupported OID %x\n", oid ); - irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; break; } } diff --git a/dlls/ndis.sys/tests/ndis.c b/dlls/ndis.sys/tests/ndis.c index caece671476..3349f1dae97 100644 --- a/dlls/ndis.sys/tests/ndis.c +++ b/dlls/ndis.sys/tests/ndis.c @@ -63,7 +63,7 @@ static void test_device(const WCHAR *service_name, const MIB_IF_ROW2 *row) iosb.Information = 0xdeadbeef; status = NtDeviceIoControlFile( netdev, NULL, NULL, NULL, &iosb, IOCTL_NDIS_QUERY_GLOBAL_STATS, &oid, sizeof(oid), &medium, sizeof(medium) ); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "got status %#x\n", status); + ok(status == STATUS_INVALID_PARAMETER, "got status %#x\n", status); ok(iosb.Status == 0xdeadbeef, "got %#x\n", iosb.Status); ok(iosb.Information == 0xdeadbeef, "got size %#Ix\n", iosb.Information);

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 September 2021