October 2021 - Wine-Commits

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

Oct. 18, 2021

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

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

Oct. 18, 2021

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 Oct. 18, 2021

Oct. 18, 2021

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

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

Oct. 18, 2021

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

Piotr Caban : imm32: Delay import ole32.dll.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: a3c6e5c843b54222a2a442390cdd8a18ad02c913 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3c6e5c843b54222a2a44239… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 18 18:42:59 2021 +0200 imm32: Delay import ole32.dll. Fixes kernel32 debugger test failure. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/imm32/Makefile.in b/dlls/imm32/Makefile.in index ad10fc2fa45..214b2b753d4 100644 --- a/dlls/imm32/Makefile.in +++ b/dlls/imm32/Makefile.in @@ -1,6 +1,7 @@ MODULE = imm32.dll IMPORTLIB = imm32 -IMPORTS = user32 gdi32 advapi32 ole32 +IMPORTS = user32 gdi32 advapi32 +DELAYIMPORTS = ole32 C_SRCS = \ imm.c

1 0

Alex Henrie : ws2_32: Clear last error in WSASocketW.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

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

Jan Sikorski : d3d11: Don't grab wined3d lock for wined3d_device_context_resolve_sub_resource().
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: c024d91d9f54d2bfbea96639658c6f374318f967 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c024d91d9f54d2bfbea96639… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:12 2021 +0200 d3d11: Don't grab wined3d lock for wined3d_device_context_resolve_sub_resource(). 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 84af9a16baf..4839d81dd19 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1510,11 +1510,9 @@ static void STDMETHODCALLTYPE d3d11_device_context_ResolveSubresource(ID3D11Devi wined3d_dst_resource = wined3d_resource_from_d3d11_resource(dst_resource); wined3d_src_resource = wined3d_resource_from_d3d11_resource(src_resource); wined3d_format = wined3dformat_from_dxgi_format(format); - wined3d_mutex_lock(); wined3d_device_context_resolve_sub_resource(context->wined3d_context, wined3d_dst_resource, dst_subresource_idx, wined3d_src_resource, src_subresource_idx, wined3d_format); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_ExecuteCommandList(ID3D11DeviceContext1 *iface, @@ -5100,11 +5098,9 @@ static void STDMETHODCALLTYPE d3d10_device_ResolveSubresource(ID3D10Device1 *ifa wined3d_dst_resource = wined3d_resource_from_d3d10_resource(dst_resource); wined3d_src_resource = wined3d_resource_from_d3d10_resource(src_resource); wined3d_format = wined3dformat_from_dxgi_format(format); - wined3d_mutex_lock(); wined3d_device_context_resolve_sub_resource(device->immediate_context.wined3d_context, wined3d_dst_resource, dst_subresource_idx, wined3d_src_resource, src_subresource_idx, wined3d_format); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_device_VSGetConstantBuffers(ID3D10Device1 *iface,

1 0

Jan Sikorski : d3d11: Don't grab wined3d lock for wined3d dispatch functions.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: f6f82669bbdf51282d7f313189eed4dc731e662f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6f82669bbdf51282d7f3131… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:08 2021 +0200 d3d11: Don't grab wined3d lock for wined3d dispatch functions. 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 55f1332b555..d9a75de20e9 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1253,10 +1253,8 @@ static void STDMETHODCALLTYPE d3d11_device_context_Dispatch(ID3D11DeviceContext1 TRACE("iface %p, thread_group_count_x %u, thread_group_count_y %u, thread_group_count_z %u.\n", iface, thread_group_count_x, thread_group_count_y, thread_group_count_z); - wined3d_mutex_lock(); wined3d_device_context_dispatch(context->wined3d_context, thread_group_count_x, thread_group_count_y, thread_group_count_z); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_DispatchIndirect(ID3D11DeviceContext1 *iface, @@ -1269,9 +1267,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_DispatchIndirect(ID3D11Device buffer_impl = unsafe_impl_from_ID3D11Buffer(buffer); - wined3d_mutex_lock(); wined3d_device_context_dispatch_indirect(context->wined3d_context, buffer_impl->wined3d_buffer, offset); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_RSSetState(ID3D11DeviceContext1 *iface,

1 0

Jan Sikorski : d3d11: Don't grab wined3d lock for wined3d draw functions.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: f1f3e0765221bb3a135544b585c9324539d5cf08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1f3e0765221bb3a135544b5… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:07 2021 +0200 d3d11: Don't grab wined3d lock for wined3d draw functions. 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 | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 59109eb3767..55f1332b555 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -766,10 +766,8 @@ static void STDMETHODCALLTYPE d3d11_device_context_DrawIndexed(ID3D11DeviceConte TRACE("iface %p, index_count %u, start_index_location %u, base_vertex_location %d.\n", iface, index_count, start_index_location, base_vertex_location); - wined3d_mutex_lock(); wined3d_device_context_draw_indexed(context->wined3d_context, base_vertex_location, start_index_location, index_count, 0, 0); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_Draw(ID3D11DeviceContext1 *iface, @@ -780,9 +778,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_Draw(ID3D11DeviceContext1 *if TRACE("iface %p, vertex_count %u, start_vertex_location %u.\n", iface, vertex_count, start_vertex_location); - wined3d_mutex_lock(); wined3d_device_context_draw(context->wined3d_context, start_vertex_location, vertex_count, 0, 0); - wined3d_mutex_unlock(); } static HRESULT STDMETHODCALLTYPE d3d11_device_context_Map(ID3D11DeviceContext1 *iface, ID3D11Resource *resource, @@ -904,10 +900,8 @@ static void STDMETHODCALLTYPE d3d11_device_context_DrawIndexedInstanced(ID3D11De iface, instance_index_count, instance_count, start_index_location, base_vertex_location, start_instance_location); - wined3d_mutex_lock(); wined3d_device_context_draw_indexed(context->wined3d_context, base_vertex_location, start_index_location, instance_index_count, start_instance_location, instance_count); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_DrawInstanced(ID3D11DeviceContext1 *iface, @@ -920,10 +914,8 @@ static void STDMETHODCALLTYPE d3d11_device_context_DrawInstanced(ID3D11DeviceCon iface, instance_vertex_count, instance_count, start_vertex_location, start_instance_location); - wined3d_mutex_lock(); wined3d_device_context_draw(context->wined3d_context, start_vertex_location, instance_vertex_count, start_instance_location, instance_count); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_GSSetConstantBuffers(ID3D11DeviceContext1 *iface, @@ -1237,9 +1229,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_DrawIndexedInstancedIndirect( d3d_buffer = unsafe_impl_from_ID3D11Buffer(buffer); - wined3d_mutex_lock(); wined3d_device_context_draw_indirect(context->wined3d_context, d3d_buffer->wined3d_buffer, offset, true); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_DrawInstancedIndirect(ID3D11DeviceContext1 *iface, @@ -1252,9 +1242,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_DrawInstancedIndirect(ID3D11D d3d_buffer = unsafe_impl_from_ID3D11Buffer(buffer); - wined3d_mutex_lock(); wined3d_device_context_draw_indirect(context->wined3d_context, d3d_buffer->wined3d_buffer, offset, false); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_Dispatch(ID3D11DeviceContext1 *iface, @@ -4684,10 +4672,8 @@ static void STDMETHODCALLTYPE d3d10_device_DrawIndexed(ID3D10Device1 *iface, UIN TRACE("iface %p, index_count %u, start_index_location %u, base_vertex_location %d.\n", iface, index_count, start_index_location, base_vertex_location); - wined3d_mutex_lock(); wined3d_device_context_draw_indexed(device->immediate_context.wined3d_context, base_vertex_location, start_index_location, index_count, 0, 0); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_device_Draw(ID3D10Device1 *iface, UINT vertex_count, @@ -4698,9 +4684,7 @@ static void STDMETHODCALLTYPE d3d10_device_Draw(ID3D10Device1 *iface, UINT verte TRACE("iface %p, vertex_count %u, start_vertex_location %u\n", iface, vertex_count, start_vertex_location); - wined3d_mutex_lock(); wined3d_device_context_draw(device->immediate_context.wined3d_context, start_vertex_location, vertex_count, 0, 0); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_device_PSSetConstantBuffers(ID3D10Device1 *iface, @@ -4781,10 +4765,8 @@ static void STDMETHODCALLTYPE d3d10_device_DrawIndexedInstanced(ID3D10Device1 *i iface, instance_index_count, instance_count, start_index_location, base_vertex_location, start_instance_location); - wined3d_mutex_lock(); wined3d_device_context_draw_indexed(device->immediate_context.wined3d_context, base_vertex_location, start_index_location, instance_index_count, start_instance_location, instance_count); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_device_DrawInstanced(ID3D10Device1 *iface, @@ -4797,10 +4779,8 @@ static void STDMETHODCALLTYPE d3d10_device_DrawInstanced(ID3D10Device1 *iface, "start_instance_location %u.\n", iface, instance_vertex_count, instance_count, start_vertex_location, start_instance_location); - wined3d_mutex_lock(); wined3d_device_context_draw(device->immediate_context.wined3d_context, start_vertex_location, instance_vertex_count, start_instance_location, instance_count); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_device_GSSetConstantBuffers(ID3D10Device1 *iface,

1 0

Dmitry Timoshkov : user32: Don't check active window state when handling SC_MINIMIZE/SC_MAXIMIZE/SC_RESTORE.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: 51d606faac8313f1231d921da8868af29dc38a2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=51d606faac8313f1231d921d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 13 13:26:43 2021 +0300 user32: Don't check active window state when handling SC_MINIMIZE/SC_MAXIMIZE/SC_RESTORE. An application I'm working on routes messages to a worker thread, and checking for an active window while processing WM_SYSCOMMAND in that thread breaks things. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/nonclient.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 02e6ad92320..b47616bb639 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1560,19 +1560,18 @@ LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) break; case SC_MINIMIZE: - if (hwnd == GetActiveWindow()) - ShowOwnedPopups(hwnd,FALSE); + ShowOwnedPopups(hwnd,FALSE); ShowWindow( hwnd, SW_MINIMIZE ); break; case SC_MAXIMIZE: - if (IsIconic(hwnd) && hwnd == GetActiveWindow()) + if (IsIconic(hwnd)) ShowOwnedPopups(hwnd,TRUE); ShowWindow( hwnd, SW_MAXIMIZE ); break; case SC_RESTORE: - if (IsIconic(hwnd) && hwnd == GetActiveWindow()) + if (IsIconic(hwnd)) ShowOwnedPopups(hwnd,TRUE); ShowWindow( hwnd, SW_RESTORE ); break;

1 0