[PATCH 5/5] winex11.drv: Avoid requesting current mode in X11DRV_desktop_get_modes.

[Rémi Bernon]

From: Rémi Bernon <rbernon at codeweavers.com>

Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
---
 dlls/winex11.drv/desktop.c | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c
index d89f1b39983..47112d7aec1 100644
--- a/dlls/winex11.drv/desktop.c
+++ b/dlls/winex11.drv/desktop.c
@@ -117,14 +117,8 @@ static void add_desktop_mode( DEVMODEW *mode, DWORD depth, DWORD width, DWORD he
 static BOOL X11DRV_desktop_get_modes( ULONG_PTR id, DWORD flags, DEVMODEW **new_modes, UINT *mode_count )
 {
     UINT depth_idx, size_idx, mode_idx = 0;
-    UINT screen_width, screen_height;
-    RECT primary_rect;
     DEVMODEW *modes;
 
-    primary_rect = NtUserGetPrimaryMonitorRect();
-    screen_width = primary_rect.right - primary_rect.left;
-    screen_height = primary_rect.bottom - primary_rect.top;
-
     /* Allocate memory for modes in different color depths */
     if (!(modes = calloc( (ARRAY_SIZE(screen_sizes) + 2) * DEPTH_COUNT, sizeof(*modes))) )
     {
@@ -140,21 +134,9 @@ static BOOL X11DRV_desktop_get_modes( ULONG_PTR id, DWORD flags, DEVMODEW **new_
                 screen_sizes[size_idx].height > max_height)
                 continue;
 
-            if (screen_sizes[size_idx].width == max_width &&
-                screen_sizes[size_idx].height == max_height)
-                continue;
-
-            if (screen_sizes[size_idx].width == screen_width &&
-                screen_sizes[size_idx].height == screen_height)
-                continue;
-
             add_desktop_mode( &modes[mode_idx++], depths[depth_idx], screen_sizes[size_idx].width,
                               screen_sizes[size_idx].height );
         }
-
-        add_desktop_mode( &modes[mode_idx++], depths[depth_idx], screen_width, screen_height );
-        if (max_width != screen_width || max_height != screen_height)
-            add_desktop_mode( &modes[mode_idx++], depths[depth_idx], max_width, max_height );
     }
 
     *new_modes = modes;
-- 
GitLab

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