From 45ea56ffb45278930a07f1bd21d1ad6953ebe1b8 Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Sun, 29 Aug 2010 23:38:14 +0200 Subject: [PATCH] d3d9/tests: Fix compilation on systems that don't support nameless unions or structs. --- dlls/d3d9/tests/d3d9ex.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 6e111169b03..090ecfc5b80 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -269,7 +269,7 @@ static void test_get_adapter_displaymode_ex(void) memset(&startmode, 0, sizeof(startmode)); startmode.dmSize = sizeof(startmode); startmode.dmFields = DM_DISPLAYORIENTATION; - startmode.dmDisplayOrientation = DMDO_180; + S2(U1(startmode)).dmDisplayOrientation = DMDO_180; retval = pChangeDisplaySettingsExA(NULL, &startmode, NULL, 0, NULL); @@ -282,7 +282,7 @@ static void test_get_adapter_displaymode_ex(void) ok(retval == DISP_CHANGE_SUCCESSFUL,"ChangeDisplaySettingsEx failed with %d\n", retval); /* try retrieve orientation info with EnumDisplaySettingsEx*/ startmode.dmFields = 0; - startmode.dmDisplayOrientation = 0; + S2(U1(startmode)).dmDisplayOrientation = 0; ok(pEnumDisplaySettingsExA(NULL, ENUM_CURRENT_SETTINGS, &startmode, EDS_ROTATEDMODE), "EnumDisplaySettingsEx failed\n"); /*now that orientation has changed start tests for GetAdapterDisplayModeEx: invalid Size*/ @@ -310,7 +310,7 @@ static void test_get_adapter_displaymode_ex(void) /* don't know yet how to test for ScanLineOrdering, just testing that it is set to a value by GetAdapterDisplayModeEx*/ todo_wine ok(mode_ex.ScanLineOrdering != 0, "ScanLineOrdering returned 0\n"); /* check that orientation is returned correctly by GetAdapterDisplayModeEx and EnumDisplaySettingsEx*/ - todo_wine ok(startmode.dmDisplayOrientation == DMDO_180 && rotation == D3DDISPLAYROTATION_180, "rotation is %d instead of %d\n", rotation, startmode.dmDisplayOrientation); + todo_wine ok(S2(U1(startmode)).dmDisplayOrientation == DMDO_180 && rotation == D3DDISPLAYROTATION_180, "rotation is %d instead of %d\n", rotation, S2(U1(startmode)).dmDisplayOrientation); trace("GetAdapterDisplayModeEx returned Width = %d,Height = %d, RefreshRate = %d, Format = %x, ScanLineOrdering = %x, rotation = %d\n", mode_ex.Width, mode_ex.Height, mode_ex.RefreshRate, mode_ex.Format, mode_ex.ScanLineOrdering, rotation);