[PATCH v2 0/1] MR5608: winex11.drv: Increment mode_idx in xrandr10_get_modes.

[Brendan McGrath (＠redmcg)]

This fixes a regression introduced in:
f74900ad1a580eda8fd4923cbd4881b42b042733

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

--
  v2: winex11.drv: Increment mode_idx in {xrandr10,xf86vm}_get_modes.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/5608

[PATCH v2 1/1] winex11.drv: Increment mode_idx in {xrandr10,xf86vm}_get_modes.

[Brendan McGrath]

From: Brendan McGrath <bmcgrath(a)codeweavers.com>

This fixes a regression introduced in:
f74900ad1a580eda8fd4923cbd4881b42b042733

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56655
---
 dlls/winex11.drv/xrandr.c   | 2 ++
 dlls/winex11.drv/xvidmode.c | 1 +
 2 files changed, 3 insertions(+)

diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c
index 885c23a09a0..6cc3c277213 100644
--- a/dlls/winex11.drv/xrandr.c
+++ b/dlls/winex11.drv/xrandr.c
@@ -211,6 +211,7 @@ static BOOL xrandr10_get_modes( x11drv_settings_id id, DWORD flags, DEVMODEW **n
                 add_xrandr10_mode( mode, depths[depth_idx], sizes[size_idx].width,
                                    sizes[size_idx].height, 0, size_idx, full );
                 mode = NEXT_DEVMODEW( mode );
+                mode_idx++;
                 continue;
             }
 
@@ -219,6 +220,7 @@ static BOOL xrandr10_get_modes( x11drv_settings_id id, DWORD flags, DEVMODEW **n
                 add_xrandr10_mode( mode, depths[depth_idx], sizes[size_idx].width,
                                    sizes[size_idx].height, rates[rate_idx], size_idx, full );
                 mode = NEXT_DEVMODEW( mode );
+                mode_idx++;
             }
         }
     }
diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c
index f5e49409080..4f653c1cf6b 100644
--- a/dlls/winex11.drv/xvidmode.c
+++ b/dlls/winex11.drv/xvidmode.c
@@ -145,6 +145,7 @@ static BOOL xf86vm_get_modes( x11drv_settings_id id, DWORD flags, DEVMODEW **new
         {
             add_xf86vm_mode( mode, depths[depth_idx], xf86vm_modes[xf86vm_mode_idx], full );
             mode = NEXT_DEVMODEW( mode );
+            mode_idx++;
         }
     }
 
-- 
GitLab

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

[Brendan McGrath (＠redmcg)]

On Thu May  9 08:39:19 2024 +0000, Zhiyi Zhang wrote:
> Thanks, `xf86vm_get_modes` has the same problem. Could you fix that as well?
> Good catch. I've now updated `xf86vm_get_modes` as well.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/5608#note_70076

[PATCH v2 0/1] MR5608: winex11.drv: Increment mode_idx in xrandr10_get_modes. - approved

[Zhiyi Zhang (＠zhiyi)]

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