From 207bdd01ca48742805033149030974bf70bb3a74 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 20 Jul 2023 11:34:02 +0200 Subject: [PATCH] gdi32/tests: Use nameless unions/structs. --- dlls/gdi32/tests/dc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 8ccadbd6ff6..e3d29ae9ca9 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSSTRUCT -#define NONAMELESSUNION - #include #include @@ -616,7 +613,7 @@ static void test_CreateCompatibleDC(void) dm.dmSize = sizeof(dm); bRet = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); ok(bRet, "EnumDisplaySettingsEx failed\n"); - dm.u1.s1.dmScale = 200; + dm.dmScale = 200; dm.dmFields |= DM_SCALE; hdc = CreateDCA( "DISPLAY", NULL, NULL, &dm ); @@ -1353,7 +1350,7 @@ static HDC create_printer_dc(int scale, BOOL reset) dbuf = HeapAlloc( GetProcessHeap(), 0, len ); if (!pGetPrinterDriverA( hprn, NULL, 3, (LPBYTE)dbuf, len, &len )) goto done; - pbuf->pDevMode->u1.s1.dmScale = scale; + pbuf->pDevMode->dmScale = scale; pbuf->pDevMode->dmFields |= DM_SCALE; hdc = CreateDCA( dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName, pbuf->pDevMode ); @@ -1600,7 +1597,7 @@ static void test_clip_box(void) EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &scale_mode); scale_mode.dmFields |= DM_SCALE; - scale_mode.u1.s1.dmScale = 200; + scale_mode.dmScale = 200; SetRect(&screen_rect, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN), GetSystemMetrics(SM_XVIRTUALSCREEN) + GetSystemMetrics(SM_CXVIRTUALSCREEN),