From: Rémi Bernon rbernon@codeweavers.com
Signed-off-by: Rémi Bernon rbernon@codeweavers.com --- dlls/win32u/driver.c | 10 +++--- dlls/win32u/sysparams.c | 70 ++++++++++--------------------------- dlls/wineandroid.drv/init.c | 12 +++++-- dlls/winemac.drv/display.c | 8 ++--- dlls/winemac.drv/macdrv.h | 2 +- dlls/winex11.drv/display.c | 9 +++-- dlls/winex11.drv/x11drv.h | 2 +- include/wine/gdi_driver.h | 2 +- 8 files changed, 44 insertions(+), 71 deletions(-)
diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 4a853b516f4..baa0143be61 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -764,10 +764,9 @@ static BOOL nulldrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDEVMODEW m return FALSE; }
-static void nulldrv_UpdateDisplayDevices( const struct gdi_device_manager *manager, - BOOL force, void *param ) +static BOOL nulldrv_UpdateDisplayDevices( const struct gdi_device_manager *manager, BOOL force, void *param ) { - manager->add_monitor( NULL, param ); /* use virtual monitor */ + return FALSE; }
static BOOL nulldrv_CreateDesktopWindow( HWND hwnd ) @@ -1112,10 +1111,9 @@ static void loaderdrv_UpdateClipboard(void) load_driver()->pUpdateClipboard(); }
-static void loaderdrv_UpdateDisplayDevices( const struct gdi_device_manager *manager, - BOOL force, void *param ) +static BOOL loaderdrv_UpdateDisplayDevices( const struct gdi_device_manager *manager, BOOL force, void *param ) { - load_driver()->pUpdateDisplayDevices( manager, force, param ); + return load_driver()->pUpdateDisplayDevices( manager, force, param ); }
static BOOL loaderdrv_CreateDesktopWindow( HWND hwnd ) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index a5a69a84bd9..141a2018830 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -192,8 +192,6 @@ static const WCHAR guid_devinterface_monitorW[] = {'{','E','6','F','0','7','B','5','F','-','E','E','9','7','-','4','A','9','0','-', 'B','0','7','6','-','3','3','F','5','7','B','F','4','E','A','A','7','}',0};
-#define NULLDRV_DEFAULT_HMONITOR ((HMONITOR)(UINT_PTR)(0x10000 + 1)) - /* Cached display device information */ struct display_device { @@ -233,17 +231,6 @@ static pthread_mutex_t display_lock = PTHREAD_MUTEX_INITIALIZER;
BOOL enable_thunk_lock = FALSE;
-static struct monitor virtual_monitor = -{ - .handle = NULLDRV_DEFAULT_HMONITOR, - .flags = MONITORINFOF_PRIMARY, - .rc_monitor.right = 1024, - .rc_monitor.bottom = 768, - .rc_work.right = 1024, - .rc_work.bottom = 768, - .dev.state_flags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED, -}; - /* the various registry keys that are used to store parameters */ enum parameter_key { @@ -804,7 +791,6 @@ struct device_manager_ctx WCHAR gpu_guid[64]; LUID gpu_luid; HKEY adapter_key; - BOOL virtual_monitor; };
static void link_device( const WCHAR *instance, const WCHAR *class ) @@ -1009,13 +995,6 @@ static void add_adapter( const struct gdi_adapter *adapter, void *param )
TRACE( "\n" );
- if (!ctx->gpu_count) - { - static const struct gdi_gpu default_gpu; - TRACE( "adding default fake GPU\n" ); - add_gpu( &default_gpu, ctx ); - } - if (ctx->adapter_key) { NtClose( ctx->adapter_key ); @@ -1078,26 +1057,9 @@ static void add_monitor( const struct gdi_monitor *monitor, void *param ) static const WCHAR default_monitorW[] = {'M','O','N','I','T','O','R','\','D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0};
- if (!monitor) - { - ctx->virtual_monitor = TRUE; - return; - } - TRACE( "%s %s %s\n", debugstr_w(monitor->name), wine_dbgstr_rect(&monitor->rc_monitor), wine_dbgstr_rect(&monitor->rc_work) );
- if (!ctx->adapter_count) - { - static const struct gdi_adapter default_adapter = - { - .state_flags = DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | - DISPLAY_DEVICE_VGA_COMPATIBLE, - }; - TRACE( "adding default fake adapter\n" ); - add_adapter( &default_adapter, ctx ); - } - monitor_index = ctx->monitor_count++; output_index = ctx->output_count++;
@@ -1224,12 +1186,6 @@ static void clear_display_devices(void) struct adapter *adapter; struct monitor *monitor;
- if (list_head( &monitors ) == &virtual_monitor.entry) - { - list_init( &monitors ); - return; - } - while (!list_empty( &monitors )) { monitor = LIST_ENTRY( list_head( &monitors ), struct monitor, entry ); @@ -1323,12 +1279,6 @@ static BOOL update_display_cache(void)
user_driver->pUpdateDisplayDevices( &device_manager, FALSE, &ctx ); release_display_manager_ctx( &ctx ); - if (ctx.virtual_monitor) - { - clear_display_devices(); - list_add_tail( &monitors, &virtual_monitor.entry ); - return TRUE; - }
if (update_display_cache_from_registry()) return TRUE; if (ctx.gpu_count) @@ -1337,7 +1287,25 @@ static BOOL update_display_cache(void) return FALSE; }
- user_driver->pUpdateDisplayDevices( &device_manager, TRUE, &ctx ); + if (!user_driver->pUpdateDisplayDevices( &device_manager, TRUE, &ctx )) + { + static const struct gdi_gpu gpu; + static const struct gdi_adapter adapter = + { + .state_flags = DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_VGA_COMPATIBLE, + }; + DEVMODEW mode = {.dmPelsWidth = 1024, .dmPelsHeight = 768}; + struct gdi_monitor monitor = + { + .state_flags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED, + .rc_monitor = {.right = mode.dmPelsWidth, .bottom = mode.dmPelsHeight}, + .rc_work = {.right = mode.dmPelsWidth, .bottom = mode.dmPelsHeight}, + }; + + add_gpu( &gpu, &ctx ); + add_adapter( &adapter, &ctx ); + add_monitor( &monitor, &ctx ); + } release_display_manager_ctx( &ctx );
if (!update_display_cache_from_registry()) diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 170ccb064a7..5d1c81a77bf 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -273,20 +273,28 @@ LONG ANDROID_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, /*********************************************************************** * ANDROID_UpdateDisplayDevices */ -void ANDROID_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, - BOOL force, void *param ) +BOOL ANDROID_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, BOOL force, void *param ) { if (force || force_display_devices_refresh) { + static const struct gdi_gpu gpu; + static const struct gdi_adapter adapter = + { + .state_flags = DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_VGA_COMPATIBLE, + }; struct gdi_monitor gdi_monitor = { .rc_monitor = virtual_screen_rect, .rc_work = monitor_rc_work, .state_flags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED, }; + device_manager->add_gpu( &gpu, param ); + device_manager->add_adapter( &adapter, param ); device_manager->add_monitor( &gdi_monitor, param ); force_display_devices_refresh = FALSE; } + + return TRUE; }
diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 19b9a9cdd9d..0507acae1a9 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1457,8 +1457,7 @@ void macdrv_displays_changed(const macdrv_event *event)
static BOOL force_display_devices_refresh;
-void macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, - BOOL force, void *param ) +BOOL macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, BOOL force, void *param ) { struct macdrv_adapter *adapters, *adapter; struct macdrv_monitor *monitors, *monitor; @@ -1466,14 +1465,14 @@ void macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manage INT gpu_count, adapter_count, monitor_count; DWORD len;
- if (!force && !force_display_devices_refresh) return; + if (!force && !force_display_devices_refresh) return TRUE; force_display_devices_refresh = FALSE;
/* Initialize GPUs */ if (macdrv_get_gpus(&gpus, &gpu_count)) { ERR("could not get GPUs\n"); - return; + return FALSE; } TRACE("GPU count: %d\n", gpu_count);
@@ -1528,6 +1527,7 @@ void macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manage }
macdrv_free_gpus(gpus); + return TRUE; }
/*********************************************************************** diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 7c0f7127883..72bd1cefaeb 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -131,7 +131,7 @@ extern LONG macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, extern BOOL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, LPDEVMODEW devmode, DWORD flags) DECLSPEC_HIDDEN; extern LRESULT macdrv_ClipboardWindowProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) DECLSPEC_HIDDEN; -extern void macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, +extern BOOL macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, BOOL force, void *param ) DECLSPEC_HIDDEN; extern BOOL macdrv_GetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) DECLSPEC_HIDDEN; extern BOOL macdrv_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index dec9d0afba8..31f73898897 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -1198,8 +1198,7 @@ void X11DRV_DisplayDevices_Update(BOOL send_display_change)
static BOOL force_display_devices_refresh;
-void X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, - BOOL force, void *param ) +BOOL X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, BOOL force, void *param ) { struct x11drv_display_device_handler *handler; struct gdi_adapter *adapters; @@ -1208,15 +1207,14 @@ void X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manage INT gpu_count, adapter_count, monitor_count; INT gpu, adapter, monitor;
- if (!force && !force_display_devices_refresh) return; + if (!force && !force_display_devices_refresh) return TRUE; force_display_devices_refresh = FALSE; handler = is_virtual_desktop() ? &desktop_handler : &host_handler;
TRACE("via %s\n", wine_dbgstr_a(handler->name));
/* Initialize GPUs */ - if (!handler->get_gpus(&gpus, &gpu_count)) - return; + if (!handler->get_gpus( &gpus, &gpu_count )) return FALSE; TRACE("GPU count: %d\n", gpu_count);
for (gpu = 0; gpu < gpu_count; gpu++) @@ -1248,6 +1246,7 @@ void X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manage }
handler->free_gpus(gpus); + return TRUE; }
void X11DRV_DisplayDevices_Init(BOOL force) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 003604cd97d..cd0d33f59bf 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -217,7 +217,7 @@ extern LONG X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd, DWORD flags, LPVOID lpvoid ) DECLSPEC_HIDDEN; extern BOOL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DWORD flags ) DECLSPEC_HIDDEN; -extern void X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, +extern BOOL X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, BOOL force, void *param ) DECLSPEC_HIDDEN; extern BOOL X11DRV_CreateDesktopWindow( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL X11DRV_CreateWindow( HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 998aa3ed3e9..465934d41c2 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -296,7 +296,7 @@ struct user_driver_funcs /* display modes */ LONG (*pChangeDisplaySettingsEx)(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID); BOOL (*pEnumDisplaySettingsEx)(LPCWSTR,DWORD,LPDEVMODEW,DWORD); - void (*pUpdateDisplayDevices)(const struct gdi_device_manager *,BOOL,void*); + BOOL (*pUpdateDisplayDevices)(const struct gdi_device_manager *,BOOL,void*); /* windowing functions */ BOOL (*pCreateDesktopWindow)(HWND); BOOL (*pCreateWindow)(HWND);