niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

win32u: Get rid of the monitor state_flags.

Browse source
This commit is contained in:
Rémi Bernon 2024-02-27 12:38:12 +01:00 • committed by Alexandre Julliard
parent caf9585c3c
commit e6a8fc2448
1 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
dlls/win32u/sysparams.c
View file

@ -153,7 +153,6 @@ struct monitor
RECT rc_monitor; RECT rc_monitor;
RECT rc_work; RECT rc_work;
BOOL is_clone; BOOL is_clone;
UINT state_flags;
struct edid_monitor_info edid_info; struct edid_monitor_info edid_info;
}; };
@ -1552,6 +1551,15 @@ static void clear_display_devices(void)
} }
} }
static BOOL is_monitor_active( struct monitor *monitor )
{
struct adapter *adapter;
/* services do not have any adapters, only a virtual monitor */
if (!(adapter = monitor->adapter)) return TRUE;
if (!(adapter->dev.state_flags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) return FALSE;
return !IsRectEmpty( &monitor->rc_monitor );
}
static void enum_device_keys( const char *root, const WCHAR *classW, UINT class_size, void (*callback)(const char *) ) static void enum_device_keys( const char *root, const WCHAR *classW, UINT class_size, void (*callback)(const char *) )
{ {
char buffer[1024]; char buffer[1024];
@ -1682,14 +1690,11 @@ static BOOL update_display_cache_from_registry(void)
monitor->id = monitor_id; monitor->id = monitor_id;
monitor->adapter = adapter_acquire( adapter ); monitor->adapter = adapter_acquire( adapter );
monitor->state_flags |= DISPLAY_DEVICE_ATTACHED;
if (adapter->dev.state_flags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) if (adapter->dev.state_flags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)
{ {
if (!IsRectEmpty(&monitor->rc_monitor)) monitor->state_flags |= DISPLAY_DEVICE_ACTIVE;
LIST_FOR_EACH_ENTRY( monitor2, &monitors, struct monitor, entry ) LIST_FOR_EACH_ENTRY( monitor2, &monitors, struct monitor, entry )
{ {
if (!(monitor2->state_flags & DISPLAY_DEVICE_ACTIVE)) continue; if (!is_monitor_active( monitor2 )) continue;
if (EqualRect( &monitor2->rc_monitor, &monitor->rc_monitor )) if (EqualRect( &monitor2->rc_monitor, &monitor->rc_monitor ))
{ {
monitor->is_clone = TRUE; monitor->is_clone = TRUE;
@ -2248,7 +2253,7 @@ RECT get_virtual_screen_rect( UINT dpi )
LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry )
{ {
if (!(monitor->state_flags & DISPLAY_DEVICE_ACTIVE)) continue; if (!is_monitor_active( monitor )) continue;
union_rect( &rect, &rect, &monitor->rc_monitor ); union_rect( &rect, &rect, &monitor->rc_monitor );
} }
@ -2269,8 +2274,7 @@ static BOOL is_window_rect_full_screen( const RECT *rect )
{ {
RECT monrect; RECT monrect;
if (!(monitor->state_flags & DISPLAY_DEVICE_ACTIVE)) if (!is_monitor_active( monitor )) continue;
continue;
monrect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), monrect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ),
get_thread_dpi() ); get_thread_dpi() );
@ -2357,8 +2361,7 @@ LONG WINAPI NtUserGetDisplayConfigBufferSizes( UINT32 flags, UINT32 *num_path_in
{ {
LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry )
{ {
if (!(monitor->state_flags & DISPLAY_DEVICE_ACTIVE)) if (!is_monitor_active( monitor )) continue;
continue;
count++; count++;
} }
unlock_display_devices(); unlock_display_devices();
@ -2541,8 +2544,7 @@ LONG WINAPI NtUserQueryDisplayConfig( UINT32 flags, UINT32 *paths_count, DISPLAY
LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry )
{ {
if (!(monitor->state_flags & DISPLAY_DEVICE_ACTIVE)) if (!is_monitor_active( monitor )) continue;
continue;
if (!monitor->adapter) if (!monitor->adapter)
continue; continue;
@ -2727,8 +2729,12 @@ NTSTATUS WINAPI NtUserEnumDisplayDevices( UNICODE_STRING *device, DWORD index,
} }
if (info->cb >= offsetof(DISPLAY_DEVICEW, StateFlags) + sizeof(info->StateFlags)) if (info->cb >= offsetof(DISPLAY_DEVICEW, StateFlags) + sizeof(info->StateFlags))
{ {
if (monitor) info->StateFlags = monitor->state_flags; if (!monitor) info->StateFlags = adapter->dev.state_flags;
else info->StateFlags = adapter->dev.state_flags; else
{
info->StateFlags = DISPLAY_DEVICE_ATTACHED;
if (is_monitor_active( monitor )) info->StateFlags |= DISPLAY_DEVICE_ACTIVE;
}
} }
if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(info->DeviceID)) if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(info->DeviceID))
{ {
@ -3329,7 +3335,8 @@ static unsigned int active_monitor_count(void)
LIST_FOR_EACH_ENTRY(monitor, &monitors, struct monitor, entry) LIST_FOR_EACH_ENTRY(monitor, &monitors, struct monitor, entry)
{ {
if ((monitor->state_flags & DISPLAY_DEVICE_ACTIVE)) count++; if (!is_monitor_active( monitor )) continue;
count++;
} }
return count; return count;
} }
@ -3414,7 +3421,7 @@ BOOL WINAPI NtUserEnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc
{ {
RECT monrect; RECT monrect;
if (!(monitor->state_flags & DISPLAY_DEVICE_ACTIVE)) continue; if (!is_monitor_active( monitor )) continue;
monrect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), monrect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ),
get_thread_dpi() ); get_thread_dpi() );
@ -3460,7 +3467,7 @@ BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info )
LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry )
{ {
if (monitor->handle != handle) continue; if (monitor->handle != handle) continue;
if (!(monitor->state_flags & DISPLAY_DEVICE_ACTIVE)) break; if (!is_monitor_active( monitor )) continue;
/* FIXME: map dpi */ /* FIXME: map dpi */
info->rcMonitor = monitor->rc_monitor; info->rcMonitor = monitor->rc_monitor;
@ -3512,7 +3519,7 @@ HMONITOR monitor_from_rect( const RECT *rect, UINT flags, UINT dpi )
{ {
RECT intersect, monitor_rect; RECT intersect, monitor_rect;
if (!(monitor->state_flags & DISPLAY_DEVICE_ACTIVE)) continue; if (!is_monitor_active( monitor )) continue;
monitor_rect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), system_dpi ); monitor_rect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), system_dpi );
if (intersect_rect( &intersect, &monitor_rect, &r )) if (intersect_rect( &intersect, &monitor_rect, &r ))