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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ed412aeb81128187d08506d31378164680268013
URL:    https://gitlab.winehq.org/wine/wine/-/commit/ed412aeb81128187d08506d31378164...

Author: Alexandre Julliard 
Date:   Thu Jul 13 11:58:05 2023 +0200

inetcpl.cpl: Use nameless unions/structs.

---

dlls/inetcpl.cpl/inetcpl.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/dlls/inetcpl.cpl/inetcpl.c b/dlls/inetcpl.cpl/inetcpl.c
index a2feccb3eb1..770a93ef007 100644
--- a/dlls/inetcpl.cpl/inetcpl.c
+++ b/dlls/inetcpl.cpl/inetcpl.c
@@ -19,7 +19,6 @@
  *
  */

-#define NONAMELESSUNION
 #define COBJMACROS
 #define CONST_VTABLE

@@ -108,25 +107,25 @@ static void display_cpl_sheets(HWND parent)
     /* Fill out all PROPSHEETPAGE */
     psp[id].dwSize = sizeof (PROPSHEETPAGEW);
     psp[id].hInstance = hcpl;
-    psp[id].u.pszTemplate = MAKEINTRESOURCEW(IDD_GENERAL);
+    psp[id].pszTemplate = MAKEINTRESOURCEW(IDD_GENERAL);
     psp[id].pfnDlgProc = general_dlgproc;
     id++;

psp[id].dwSize = sizeof (PROPSHEETPAGEW);
     psp[id].hInstance = hcpl;
-    psp[id].u.pszTemplate = MAKEINTRESOURCEW(IDD_SECURITY);
+    psp[id].pszTemplate = MAKEINTRESOURCEW(IDD_SECURITY);
     psp[id].pfnDlgProc = security_dlgproc;
     id++;

psp[id].dwSize = sizeof (PROPSHEETPAGEW);
     psp[id].hInstance = hcpl;
-    psp[id].u.pszTemplate = MAKEINTRESOURCEW(IDD_CONTENT);
+    psp[id].pszTemplate = MAKEINTRESOURCEW(IDD_CONTENT);
     psp[id].pfnDlgProc = content_dlgproc;
     id++;

psp[id].dwSize = sizeof (PROPSHEETPAGEW);
     psp[id].hInstance = hcpl;
-    psp[id].u.pszTemplate = MAKEINTRESOURCEW(IDD_CONNECTIONS);
+    psp[id].pszTemplate = MAKEINTRESOURCEW(IDD_CONNECTIONS);
     psp[id].pfnDlgProc = connections_dlgproc;
     id++;

@@ -135,10 +134,10 @@ static void display_cpl_sheets(HWND parent)
     psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID | PSH_USECALLBACK;
     psh.hwndParent = parent;
     psh.hInstance = hcpl;
-    psh.u.pszIcon = MAKEINTRESOURCEW(ICO_MAIN);
+    psh.pszIcon = MAKEINTRESOURCEW(ICO_MAIN);
     psh.pszCaption = MAKEINTRESOURCEW(IDS_CPL_NAME);
     psh.nPages = id;
-    psh.u3.ppsp = psp;
+    psh.ppsp = psp;
     psh.pfnCallback = propsheet_callback;

/* display the dialog */