Alexandre Julliard : msi: Use nameless unions/structs.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8de0a9dc740d3ed1e3cf9460852db7e609122f3b
URL:    https://gitlab.winehq.org/wine/wine/-/commit/8de0a9dc740d3ed1e3cf9460852db7e...

Author: Alexandre Julliard 
Date:   Fri Jul 14 09:23:45 2023 +0200

msi: Use nameless unions/structs.

---

dlls/msi/dialog.c  | 7 +++----
 dlls/msi/msi.c     | 4 +---
 dlls/msi/package.c | 6 ++----
 dlls/msi/suminfo.c | 2 --
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index 6c1b9ebf2a8..ba8ca526266 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -20,7 +20,6 @@
  */

#define COBJMACROS
-#define NONAMELESSUNION

#include <stdarg.h>

@@ -2439,9 +2438,9 @@ static void seltree_add_child_features( MSIPACKAGE *package, HWND hwnd, const WC
         memset( &tvis, 0, sizeof tvis );
         tvis.hParent = hParent;
         tvis.hInsertAfter = TVI_LAST;
-        tvis.u.item.mask = TVIF_TEXT | TVIF_PARAM;
-        tvis.u.item.pszText = feature->Title;
-        tvis.u.item.lParam = (LPARAM) feature;
+        tvis.item.mask = TVIF_TEXT | TVIF_PARAM;
+        tvis.item.pszText = feature->Title;
+        tvis.item.lParam = (LPARAM) feature;

hitem = (HTREEITEM) SendMessageW( hwnd, TVM_INSERTITEMW, 0, (LPARAM) &tvis );
         if (!hitem)
diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c
index 42f2122bed8..2b821d08cf5 100644
--- a/dlls/msi/msi.c
+++ b/dlls/msi/msi.c
@@ -21,8 +21,6 @@
 #include <stdarg.h>

#define COBJMACROS
-#define NONAMELESSUNION
-
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"
@@ -2548,7 +2546,7 @@ HRESULT WINAPI MsiGetFileSignatureInformationW( const WCHAR *path, DWORD flags,
     data.dwUIChoice          = WTD_UI_NONE;
     data.fdwRevocationChecks = WTD_REVOKE_WHOLECHAIN;
     data.dwUnionChoice       = WTD_CHOICE_FILE;
-    data.u.pFile             = &info;
+    data.pFile               = &info;
     data.dwStateAction       = WTD_STATEACTION_VERIFY;
     data.dwUIContext         = WTD_UICONTEXT_INSTALL;

diff --git a/dlls/msi/package.c b/dlls/msi/package.c
index 081ab2caa3b..8c2168d9226 100644
--- a/dlls/msi/package.c
+++ b/dlls/msi/package.c
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
 #define COBJMACROS

#include <stdarg.h>
@@ -776,7 +774,7 @@ static VOID set_installer_properties(MSIPACKAGE *package)
     GetNativeSystemInfo( &sys_info );
     len = swprintf( bufstr, ARRAY_SIZE(bufstr), L"%d", sys_info.wProcessorLevel );
     msi_set_property( package->db, L"Intel", bufstr, len );
-    if (sys_info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL)
+    if (sys_info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL)
     {
         GetSystemDirectoryW( pth, MAX_PATH );
         PathAddBackslashW( pth );
@@ -792,7 +790,7 @@ static VOID set_installer_properties(MSIPACKAGE *package)
         PathAddBackslashW( pth );
         msi_set_property( package->db, L"CommonFilesFolder", pth, -1 );
     }
-    else if (sys_info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
+    else if (sys_info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
     {
         msi_set_property( package->db, L"MsiAMD64", bufstr, -1 );
         msi_set_property( package->db, L"Msix64", bufstr, -1 );
diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c
index 26da79ce8e1..93ecc9f5e04 100644
--- a/dlls/msi/suminfo.c
+++ b/dlls/msi/suminfo.c
@@ -21,8 +21,6 @@
 #include <stdarg.h>

#define COBJMACROS
-#define NONAMELESSUNION
-
 #include "stdio.h"
 #include "windef.h"
 #include "winbase.h"