Alexandre Julliard : msxml3: Use nameless unions/structs.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 194b4025b05e8c220492b589cbb55a3fda0f3651
URL:    https://gitlab.winehq.org/wine/wine/-/commit/194b4025b05e8c220492b589cbb55a3...

Author: Alexandre Julliard 
Date:   Fri Jul 14 09:24:57 2023 +0200

msxml3: Use nameless unions/structs.

---

dlls/msxml3/bsc.c         | 3 +--
 dlls/msxml3/httprequest.c | 5 ++---
 dlls/msxml3/xmlview.c     | 6 ++----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c
index 5e3b60d92b5..e6b7799e843 100644
--- a/dlls/msxml3/bsc.c
+++ b/dlls/msxml3/bsc.c
@@ -17,7 +17,6 @@
  */

#define COBJMACROS
-#define NONAMELESSUNION

#include <stdarg.h>

@@ -206,7 +205,7 @@ static HRESULT WINAPI bsc_OnDataAvailable(

do
     {
-        hr = IStream_Read(pstgmed->u.pstm, buf, sizeof(buf), &read);
+        hr = IStream_Read(pstgmed->pstm, buf, sizeof(buf), &read);
         if(FAILED(hr))
             break;

diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c
index cc384a380e5..459466a1234 100644
--- a/dlls/msxml3/httprequest.c
+++ b/dlls/msxml3/httprequest.c
@@ -20,7 +20,6 @@
  */

#define COBJMACROS
-#define NONAMELESSUNION

#include <stdarg.h>

@@ -375,7 +374,7 @@ static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface,
     if (This->request->verb != BINDVERB_GET && This->body)
     {
         pbindinfo->stgmedData.tymed = TYMED_HGLOBAL;
-        pbindinfo->stgmedData.u.hGlobal = This->body;
+        pbindinfo->stgmedData.hGlobal = This->body;
         pbindinfo->cbstgmedData = GlobalSize(This->body);
         /* callback owns passed body pointer */
         IBindStatusCallback_QueryInterface(iface, &IID_IUnknown, (void**)&pbindinfo->stgmedData.pUnkForRelease);
@@ -403,7 +402,7 @@ static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *if

do
     {
-        hr = IStream_Read(stgmed->u.pstm, buf, sizeof(buf), &read);
+        hr = IStream_Read(stgmed->pstm, buf, sizeof(buf), &read);
         if (hr != S_OK) break;

hr = IStream_Write(This->stream, buf, read, &written);
diff --git a/dlls/msxml3/xmlview.c b/dlls/msxml3/xmlview.c
index 91f3ecf4805..7139c5c3c24 100644
--- a/dlls/msxml3/xmlview.c
+++ b/dlls/msxml3/xmlview.c
@@ -19,8 +19,6 @@
 #include <stdarg.h>

#define COBJMACROS
-#define NONAMELESSUNION
-
 #include "windef.h"
 #include "winbase.h"
 #include "ole2.h"
@@ -348,7 +346,7 @@ static inline HRESULT report_data(BindStatusCallback *This)
         return hres;

stgmedium.tymed = TYMED_ISTREAM;
-    stgmedium.u.pstm = This->stream;
+    stgmedium.pstm = This->stream;
     stgmedium.pUnkForRelease = NULL;

hres = IBindStatusCallback_OnDataAvailable(This->bsc,
@@ -518,7 +516,7 @@ static HRESULT WINAPI XMLView_BindStatusCallback_OnDataAvailable(
         return E_FAIL;

do {
-        hres = IStream_Read(pstgmed->u.pstm, buf, sizeof(buf), &size);
+        hres = IStream_Read(pstgmed->pstm, buf, sizeof(buf), &size);
         IStream_Write(This->stream, buf, size, &size);
     } while(hres==S_OK && size);