system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 08:54:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

gdiplus/tests: Use nameless unions/structs.

Browse source
This commit is contained in:
Alexandre Julliard 2023-07-20 11:34:30 +02:00
parent 207bdd01ca
commit 6077ea6946
2 changed files with 74 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/gdiplus/tests/image.c
View file

@ -1787,7 +1787,7 @@ static void test_loadwmf(void)
expect(0, header.Y);
expect(320, header.Width);
expect(320, header.Height);
expect(1, U(header).WmfHeader.mtType);
expect(1, header.WmfHeader.mtType);
expect(0, header.EmfPlusHeaderSize);
expect(0, header.LogicalDpiX);
expect(0, header.LogicalDpiY);
@ -1845,7 +1845,7 @@ static void test_createfromwmf(void)
expect(0, header.Y);
expect(320, header.Width);
expect(320, header.Height);
expect(1, U(header).WmfHeader.mtType);
expect(1, header.WmfHeader.mtType);
expect(0, header.EmfPlusHeaderSize);
expect(0, header.LogicalDpiX);
expect(0, header.LogicalDpiY);

144
dlls/gdiplus/tests/metafile.c
View file

@ -493,13 +493,13 @@ static void test_empty(void)
stat = GdipGetMetafileHeaderFromMetafile(metafile, &header);
expect(Ok, stat);
expect(MetafileTypeEmfPlusOnly, header.Type);
expect(U(header).EmfHeader.nBytes, header.Size);
expect(header.EmfHeader.nBytes, header.Size);
ok(header.Version == 0xdbc01001 || header.Version == 0xdbc01002, "Unexpected version %x\n", header.Version);
expect(1, header.EmfPlusFlags); /* reference device was display, not printer */
expectf(xres, header.DpiX);
expectf(xres, U(header).EmfHeader.szlDevice.cx / (REAL)U(header).EmfHeader.szlMillimeters.cx * 25.4);
expectf(xres, header.EmfHeader.szlDevice.cx / (REAL)header.EmfHeader.szlMillimeters.cx * 25.4);
expectf(yres, header.DpiY);
expectf(yres, U(header).EmfHeader.szlDevice.cy / (REAL)U(header).EmfHeader.szlMillimeters.cy * 25.4);
expectf(yres, header.EmfHeader.szlDevice.cy / (REAL)header.EmfHeader.szlMillimeters.cy * 25.4);
expect(0, header.X);
expect(0, header.Y);
expect(100, header.Width);
@ -507,15 +507,15 @@ static void test_empty(void)
expect(28, header.EmfPlusHeaderSize);
expect(96, header.LogicalDpiX);
expect(96, header.LogicalDpiY);
expect(EMR_HEADER, U(header).EmfHeader.iType);
expect(0, U(header).EmfHeader.rclBounds.left);
expect(0, U(header).EmfHeader.rclBounds.top);
expect(-1, U(header).EmfHeader.rclBounds.right);
expect(-1, U(header).EmfHeader.rclBounds.bottom);
expect(0, U(header).EmfHeader.rclFrame.left);
expect(0, U(header).EmfHeader.rclFrame.top);
expectf_(100.0, U(header).EmfHeader.rclFrame.right * xres / 2540.0, 2.0);
expectf_(100.0, U(header).EmfHeader.rclFrame.bottom * yres / 2540.0, 2.0);
expect(EMR_HEADER, header.EmfHeader.iType);
expect(0, header.EmfHeader.rclBounds.left);
expect(0, header.EmfHeader.rclBounds.top);
expect(-1, header.EmfHeader.rclBounds.right);
expect(-1, header.EmfHeader.rclBounds.bottom);
expect(0, header.EmfHeader.rclFrame.left);
expect(0, header.EmfHeader.rclFrame.top);
expectf_(100.0, header.EmfHeader.rclFrame.right * xres / 2540.0, 2.0);
expectf_(100.0, header.EmfHeader.rclFrame.bottom * yres / 2540.0, 2.0);
stat = GdipGetHemfFromMetafile(metafile, &hemf);
expect(Ok, stat);
@ -532,13 +532,13 @@ static void test_empty(void)
stat = GdipGetMetafileHeaderFromEmf(hemf, &header);
expect(Ok, stat);
expect(MetafileTypeEmfPlusOnly, header.Type);
expect(U(header).EmfHeader.nBytes, header.Size);
expect(header.EmfHeader.nBytes, header.Size);
ok(header.Version == 0xdbc01001 || header.Version == 0xdbc01002, "Unexpected version %x\n", header.Version);
expect(1, header.EmfPlusFlags); /* reference device was display, not printer */
expectf(xres, header.DpiX);
expectf(xres, U(header).EmfHeader.szlDevice.cx / (REAL)U(header).EmfHeader.szlMillimeters.cx * 25.4);
expectf(xres, header.EmfHeader.szlDevice.cx / (REAL)header.EmfHeader.szlMillimeters.cx * 25.4);
expectf(yres, header.DpiY);
expectf(yres, U(header).EmfHeader.szlDevice.cy / (REAL)U(header).EmfHeader.szlMillimeters.cy * 25.4);
expectf(yres, header.EmfHeader.szlDevice.cy / (REAL)header.EmfHeader.szlMillimeters.cy * 25.4);
expect(0, header.X);
expect(0, header.Y);
expect(100, header.Width);
@ -546,15 +546,15 @@ static void test_empty(void)
expect(28, header.EmfPlusHeaderSize);
expect(96, header.LogicalDpiX);
expect(96, header.LogicalDpiY);
expect(EMR_HEADER, U(header).EmfHeader.iType);
expect(0, U(header).EmfHeader.rclBounds.left);
expect(0, U(header).EmfHeader.rclBounds.top);
expect(-1, U(header).EmfHeader.rclBounds.right);
expect(-1, U(header).EmfHeader.rclBounds.bottom);
expect(0, U(header).EmfHeader.rclFrame.left);
expect(0, U(header).EmfHeader.rclFrame.top);
expectf_(100.0, U(header).EmfHeader.rclFrame.right * xres / 2540.0, 2.0);
expectf_(100.0, U(header).EmfHeader.rclFrame.bottom * yres / 2540.0, 2.0);
expect(EMR_HEADER, header.EmfHeader.iType);
expect(0, header.EmfHeader.rclBounds.left);
expect(0, header.EmfHeader.rclBounds.top);
expect(-1, header.EmfHeader.rclBounds.right);
expect(-1, header.EmfHeader.rclBounds.bottom);
expect(0, header.EmfHeader.rclFrame.left);
expect(0, header.EmfHeader.rclFrame.top);
expectf_(100.0, header.EmfHeader.rclFrame.right * xres / 2540.0, 2.0);
expectf_(100.0, header.EmfHeader.rclFrame.bottom * yres / 2540.0, 2.0);
stat = GdipCreateMetafileFromEmf(hemf, TRUE, &metafile);
expect(Ok, stat);
@ -579,13 +579,13 @@ static void test_empty(void)
stat = GdipGetMetafileHeaderFromMetafile(metafile, &header);
expect(Ok, stat);
expect(MetafileTypeEmfPlusOnly, header.Type);
expect(U(header).EmfHeader.nBytes, header.Size);
expect(header.EmfHeader.nBytes, header.Size);
ok(header.Version == 0xdbc01001 || header.Version == 0xdbc01002, "Unexpected version %x\n", header.Version);
expect(1, header.EmfPlusFlags); /* reference device was display, not printer */
expectf(xres, header.DpiX);
expectf(xres, U(header).EmfHeader.szlDevice.cx / (REAL)U(header).EmfHeader.szlMillimeters.cx * 25.4);
expectf(xres, header.EmfHeader.szlDevice.cx / (REAL)header.EmfHeader.szlMillimeters.cx * 25.4);
expectf(yres, header.DpiY);
expectf(yres, U(header).EmfHeader.szlDevice.cy / (REAL)U(header).EmfHeader.szlMillimeters.cy * 25.4);
expectf(yres, header.EmfHeader.szlDevice.cy / (REAL)header.EmfHeader.szlMillimeters.cy * 25.4);
expect(0, header.X);
expect(0, header.Y);
expect(100, header.Width);
@ -593,15 +593,15 @@ static void test_empty(void)
expect(28, header.EmfPlusHeaderSize);
expect(96, header.LogicalDpiX);
expect(96, header.LogicalDpiY);
expect(EMR_HEADER, U(header).EmfHeader.iType);
expect(0, U(header).EmfHeader.rclBounds.left);
expect(0, U(header).EmfHeader.rclBounds.top);
expect(-1, U(header).EmfHeader.rclBounds.right);
expect(-1, U(header).EmfHeader.rclBounds.bottom);
expect(0, U(header).EmfHeader.rclFrame.left);
expect(0, U(header).EmfHeader.rclFrame.top);
expectf_(100.0, U(header).EmfHeader.rclFrame.right * xres / 2540.0, 2.0);
expectf_(100.0, U(header).EmfHeader.rclFrame.bottom * yres / 2540.0, 2.0);
expect(EMR_HEADER, header.EmfHeader.iType);
expect(0, header.EmfHeader.rclBounds.left);
expect(0, header.EmfHeader.rclBounds.top);
expect(-1, header.EmfHeader.rclBounds.right);
expect(-1, header.EmfHeader.rclBounds.bottom);
expect(0, header.EmfHeader.rclFrame.left);
expect(0, header.EmfHeader.rclFrame.top);
expectf_(100.0, header.EmfHeader.rclFrame.right * xres / 2540.0, 2.0);
expectf_(100.0, header.EmfHeader.rclFrame.bottom * yres / 2540.0, 2.0);
stat = GdipDisposeImage((GpImage*)metafile);
expect(Ok, stat);
@ -865,14 +865,14 @@ static void test_emfonly(void)
stat = GdipGetMetafileHeaderFromMetafile(metafile, &header);
expect(Ok, stat);
expect(MetafileTypeEmf, header.Type);
expect(U(header).EmfHeader.nBytes, header.Size);
expect(header.EmfHeader.nBytes, header.Size);
/* For some reason a recoreded EMF Metafile has an EMF+ version. */
todo_wine ok(header.Version == 0xdbc01001 || header.Version == 0xdbc01002, "Unexpected version %x\n", header.Version);
expect(0, header.EmfPlusFlags);
expectf(xres, header.DpiX);
expectf(xres, U(header).EmfHeader.szlDevice.cx / (REAL)U(header).EmfHeader.szlMillimeters.cx * 25.4);
expectf(xres, header.EmfHeader.szlDevice.cx / (REAL)header.EmfHeader.szlMillimeters.cx * 25.4);
expectf(yres, header.DpiY);
expectf(yres, U(header).EmfHeader.szlDevice.cy / (REAL)U(header).EmfHeader.szlMillimeters.cy * 25.4);
expectf(yres, header.EmfHeader.szlDevice.cy / (REAL)header.EmfHeader.szlMillimeters.cy * 25.4);
expect(0, header.X);
expect(0, header.Y);
expect(100, header.Width);
@ -880,15 +880,15 @@ static void test_emfonly(void)
expect(0, header.EmfPlusHeaderSize);
expect(0, header.LogicalDpiX);
expect(0, header.LogicalDpiY);
expect(EMR_HEADER, U(header).EmfHeader.iType);
expect(25, U(header).EmfHeader.rclBounds.left);
expect(25, U(header).EmfHeader.rclBounds.top);
expect(74, U(header).EmfHeader.rclBounds.right);
expect(74, U(header).EmfHeader.rclBounds.bottom);
expect(0, U(header).EmfHeader.rclFrame.left);
expect(0, U(header).EmfHeader.rclFrame.top);
expectf_(100.0, U(header).EmfHeader.rclFrame.right * xres / 2540.0, 2.0);
expectf_(100.0, U(header).EmfHeader.rclFrame.bottom * yres / 2540.0, 2.0);
expect(EMR_HEADER, header.EmfHeader.iType);
expect(25, header.EmfHeader.rclBounds.left);
expect(25, header.EmfHeader.rclBounds.top);
expect(74, header.EmfHeader.rclBounds.right);
expect(74, header.EmfHeader.rclBounds.bottom);
expect(0, header.EmfHeader.rclFrame.left);
expect(0, header.EmfHeader.rclFrame.top);
expectf_(100.0, header.EmfHeader.rclFrame.right * xres / 2540.0, 2.0);
expectf_(100.0, header.EmfHeader.rclFrame.bottom * yres / 2540.0, 2.0);
stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap);
expect(Ok, stat);
@ -962,13 +962,13 @@ static void test_emfonly(void)
stat = GdipGetMetafileHeaderFromEmf(hemf, &header);
expect(Ok, stat);
expect(MetafileTypeEmf, header.Type);
expect(U(header).EmfHeader.nBytes, header.Size);
expect(header.EmfHeader.nBytes, header.Size);
expect(0x10000, header.Version);
expect(0, header.EmfPlusFlags);
expectf(xres, header.DpiX);
expectf(xres, U(header).EmfHeader.szlDevice.cx / (REAL)U(header).EmfHeader.szlMillimeters.cx * 25.4);
expectf(xres, header.EmfHeader.szlDevice.cx / (REAL)header.EmfHeader.szlMillimeters.cx * 25.4);
expectf(yres, header.DpiY);
expectf(yres, U(header).EmfHeader.szlDevice.cy / (REAL)U(header).EmfHeader.szlMillimeters.cy * 25.4);
expectf(yres, header.EmfHeader.szlDevice.cy / (REAL)header.EmfHeader.szlMillimeters.cy * 25.4);
expect(0, header.X);
expect(0, header.Y);
expect(100, header.Width);
@ -976,15 +976,15 @@ static void test_emfonly(void)
expect(0, header.EmfPlusHeaderSize);
expect(0, header.LogicalDpiX);
expect(0, header.LogicalDpiY);
expect(EMR_HEADER, U(header).EmfHeader.iType);
expect(25, U(header).EmfHeader.rclBounds.left);
expect(25, U(header).EmfHeader.rclBounds.top);
expect(74, U(header).EmfHeader.rclBounds.right);
expect(74, U(header).EmfHeader.rclBounds.bottom);
expect(0, U(header).EmfHeader.rclFrame.left);
expect(0, U(header).EmfHeader.rclFrame.top);
expectf_(100.0, U(header).EmfHeader.rclFrame.right * xres / 2540.0, 2.0);
expectf_(100.0, U(header).EmfHeader.rclFrame.bottom * yres / 2540.0, 2.0);
expect(EMR_HEADER, header.EmfHeader.iType);
expect(25, header.EmfHeader.rclBounds.left);
expect(25, header.EmfHeader.rclBounds.top);
expect(74, header.EmfHeader.rclBounds.right);
expect(74, header.EmfHeader.rclBounds.bottom);
expect(0, header.EmfHeader.rclFrame.left);
expect(0, header.EmfHeader.rclFrame.top);
expectf_(100.0, header.EmfHeader.rclFrame.right * xres / 2540.0, 2.0);
expectf_(100.0, header.EmfHeader.rclFrame.bottom * yres / 2540.0, 2.0);
stat = GdipCreateMetafileFromEmf(hemf, TRUE, &metafile);
expect(Ok, stat);
@ -1009,13 +1009,13 @@ static void test_emfonly(void)
stat = GdipGetMetafileHeaderFromMetafile(metafile, &header);
expect(Ok, stat);
expect(MetafileTypeEmf, header.Type);
expect(U(header).EmfHeader.nBytes, header.Size);
expect(header.EmfHeader.nBytes, header.Size);
expect(0x10000, header.Version);
expect(0, header.EmfPlusFlags);
expectf(xres, header.DpiX);
expectf(xres, U(header).EmfHeader.szlDevice.cx / (REAL)U(header).EmfHeader.szlMillimeters.cx * 25.4);
expectf(xres, header.EmfHeader.szlDevice.cx / (REAL)header.EmfHeader.szlMillimeters.cx * 25.4);
expectf(yres, header.DpiY);
expectf(yres, U(header).EmfHeader.szlDevice.cy / (REAL)U(header).EmfHeader.szlMillimeters.cy * 25.4);
expectf(yres, header.EmfHeader.szlDevice.cy / (REAL)header.EmfHeader.szlMillimeters.cy * 25.4);
expect(0, header.X);
expect(0, header.Y);
expect(100, header.Width);
@ -1023,15 +1023,15 @@ static void test_emfonly(void)
expect(0, header.EmfPlusHeaderSize);
expect(0, header.LogicalDpiX);
expect(0, header.LogicalDpiY);
expect(EMR_HEADER, U(header).EmfHeader.iType);
expect(25, U(header).EmfHeader.rclBounds.left);
expect(25, U(header).EmfHeader.rclBounds.top);
expect(74, U(header).EmfHeader.rclBounds.right);
expect(74, U(header).EmfHeader.rclBounds.bottom);
expect(0, U(header).EmfHeader.rclFrame.left);
expect(0, U(header).EmfHeader.rclFrame.top);
expectf_(100.0, U(header).EmfHeader.rclFrame.right * xres / 2540.0, 2.0);
expectf_(100.0, U(header).EmfHeader.rclFrame.bottom * yres / 2540.0, 2.0);
expect(EMR_HEADER, header.EmfHeader.iType);
expect(25, header.EmfHeader.rclBounds.left);
expect(25, header.EmfHeader.rclBounds.top);
expect(74, header.EmfHeader.rclBounds.right);
expect(74, header.EmfHeader.rclBounds.bottom);
expect(0, header.EmfHeader.rclFrame.left);
expect(0, header.EmfHeader.rclFrame.top);
expectf_(100.0, header.EmfHeader.rclFrame.right * xres / 2540.0, 2.0);
expectf_(100.0, header.EmfHeader.rclFrame.bottom * yres / 2540.0, 2.0);
stat = GdipDisposeImage((GpImage*)metafile);
expect(Ok, stat);