[PATCH v5 5/6] win32u: Write display settings to the registry in apply_display_settings.

[Rémi Bernon]

From: Rémi Bernon

As a fallback if ChangeDisplaySettings returns E_NOTIMPL.
---
 dlls/win32u/driver.c    |  2 +-
 dlls/win32u/sysparams.c | 50 +++++++++++++++++++++++++++++++++++++----
 2 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c
index d9c1f0d6f6d..5341dafac6d 100644
--- a/dlls/win32u/driver.c
+++ b/dlls/win32u/driver.c
@@ -756,7 +756,7 @@ static void nulldrv_UpdateClipboard(void)
 static LONG nulldrv_ChangeDisplaySettings( LPDEVMODEW displays, HWND hwnd,
                                            DWORD flags, LPVOID lparam )
 {
-    return DISP_CHANGE_FAILED;
+    return E_NOTIMPL;
 }

static BOOL nulldrv_GetCurrentDisplaySettings( LPCWSTR name, LPDEVMODEW mode )
diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c
index 4be1e0b9a3b..d74c9bfbf5b 100644
--- a/dlls/win32u/sysparams.c
+++ b/dlls/win32u/sysparams.c
@@ -562,6 +562,26 @@ static BOOL adapter_set_registry_settings( const struct adapter *adapter, const
     return ret;
 }

+static BOOL adapter_set_current_settings( const struct adapter *adapter, const DEVMODEW *mode )
+{
+    HANDLE mutex;
+    HKEY hkey;
+    BOOL ret;
+
+    mutex = get_display_device_init_mutex();
+
+    if (!config_key && !(config_key = reg_open_key( NULL, config_keyW, sizeof(config_keyW) ))) ret = FALSE;
+    if (!(hkey = reg_open_key( config_key, adapter->config_key, lstrlenW( adapter->config_key ) * sizeof(WCHAR) ))) ret = FALSE;
+    else
+    {
+        ret = write_adapter_mode( hkey, ENUM_CURRENT_SETTINGS, mode );
+        NtClose( hkey );
+    }
+
+    release_display_device_init_mutex( mutex );
+    return ret;
+}
+
 static int mode_compare(const void *p1, const void *p2)
 {
     BOOL a_interlaced, b_interlaced, a_stretched, b_stretched;
@@ -1599,13 +1619,24 @@ static BOOL update_display_cache( BOOL force )
         struct gdi_monitor monitor =
         {
             .state_flags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED,
-            .rc_monitor = {.right = modes[2].dmPelsWidth, .bottom = modes[2].dmPelsHeight},
-            .rc_work = {.right = modes[2].dmPelsWidth, .bottom = modes[2].dmPelsHeight},
         };
+        DEVMODEW mode = {{0}};
         UINT i;

add_gpu( &gpu, &ctx );
         add_adapter( &adapter, &ctx );
+
+        if (!read_adapter_mode( ctx.adapter_key, ENUM_CURRENT_SETTINGS, &mode ))
+        {
+            mode = modes[2];
+            mode.dmFields |= DM_POSITION;
+            write_adapter_mode( ctx.adapter_key, ENUM_CURRENT_SETTINGS, &mode );
+        }
+        monitor.rc_monitor.right = mode.dmPelsWidth;
+        monitor.rc_monitor.bottom = mode.dmPelsHeight;
+        monitor.rc_work.right = mode.dmPelsWidth;
+        monitor.rc_work.bottom = mode.dmPelsHeight;
+
         add_monitor( &monitor, &ctx );
         for (i = 0; i < ARRAY_SIZE(modes); ++i) add_mode( modes + i, &ctx );
     }
@@ -2469,8 +2500,8 @@ static BOOL all_detached_settings( const DEVMODEW *displays )
 static LONG apply_display_settings( const WCHAR *devname, const DEVMODEW *devmode,
                                     HWND hwnd, DWORD flags, void *lparam )
 {
+    DEVMODEW *mode, *displays;
     struct adapter *adapter;
-    DEVMODEW *displays;
     LONG ret;

if (!lock_display_devices()) return DISP_CHANGE_FAILED;
@@ -2490,8 +2521,19 @@ static LONG apply_display_settings( const WCHAR *devname, const DEVMODEW *devmod

place_all_displays( displays );

-    ret = user_driver->pChangeDisplaySettings( displays, hwnd, flags, lparam );
+    if ((ret = user_driver->pChangeDisplaySettings( displays, hwnd, flags, lparam )) == E_NOTIMPL)
+    {
+        mode = displays;
+        LIST_FOR_EACH_ENTRY( adapter, &adapters, struct adapter, entry )
+        {
+            if (!adapter_set_current_settings( adapter, mode ))
+                WARN( "Failed to write adapter %s current mode.\n", debugstr_w(adapter->dev.device_name) );
+            mode = NEXT_DEVMODEW(mode);
+        }
+        ret = DISP_CHANGE_SUCCESSFUL;
+    }
     unlock_display_devices();
+
     free( displays );
     if (ret) return ret;