Alexandre Julliard : wordpad: Use nameless unions/structs.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c938f92e4c76744a2ee4d584d0587fbf1b696c3a
URL:    https://gitlab.winehq.org/wine/wine/-/commit/c938f92e4c76744a2ee4d584d0587fb...

Author: Alexandre Julliard 
Date:   Tue May 30 11:22:37 2023 +0200

wordpad: Use nameless unions/structs.

---

programs/wordpad/wordpad.c | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c
index 2a0d380a101..ed55a1d2268 100644
--- a/programs/wordpad/wordpad.c
+++ b/programs/wordpad/wordpad.c
@@ -37,16 +37,6 @@

#include "wordpad.h"

-#ifdef NONAMELESSUNION
-# define U(x)  (x).u
-# define U2(x) (x).u2
-# define U3(x) (x).u3
-#else
-# define U(x)  (x)
-# define U2(x) (x)
-# define U3(x) (x)
-#endif
-
 /* use LoadString */
 static const WCHAR wszAppTitle[] = {'W','i','n','e',' ','W','o','r','d','p','a','d',0};

@@ -1180,7 +1170,7 @@ static void dialog_viewproperties(void)

psp[0].dwSize = sizeof(PROPSHEETPAGEW);
     psp[0].dwFlags = PSP_USETITLE;
-    U(psp[0]).pszTemplate = MAKEINTRESOURCEW(IDD_FORMATOPTS);
+    psp[0].pszTemplate = MAKEINTRESOURCEW(IDD_FORMATOPTS);
     psp[0].pfnDlgProc = formatopts_proc;
     psp[0].hInstance = hInstance;
     psp[0].lParam = reg_formatindex(SF_TEXT);
@@ -1190,7 +1180,7 @@ static void dialog_viewproperties(void)
     {
         psp[i].dwSize = psp[0].dwSize;
         psp[i].dwFlags = psp[0].dwFlags;
-        U(psp[i]).pszTemplate = U(psp[0]).pszTemplate;
+        psp[i].pszTemplate = psp[0].pszTemplate;
         psp[i].pfnDlgProc = psp[0].pfnDlgProc;
         psp[i].hInstance = psp[0].hInstance;
         psp[i].lParam = reg_formatindex(SF_RTF);
@@ -1204,13 +1194,13 @@ static void dialog_viewproperties(void)
     psh.hInstance = hInstance;
     psh.pszCaption = MAKEINTRESOURCEW(STRING_VIEWPROPS_TITLE);
     psh.nPages = ARRAY_SIZE(psp);
-    U3(psh).ppsp = ppsp;
-    U(psh).pszIcon = MAKEINTRESOURCEW(IDI_WORDPAD);
+    psh.ppsp = ppsp;
+    psh.pszIcon = MAKEINTRESOURCEW(IDI_WORDPAD);

if(fileFormat & SF_RTF)
-        U2(psh).nStartPage = 1;
+        psh.nStartPage = 1;
     else
-        U2(psh).nStartPage = 0;
+        psh.nStartPage = 0;
     PropertySheetW(&psh);
     set_bar_states();
     target_device(hMainWnd, wordWrap[reg_formatindex(fileFormat)]);