Alexandre Julliard : appwiz.cpl: Use nameless unions/structs.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 25c70738fb42fa5ea629c4ea83294d0bc0696340
URL:    https://gitlab.winehq.org/wine/wine/-/commit/25c70738fb42fa5ea629c4ea83294d0...

Author: Alexandre Julliard 
Date:   Wed Jul 12 15:45:55 2023 +0200

appwiz.cpl: Use nameless unions/structs.

---

dlls/appwiz.cpl/addons.c |  4 +---
 dlls/appwiz.cpl/appwiz.c | 12 +++++-------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c
index e69b47745f1..bcf92efdb80 100644
--- a/dlls/appwiz.cpl/addons.c
+++ b/dlls/appwiz.cpl/addons.c
@@ -22,8 +22,6 @@
 #include <errno.h>

#define COBJMACROS
-#define NONAMELESSUNION
-
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
@@ -518,7 +516,7 @@ static HRESULT WINAPI InstallCallback_OnDataAvailable(IBindStatusCallback *iface
         DWORD dwSize, FORMATETC* pformatetc, STGMEDIUM* pstgmed)
 {
     if(!msi_file) {
-        msi_file = wcsdup(pstgmed->u.lpszFileName);
+        msi_file = wcsdup(pstgmed->lpszFileName);
         TRACE("got file name %s\n", debugstr_w(msi_file));
     }

diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c
index 3359d5c4a2b..6f95c23bf28 100644
--- a/dlls/appwiz.cpl/appwiz.c
+++ b/dlls/appwiz.cpl/appwiz.c
@@ -23,8 +23,6 @@
  *
  */

-#define NONAMELESSUNION
-
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -926,8 +924,8 @@ static void StartApplet(HWND hWnd)
     psp.dwSize = sizeof (PROPSHEETPAGEW);
     psp.dwFlags = PSP_USETITLE;
     psp.hInstance = hInst;
-    psp.u.pszTemplate = MAKEINTRESOURCEW (IDD_MAIN);
-    psp.u2.pszIcon = NULL;
+    psp.pszTemplate = MAKEINTRESOURCEW (IDD_MAIN);
+    psp.pszIcon = NULL;
     psp.pfnDlgProc = MainDlgProc;
     psp.pszTitle = tab_title;
     psp.lParam = 0;
@@ -937,12 +935,12 @@ static void StartApplet(HWND hWnd)
     psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID | PSH_USECALLBACK;
     psh.hwndParent = hWnd;
     psh.hInstance = hInst;
-    psh.u.pszIcon = MAKEINTRESOURCEW(ICO_MAIN);
+    psh.pszIcon = MAKEINTRESOURCEW(ICO_MAIN);
     psh.pszCaption = app_title;
     psh.nPages = 1;
-    psh.u3.ppsp = &psp;
+    psh.ppsp = &psp;
     psh.pfnCallback = propsheet_callback;
-    psh.u2.nStartPage = 0;
+    psh.nStartPage = 0;

/* Display the property sheet */
     PropertySheetW (&psh);