78608: Subject: dinput: Fix compilation on systems that don't support nameless unions.

buildbot at kegel.com buildbot at kegel.com
Fri Sep 9 07:45:48 CDT 2011


This is an experimental automated build and test service.
Please feel free to ignore this email while we work the kinks out.

The Buildbot has detected a failed build on builder runtests-default-x86_64 while building Wine.
Full details are available at: http://buildbot.kegel.com/builders/runtests-default-x86_64/builds/46 (though maybe not for long, as I'm still reinstalling the buildbot periodically while experimenting)
BUILD FAILED: failed shell


For more info about this message, see http://wiki.winehq.org/BuildBot


-------------- next part --------------
From: Dan Kegel <dank at kegel.com>
Subject: dinput: Fix compilation on systems that don't support nameless unions.
Message-Id: <CAPF-yOb1-sPYenXWCK0pqtEb7f69nUq0vj7sm3scmi554S2=dQ at mail.gmail.com>
Date: Fri, 9 Sep 2011 05:40:49 -0700

The regression is only three days old.

diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c
index 1c6da6c..3818529 100644
--- a/dlls/dinput/config.c
+++ b/dlls/dinput/config.c
@@ -141,7 +141,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].lptszActionName;
+        action_text = lpdiaf->rgoAction[action].u.lptszActionName;
 
     /* Keep the action and text in the listview item */
     lvItem.iItem = item;
@@ -282,7 +282,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].lptszActionName);
+            SendDlgItemMessageW(dialog, IDC_ACTIONLIST, LB_ADDSTRING, 0, (LPARAM)lpdiaf->rgoAction[i].u.lptszActionName);
             SendDlgItemMessageW(dialog, IDC_ACTIONLIST, LB_SETITEMDATA, added, (LPARAM) i);
             added++;
         }
@@ -337,7 +337,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].lptszActionName = from->rgoAction[i].lptszActionName;
+        to->rgoAction[i].u.lptszActionName = from->rgoAction[i].u.lptszActionName;
     }
 }
 



More information about the wine-tests-results mailing list