From 0f1d8329f050f90273352e5a67dec888a7e26215 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 27 Sep 2022 11:24:13 +0200
Subject: [PATCH] win32u: Force update display cache after
 NtUserChangeDisplaySettingsEx.

---
 dlls/win32u/sysparams.c    | 3 +++
 dlls/winemac.drv/display.c | 4 +---
 dlls/winex11.drv/display.c | 2 --
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c
index d2e5a2f1e2b..98ef5b276b7 100644
--- a/dlls/win32u/sysparams.c
+++ b/dlls/win32u/sysparams.c
@@ -2443,6 +2443,9 @@ static LONG apply_display_settings( const WCHAR *devname, const DEVMODEW *devmod
     free( displays );
     if (ret) return ret;
 
+    if (!update_display_cache( TRUE ))
+        WARN( "Failed to update display cache after mode change.\n" );
+
     if ((adapter = find_adapter( NULL )))
     {
         DEVMODEW current_mode = {.dmSize = sizeof(DEVMODEW)};
diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c
index e5dbadde332..e18e57281f7 100644
--- a/dlls/winemac.drv/display.c
+++ b/dlls/winemac.drv/display.c
@@ -830,9 +830,7 @@ LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, HWND hwnd, DWORD flags, L
                 bpp, mode->dmDisplayFrequency);
             ret = DISP_CHANGE_BADMODE;
         }
-        else if (macdrv_set_display_mode(&macdrv_displays[0], best_display_mode))
-            macdrv_init_display_devices(TRUE);
-        else
+        else if (!macdrv_set_display_mode(&macdrv_displays[0], best_display_mode))
         {
             WARN("Failed to set display mode\n");
             ret = DISP_CHANGE_FAILED;
diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c
index 572b81aa491..2a4a34e2c02 100644
--- a/dlls/winex11.drv/display.c
+++ b/dlls/winex11.drv/display.c
@@ -418,8 +418,6 @@ LONG X11DRV_ChangeDisplaySettings( LPDEVMODEW displays, HWND hwnd, DWORD flags,
     ret = apply_display_settings( displays, ids, FALSE );
     if (ret == DISP_CHANGE_SUCCESSFUL)
         ret = apply_display_settings( displays, ids, TRUE );
-    if (ret == DISP_CHANGE_SUCCESSFUL)
-        X11DRV_DisplayDevices_Init(TRUE);
 
 done:
     free( ids );