wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Rémi Bernon : winebus.sys: Process quirky DS4 bluetooth reports.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: b51c982de16c90cc35b32609a5a778ed8073a3e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b51c982de16c90cc35b32609… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 18 17:16:45 2021 +0200 winebus.sys: Process quirky DS4 bluetooth reports. Based on a Proton patch from Andrew Eikum <aeikum(a)codeweavers.com>. 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 | 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 e137299df77..1dfce05e4bc 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) @@ -282,7 +285,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) @@ -290,7 +293,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) @@ -1149,6 +1171,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 = @@ -1250,6 +1278,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 61c6dbb1deb..89a0c9abad9 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -244,5 +244,6 @@ extern BOOL hid_device_sync_report(struct unix_device *iface) DECLSPEC_HIDDEN; extern void hid_device_drop_report(struct unix_device *iface) 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;

1 0

Rémi Bernon : winebus.sys: Only use SDL_JoystickRumble as a fallback.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: 2369cdc180e59fac82569e5e087cf490860bfd02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2369cdc180e59fac82569e5e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 18 17:16:44 2021 +0200 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 16e7a2f6f30..f1c20692b29 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -192,7 +192,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) @@ -394,9 +395,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; @@ -416,7 +418,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;

1 0

Rémi Bernon : winebus.sys: Define BUS_BLUETOOTH if it is missing.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: 92c4cccb4318a3c724dfbae7e35830720e535dbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=92c4cccb4318a3c724dfbae7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 18 15:58:48 2021 +0200 winebus.sys: Define BUS_BLUETOOTH if it is missing. 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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index b857ba25df8..e137299df77 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -59,6 +59,10 @@ # endif #endif +#ifndef BUS_BLUETOOTH +# define BUS_BLUETOOTH 5 +#endif + #include <pthread.h> #include "ntstatus.h"

1 0

Francois Gouget : ctype.h: Add _isctype_l() declaration.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: 91851e3e45f4147d4818fee3c7cc606cfcf380a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91851e3e45f4147d4818fee3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 18 17:58:11 2021 +0200 ctype.h: Add _isctype_l() declaration. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/ctype.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msvcrt/ctype.h b/include/msvcrt/ctype.h index be99f7409e4..312888c3cfc 100644 --- a/include/msvcrt/ctype.h +++ b/include/msvcrt/ctype.h @@ -24,6 +24,7 @@ _ACRTIMP int __cdecl __iscsymf(int); _ACRTIMP int __cdecl __toascii(int); _ACRTIMP int __cdecl _isblank_l(int,_locale_t); _ACRTIMP int __cdecl _isctype(int,int); +_ACRTIMP int __cdecl _isctype_l(int,int,_locale_t); _ACRTIMP int __cdecl _tolower(int); _ACRTIMP int __cdecl _tolower_l(int,_locale_t); _ACRTIMP int __cdecl _toupper(int);

1 0

Alex Henrie : ws2_32: Set WSAEFAULT if the bind address is null.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: a990e25bf029913b08590d89841ec4faa89236b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a990e25bf029913b08590d89… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 17 23:45:29 2021 -0600 ws2_32: Set WSAEFAULT if the bind address is null. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 50ea15c5b0e..2db441bee3c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1068,7 +1068,7 @@ int WINAPI bind( SOCKET s, const struct sockaddr *addr, int len ) if (!addr) { - SetLastError( WSAEAFNOSUPPORT ); + SetLastError( WSAEFAULT ); return -1; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index eadc47a8ea6..63f8149f160 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -10794,7 +10794,18 @@ static void test_bind(void) WSASetLastError(0xdeadbeef); ret = bind(s, NULL, 0); ok(ret == -1, "expected failure\n"); - todo_wine ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = bind(s, NULL, sizeof(addr)); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + addr.sa_family = AF_INET; + WSASetLastError(0xdeadbeef); + ret = bind(s, &addr, 0); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); addr.sa_family = 0xdead; WSASetLastError(0xdeadbeef);

1 0

Alex Henrie : ws2_32: Clear last error in WSASocketW.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: 63110f9879df16981c926a795287131c2bc424d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63110f9879df16981c926a79… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 17 23:45:28 2021 -0600 ws2_32: Clear last error in WSASocketW. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 1 + dlls/ws2_32/tests/sock.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b3dab22ae6e..50ea15c5b0e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3363,6 +3363,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, CloseHandle(handle); return INVALID_SOCKET; } + WSASetLastError(0); return ret; done: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2bb219d7c0e..eadc47a8ea6 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2418,7 +2418,7 @@ static void test_WSASocket(void) { SetLastError( 0xdeadbeef ); sock = WSASocketA( tests[i].family, tests[i].type, tests[i].protocol, NULL, 0, 0 ); - todo_wine_if (!tests[i].error || i == 7) + todo_wine_if (i == 7) ok(WSAGetLastError() == tests[i].error, "Test %u: got wrong error %u\n", i, WSAGetLastError()); if (tests[i].error) {

1 0

Zebediah Figura : wined3d: Fully initialize the allocator structure in wined3d_allocator_init().
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: b344d1d0913fb7f87c72e7c4693587a78915abef URL: https://source.winehq.org/git/wine.git/?a=commit;h=b344d1d0913fb7f87c72e7c4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Oct 17 15:08:30 2021 -0500 wined3d: Fully initialize the allocator structure in wined3d_allocator_init(). Allows the allocator to be uninitialized and reinitialized. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 47718c9f710..29326668e07 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -7432,5 +7432,7 @@ bool wined3d_allocator_init(struct wined3d_allocator *allocator, list_init(&allocator->pools[i].chunks); } + allocator->free = NULL; + return true; }

1 0

Jan Sikorski : d3d11: Don't grab wined3d lock for wined3d_device_context_copy_uav_counter().
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: fa63f80d0ebc80e9c8b32dde95ad6f1089c528d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa63f80d0ebc80e9c8b32dde… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:16 2021 +0200 d3d11: Don't grab wined3d lock for wined3d_device_context_copy_uav_counter(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e5618f09174..248634a245d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1392,10 +1392,8 @@ static void STDMETHODCALLTYPE d3d11_device_context_CopyStructureCount(ID3D11Devi buffer_impl = unsafe_impl_from_ID3D11Buffer(dst_buffer); uav = unsafe_impl_from_ID3D11UnorderedAccessView(src_view); - wined3d_mutex_lock(); wined3d_device_context_copy_uav_counter(context->wined3d_context, buffer_impl->wined3d_buffer, dst_offset, uav->wined3d_view); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_ClearRenderTargetView(ID3D11DeviceContext1 *iface,

1 0

Jan Sikorski : d3d11: Don't grab wined3d lock for wined3d_device_context_flush().
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: 82b02b1ce6f122b6b6b234f723a24d6c6d35869a URL: https://source.winehq.org/git/wine.git/?a=commit;h=82b02b1ce6f122b6b6b234f7… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:15 2021 +0200 d3d11: Don't grab wined3d lock for wined3d_device_context_flush(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 2ea657b9641..e5618f09174 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2665,9 +2665,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_Flush(ID3D11DeviceContext1 *i TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); wined3d_device_context_flush(context->wined3d_context); - wined3d_mutex_unlock(); } static D3D11_DEVICE_CONTEXT_TYPE STDMETHODCALLTYPE d3d11_device_context_GetType(ID3D11DeviceContext1 *iface) @@ -5755,9 +5753,7 @@ static void STDMETHODCALLTYPE d3d10_device_Flush(ID3D10Device1 *iface) TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); wined3d_device_context_flush(device->immediate_context.wined3d_context); - wined3d_mutex_unlock(); } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBuffer(ID3D10Device1 *iface,

1 0

Jan Sikorski : d3d11: Don't grab wined3d lock for wined3d_device_context_reset_state().
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: b02663fa06a4af5dc27693e686ec14f4c1ecc574 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b02663fa06a4af5dc27693e6… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:14 2021 +0200 d3d11: Don't grab wined3d lock for wined3d_device_context_reset_state(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 43db6b76b8c..2ea657b9641 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2656,9 +2656,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_ClearState(ID3D11DeviceContex TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); wined3d_device_context_reset_state(context->wined3d_context); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_Flush(ID3D11DeviceContext1 *iface)

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