From 6431b9584b3bb957c7d819b0d1ce652bdb68a254 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Thu, 13 Jul 2023 11:57:54 +0200
Subject: [PATCH] inetcomm: Use nameless unions/structs.

---
 dlls/inetcomm/mimeintl.c      |  1 -
 dlls/inetcomm/mimeole.c       | 11 +++++------
 dlls/inetcomm/pop3transport.c |  1 -
 dlls/inetcomm/protocol.c      |  5 ++---
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c
index 0ac695afb39..1e5b1a0ce90 100644
--- a/dlls/inetcomm/mimeintl.c
+++ b/dlls/inetcomm/mimeintl.c
@@ -19,7 +19,6 @@
  */
 
 #define COBJMACROS
-#define NONAMELESSUNION
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c
index dd2c00b01fa..5a2225b2fdf 100644
--- a/dlls/inetcomm/mimeole.c
+++ b/dlls/inetcomm/mimeole.c
@@ -20,7 +20,6 @@
  */
 
 #define COBJMACROS
-#define NONAMELESSUNION
 
 #include <stdarg.h>
 #include <stdio.h>
@@ -267,7 +266,7 @@ static HRESULT WINAPI sub_stream_Seek(
     sub_stream_t *This = impl_from_IStream(iface);
     LARGE_INTEGER new_pos;
 
-    TRACE("(%08lx.%08lx, %lx, %p)\n", dlibMove.u.HighPart, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
+    TRACE("(%08lx.%08lx, %lx, %p)\n", dlibMove.HighPart, dlibMove.LowPart, dwOrigin, plibNewPosition);
 
     switch(dwOrigin)
     {
@@ -314,7 +313,7 @@ static HRESULT WINAPI sub_stream_CopyTo(
     ULARGE_INTEGER totalBytesRead;
     ULARGE_INTEGER totalBytesWritten;
 
-    TRACE("(%p)->(%p, %ld, %p, %p)\n", iface, pstm, cb.u.LowPart, pcbRead, pcbWritten);
+    TRACE("(%p)->(%p, %ld, %p, %p)\n", iface, pstm, cb.LowPart, pcbRead, pcbWritten);
 
     totalBytesRead.QuadPart = 0;
     totalBytesWritten.QuadPart = 0;
@@ -324,7 +323,7 @@ static HRESULT WINAPI sub_stream_CopyTo(
         if ( cb.QuadPart >= sizeof(tmpBuffer) )
             copySize = sizeof(tmpBuffer);
         else
-            copySize = cb.u.LowPart;
+            copySize = cb.LowPart;
 
         hr = IStream_Read(iface, tmpBuffer, copySize, &bytesRead);
         if (FAILED(hr)) break;
@@ -2063,7 +2062,7 @@ static HRESULT create_body_offset_list(IStream *stm, const char *boundary, struc
 
     zero.QuadPart = 0;
     hr = IStream_Seek(stm, zero, STREAM_SEEK_CUR, &cur);
-    start = cur.u.LowPart;
+    start = cur.LowPart;
 
     do {
         hr = IStream_Read(stm, overlap, PARSER_BUF_SIZE, &read);
@@ -2218,7 +2217,7 @@ static HRESULT WINAPI MimeMessage_Load(IMimeMessage *iface, IStream *pStm)
 
     zero.QuadPart = 0;
     IStream_Seek(pStm, zero, STREAM_SEEK_END, &cur);
-    offsets.cbBodyEnd = cur.u.LowPart;
+    offsets.cbBodyEnd = cur.LowPart;
     MimeBody_set_offsets(root_body->mime_body, &offsets);
 
     list_add_head(&This->body_tree, &root_body->entry);
diff --git a/dlls/inetcomm/pop3transport.c b/dlls/inetcomm/pop3transport.c
index 7901b831cb5..6dbbab1fa3f 100644
--- a/dlls/inetcomm/pop3transport.c
+++ b/dlls/inetcomm/pop3transport.c
@@ -19,7 +19,6 @@
  */
 
 #define COBJMACROS
-#define NONAMELESSUNION
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/dlls/inetcomm/protocol.c b/dlls/inetcomm/protocol.c
index c98139ad49e..155adace482 100644
--- a/dlls/inetcomm/protocol.c
+++ b/dlls/inetcomm/protocol.c
@@ -17,7 +17,6 @@
  */
 
 #define COBJMACROS
-#define NONAMELESSUNION
 
 #include <assert.h>
 
@@ -316,7 +315,7 @@ static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *if
     assert(pstgmed->tymed == TYMED_ISTREAM);
 
     while(1) {
-        hres = IStream_Read(pstgmed->u.pstm, buf, sizeof(buf), &read);
+        hres = IStream_Read(pstgmed->pstm, buf, sizeof(buf), &read);
         if(FAILED(hres))
             return hres;
         if(!read)
@@ -567,7 +566,7 @@ static HRESULT WINAPI MimeHtmlProtocol_Seek(IInternetProtocol *iface, LARGE_INTE
         DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition)
 {
     MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface);
-    FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
+    FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.LowPart, dwOrigin, plibNewPosition);
     return E_NOTIMPL;
 }