May 2024 - Wine-Commits - list.winehq.org

Rémi Bernon : win32u: Fix list corruption in vulkan_detach_surfaces.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: ad4f9d73fdfb89b8424b6727554f99a043b18263 URL: https://gitlab.winehq.org/wine/wine/-/commit/ad4f9d73fdfb89b8424b6727554f99… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 2 11:36:04 2024 +0200 win32u: Fix list corruption in vulkan_detach_surfaces. --- dlls/win32u/vulkan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/vulkan.c b/dlls/win32u/vulkan.c index 4fae491b1db..59b9364065e 100644 --- a/dlls/win32u/vulkan.c +++ b/dlls/win32u/vulkan.c @@ -258,9 +258,9 @@ static void vulkan_init(void) void vulkan_detach_surfaces( struct list *surfaces ) { - struct surface *surface; + struct surface *surface, *next; - LIST_FOR_EACH_ENTRY( surface, surfaces, struct surface, entry ) + LIST_FOR_EACH_ENTRY_SAFE( surface, next, surfaces, struct surface, entry ) { driver_funcs->p_vulkan_surface_detach( surface->hwnd, surface->driver_private ); list_remove( &surface->entry );

1 0

Rémi Bernon : win32u: Use find_device_from_handle in process_rawinput_message.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: f333f4cdbe993a3ca6847402fdaf0be3c7cab22a URL: https://gitlab.winehq.org/wine/wine/-/commit/f333f4cdbe993a3ca6847402fdaf0b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 5 16:14:02 2022 +0100 win32u: Use find_device_from_handle in process_rawinput_message. And only refresh the list if the device handle isn't known. --- dlls/win32u/rawinput.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index c86e28dea8d..c004f296038 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -301,12 +301,13 @@ static void rawinput_update_device_list(void) enumerate_devices( RIM_TYPEHID, guid_devinterface_hidW ); } -static struct device *find_device_from_handle( HANDLE handle ) +static struct device *find_device_from_handle( HANDLE handle, BOOL refresh ) { struct device *device; LIST_FOR_EACH_ENTRY( device, &devices, struct device, entry ) if (device->handle == handle) return device; + if (!refresh) return NULL; rawinput_update_device_list(); @@ -399,7 +400,7 @@ UINT WINAPI NtUserGetRawInputDeviceInfo( HANDLE handle, UINT command, void *data pthread_mutex_lock( &rawinput_mutex ); - if (!(device = find_device_from_handle( handle ))) + if (!(device = find_device_from_handle( handle, TRUE ))) { pthread_mutex_unlock( &rawinput_mutex ); RtlSetLastWin32Error( ERROR_INVALID_HANDLE ); @@ -568,8 +569,20 @@ BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardware_msg_d if (msg->message == WM_INPUT_DEVICE_CHANGE) { + BOOL refresh = msg->wParam == GIDC_ARRIVAL; + struct device *device; + pthread_mutex_lock( &rawinput_mutex ); - rawinput_update_device_list(); + if ((device = find_device_from_handle( UlongToHandle( msg_data->rawinput.device ), refresh ))) + { + if (msg->wParam == GIDC_REMOVAL) + { + list_remove( &device->entry ); + NtClose( device->file ); + free( device->data ); + free( device ); + } + } pthread_mutex_unlock( &rawinput_mutex ); } else

1 0

Rémi Bernon : win32u: Move rawinput device cache ticks check to rawinput_update_device_list.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: 464ce9a0858c4c2b1a2d5a5234a63413ce92bd1b URL: https://gitlab.winehq.org/wine/wine/-/commit/464ce9a0858c4c2b1a2d5a5234a634… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 2 17:54:32 2024 +0200 win32u: Move rawinput device cache ticks check to rawinput_update_device_list. --- dlls/win32u/rawinput.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index c004f296038..5b1d9d211df 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -282,12 +282,17 @@ static void enumerate_devices( DWORD type, const WCHAR *class ) NtClose( class_key ); } -static void rawinput_update_device_list(void) +static void rawinput_update_device_list( BOOL force ) { + unsigned int ticks = NtGetTickCount(); + static unsigned int last_check; struct device *device, *next; TRACE( "\n" ); + if (ticks - last_check <= 2000 && !force) return; + last_check = ticks; + LIST_FOR_EACH_ENTRY_SAFE( device, next, &devices, struct device, entry ) { list_remove( &device->entry ); @@ -309,7 +314,7 @@ static struct device *find_device_from_handle( HANDLE handle, BOOL refresh ) if (device->handle == handle) return device; if (!refresh) return NULL; - rawinput_update_device_list(); + rawinput_update_device_list( TRUE ); LIST_FOR_EACH_ENTRY( device, &devices, struct device, entry ) if (device->handle == handle) return device; @@ -322,8 +327,7 @@ static struct device *find_device_from_handle( HANDLE handle, BOOL refresh ) */ UINT WINAPI NtUserGetRawInputDeviceList( RAWINPUTDEVICELIST *device_list, UINT *device_count, UINT size ) { - unsigned int count = 0, ticks = NtGetTickCount(); - static unsigned int last_check; + unsigned int count = 0; struct device *device; TRACE( "device_list %p, device_count %p, size %u.\n", device_list, device_count, size ); @@ -342,11 +346,7 @@ UINT WINAPI NtUserGetRawInputDeviceList( RAWINPUTDEVICELIST *device_list, UINT * pthread_mutex_lock( &rawinput_mutex ); - if (ticks - last_check > 2000) - { - last_check = ticks; - rawinput_update_device_list(); - } + rawinput_update_device_list( FALSE ); LIST_FOR_EACH_ENTRY( device, &devices, struct device, entry ) {

1 0

Evan Tang : user32/tests: Check RegisterRawInputDevices RIDDEV_DEVNOTIFY posted messages.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: a3134963e01ec9f17ec2d594e0ae90fffb2bcb29 URL: https://gitlab.winehq.org/wine/wine/-/commit/a3134963e01ec9f17ec2d594e0ae90… Author: Evan Tang <etang(a)codeweavers.com> Date: Thu May 2 17:39:21 2024 +0200 user32/tests: Check RegisterRawInputDevices RIDDEV_DEVNOTIFY posted messages. --- dlls/user32/tests/input.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index b92e59396ac..8b374fae8a3 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1778,6 +1778,7 @@ static void test_RegisterRawInputDevices(void) HWND hwnd; RAWINPUTDEVICE raw_devices[2] = {0}; UINT count, raw_devices_count; + MSG msg; raw_devices[0].usUsagePage = HID_USAGE_PAGE_GENERIC; raw_devices[0].usUsage = HID_USAGE_GENERIC_GAMEPAD; @@ -1849,6 +1850,48 @@ static void test_RegisterRawInputDevices(void) raw_devices[1].hwndTarget = hwnd; ok_ret( 1, RegisterRawInputDevices( raw_devices, ARRAY_SIZE( raw_devices ), sizeof(RAWINPUTDEVICE) ) ); + /* RIDEV_DEVNOTIFY send messages for any pre-existing device */ + raw_devices[0].dwFlags = RIDEV_DEVNOTIFY; + raw_devices[0].hwndTarget = 0; + raw_devices[0].usUsagePage = HID_USAGE_PAGE_GENERIC; + raw_devices[0].usUsage = HID_USAGE_GENERIC_MOUSE; + raw_devices[1].dwFlags = RIDEV_DEVNOTIFY; + raw_devices[1].hwndTarget = 0; + raw_devices[1].usUsagePage = HID_USAGE_PAGE_GENERIC; + raw_devices[1].usUsage = HID_USAGE_GENERIC_KEYBOARD; + + ok_ret( 1, RegisterRawInputDevices( raw_devices, ARRAY_SIZE( raw_devices ), sizeof(RAWINPUTDEVICE) ) ); + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) + { + ok_ne( WM_INPUT_DEVICE_CHANGE, msg.message, UINT, "%#x" ); + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + } + + /* RIDEV_DEVNOTIFY send messages only to hwndTarget */ + raw_devices[0].hwndTarget = hwnd; + raw_devices[1].hwndTarget = hwnd; + + count = 0; + ok_ret( 1, RegisterRawInputDevices( raw_devices, ARRAY_SIZE( raw_devices ), sizeof(RAWINPUTDEVICE) ) ); + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) + { + if (msg.message == WM_INPUT_DEVICE_CHANGE) count++; + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + } + todo_wine ok( count >= 2, "got %u messages\n", count ); + + count = 0; + ok_ret( 1, RegisterRawInputDevices( raw_devices, ARRAY_SIZE( raw_devices ), sizeof(RAWINPUTDEVICE) ) ); + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) + { + if (msg.message == WM_INPUT_DEVICE_CHANGE) count++; + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + } + todo_wine ok( count >= 2, "got %u messages\n", count ); + /* RIDEV_REMOVE requires hwndTarget == NULL */ raw_devices[0].dwFlags = RIDEV_REMOVE; raw_devices[0].hwndTarget = hwnd;

1 0

Rémi Bernon : win32u: Remove now unnecessary rawinput_device_get_usages.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: f0e02e4f981552a595a5aace326241142bc88eec URL: https://gitlab.winehq.org/wine/wine/-/commit/f0e02e4f981552a595a5aace326241… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 29 18:28:40 2024 +0200 win32u: Remove now unnecessary rawinput_device_get_usages. --- dlls/win32u/rawinput.c | 19 ------------------- dlls/win32u/win32u_private.h | 1 - 2 files changed, 20 deletions(-) diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index 1120ce053aa..c86e28dea8d 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -316,25 +316,6 @@ static struct device *find_device_from_handle( HANDLE handle ) return NULL; } -BOOL rawinput_device_get_usages( HANDLE handle, USAGE *usage_page, USAGE *usage ) -{ - struct device *device; - - pthread_mutex_lock( &rawinput_mutex ); - - if (!(device = find_device_from_handle( handle )) || device->info.dwType != RIM_TYPEHID) - *usage_page = *usage = 0; - else - { - *usage_page = device->info.hid.usUsagePage; - *usage = device->info.hid.usUsage; - } - - pthread_mutex_unlock( &rawinput_mutex ); - - return *usage_page || *usage; -} - /********************************************************************** * NtUserGetRawInputDeviceList (win32u.@) */ diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index ff861db4dd9..24e8b1b498d 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -146,7 +146,6 @@ extern void pack_user_message( void *buffer, size_t size, UINT message, /* rawinput.c */ extern BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardware_msg_data *msg_data ); -extern BOOL rawinput_device_get_usages( HANDLE handle, USHORT *usage_page, USHORT *usage ); /* scroll.c */ extern void draw_nc_scrollbar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw_vertical );

1 0

Evan Tang : win32u: Post device arrival messages in NtUserRegisterRawInputDevices.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: 4ae893e2f005e0915be480075feaecc0ccec8d8f URL: https://gitlab.winehq.org/wine/wine/-/commit/4ae893e2f005e0915be480075feaec… Author: Evan Tang <etang(a)codeweavers.com> Date: Thu May 2 17:44:18 2024 +0200 win32u: Post device arrival messages in NtUserRegisterRawInputDevices. --- dlls/user32/tests/input.c | 4 ++-- dlls/win32u/rawinput.c | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 8b374fae8a3..fcaa4229b02 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1880,7 +1880,7 @@ static void test_RegisterRawInputDevices(void) TranslateMessage( &msg ); DispatchMessageW( &msg ); } - todo_wine ok( count >= 2, "got %u messages\n", count ); + ok( count >= 2, "got %u messages\n", count ); count = 0; ok_ret( 1, RegisterRawInputDevices( raw_devices, ARRAY_SIZE( raw_devices ), sizeof(RAWINPUTDEVICE) ) ); @@ -1890,7 +1890,7 @@ static void test_RegisterRawInputDevices(void) TranslateMessage( &msg ); DispatchMessageW( &msg ); } - todo_wine ok( count >= 2, "got %u messages\n", count ); + ok( count >= 2, "got %u messages\n", count ); /* RIDEV_REMOVE requires hwndTarget == NULL */ raw_devices[0].dwFlags = RIDEV_REMOVE; diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index 5b1d9d211df..1083571802d 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -598,6 +598,30 @@ BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardware_msg_d return TRUE; } +static void post_device_notifications( const RAWINPUTDEVICE *filter ) +{ + ULONG usages = MAKELONG( filter->usUsagePage, filter->usUsage ); + struct device *device; + + LIST_FOR_EACH_ENTRY( device, &devices, struct device, entry ) + { + switch (device->info.dwType) + { + case RIM_TYPEMOUSE: + if (usages != MAKELONG( HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_MOUSE )) continue; + break; + case RIM_TYPEKEYBOARD: + if (usages != MAKELONG( HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_KEYBOARD )) continue; + break; + case RIM_TYPEHID: + if (usages != MAKELONG( device->info.hid.usUsagePage, device->info.hid.usUsage )) continue; + break; + } + + NtUserPostMessage( filter->hwndTarget, WM_INPUT_DEVICE_CHANGE, GIDC_ARRIVAL, (LPARAM)device->handle ); + } +} + static void register_rawinput_device( const RAWINPUTDEVICE *device ) { RAWINPUTDEVICE *pos, *end; @@ -619,6 +643,7 @@ static void register_rawinput_device( const RAWINPUTDEVICE *device ) } else { + if ((device->dwFlags & RIDEV_DEVNOTIFY) && device->hwndTarget) post_device_notifications( device ); if (pos == end || pos->usUsagePage != device->usUsagePage || pos->usUsage != device->usUsage) { memmove( pos + 1, pos, (char *)end - (char *)pos ); @@ -684,6 +709,8 @@ BOOL WINAPI NtUserRegisterRawInputDevices( const RAWINPUTDEVICE *devices, UINT d return FALSE; } + rawinput_update_device_list( TRUE ); + registered_devices = new_registered_devices; for (i = 0; i < device_count; ++i) register_rawinput_device( devices + i );

1 0

Aida Jonikienė : msvcp140_atomic_wait: Implement __std_*_crt().
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: efce36004de600662876fb57389c9488b9c863bc URL: https://gitlab.winehq.org/wine/wine/-/commit/efce36004de600662876fb57389c94… Author: Aida Jonikienė <aidas957(a)gmail.com> Date: Thu May 2 02:02:36 2024 +0300 msvcp140_atomic_wait: Implement __std_*_crt(). OpenImageViewer calls these functions when triggering the image properties menu. --- dlls/msvcp140_atomic_wait/main.c | 10 ++++++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140_atomic_wait/main.c b/dlls/msvcp140_atomic_wait/main.c index b7aa30200ff..52ecae486eb 100644 --- a/dlls/msvcp140_atomic_wait/main.c +++ b/dlls/msvcp140_atomic_wait/main.c @@ -165,3 +165,13 @@ void __stdcall __std_release_shared_mutex_for_instance(void *ptr) } LeaveCriticalSection(&shared_mutex_cs); } + +void* __stdcall __std_calloc_crt(size_t count, size_t size) +{ + return calloc(count, size); +} + +void __stdcall __std_free_crt(void *ptr) +{ + free(ptr); +} diff --git a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec index 5d9dd5c1a74..88ed59adad9 100644 --- a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec +++ b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec @@ -12,12 +12,12 @@ @ stub __std_atomic_wait_get_remaining_timeout @ stub __std_atomic_wait_indirect @ stdcall __std_bulk_submit_threadpool_work(ptr long) -@ stub __std_calloc_crt +@ stdcall __std_calloc_crt(long long) @ stdcall __std_close_threadpool_work(ptr) @ stdcall __std_create_threadpool_work(ptr ptr ptr) @ stub __std_execution_wait_on_uchar @ stub __std_execution_wake_by_address_all -@ stub __std_free_crt +@ stdcall __std_free_crt(ptr) @ stdcall __std_parallel_algorithms_hw_threads() @ stdcall __std_release_shared_mutex_for_instance(ptr) @ stdcall __std_submit_threadpool_work(ptr)

1 0

Anton Baskanov : winex11.drv: Process RRNotify events in xrandr14_get_id.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: b3eb55227aef198a637f80a2fa0bce74aa0a7190 URL: https://gitlab.winehq.org/wine/wine/-/commit/b3eb55227aef198a637f80a2fa0bce… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Fri Feb 9 14:37:20 2024 +0700 winex11.drv: Process RRNotify events in xrandr14_get_id. We have to invalidate the current mode cache if there are pending RRNotify events. The performance hit on EnumDisplaySettingsExW is around 7%. Also call X11DRV_DisplayDevices_RegisterEventHandlers in x11drv_init. Otherwise, RRNotify events will only be handled in the explorer process. --- dlls/user32/tests/monitor.c | 10 +++++----- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/window.c | 1 - dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 1 + dlls/winex11.drv/xrandr.c | 28 ++++++++++++++++++++++++++++ 6 files changed, 36 insertions(+), 7 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 63c1e4a1271..c638e1cbfef 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1258,7 +1258,7 @@ static void test_ChangeDisplaySettingsEx(int argc, char **argv) dm.dmPelsWidth = 640; dm.dmPelsHeight = 480; - expect_dm(&dm, devices[0].name, 0, TRUE); + expect_dm(&dm, devices[0].name, 0, FALSE); SetEvent(exit_event1); wait_result = WaitForSingleObject(process1, 5000); @@ -1300,7 +1300,7 @@ static void test_ChangeDisplaySettingsEx(int argc, char **argv) dm.dmPelsWidth = 640; dm.dmPelsHeight = 480; - expect_dm(&dm, devices[0].name, 0, TRUE); + expect_dm(&dm, devices[0].name, 0, FALSE); SetEvent(exit_event1); wait_result = WaitForSingleObject(process1, 5000); @@ -1310,7 +1310,7 @@ static void test_ChangeDisplaySettingsEx(int argc, char **argv) dm.dmPelsWidth = 640; dm.dmPelsHeight = 480; - expect_dm(&dm, devices[0].name, 0, TRUE); + expect_dm(&dm, devices[0].name, 0, FALSE); CloseHandle(process1); CloseHandle(process0); @@ -1328,7 +1328,7 @@ static void test_ChangeDisplaySettingsEx(int argc, char **argv) dm.dmPelsWidth = 640; dm.dmPelsHeight = 480; - expect_dm(&dm, devices[0].name, 0, TRUE); + expect_dm(&dm, devices[0].name, 0, FALSE); SetEvent(exit_event0); wait_result = WaitForSingleObject(process0, 5000); @@ -1338,7 +1338,7 @@ static void test_ChangeDisplaySettingsEx(int argc, char **argv) dm.dmPelsWidth = 640; dm.dmPelsHeight = 480; - expect_dm(&dm, devices[0].name, 0, TRUE); + expect_dm(&dm, devices[0].name, 0, FALSE); CloseHandle(process1); CloseHandle(process0); diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 379b27b3f70..2070d942056 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -405,7 +405,7 @@ static inline BOOL call_event_handler( Display *display, XEvent *event ) /*********************************************************************** * process_events */ -static BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,XPointer), ULONG_PTR arg ) +BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,XPointer), ULONG_PTR arg ) { XEvent event, prev_event; int count = 0; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 957a46dba86..68b34fa868d 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2093,7 +2093,6 @@ BOOL X11DRV_CreateWindow( HWND hwnd ) CWOverrideRedirect | CWEventMask, &attr ); XFlush( data->display ); NtUserSetProp( hwnd, clip_window_prop, (HANDLE)data->clip_window ); - X11DRV_DisplayDevices_RegisterEventHandlers(); } return TRUE; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 1e13122076c..0ccffecec49 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -679,6 +679,7 @@ extern void retry_grab_clipping_window(void); extern void ungrab_clipping_window(void); extern void move_resize_window( HWND hwnd, int dir ); extern void X11DRV_InitKeyboard( Display *display ); +extern BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*, XPointer), ULONG_PTR arg ); extern BOOL X11DRV_ProcessEvents( DWORD mask ); extern HWND *build_hwnd_list(void); diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 180573128e7..dc94ee84ccc 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -683,6 +683,7 @@ static NTSTATUS x11drv_init( void *arg ) init_user_driver(); X11DRV_DisplayDevices_Init(FALSE); + X11DRV_DisplayDevices_RegisterEventHandlers(); return STATUS_SUCCESS; } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 002ab77c086..c161b119cc9 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1220,6 +1220,32 @@ static void xrandr14_register_event_handlers(void) "XRandR ProviderChange" ); } +static Bool filter_rrnotify_event( Display *display, XEvent *event, char *arg ) +{ + ULONG_PTR event_base = (ULONG_PTR)arg; + + if (event->type == event_base + RRNotify_CrtcChange + || event->type == event_base + RRNotify_OutputChange + || event->type == event_base + RRNotify_ProviderChange) + return 1; + + return 0; +} + +static void process_rrnotify_events(void) +{ + struct x11drv_thread_data *data = x11drv_thread_data(); + int event_base, error_base; + + if (!data) return; + if (data->current_event) return; /* don't process nested events */ + + if (!pXRRQueryExtension( data->display, &event_base, &error_base )) + return; + + process_events( data->display, filter_rrnotify_event, event_base ); +} + /* XRandR 1.4 display settings handler */ static BOOL xrandr14_get_id( const WCHAR *device_name, BOOL is_primary, x11drv_settings_id *id ) { @@ -1235,6 +1261,8 @@ static BOOL xrandr14_get_id( const WCHAR *device_name, BOOL is_primary, x11drv_s if (*end) return FALSE; + process_rrnotify_events(); + /* Update cache */ pthread_mutex_lock( &xrandr_mutex ); if (!current_modes)

1 0

Anton Baskanov : explorer: Restore display settings on process exit.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: 89ad36b1d96fdd64cb2e59bd5743716b5874dac9 URL: https://gitlab.winehq.org/wine/wine/-/commit/89ad36b1d96fdd64cb2e59bd574371… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Feb 6 20:59:57 2024 +0700 explorer: Restore display settings on process exit. Restore display settings to the ones in the registry when CDS_FULLSCREEN is used in ChangeDisplaySettings(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49674 --- dlls/user32/tests/monitor.c | 50 ++++++++++----------- dlls/win32u/sysparams.c | 13 ++++++ programs/explorer/desktop.c | 105 +++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 136 insertions(+), 32 deletions(-)

1 0

Anton Baskanov : user32/tests: Test that display settings are restored on process exit.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: 30c3d0a3373db51f978b846fe90551ee2fe2b9d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/30c3d0a3373db51f978b846fe90551… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Feb 6 16:52:24 2024 +0700 user32/tests: Test that display settings are restored on process exit. --- dlls/user32/tests/monitor.c | 308 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 290 insertions(+), 18 deletions(-)

1 0