winex11.drv: Set DM_POSITION and DM_DISPLAYORIENTATION when reporting registry display settings.

Set DM_POSITION and DM_DISPLAYORIENTATION when calling EnumDisplaySettings(ENUM_REGISTRY_SETTINGS). DM_DISPLAYFIXEDOUTPUT is not set because it is not necessarily reported according to tests. Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winex11.drv: Set DM_POSITION and DM_DISPLAYORIENTATION when reporting registry display settings.
1b33e0f7 · Zhiyi Zhang · Alexandre Julliard · d8d6a6b2 · 1b33e0f7 · 1b33e0f7
Commit 1b33e0f7 authored Jun 03, 2020 by Zhiyi Zhang Committed by Alexandre Julliard Jun 09, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

sysparams.c dlls/user32/tests/sysparams.c +2 -1

settings.c dlls/winex11.drv/settings.c +2 -0

No files found.
--- a/dlls/user32/tests/sysparams.c
+++ b/dlls/user32/tests/sysparams.c
@@ -3319,7 +3319,8 @@ static void test_EnumDisplaySettings(void)
            }
            else
            {
-                todo_wine ok((dm.dmFields & mode_fields) == mode_fields, "Expect dmFields to contain %#x, got %#x\n",
+                todo_wine_if(mode != ENUM_REGISTRY_SETTINGS)
+                ok((dm.dmFields & mode_fields) == mode_fields, "Expect dmFields to contain %#x, got %#x\n",
                        mode_fields, dm.dmFields);
            }


--- a/dlls/winex11.drv/settings.c
+++ b/dlls/winex11.drv/settings.c
@@ -210,7 +210,9 @@ static BOOL read_registry_settings(DEVMODEW *dm)
    dm->dmFields |= DM_DISPLAYFLAGS;
    query_value("DefaultSettings.XPanning", &dm->u1.s2.dmPosition.x);
    query_value("DefaultSettings.YPanning", &dm->u1.s2.dmPosition.y);
+    dm->dmFields |= DM_POSITION;
    query_value("DefaultSettings.Orientation", &dm->u1.s2.dmDisplayOrientation);
+    dm->dmFields |= DM_DISPLAYORIENTATION;
    query_value("DefaultSettings.FixedOutput", &dm->u1.s2.dmDisplayFixedOutput);

 #undef query_value