[PATCH v7 4/6] win32u: Use current mode position if desired mode doesn't specify it.

[Rémi Bernon]

From: R��mi Bernon

---
 dlls/win32u/sysparams.c    |  7 ++++++-
 dlls/winex11.drv/display.c | 10 ----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c
index c6c4551c478..36434877c93 100644
--- a/dlls/win32u/sysparams.c
+++ b/dlls/win32u/sysparams.c
@@ -2055,12 +2055,17 @@ static DEVMODEW *validate_display_settings( const WCHAR *adapter_path, const WCH
         return NULL;
     }

-    if (!is_detached_mode( devmode ) && (!devmode->dmPelsWidth || !devmode->dmPelsHeight))
+    if (!is_detached_mode( devmode ) && (!devmode->dmPelsWidth || !devmode->dmPelsHeight || !(devmode->dmFields & DM_POSITION)))
     {
         DEVMODEW current_mode = {.dmSize = sizeof(DEVMODEW)};
         if (!user_driver->pGetCurrentDisplaySettings( device_name, &current_mode )) return NULL;
         if (!devmode->dmPelsWidth) devmode->dmPelsWidth = current_mode.dmPelsWidth;
         if (!devmode->dmPelsHeight) devmode->dmPelsHeight = current_mode.dmPelsHeight;
+        if (!(devmode->dmFields & DM_POSITION))
+        {
+            devmode->dmPosition = current_mode.dmPosition;
+            devmode->dmFields |= DM_POSITION;
+        }
     }

return devmode;
diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c
index 77f71b73b77..34fd0136fc3 100644
--- a/dlls/winex11.drv/display.c
+++ b/dlls/winex11.drv/display.c
@@ -498,16 +498,6 @@ static LONG get_display_settings(DEVMODEW **new_displays, const WCHAR *dev_name,
         else if (!wcsicmp(dev_name, display_device.DeviceName))
         {
             *mode = *dev_mode;
-            if (!(dev_mode->dmFields & DM_POSITION))
-            {
-                memset(&current_mode, 0, sizeof(current_mode));
-                current_mode.dmSize = sizeof(current_mode);
-                if (!NtUserEnumDisplaySettings( &device_name, ENUM_CURRENT_SETTINGS, &current_mode, 0 ))
-                    goto done;
-
-                mode->dmFields |= DM_POSITION;
-                mode->dmPosition = current_mode.dmPosition;
-            }
         }
         else
         {