[PATCH v2 0/5] MR5108: win32u: Don't assume that the primary adapter is always first.
In preparation for some virtual desktop refactor for display mode emulation (https://gitlab.winehq.org/wine/wine/-/merge_requests/5057) -- v2: win32u: Don't assume that the primary adapter is always first. win32u: Only consider active monitors in monitor_from_rect. win32u: Only consider active monitors for virtual screen rect. win32u: Only consider active monitors for clone detection. win32u: Deduce monitor device flags from their adapter. https://gitlab.winehq.org/wine/wine/-/merge_requests/5108
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/sysparams.c | 47 +++++++------------------------- dlls/wineandroid.drv/init.c | 1 - dlls/winemac.drv/cocoa_display.m | 1 - dlls/winemac.drv/display.c | 1 - dlls/winemac.drv/macdrv_cocoa.h | 5 ---- dlls/winewayland.drv/display.c | 7 ++--- dlls/winex11.drv/xinerama.c | 3 -- dlls/winex11.drv/xrandr.c | 5 ---- include/wine/gdi_driver.h | 1 - 9 files changed, 12 insertions(+), 59 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 1573edf069f..693d8839028 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -143,14 +143,6 @@ static const WCHAR devpropkey_monitor_output_idW[] = '\\','0','0','0','2' }; -static const WCHAR wine_devpropkey_monitor_stateflagsW[] = -{ - 'P','r','o','p','e','r','t','i','e','s','\\', - '{','2','3','3','a','9','e','f','3','-','a','f','c','4','-','4','a','b','d', - '-','b','5','6','4','-','c','3','2','f','2','1','f','1','5','3','5','b','}', - '\\','0','0','0','2' -}; - static const WCHAR wine_devpropkey_monitor_rcmonitorW[] = { 'P','r','o','p','e','r','t','i','e','s','\\', @@ -817,12 +809,13 @@ static BOOL read_display_adapter_settings( unsigned int index, struct adapter *i static BOOL read_monitor_settings( struct adapter *adapter, UINT index, struct monitor *monitor ) { char buffer[4096]; + BOOL is_primary = !!(adapter->dev.state_flags & DISPLAY_DEVICE_PRIMARY_DEVICE); KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; WCHAR *device_name, *value_str = (WCHAR *)value->Data, *ptr; HKEY hkey, subkey; DWORD size, len; - monitor->flags = adapter->id ? 0 : MONITORINFOF_PRIMARY; + monitor->flags = is_primary ? MONITORINFOF_PRIMARY : 0; /* DeviceName */ sprintf( buffer, "\\\\.\\DISPLAY%d\\Monitor%d", adapter->id + 1, index ); @@ -851,17 +844,6 @@ static BOOL read_monitor_settings( struct adapter *adapter, UINT index, struct m if (!(hkey = reg_open_key( enum_key, value_str, value->DataLength - sizeof(WCHAR) ))) return FALSE; - /* StateFlags, WINE_DEVPROPKEY_MONITOR_STATEFLAGS */ - size = query_reg_subkey_value( hkey, wine_devpropkey_monitor_stateflagsW, - sizeof(wine_devpropkey_monitor_stateflagsW), - value, sizeof(buffer) ); - if (size != sizeof(monitor->dev.state_flags)) - { - NtClose( hkey ); - return FALSE; - } - monitor->dev.state_flags = *(const DWORD *)value->Data; - /* Output ID */ size = query_reg_subkey_value( hkey, devpropkey_monitor_output_idW, sizeof(devpropkey_monitor_output_idW), @@ -1545,15 +1527,6 @@ static void add_monitor( const struct gdi_monitor *monitor, void *param ) NtClose( subkey ); } - /* StateFlags */ - if ((subkey = reg_create_key( hkey, wine_devpropkey_monitor_stateflagsW, - sizeof(wine_devpropkey_monitor_stateflagsW), 0, NULL ))) - { - set_reg_value( subkey, NULL, 0xffff0000 | DEVPROP_TYPE_UINT32, &monitor->state_flags, - sizeof(monitor->state_flags) ); - NtClose( subkey ); - } - /* WINE_DEVPROPKEY_MONITOR_RCMONITOR */ if ((subkey = reg_create_key( hkey, wine_devpropkey_monitor_rcmonitorW, sizeof(wine_devpropkey_monitor_rcmonitorW), 0, NULL ))) @@ -1769,6 +1742,12 @@ static BOOL update_display_cache_from_registry(void) monitor->id = monitor_id; monitor->adapter = adapter_acquire( adapter ); + monitor->dev.state_flags |= DISPLAY_DEVICE_ATTACHED; + if (adapter->dev.state_flags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) + { + if (!IsRectEmpty(&monitor->rc_monitor)) monitor->dev.state_flags |= DISPLAY_DEVICE_ACTIVE; + } + LIST_FOR_EACH_ENTRY(monitor2, &monitors, struct monitor, entry) { if (EqualRect(&monitor2->rc_monitor, &monitor->rc_monitor)) @@ -1878,10 +1857,7 @@ static BOOL default_update_display_devices( const struct gdi_device_manager *man { .state_flags = DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_VGA_COMPATIBLE, }; - struct gdi_monitor monitor = - { - .state_flags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED, - }; + struct gdi_monitor monitor = {0}; DEVMODEW mode = {{0}}; UINT i; @@ -1990,10 +1966,7 @@ static BOOL desktop_update_display_devices( BOOL force, struct device_manager_ct { .state_flags = DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_VGA_COMPATIBLE, }; - struct gdi_monitor monitor = - { - .state_flags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED, - }; + struct gdi_monitor monitor = {0}; static struct screen_size { unsigned int width; diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 26eda5edcd4..c39bf690a06 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -282,7 +282,6 @@ BOOL ANDROID_UpdateDisplayDevices( const struct gdi_device_manager *device_manag { .rc_monitor = virtual_screen_rect, .rc_work = monitor_rc_work, - .state_flags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED, }; const DEVMODEW mode = { diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index fbbe16efcbf..3f6246e7e1b 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -707,7 +707,6 @@ int macdrv_get_monitors(uint32_t adapter_id, struct macdrv_monitor** new_monitor if (j == 0) primary_index = monitor_count; - monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE; monitors[monitor_count].rc_monitor = displays[j].frame; monitors[monitor_count].rc_work = displays[j].work_frame; monitor_count++; diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 9bc8c79896f..6d6e76da1ee 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1195,7 +1195,6 @@ BOOL macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manage { .rc_monitor = rect_from_cgrect(monitor->rc_monitor), .rc_work = rect_from_cgrect(monitor->rc_work), - .state_flags = monitor->state_flags, }; device_manager->add_monitor( &gdi_monitor, param ); } diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 3a977f68955..0c010d6e097 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -251,9 +251,6 @@ static inline CGPoint cgpoint_win_from_mac(CGPoint point) /* Used DISPLAY_DEVICE.StateFlags for adapters */ #define DISPLAY_DEVICE_ATTACHED_TO_DESKTOP 0x00000001 #define DISPLAY_DEVICE_PRIMARY_DEVICE 0x00000004 -/* Used DISPLAY_DEVICE.StateFlags for monitors */ -#define DISPLAY_DEVICE_ACTIVE 0x00000001 -#define DISPLAY_DEVICE_ATTACHED 0x00000002 /* Represent a physical GPU in the PCI slots */ struct macdrv_gpu @@ -285,8 +282,6 @@ static inline CGPoint cgpoint_win_from_mac(CGPoint point) CGRect rc_monitor; /* as RcWork in MONITORINFO struct after conversion by rect_from_cgrect */ CGRect rc_work; - /* StateFlags in DISPLAY_DEVICE struct */ - uint32_t state_flags; }; extern int macdrv_get_displays(struct macdrv_display** displays, int* count); diff --git a/dlls/winewayland.drv/display.c b/dlls/winewayland.drv/display.c index ebe151ffab0..6c399cbf321 100644 --- a/dlls/winewayland.drv/display.c +++ b/dlls/winewayland.drv/display.c @@ -237,11 +237,8 @@ static void wayland_add_device_monitor(const struct gdi_device_manager *device_m /* We don't have a direct way to get the work area in Wayland. */ monitor.rc_work = monitor.rc_monitor; - monitor.state_flags = DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE; - - TRACE("name=%s rc_monitor=rc_work=%s state_flags=0x%x\n", - output_info->output->name, wine_dbgstr_rect(&monitor.rc_monitor), - (UINT)monitor.state_flags); + TRACE("name=%s rc_monitor=rc_work=%s\n", + output_info->output->name, wine_dbgstr_rect(&monitor.rc_monitor)); device_manager->add_monitor(&monitor, param); } diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index f0f831cbc1d..43b25c02b86 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -319,11 +319,8 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct gdi_monitor **ne monitor[index].rc_monitor = monitors[i].rcMonitor; monitor[index].rc_work = monitors[i].rcWork; /* Xinerama only reports monitors already attached */ - monitor[index].state_flags = DISPLAY_DEVICE_ATTACHED; monitor[index].edid_len = 0; monitor[index].edid = NULL; - if (!IsRectEmpty( &monitors[i].rcMonitor )) - monitor[index].state_flags |= DISPLAY_DEVICE_ACTIVE; index++; } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index c5e47cb355c..5c0269f3550 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1066,7 +1066,6 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct gdi_monitor **ne /* Inactive but attached monitor, no need to check for mirrored/replica monitors */ if (!output_info->crtc || !crtc_info->mode) { - monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED; monitors[monitor_count].edid_len = get_edid( adapter_id, &monitors[monitor_count].edid ); monitor_count = 1; } @@ -1114,10 +1113,6 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct gdi_monitor **ne crtc_info->x + crtc_info->width, crtc_info->y + crtc_info->height ); monitors[monitor_count].rc_work = get_work_area( &monitors[monitor_count].rc_monitor ); - monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED; - if (!IsRectEmpty( &monitors[monitor_count].rc_monitor )) - monitors[monitor_count].state_flags |= DISPLAY_DEVICE_ACTIVE; - if (is_crtc_primary( primary_rect, crtc_info )) primary_index = monitor_count; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index bd827c31cb1..4acf23df1d4 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -264,7 +264,6 @@ struct gdi_monitor { RECT rc_monitor; /* RcMonitor in MONITORINFO struct */ RECT rc_work; /* RcWork in MONITORINFO struct */ - DWORD state_flags; /* StateFlags in DISPLAY_DEVICE struct */ unsigned char *edid; /* Extended Device Identification Data */ UINT edid_len; }; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5108
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/sysparams.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 693d8839028..edf68859aa8 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1746,14 +1746,15 @@ static BOOL update_display_cache_from_registry(void) if (adapter->dev.state_flags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) { if (!IsRectEmpty(&monitor->rc_monitor)) monitor->dev.state_flags |= DISPLAY_DEVICE_ACTIVE; - } - LIST_FOR_EACH_ENTRY(monitor2, &monitors, struct monitor, entry) - { - if (EqualRect(&monitor2->rc_monitor, &monitor->rc_monitor)) + LIST_FOR_EACH_ENTRY( monitor2, &monitors, struct monitor, entry ) { - monitor->is_clone = TRUE; - break; + if (!(monitor2->dev.state_flags & DISPLAY_DEVICE_ACTIVE)) continue; + if (EqualRect( &monitor2->rc_monitor, &monitor->rc_monitor )) + { + monitor->is_clone = TRUE; + break; + } } } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5108
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/sysparams.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index edf68859aa8..824e3b57bb7 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2370,6 +2370,7 @@ RECT get_virtual_screen_rect( UINT dpi ) LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) { + if (!(monitor->dev.state_flags & DISPLAY_DEVICE_ACTIVE)) continue; union_rect( &rect, &rect, &monitor->rc_monitor ); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5108
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/sysparams.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 824e3b57bb7..87c37cd2e72 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -3564,10 +3564,11 @@ HMONITOR monitor_from_rect( const RECT *rect, UINT flags, UINT dpi ) LIST_FOR_EACH_ENTRY(monitor, &monitors, struct monitor, entry) { - RECT intersect; - RECT monitor_rect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), - system_dpi ); + RECT intersect, monitor_rect; + if (!(monitor->dev.state_flags & DISPLAY_DEVICE_ACTIVE)) continue; + + monitor_rect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), system_dpi ); if (intersect_rect( &intersect, &monitor_rect, &r )) { /* check for larger intersecting area */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5108
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/sysparams.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 87c37cd2e72..5dcf42ff7f5 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2744,6 +2744,19 @@ static struct display_device *find_adapter_device_by_id( UINT index ) return NULL; } +/* display_lock mutex must be held */ +static struct display_device *find_primary_adapter_device(void) +{ + struct adapter *adapter; + + LIST_FOR_EACH_ENTRY(adapter, &adapters, struct adapter, entry) + if (adapter->dev.state_flags & DISPLAY_DEVICE_PRIMARY_DEVICE) + return &adapter->dev; + + WARN( "Failed to find primary adapter.\n" ); + return NULL; +} + /* display_lock mutex must be held */ static struct display_device *find_adapter_device_by_name( UNICODE_STRING *name ) { @@ -2769,7 +2782,7 @@ static struct adapter *find_adapter( UNICODE_STRING *name ) if (!lock_display_devices()) return NULL; if (name && name->Length) device = find_adapter_device_by_name( name ); - else device = find_adapter_device_by_id( 0 ); /* use primary adapter */ + else device = find_primary_adapter_device(); if (!device) adapter = NULL; else adapter = adapter_acquire( CONTAINING_RECORD( device, struct adapter, dev ) ); @@ -3226,7 +3239,7 @@ static LONG apply_display_settings( const WCHAR *devname, const DEVMODEW *devmod place_all_displays( displays ); - if (!(primary = find_adapter_device_by_id( 0 ))) primary_name[0] = 0; + if (!(primary = find_primary_adapter_device())) primary_name[0] = 0; else wcscpy( primary_name, primary->device_name ); /* use the default implementation in virtual desktop mode */ @@ -3396,7 +3409,7 @@ INT get_display_depth( UNICODE_STRING *name ) if (name && name->Length) device = find_adapter_device_by_name( name ); else - device = find_adapter_device_by_id( 0 ); /* use primary adapter */ + device = find_primary_adapter_device(); if (!device) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5108
v2: Fix macOS build. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5108#note_61843
Test failure is the unrelated oleaut32:varformat failure. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5108#note_61851
This merge request was approved by Zhiyi Zhang. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5108
participants (2)
-
Rémi Bernon -
Zhiyi Zhang (＠zhiyi)