Alexandre Julliard : dinput: Use nameless unions/structs.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: aa9aace5f38894f75a6b8af945cb2d15262c935f
URL:    https://gitlab.winehq.org/wine/wine/-/commit/aa9aace5f38894f75a6b8af945cb2d1...

Author: Alexandre Julliard 
Date:   Mon Jul 10 17:14:57 2023 +0200

dinput: Use nameless unions/structs.

---

dlls/dinput/config.c      | 8 +++-----
 dlls/dinput/dinput_main.c | 2 --
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c
index 8cc73c80242..d7a416501f0 100644
--- a/dlls/dinput/config.c
+++ b/dlls/dinput/config.c
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#define NONAMELESSUNION
-
 #include "objbase.h"

#include "dinput_private.h"
@@ -138,7 +136,7 @@ static void lv_set_action(HWND dialog, int item, int action, LPDIACTIONFORMATW l
     if (item < 0) return;

if (action != -1)
-        action_text = lpdiaf->rgoAction[action].u.lptszActionName;
+        action_text = lpdiaf->rgoAction[action].lptszActionName;

/* Keep the action and text in the listview item */
     lvItem.iItem = item;
@@ -280,7 +278,7 @@ static void show_suitable_actions(HWND dialog)
         /* Add action string and index in the action format to the list entry */
         if (DIDFT_GETINSTANCE(lpdiaf->rgoAction[i].dwSemantic) & DIDFT_GETTYPE(device->ddo[obj].dwType))
         {
-            SendDlgItemMessageW(dialog, IDC_ACTIONLIST, LB_ADDSTRING, 0, (LPARAM)lpdiaf->rgoAction[i].u.lptszActionName);
+            SendDlgItemMessageW(dialog, IDC_ACTIONLIST, LB_ADDSTRING, 0, (LPARAM)lpdiaf->rgoAction[i].lptszActionName);
             SendDlgItemMessageW(dialog, IDC_ACTIONLIST, LB_SETITEMDATA, added, (LPARAM) i);
             added++;
         }
@@ -336,7 +334,7 @@ static void copy_actions(LPDIACTIONFORMATW to, LPDIACTIONFORMATW from)
         to->rgoAction[i].guidInstance = from->rgoAction[i].guidInstance;
         to->rgoAction[i].dwObjID = from->rgoAction[i].dwObjID;
         to->rgoAction[i].dwHow = from->rgoAction[i].dwHow;
-        to->rgoAction[i].u.lptszActionName = from->rgoAction[i].u.lptszActionName;
+        to->rgoAction[i].lptszActionName = from->rgoAction[i].lptszActionName;
     }
 }

diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c
index 51e1a134023..e0406db62b1 100644
--- a/dlls/dinput/dinput_main.c
+++ b/dlls/dinput/dinput_main.c
@@ -26,8 +26,6 @@
 #include <string.h>

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