forked from Mirrors/wine-wine
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>feature/deterministic
parent
d8d6a6b2e6
commit
1b33e0f72e
|
@ -3319,7 +3319,8 @@ static void test_EnumDisplaySettings(void)
|
||||||
}
|
}
|
||||||
else
|
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);
|
mode_fields, dm.dmFields);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -210,7 +210,9 @@ static BOOL read_registry_settings(DEVMODEW *dm)
|
||||||
dm->dmFields |= DM_DISPLAYFLAGS;
|
dm->dmFields |= DM_DISPLAYFLAGS;
|
||||||
query_value("DefaultSettings.XPanning", &dm->u1.s2.dmPosition.x);
|
query_value("DefaultSettings.XPanning", &dm->u1.s2.dmPosition.x);
|
||||||
query_value("DefaultSettings.YPanning", &dm->u1.s2.dmPosition.y);
|
query_value("DefaultSettings.YPanning", &dm->u1.s2.dmPosition.y);
|
||||||
|
dm->dmFields |= DM_POSITION;
|
||||||
query_value("DefaultSettings.Orientation", &dm->u1.s2.dmDisplayOrientation);
|
query_value("DefaultSettings.Orientation", &dm->u1.s2.dmDisplayOrientation);
|
||||||
|
dm->dmFields |= DM_DISPLAYORIENTATION;
|
||||||
query_value("DefaultSettings.FixedOutput", &dm->u1.s2.dmDisplayFixedOutput);
|
query_value("DefaultSettings.FixedOutput", &dm->u1.s2.dmDisplayFixedOutput);
|
||||||
|
|
||||||
#undef query_value
|
#undef query_value
|
||||||
|
|
Loading…
Reference in New Issue