- Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Use the exported structures for dll redirection data.
by Alexandre Julliard Feb. 28, 2024

Feb. 28, 2024

Module: wine Branch: master Commit: 6a153ac33e25d7cbd5633aa4b9ab95eddf94eeab URL: https://gitlab.winehq.org/wine/wine/-/commit/6a153ac33e25d7cbd5633aa4b9ab95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 14:19:35 2024 +0100 ntdll: Use the exported structures for dll redirection data. --- dlls/ntdll/actctx.c | 51 ++++++++++++++++++++++++++----------------------- dlls/ntdll/loader.c | 20 ++++++++++--------- dlls/ntdll/ntdll_misc.h | 15 --------------- include/winnt.h | 20 +++++++++++++++++++ 4 files changed, 58 insertions(+), 48 deletions(-)

1 0

Alexandros Frantzis : winex11.drv: Remove unused refresh_drawables field.
by Alexandre Julliard Feb. 28, 2024

Feb. 28, 2024

Module: wine Branch: master Commit: 8e0a00db04e2f860197da14ebcf01853a58b6638 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e0a00db04e2f860197da14ebcf018… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Feb 28 09:23:40 2024 +0200 winex11.drv: Remove unused refresh_drawables field. The field is set but no longer read from. --- dlls/winex11.drv/opengl.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index d70f1928655..afedfb38af3 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -205,7 +205,6 @@ struct wgl_context GLXContext ctx; struct gl_drawable *drawables[2]; struct gl_drawable *new_drawables[2]; - BOOL refresh_drawables; struct list entry; }; @@ -1870,7 +1869,6 @@ static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx) ctx->has_been_current = TRUE; ctx->hdc = hdc; set_context_drawables( ctx, gl, gl ); - ctx->refresh_drawables = FALSE; pthread_mutex_unlock( &context_mutex ); goto done; } @@ -1915,7 +1913,6 @@ static BOOL X11DRV_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, struct ctx->has_been_current = TRUE; ctx->hdc = draw_hdc; set_context_drawables( ctx, draw_gl, read_gl ); - ctx->refresh_drawables = FALSE; NtCurrentTeb()->glContext = ctx; pthread_mutex_unlock( &context_mutex ); goto done;

1 0

Alexandre Julliard : winedump: Print the correct register names for exception info on ARM64.
by Alexandre Julliard Feb. 28, 2024

Feb. 28, 2024

Module: wine Branch: master Commit: ebaa47dcee08cb58d407a8dd15323258e8e5aa79 URL: https://gitlab.winehq.org/wine/wine/-/commit/ebaa47dcee08cb58d407a8dd153232… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 19:03:14 2024 +0100 winedump: Print the correct register names for exception info on ARM64. --- tools/winedump/pe.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 1104072a2c2..d4bf46c5307 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1424,15 +1424,15 @@ static void dump_arm64_codes( const BYTE *ptr, unsigned int count ) } else if (ptr[i] < 0x40) /* save_r19r20_x */ { - printf( "stp r19,r20,[sp,-#%#x]!\n", 8 * (val & 0x1f) ); + printf( "stp x19,x20,[sp,-#%#x]!\n", 8 * (val & 0x1f) ); } else if (ptr[i] < 0x80) /* save_fplr */ { - printf( "stp r29,lr,[sp,#%#x]\n", 8 * (val & 0x3f) ); + printf( "stp x29,lr,[sp,#%#x]\n", 8 * (val & 0x3f) ); } else if (ptr[i] < 0xc0) /* save_fplr_x */ { - printf( "stp r29,lr,[sp,-#%#x]!\n", 8 * (val & 0x3f) + 8 ); + printf( "stp x29,lr,[sp,-#%#x]!\n", 8 * (val & 0x3f) + 8 ); } else if (ptr[i] < 0xc8) /* alloc_m */ { @@ -1441,27 +1441,27 @@ static void dump_arm64_codes( const BYTE *ptr, unsigned int count ) else if (ptr[i] < 0xcc) /* save_regp */ { int reg = 19 + ((val >> 6) & 0xf); - printf( "stp r%u,r%u,[sp,#%#x]\n", reg, reg + 1, 8 * (val & 0x3f) ); + printf( "stp x%u,x%u,[sp,#%#x]\n", reg, reg + 1, 8 * (val & 0x3f) ); } else if (ptr[i] < 0xd0) /* save_regp_x */ { int reg = 19 + ((val >> 6) & 0xf); - printf( "stp r%u,r%u,[sp,-#%#x]!\n", reg, reg + 1, 8 * (val & 0x3f) + 8 ); + printf( "stp x%u,x%u,[sp,-#%#x]!\n", reg, reg + 1, 8 * (val & 0x3f) + 8 ); } else if (ptr[i] < 0xd4) /* save_reg */ { int reg = 19 + ((val >> 6) & 0xf); - printf( "str r%u,[sp,#%#x]\n", reg, 8 * (val & 0x3f) ); + printf( "str x%u,[sp,#%#x]\n", reg, 8 * (val & 0x3f) ); } else if (ptr[i] < 0xd6) /* save_reg_x */ { int reg = 19 + ((val >> 5) & 0xf); - printf( "str r%u,[sp,-#%#x]!\n", reg, 8 * (val & 0x1f) + 8 ); + printf( "str x%u,[sp,-#%#x]!\n", reg, 8 * (val & 0x1f) + 8 ); } else if (ptr[i] < 0xd8) /* save_lrpair */ { int reg = 19 + 2 * ((val >> 6) & 0x7); - printf( "stp r%u,lr,[sp,#%#x]\n", reg, 8 * (val & 0x3f) ); + printf( "stp x%u,lr,[sp,#%#x]\n", reg, 8 * (val & 0x3f) ); } else if (ptr[i] < 0xda) /* save_fregp */ {

1 0

Alexandre Julliard : ntdll: Remove no longer needed definitions from the private header.
by Alexandre Julliard Feb. 28, 2024

Feb. 28, 2024

Module: wine Branch: master Commit: 3de0f99d4eec174a66faf454f55577636b46a523 URL: https://gitlab.winehq.org/wine/wine/-/commit/3de0f99d4eec174a66faf454f55577… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 14:25:24 2024 +0100 ntdll: Remove no longer needed definitions from the private header. --- dlls/ntdll/loader.c | 2 +- dlls/ntdll/ntdll_misc.h | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 8f7097a2460..ef3fafd994c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -138,7 +138,7 @@ typedef struct _wine_modref static UINT tls_module_count; /* number of modules with TLS directory */ static IMAGE_TLS_DIRECTORY *tls_dirs; /* array of TLS directories */ -LIST_ENTRY tls_links = { &tls_links, &tls_links }; +static LIST_ENTRY tls_links = { &tls_links, &tls_links }; static RTL_CRITICAL_SECTION loader_section; static RTL_CRITICAL_SECTION_DEBUG critsect_debug = diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 50a3dde574c..24c583dd159 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -30,13 +30,6 @@ #include "unixlib.h" #include "wine/asm.h" -#define DECLARE_CRITICAL_SECTION(cs) \ - static RTL_CRITICAL_SECTION cs; \ - static RTL_CRITICAL_SECTION_DEBUG cs##_debug = \ - { 0, 0, &cs, { &cs##_debug.ProcessLocksList, &cs##_debug.ProcessLocksList }, \ - 0, 0, { (DWORD_PTR)(__FILE__ ": " # cs) }}; \ - static RTL_CRITICAL_SECTION cs = { &cs##_debug, -1, 0, 0, 0, 0 }; - #define MAX_NT_PATH_LENGTH 277 #define NTDLL_TLS_ERRNO 16 /* TLS slot for _errno() */ @@ -79,7 +72,7 @@ static inline BOOL is_valid_frame( ULONG_PTR frame ) } extern void WINAPI LdrInitializeThunk(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR); -extern NTSTATUS WINAPI KiUserExceptionDispatcher(EXCEPTION_RECORD*,CONTEXT*); +extern void WINAPI KiUserExceptionDispatcher(EXCEPTION_RECORD*,CONTEXT*); extern void WINAPI KiUserApcDispatcher(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC); extern void WINAPI KiUserCallbackDispatcher(ULONG,void*,ULONG); extern void WINAPI KiUserCallbackDispatcherReturn(void); @@ -99,7 +92,6 @@ extern void init_user_process_params(void); extern void get_resource_lcids( LANGID *user, LANGID *user_neutral, LANGID *system ); /* module handling */ -extern LIST_ENTRY tls_links; extern FARPROC RELAY_GetProcAddress( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, FARPROC proc, DWORD ordinal, const WCHAR *user ); extern FARPROC SNOOP_GetProcAddress( HMODULE hmod, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, @@ -113,9 +105,6 @@ extern void (FASTCALL *pBaseThreadInitThunk)(DWORD,LPTHREAD_START_ROUTINE,void * extern struct _KUSER_SHARED_DATA *user_shared_data; -extern int CDECL NTDLL__vsnprintf( char *str, SIZE_T len, const char *format, va_list args ); -extern int CDECL NTDLL__vsnwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, va_list args ); - #ifdef _WIN64 static inline TEB64 *NtCurrentTeb64(void) { return NULL; } #else

1 0

Rémi Bernon : winevulkan: Remove unnecessary WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT quirk.
by Alexandre Julliard Feb. 28, 2024

Feb. 28, 2024

Module: wine Branch: master Commit: 72c228a3ab6913930d19b926a971cb93345113be URL: https://gitlab.winehq.org/wine/wine/-/commit/72c228a3ab6913930d19b926a971cb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 23 10:23:11 2024 +0100 winevulkan: Remove unnecessary WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT quirk. --- dlls/winevulkan/vulkan.c | 4 +--- dlls/winevulkan/vulkan_loader.h | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index de7f7282c4e..01d2a0c20a0 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -893,8 +893,6 @@ VkResult wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, object->quirks |= WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR; } - object->quirks |= WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT; - client_instance->base.unix_handle = (uintptr_t)object; *instance = client_instance; TRACE("Created instance %p, host_instance %p.\n", object, object->host_instance); @@ -1866,7 +1864,7 @@ static void adjust_surface_capabilities(struct wine_instance *instance, struct w * https://vulkan.gpuinfo.org/displayreport.php?id=9122#surface * https://vulkan.gpuinfo.org/displayreport.php?id=9121#surface */ - if ((instance->quirks & WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT) && !capabilities->maxImageCount) + if (!capabilities->maxImageCount) capabilities->maxImageCount = max(capabilities->minImageCount, 16); /* Update the image extents to match what the Win32 WSI would provide. */ diff --git a/dlls/winevulkan/vulkan_loader.h b/dlls/winevulkan/vulkan_loader.h index 6f62201f503..710c07772fc 100644 --- a/dlls/winevulkan/vulkan_loader.h +++ b/dlls/winevulkan/vulkan_loader.h @@ -39,7 +39,6 @@ #define VULKAN_ICD_MAGIC_VALUE 0x01CDC0DE #define WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR 0x00000001 -#define WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT 0x00000002 /* Base 'class' for our Vulkan dispatchable objects such as VkDevice and VkInstance. * This structure MUST be the first element of a dispatchable object as the ICD

1 0

Esme Povirk : gdiplus: Fix crash in GdipAddPathString.
by Alexandre Julliard Feb. 28, 2024

Feb. 28, 2024

Module: wine Branch: master Commit: 1ee1f2e9d78fb3c8da21618c8fef1b4129f200f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/1ee1f2e9d78fb3c8da21618c8fef1b… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Feb 28 16:40:50 2024 +0000 gdiplus: Fix crash in GdipAddPathString. Apparently, 1454ffe7ddf01226aacec07836d4afa62fecd3fa introduced the assumption that the font passed to gdip_format_string is non-NULL, and GdipAddPathString wasn't passing it in. --- dlls/gdiplus/graphicspath.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 54d9f252c2f..23a9be25055 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1141,7 +1141,6 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT } get_log_fontW(font, graphics, &lfw); - GdipDeleteFont(font); GdipDeleteGraphics(graphics); hfont = CreateFontIndirectW(&lfw); @@ -1150,6 +1149,7 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT WARN("Failed to create font\n"); DeleteDC(dc); GdipDeletePath(backup); + GdipDeleteFont(font); return GenericError; } @@ -1161,11 +1161,12 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT args.maxY = 0; args.scale = emSize / native_height; args.ascent = textmetric.tmAscent * args.scale; - status = gdip_format_string(graphics, dc, string, length, NULL, &scaled_layout_rect, + status = gdip_format_string(graphics, dc, string, length, font, &scaled_layout_rect, format, TRUE, format_string_callback, &args); DeleteDC(dc); DeleteObject(hfont); + GdipDeleteFont(font); if (status != Ok) /* free backup */ {

1 0

Yuxuan Shui : dmband: Move band.c to dmusic.
by Alexandre Julliard Feb. 28, 2024

Feb. 28, 2024

Module: wine Branch: master Commit: 09c6f48b1295b900df5a7d104996e0e69b7f23b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/09c6f48b1295b900df5a7d104996e0… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Wed Jan 31 15:48:30 2024 +0000 dmband: Move band.c to dmusic. --- dlls/dmband/bandtrack.c | 1 + dlls/dmband/dmband_main.c | 1 + dlls/dmband/dmband_private.h | 10 ---------- dlls/dmusic/Makefile.in | 1 + dlls/{dmband => dmusic}/band.c | 3 +-- dlls/dmusic/dmusic_band.h | 25 +++++++++++++++++++++++++ 6 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index b410cf81d3a..45346ad1f7a 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -17,6 +17,7 @@ */ #include "dmband_private.h" +#include "dmusic_band.h" #include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmband); diff --git a/dlls/dmband/dmband_main.c b/dlls/dmband/dmband_main.c index 55f979e3fbc..43790fbff61 100644 --- a/dlls/dmband/dmband_main.c +++ b/dlls/dmband/dmband_main.c @@ -20,6 +20,7 @@ #include "initguid.h" #include "dmband_private.h" #include "rpcproxy.h" +#include "dmusic_band.h" #include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmband); diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h index 48c5ec02aeb..3b2617322fe 100644 --- a/dlls/dmband/dmband_private.h +++ b/dlls/dmband/dmband_private.h @@ -20,21 +20,16 @@ #ifndef __WINE_DMBAND_PRIVATE_H #define __WINE_DMBAND_PRIVATE_H -#include <stdio.h> #include <stdarg.h> -#include <string.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winnt.h" -#include "wingdi.h" -#include "winuser.h" #include "wine/debug.h" #include "wine/list.h" -#include "winreg.h" #include "objbase.h" #include "dmusici.h" @@ -44,11 +39,6 @@ /***************************************************************************** * ClassFactory */ -extern HRESULT create_dmband(REFIID riid, void **ret_iface); extern HRESULT create_dmbandtrack(REFIID riid, void **ret_iface); -extern HRESULT band_connect_to_collection(IDirectMusicBand *iface, IDirectMusicCollection *collection); -extern HRESULT band_send_messages(IDirectMusicBand *iface, IDirectMusicPerformance *performance, - IDirectMusicGraph *graph, MUSIC_TIME time, DWORD track_id); - #endif /* __WINE_DMBAND_PRIVATE_H */ diff --git a/dlls/dmusic/Makefile.in b/dlls/dmusic/Makefile.in index 8e1c07e90a7..446eca15543 100644 --- a/dlls/dmusic/Makefile.in +++ b/dlls/dmusic/Makefile.in @@ -2,6 +2,7 @@ MODULE = dmusic.dll IMPORTS = dxguid uuid ole32 advapi32 dsound user32 winmm SOURCES = \ + band.c \ buffer.c \ clock.c \ collection.c \ diff --git a/dlls/dmband/band.c b/dlls/dmusic/band.c similarity index 99% rename from dlls/dmband/band.c rename to dlls/dmusic/band.c index 78ec68ae035..370b85c2941 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmusic/band.c @@ -17,8 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "dmband_private.h" -#include "dmobject.h" +#include "dmusic_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dmband); diff --git a/dlls/dmusic/dmusic_band.h b/dlls/dmusic/dmusic_band.h new file mode 100644 index 00000000000..e189acb7230 --- /dev/null +++ b/dlls/dmusic/dmusic_band.h @@ -0,0 +1,25 @@ +/* DirectMusicBand Private Include + * + * Copyright (C) 2024 Yuxuan Shui for CodeWeavers + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "dmusici.h" + +extern HRESULT create_dmband(REFIID riid, void **ret_iface); +extern HRESULT band_connect_to_collection(IDirectMusicBand *iface, IDirectMusicCollection *collection); +extern HRESULT band_send_messages(IDirectMusicBand *iface, IDirectMusicPerformance *performance, + IDirectMusicGraph *graph, MUSIC_TIME time, DWORD track_id);

1 0

Rémi Bernon : server: Dispatch rawinput messages using the rawinput process list.
by Alexandre Julliard Feb. 28, 2024

Feb. 28, 2024

Module: wine Branch: master Commit: 9591a36ee85b5e850e06e7f65c03ccff50ff6683 URL: https://gitlab.winehq.org/wine/wine/-/commit/9591a36ee85b5e850e06e7f65c03cc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 27 22:36:04 2024 +0100 server: Dispatch rawinput messages using the rawinput process list. --- dlls/dinput/tests/joystick8.c | 9 ------ server/queue.c | 75 ++++++++++++++++++------------------------- 2 files changed, 31 insertions(+), 53 deletions(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 428fc59c1af..be6f432808f 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -5756,23 +5756,16 @@ static DWORD WINAPI test_rawinput_desktop_thread( void *args ) rawbuffer_size = sizeof(rawbuffer); memset( rawbuffer, 0, sizeof(rawbuffer) ); res = msg_wait_for_events( 1, &rawinput_event, 100 ); - todo_wine_if( params->input ) ok( res == 0, "WaitForSingleObject returned %#lx\n", res ); - todo_wine_if( params->input ) ok( rawinput_calls == 1, "got %u WM_INPUT messages\n", rawinput_calls ); rawinput = (RAWINPUT *)rawbuffer; - todo_wine_if( params->input ) ok( rawinput->header.dwType == RIM_TYPEHID, "got dwType %lu\n", rawinput->header.dwType ); - todo_wine_if( params->input ) ok( rawinput->header.dwSize == offsetof(RAWINPUT, data.hid.bRawData[desc.caps.InputReportByteLength * rawinput->data.hid.dwCount]), "got header.dwSize %lu\n", rawinput->header.dwSize ); - todo_wine_if( params->input ) ok( rawinput->header.hDevice != 0, "got hDevice %p\n", rawinput->header.hDevice ); ok( rawinput->header.wParam == 0, "got wParam %#Ix\n", rawinput->header.wParam ); - todo_wine_if( params->input ) ok( rawinput->data.hid.dwSizeHid == desc.caps.InputReportByteLength, "got dwSizeHid %lu\n", rawinput->data.hid.dwSizeHid ); - todo_wine_if( params->input ) ok( rawinput->data.hid.dwCount >= 1, "got dwCount %lu\n", rawinput->data.hid.dwCount ); @@ -5878,9 +5871,7 @@ static void test_rawinput_desktop( const char *path, BOOL input ) } else { - todo_wine ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx\n", res ); - todo_wine ok( rawinput_calls == 0, "got %u WM_INPUT messages\n", rawinput_calls ); } diff --git a/server/queue.c b/server/queue.c index 041df36331e..4373bd71254 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1896,7 +1896,6 @@ static void rawhid_init( struct rawinput *rawinput, RAWHID *hid, const hw_input_ struct rawinput_message { struct thread *foreground; - struct desktop *desktop; struct hw_msg_source source; unsigned int time; unsigned int message; @@ -1912,12 +1911,10 @@ struct rawinput_message }; /* check if process is supposed to receive a WM_INPUT message and eventually queue it */ -static int queue_rawinput_message( struct process* process, void *arg ) +static void queue_rawinput_message( struct desktop *desktop, struct process *process, void *args ) { - const struct rawinput_message *raw_msg = arg; - const struct rawinput_device *device = NULL; - struct desktop *target_desktop = NULL, *desktop = NULL; - struct thread *target_thread = NULL, *foreground = NULL; + const struct rawinput_message *raw_msg = args; + const struct rawinput_device *device; struct hardware_msg_data *msg_data; struct message *msg; data_size_t report_size = 0, data_size = 0; @@ -1942,26 +1939,16 @@ static int queue_rawinput_message( struct process* process, void *arg ) data_size = offsetof(RAWHID, bRawData[0]); report_size = raw_msg->data.hid.dwCount * raw_msg->data.hid.dwSizeHid; } - if (!device) return 0; - - if (raw_msg->message == WM_INPUT_DEVICE_CHANGE && !(device->flags & RIDEV_DEVNOTIFY)) return 0; - - if (raw_msg->desktop) desktop = (struct desktop *)grab_object( raw_msg->desktop ); - else if (!(desktop = get_desktop_obj( process, process->desktop, 0 ))) goto done; + if (!device) return; - if (raw_msg->foreground) foreground = (struct thread *)grab_object( raw_msg->foreground ); - else if (!(foreground = get_foreground_thread( desktop, 0 ))) goto done; - - if (process != foreground->process) + if (raw_msg->message == WM_INPUT_DEVICE_CHANGE && !(device->flags & RIDEV_DEVNOTIFY)) return; + if (process != raw_msg->foreground->process) { - if (raw_msg->message == WM_INPUT && !(device->flags & RIDEV_INPUTSINK)) goto done; - if (!(target_thread = get_window_thread( device->target ))) goto done; - if (!(target_desktop = get_thread_desktop( target_thread, 0 ))) goto done; - if (target_desktop != desktop) goto done; + if (raw_msg->message == WM_INPUT && !(device->flags & RIDEV_INPUTSINK)) return; wparam = RIM_INPUTSINK; } - if (!(msg = alloc_hardware_message( info, raw_msg->source, raw_msg->time, data_size + report_size ))) goto done; + if (!(msg = alloc_hardware_message( info, raw_msg->source, raw_msg->time, data_size + report_size ))) return; msg->win = device->target; msg->msg = raw_msg->message; msg->wparam = wparam; @@ -1980,13 +1967,14 @@ static int queue_rawinput_message( struct process* process, void *arg ) } queue_hardware_message( desktop, msg, 1 ); +} -done: - if (target_thread) release_object( target_thread ); - if (target_desktop) release_object( target_desktop ); - if (foreground) release_object( foreground ); - if (desktop) release_object( desktop ); - return 0; +static void dispatch_rawinput_message( struct desktop *desktop, struct rawinput_message *raw_msg ) +{ + struct process *process; + + LIST_FOR_EACH_ENTRY( process, &rawinput_processes, struct process, rawinput_entry ) + queue_rawinput_message( desktop, process, raw_msg ); } /* queue a hardware message for a mouse event */ @@ -2050,7 +2038,6 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons { memset( &raw_msg, 0, sizeof(raw_msg) ); raw_msg.foreground = foreground; - raw_msg.desktop = desktop; raw_msg.source = source; raw_msg.time = time; raw_msg.message = WM_INPUT; @@ -2058,7 +2045,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons rawmouse_init( &raw_msg.rawinput, &raw_msg.data.mouse, x - desktop->cursor.x, y - desktop->cursor.y, raw_msg.flags, input->mouse.data, input->mouse.info ); - enum_processes( queue_rawinput_message, &raw_msg ); + dispatch_rawinput_message( desktop, &raw_msg ); release_object( foreground ); } @@ -2105,7 +2092,6 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c struct hw_msg_source source = { IMDT_KEYBOARD, origin }; const struct rawinput_device *device; struct hardware_msg_data *msg_data; - struct rawinput_message raw_msg; struct message *msg; struct thread *foreground; unsigned char vkey = input->kbd.vkey; @@ -2180,9 +2166,8 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c if ((foreground = get_foreground_thread( desktop, win ))) { - memset( &raw_msg, 0, sizeof(raw_msg) ); + struct rawinput_message raw_msg = {0}; raw_msg.foreground = foreground; - raw_msg.desktop = desktop; raw_msg.source = source; raw_msg.time = time; raw_msg.message = WM_INPUT; @@ -2190,7 +2175,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c rawkeyboard_init( &raw_msg.rawinput, &raw_msg.data.keyboard, input->kbd.scan, vkey, raw_msg.flags, message_code, input->kbd.info ); - enum_processes( queue_rawinput_message, &raw_msg ); + dispatch_rawinput_message( desktop, &raw_msg ); release_object( foreground ); } @@ -2236,26 +2221,28 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ unsigned int origin, const hw_input_t *input ) { struct hw_msg_source source = { IMDT_UNAVAILABLE, origin }; - struct rawinput_message raw_msg; + struct thread *foreground; struct message *msg; switch (input->hw.msg) { case WM_INPUT: case WM_INPUT_DEVICE_CHANGE: - memset( &raw_msg, 0, sizeof(raw_msg) ); - raw_msg.source = source; - raw_msg.time = get_tick_count(); - raw_msg.message = input->hw.msg; - raw_msg.hid_report = get_req_data(); if (input->hw.hid.length * input->hw.hid.count != get_req_data_size()) - { set_error( STATUS_INVALID_PARAMETER ); - return; + else if ((foreground = get_foreground_thread( desktop, win ))) + { + struct rawinput_message raw_msg = {0}; + raw_msg.foreground = foreground; + raw_msg.source = source; + raw_msg.time = get_tick_count(); + raw_msg.message = input->hw.msg; + raw_msg.hid_report = get_req_data(); + rawhid_init( &raw_msg.rawinput, &raw_msg.data.hid, input ); + + dispatch_rawinput_message( desktop, &raw_msg ); + release_object( foreground ); } - rawhid_init( &raw_msg.rawinput, &raw_msg.data.hid, input ); - - enum_processes( queue_rawinput_message, &raw_msg ); return; }

1 0

Alexandre Julliard : ntdll: Implement RtlCaptureContext on ARM64EC.
by Alexandre Julliard Feb. 28, 2024

Feb. 28, 2024

Module: wine Branch: master Commit: 31e3c4316d8c014fda2e95b9db6e54d8a3b91120 URL: https://gitlab.winehq.org/wine/wine/-/commit/31e3c4316d8c014fda2e95b9db6e54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 13:40:33 2024 +0100 ntdll: Implement RtlCaptureContext on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 67 +++++++++++++++++++- dlls/ntdll/tests/exception.c | 144 +++++++++++++++++++++++-------------------- dlls/ntdll/unwind.h | 2 +- 3 files changed, 142 insertions(+), 71 deletions(-)

1 0

Rémi Bernon : server: Keep a list of processes that can receive rawinput messages.
by Alexandre Julliard Feb. 28, 2024

Feb. 28, 2024

Module: wine Branch: master Commit: c43b1ecbc3e8509b1f4778d799f9759eb64dda40 URL: https://gitlab.winehq.org/wine/wine/-/commit/c43b1ecbc3e8509b1f4778d799f975… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Feb 25 09:53:09 2024 +0100 server: Keep a list of processes that can receive rawinput messages. --- server/process.c | 2 ++ server/process.h | 1 + server/queue.c | 24 ++++++++++++++++++++++++ server/user.h | 1 + server/winstation.c | 30 +++++++++++++++++++++++++++++- 5 files changed, 57 insertions(+), 1 deletion(-) diff --git a/server/process.c b/server/process.c index 349aa87be3d..c9ab161e3fb 100644 --- a/server/process.c +++ b/server/process.c @@ -684,6 +684,7 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla process->rawinput_mouse = NULL; process->rawinput_kbd = NULL; memset( &process->image_info, 0, sizeof(process->image_info) ); + list_init( &process->rawinput_entry ); list_init( &process->kernel_object ); list_init( &process->thread_list ); list_init( &process->locks ); @@ -784,6 +785,7 @@ static void process_destroy( struct object *obj ) if (process->idle_event) release_object( process->idle_event ); if (process->id) free_ptid( process->id ); if (process->token) release_object( process->token ); + list_remove( &process->rawinput_entry ); free( process->rawinput_devices ); free( process->dir_cache ); free( process->image ); diff --git a/server/process.h b/server/process.h index 97e0d455ece..1e73e9d47dc 100644 --- a/server/process.h +++ b/server/process.h @@ -83,6 +83,7 @@ struct process unsigned int rawinput_device_count; /* number of registered rawinput devices */ const struct rawinput_device *rawinput_mouse; /* rawinput mouse device, if any */ const struct rawinput_device *rawinput_kbd; /* rawinput keyboard device, if any */ + struct list rawinput_entry; /* entry in the rawinput process list */ struct list kernel_object; /* list of kernel object pointers */ pe_image_info_t image_info; /* main exe image info */ }; diff --git a/server/queue.c b/server/queue.c index dbd83c43217..041df36331e 100644 --- a/server/queue.c +++ b/server/queue.c @@ -50,6 +50,8 @@ enum message_kind { SEND_MESSAGE, POST_MESSAGE }; #define NB_MSG_KINDS (POST_MESSAGE+1) +/* list of processes registered for rawinput in the input desktop */ +static struct list rawinput_processes = LIST_INIT(rawinput_processes); struct message_result { @@ -2620,6 +2622,14 @@ static struct desktop *get_hardware_input_desktop( user_handle_t win ) return desktop; } +/* enable or disable rawinput for a given process */ +void set_rawinput_process( struct process *process, int enable ) +{ + list_remove( &process->rawinput_entry ); /* remove it first, it might already be in the list */ + if (!process->rawinput_device_count || !enable) list_init( &process->rawinput_entry ); + else list_add_tail( &rawinput_processes, &process->rawinput_entry ); +} + /* check if the thread owning the window is hung */ DECL_HANDLER(is_window_hung) @@ -3639,12 +3649,15 @@ DECL_HANDLER(update_rawinput_devices) unsigned int device_count = get_req_data_size() / sizeof (*devices); size_t size = device_count * sizeof(*devices); struct process *process = current->process; + struct winstation *winstation; + struct desktop *desktop; if (!size) { process->rawinput_device_count = 0; process->rawinput_mouse = NULL; process->rawinput_kbd = NULL; + set_rawinput_process( process, 0 ); return; } @@ -3659,4 +3672,15 @@ DECL_HANDLER(update_rawinput_devices) process->rawinput_mouse = find_rawinput_device( process, MAKELONG(HID_USAGE_GENERIC_MOUSE, HID_USAGE_PAGE_GENERIC) ); process->rawinput_kbd = find_rawinput_device( process, MAKELONG(HID_USAGE_GENERIC_KEYBOARD, HID_USAGE_PAGE_GENERIC) ); + + if ((winstation = get_visible_winstation()) && (desktop = get_input_desktop( winstation ))) + { + struct thread *thread; + + /* one of the process thread might be connected to the input desktop, update the full list */ + LIST_FOR_EACH_ENTRY( thread, &desktop->threads, struct thread, desktop_entry ) + set_rawinput_process( thread->process, 1 ); + + release_object( desktop ); + } } diff --git a/server/user.h b/server/user.h index c3ca90d5a77..b4cf618f87e 100644 --- a/server/user.h +++ b/server/user.h @@ -125,6 +125,7 @@ extern void post_win_event( struct thread *thread, unsigned int event, const WCHAR *module, data_size_t module_size, user_handle_t handle ); extern void free_hotkeys( struct desktop *desktop, user_handle_t window ); +extern void set_rawinput_process( struct process *process, int enable ); /* region functions */ diff --git a/server/winstation.c b/server/winstation.c index f6fe5fd9e57..373a1f7ba92 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -232,9 +232,27 @@ struct desktop *get_input_desktop( struct winstation *winstation ) /* changes the winstation current input desktop and update its input time */ int set_input_desktop( struct winstation *winstation, struct desktop *new_desktop ) { + struct desktop *old_desktop = winstation->input_desktop; + struct thread *thread; + if (!(winstation->flags & WSF_VISIBLE)) return 0; if (new_desktop) new_desktop->input_time = current_time; - winstation->input_desktop = new_desktop; + if (old_desktop == new_desktop) return 1; + + if (old_desktop) + { + /* disconnect every process of the old input desktop from rawinput */ + LIST_FOR_EACH_ENTRY( thread, &old_desktop->threads, struct thread, desktop_entry ) + set_rawinput_process( thread->process, 0 ); + } + + if ((winstation->input_desktop = new_desktop)) + { + /* connect every process of the new input desktop to rawinput */ + LIST_FOR_EACH_ENTRY( thread, &new_desktop->threads, struct thread, desktop_entry ) + set_rawinput_process( thread->process, 1 ); + } + return 1; } @@ -376,6 +394,9 @@ static void add_desktop_thread( struct desktop *desktop, struct thread *thread ) desktop->close_timeout = NULL; } } + + /* if thread process is now connected to the input desktop, let it receive rawinput */ + if (desktop == desktop->winstation->input_desktop) set_rawinput_process( thread->process, 1 ); } /* remove a user of the desktop and start the close timeout if necessary */ @@ -394,6 +415,13 @@ static void remove_desktop_thread( struct desktop *desktop, struct thread *threa if ((process = get_top_window_owner( desktop )) && desktop->users == process->running_threads && !desktop->close_timeout) desktop->close_timeout = add_timeout_user( -TICKS_PER_SEC, close_desktop_timeout, desktop ); } + + if (desktop == desktop->winstation->input_desktop) + { + /* thread process might still be connected the input desktop through another thread, update the full list */ + LIST_FOR_EACH_ENTRY( thread, &desktop->threads, struct thread, desktop_entry ) + set_rawinput_process( thread->process, 1 ); + } } /* set the thread default desktop handle */

1 0