[PATCH 0/1] MR7126: winex11: Fixup monitor / display mode inconsistencies.

[Rémi Bernon]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=57610

This is a simple workaround to fix the regression. The issue seems to be residing in inconsistent values returned by XRandR, and arguably a host driver bug, but it probably could be better fixed by enumerating the XRandR tree only on startup and when it is updated, but this would be a much larger change.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7126

[PATCH 1/1] winex11: Fixup monitor / display mode inconsistencies.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=57610
---
 dlls/winex11.drv/display.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c
index 8d1a1dfd414..2d5000ea1e4 100644
--- a/dlls/winex11.drv/display.c
+++ b/dlls/winex11.drv/display.c
@@ -434,6 +434,7 @@ UINT X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manage
             x11drv_settings_id settings_id;
             BOOL is_primary = adapters[adapter].state_flags & DISPLAY_DEVICE_PRIMARY_DEVICE;
             UINT dpi = NtUserGetSystemDpiForProcess( NULL );
+            POINT position = {0};
 
             sprintf( buffer, "%04lx", adapters[adapter].id );
             device_manager->add_source( buffer, adapters[adapter].state_flags, dpi, param );
@@ -445,6 +446,12 @@ UINT X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manage
             for (monitor = 0; monitor < monitor_count; monitor++)
                 device_manager->add_monitor( &monitors[monitor], param );
 
+            if (monitor_count)
+            {
+                position.x = monitors[0].rc_monitor.left;
+                position.y = monitors[0].rc_monitor.top;
+            }
+
             host_handler.free_monitors( monitors, monitor_count );
 
             /* Get the settings handler id for the adapter */
@@ -453,6 +460,13 @@ UINT X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manage
             if (!settings_handler.get_id( devname, is_primary, &settings_id )) break;
 
             settings_handler.get_current_mode( settings_id, ¤t_mode );
+            if (memcmp( ¤t_mode.dmPosition, &position, sizeof(position) ))
+            {
+                WARN( "Inconsistent monitor / current mode coordinates, using %s\n", wine_dbgstr_point( &position ));
+                current_mode.dmPosition.x = position.x;
+                current_mode.dmPosition.y = position.y;
+            }
+
             if (settings_handler.get_modes( settings_id, EDS_ROTATEDMODE, &modes, &mode_count, FALSE ))
             {
                 device_manager->add_modes( ¤t_mode, mode_count, modes, param );
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/7126

[Zhiyi Zhang (＠zhiyi)]

Superseded by https://gitlab.winehq.org/wine/wine/-/merge_requests/7136

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7126#note_91806

[PATCH 0/1] MR7126: winex11: Fixup monitor / display mode inconsistencies. - closed

[Zhiyi Zhang (＠zhiyi)]

This merge request was closed by Zhiyi Zhang.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7126