[PATCH v3 5/7] win32u: Write current display settings to the registry in apply_display_settings.

[Rémi Bernon]

From: R��mi Bernon

---
 dlls/win32u/sysparams.c | 50 ++++++++++++++++++++++++++++++-----------
 1 file changed, 37 insertions(+), 13 deletions(-)

diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c
index a3abc8948de..452f1c706b0 100644
--- a/dlls/win32u/sysparams.c
+++ b/dlls/win32u/sysparams.c
@@ -526,7 +526,7 @@ static BOOL read_registry_settings( const WCHAR *adapter_path, DEVMODEW *mode )
     return ret;
 }

-static BOOL write_registry_settings( const WCHAR *adapter_path, const DEVMODEW *mode )
+static BOOL write_registry_settings( const WCHAR *adapter_path, DWORD index, const DEVMODEW *mode )
 {
     HANDLE mutex;
     HKEY hkey;
@@ -538,7 +538,7 @@ static BOOL write_registry_settings( const WCHAR *adapter_path, const DEVMODEW *
     if (!(hkey = reg_open_key( config_key, adapter_path, lstrlenW( adapter_path ) * sizeof(WCHAR) ))) ret = FALSE;
     else
     {
-        ret = write_adapter_mode( hkey, ENUM_REGISTRY_SETTINGS, mode );
+        ret = write_adapter_mode( hkey, index, mode );
         NtClose( hkey );
     }

@@ -1596,13 +1596,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 );
     }
@@ -2214,10 +2225,8 @@ static DEVMODEW *get_display_settings( const WCHAR *devname, const DEVMODEW *dev
     struct adapter *adapter;
     BOOL ret;

-    if (!lock_display_devices()) return NULL;
-
     /* allocate an extra mode for easier iteration */
-    if (!(displays = calloc( list_count( &adapters ) + 1, sizeof(DEVMODEW) ))) goto done;
+    if (!(displays = calloc( list_count( &adapters ) + 1, sizeof(DEVMODEW) ))) return NULL;
     mode = displays;

LIST_FOR_EACH_ENTRY( adapter, &adapters, struct adapter, entry )
@@ -2236,11 +2245,9 @@ static DEVMODEW *get_display_settings( const WCHAR *devname, const DEVMODEW *dev
         mode = NEXT_DEVMODEW(mode);
     }

-    unlock_display_devices();
     return displays;

done:
-    unlock_display_devices();
     free( displays );
     return NULL;
 }
@@ -2435,15 +2442,21 @@ 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 *displays;
+    DEVMODEW *mode, *displays;
+    struct adapter *adapter;
     LONG ret;

-    displays = get_display_settings( devname, devmode );
-    if (!displays) return DISP_CHANGE_FAILED;
+    if (!lock_display_devices()) return DISP_CHANGE_FAILED;
+    if (!(displays = get_display_settings( devname, devmode )))
+    {
+        unlock_display_devices();
+        return DISP_CHANGE_FAILED;
+    }

if (all_detached_settings( displays ))
     {
         WARN( "Detaching all modes is not permitted.\n" );
+        unlock_display_devices();
         free( displays );
         return DISP_CHANGE_SUCCESSFUL;
     }
@@ -2451,9 +2464,20 @@ static LONG apply_display_settings( const WCHAR *devname, const DEVMODEW *devmod
     place_all_displays( displays );

if (!(ret = user_driver->pChangeDisplaySettings( displays, hwnd, flags, lparam )))
+    {
+        mode = displays;
+        LIST_FOR_EACH_ENTRY( adapter, &adapters, struct adapter, entry )
+        {
+            if (!write_registry_settings( adapter->config_key, ENUM_CURRENT_SETTINGS, mode ))
+                WARN( "Failed to write adapter %s current mode.\n", debugstr_w(mode->dmDeviceName) );
+            mode = NEXT_DEVMODEW(mode);
+        }
+
         send_message_timeout( HWND_BROADCAST, WM_DISPLAYCHANGE, displays->dmBitsPerPel,
                               MAKELPARAM( displays->dmPelsWidth, displays->dmPelsHeight ),
                               SMTO_ABORTIFHUNG, 2000, FALSE );
+    }
+    unlock_display_devices();

free( displays );
     if (!ret && !update_display_cache( TRUE )) WARN( "Failed to update display cache after mode change.\n" );
@@ -2493,7 +2517,7 @@ LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devm
     }

if (!(devmode = get_full_mode( adapter_path, device_name, modes, devmode, &temp_mode ))) ret = DISP_CHANGE_BADMODE;
-    else if ((flags & CDS_UPDATEREGISTRY) && !write_registry_settings( adapter_path, devmode )) ret = DISP_CHANGE_NOTUPDATED;
+    else if ((flags & CDS_UPDATEREGISTRY) && !write_registry_settings( adapter_path, ENUM_REGISTRY_SETTINGS, devmode )) ret = DISP_CHANGE_NOTUPDATED;
     else if (flags & (CDS_TEST | CDS_NORESET)) ret = DISP_CHANGE_SUCCESSFUL;
     else ret = apply_display_settings( device_name, devmode, hwnd, flags, lparam );
     free( modes );