Commit aa9aace5 authored by Alexandre Julliard's avatar Alexandre Julliard

dinput: Use nameless unions/structs.

parent c86bb606
...@@ -16,8 +16,6 @@ ...@@ -16,8 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define NONAMELESSUNION
#include "objbase.h" #include "objbase.h"
#include "dinput_private.h" #include "dinput_private.h"
...@@ -138,7 +136,7 @@ static void lv_set_action(HWND dialog, int item, int action, LPDIACTIONFORMATW l ...@@ -138,7 +136,7 @@ static void lv_set_action(HWND dialog, int item, int action, LPDIACTIONFORMATW l
if (item < 0) return; if (item < 0) return;
if (action != -1) 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 */ /* Keep the action and text in the listview item */
lvItem.iItem = item; lvItem.iItem = item;
...@@ -280,7 +278,7 @@ static void show_suitable_actions(HWND dialog) ...@@ -280,7 +278,7 @@ static void show_suitable_actions(HWND dialog)
/* Add action string and index in the action format to the list entry */ /* 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)) 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); SendDlgItemMessageW(dialog, IDC_ACTIONLIST, LB_SETITEMDATA, added, (LPARAM) i);
added++; added++;
} }
...@@ -336,7 +334,7 @@ static void copy_actions(LPDIACTIONFORMATW to, LPDIACTIONFORMATW from) ...@@ -336,7 +334,7 @@ static void copy_actions(LPDIACTIONFORMATW to, LPDIACTIONFORMATW from)
to->rgoAction[i].guidInstance = from->rgoAction[i].guidInstance; to->rgoAction[i].guidInstance = from->rgoAction[i].guidInstance;
to->rgoAction[i].dwObjID = from->rgoAction[i].dwObjID; to->rgoAction[i].dwObjID = from->rgoAction[i].dwObjID;
to->rgoAction[i].dwHow = from->rgoAction[i].dwHow; 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;
} }
} }
......
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
#include <string.h> #include <string.h>
#define COBJMACROS #define COBJMACROS
#define NONAMELESSUNION
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winuser.h" #include "winuser.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment