Module: wine Branch: master Commit: 4e1a049c9399e8a35b5fda7d317804fa2fcd4b7c URL: https://gitlab.winehq.org/wine/wine/-/commit/4e1a049c9399e8a35b5fda7d317804f...
Author: Rémi Bernon rbernon@codeweavers.com Date: Fri May 17 11:43:32 2024 +0200
win32u: Update the display device cache after loading the driver.
---
dlls/win32u/driver.c | 1 + dlls/winemac.drv/display.c | 13 ------------- dlls/winemac.drv/macdrv.h | 1 - dlls/winemac.drv/macdrv_main.c | 1 - dlls/winewayland.drv/display.c | 10 ---------- dlls/winewayland.drv/wayland.c | 2 -- dlls/winewayland.drv/waylanddrv.h | 1 - dlls/winex11.drv/display.c | 8 -------- dlls/winex11.drv/x11drv.h | 1 - dlls/winex11.drv/x11drv_main.c | 1 - 10 files changed, 1 insertion(+), 38 deletions(-)
diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 7c694d20a3c..3d4f01643c8 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -1012,6 +1012,7 @@ static const struct user_driver_funcs *load_driver(void) __wine_set_user_driver( &null_user_driver, WINE_GDI_DRIVER_VERSION ); }
+ update_display_cache( FALSE ); return user_driver; }
diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index c933a770a79..4caae9c8444 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1206,16 +1206,3 @@ UINT macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manage macdrv_free_displays(displays); return STATUS_SUCCESS; } - -/*********************************************************************** - * macdrv_init_display_devices - * - * Initialize display device registry data. - */ -void macdrv_init_display_devices(void) -{ - UINT32 num_path, num_mode; - - /* trigger refresh in win32u */ - NtUserGetDisplayConfigBufferSizes( QDC_ONLY_ACTIVE_PATHS, &num_path, &num_mode ); -} diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 3899fbb1d30..774d3505b5f 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -271,7 +271,6 @@ extern void macdrv_status_item_mouse_button(const macdrv_event *event); extern void macdrv_status_item_mouse_move(const macdrv_event *event);
extern void check_retina_status(void); -extern void macdrv_init_display_devices(void); extern void macdrv_resize_desktop(void); extern void init_user_driver(void);
diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index d42a85f257a..84e5818b8ce 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -451,7 +451,6 @@ static NTSTATUS macdrv_init(void *arg) }
init_user_driver(); - macdrv_init_display_devices(); return STATUS_SUCCESS; }
diff --git a/dlls/winewayland.drv/display.c b/dlls/winewayland.drv/display.c index aed1f65904a..51fae6aac8b 100644 --- a/dlls/winewayland.drv/display.c +++ b/dlls/winewayland.drv/display.c @@ -36,16 +36,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(waylanddrv);
-void wayland_init_display_devices(void) -{ - UINT32 num_path, num_mode; - - TRACE("\n"); - - /* Trigger refresh in win32u */ - NtUserGetDisplayConfigBufferSizes(QDC_ONLY_ACTIVE_PATHS, &num_path, &num_mode); -} - struct output_info { int x, y; diff --git a/dlls/winewayland.drv/wayland.c b/dlls/winewayland.drv/wayland.c index 2e82a1deee2..c94b35e173c 100644 --- a/dlls/winewayland.drv/wayland.c +++ b/dlls/winewayland.drv/wayland.c @@ -280,8 +280,6 @@ BOOL wayland_process_init(void) return FALSE; }
- wayland_init_display_devices(); - process_wayland.initialized = TRUE;
return TRUE; diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index bdc205a92d9..bc4d456ef50 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -223,7 +223,6 @@ struct wayland_shm_buffer */
BOOL wayland_process_init(void); -void wayland_init_display_devices(void);
/********************************************************************** * Wayland output diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 7238ba87ce2..f2780ccbf83 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -559,11 +559,3 @@ UINT X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manage host_handler.free_gpus( gpus, gpu_count ); return STATUS_SUCCESS; } - -void X11DRV_DisplayDevices_Init(void) -{ - UINT32 num_path, num_mode; - - /* trigger refresh in win32u */ - NtUserGetDisplayConfigBufferSizes( QDC_ONLY_ACTIVE_PATHS, &num_path, &num_mode ); -} diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 1aa71449af6..9f522778436 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -819,7 +819,6 @@ struct x11drv_display_device_handler };
extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler); -extern void X11DRV_DisplayDevices_Init(void); extern void X11DRV_DisplayDevices_RegisterEventHandlers(void); extern BOOL X11DRV_DisplayDevices_SupportEventHandlers(void); /* Display device handler used in virtual desktop mode */ diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 420c254b7ca..9c00b16386e 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -682,7 +682,6 @@ static NTSTATUS x11drv_init( void *arg ) if (use_xim) use_xim = xim_init( input_style );
init_user_driver(); - X11DRV_DisplayDevices_Init(); X11DRV_DisplayDevices_RegisterEventHandlers(); return STATUS_SUCCESS; }