Rémi Bernon : win32u: Always copy devmode in validate_display_settings.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f60716c9fc20275cadb5759145aa96330a3482c1
URL:    https://gitlab.winehq.org/wine/wine/-/commit/f60716c9fc20275cadb5759145aa963...

Author: Rémi Bernon 
Date:   Thu Aug  4 10:48:17 2022 +0200

win32u: Always copy devmode in validate_display_settings.

So that updating dmPelsWidth / dmPelsHeight doesn't modify user devmode.

---

dlls/win32u/sysparams.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c
index 1e74952a1f0..70f385abdad 100644
--- a/dlls/win32u/sysparams.c
+++ b/dlls/win32u/sysparams.c
@@ -2046,12 +2046,13 @@ static DEVMODEW *validate_display_settings( const WCHAR *adapter_path, const WCH
             devmode = NULL;
     }

-    if (!devmode)
+    if (devmode) memcpy( temp_mode, devmode, devmode->dmSize );
+    else
     {
         if (!read_registry_settings( adapter_path, temp_mode )) return NULL;
         TRACE( "Return to original display mode\n" );
-        devmode = temp_mode;
     }
+    devmode = temp_mode;

if ((devmode->dmFields & (DM_PELSWIDTH | DM_PELSHEIGHT)) != (DM_PELSWIDTH | DM_PELSHEIGHT))
     {