Alexandre Julliard : gdiplus: Use nameless unions/structs.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 313e4d0efc9f40246cee831007d88970a0d62fdc
URL:    https://gitlab.winehq.org/wine/wine/-/commit/313e4d0efc9f40246cee831007d8897...

Author: Alexandre Julliard 
Date:   Thu Jul 13 11:57:07 2023 +0200

gdiplus: Use nameless unions/structs.

---

dlls/gdiplus/image.c    |  2 --
 dlls/gdiplus/metafile.c | 14 ++++++--------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index 3b9ce3c14f1..50a666c5bc9 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -20,8 +20,6 @@
 #include <stdarg.h>
 #include <assert.h>

-#define NONAMELESSUNION
-
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c
index 4880211ad87..0664aa5fc89 100644
--- a/dlls/gdiplus/metafile.c
+++ b/dlls/gdiplus/metafile.c
@@ -20,8 +20,6 @@
 #include <math.h>
 #include <assert.h>

-#define NONAMELESSUNION
-
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
@@ -1702,7 +1700,7 @@ GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile)
             BYTE* buffer;
             UINT buffer_size;

-            gdi_bounds_rc = header.u.EmfHeader.rclBounds;
+            gdi_bounds_rc = header.EmfHeader.rclBounds;
             if (gdi_bounds_rc.right > gdi_bounds_rc.left &&
                 gdi_bounds_rc.bottom > gdi_bounds_rc.top)
             {
@@ -4156,7 +4154,7 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromEmf(HENHMETAFILE hemf,
     header->Y = gdip_round((REAL)emfheader.rclFrame.top / 2540.0 * header->DpiY);
     header->Width = gdip_round((REAL)(emfheader.rclFrame.right - emfheader.rclFrame.left) / 2540.0 * header->DpiX);
     header->Height = gdip_round((REAL)(emfheader.rclFrame.bottom - emfheader.rclFrame.top) / 2540.0 * header->DpiY);
-    header->u.EmfHeader = emfheader;
+    header->EmfHeader = emfheader;

if (metafile_type == MetafileTypeEmfPlusDual || metafile_type == MetafileTypeEmfPlusOnly)
     {
@@ -4259,11 +4257,11 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE hemf, BOOL delete,
     (*metafile)->image.frame_count = 1;
     (*metafile)->image.xres = header.DpiX;
     (*metafile)->image.yres = header.DpiY;
-    (*metafile)->bounds.X = (REAL)header.u.EmfHeader.rclFrame.left / 2540.0 * header.DpiX;
-    (*metafile)->bounds.Y = (REAL)header.u.EmfHeader.rclFrame.top / 2540.0 * header.DpiY;
-    (*metafile)->bounds.Width = (REAL)(header.u.EmfHeader.rclFrame.right - header.u.EmfHeader.rclFrame.left)
+    (*metafile)->bounds.X = (REAL)header.EmfHeader.rclFrame.left / 2540.0 * header.DpiX;
+    (*metafile)->bounds.Y = (REAL)header.EmfHeader.rclFrame.top / 2540.0 * header.DpiY;
+    (*metafile)->bounds.Width = (REAL)(header.EmfHeader.rclFrame.right - header.EmfHeader.rclFrame.left)
                                 / 2540.0 * header.DpiX;
-    (*metafile)->bounds.Height = (REAL)(header.u.EmfHeader.rclFrame.bottom - header.u.EmfHeader.rclFrame.top)
+    (*metafile)->bounds.Height = (REAL)(header.EmfHeader.rclFrame.bottom - header.EmfHeader.rclFrame.top)
                                  / 2540.0 * header.DpiY;
     (*metafile)->unit = UnitPixel;
     (*metafile)->metafile_type = header.Type;