dinput: Search for device objects of the correct type in BuildActionMap

Lucas Fialho Zawacki lfzawacki at gmail.com
Tue Feb 28 12:22:20 CST 2012


From: Lucas Fialho Zawacki <lfzawacki at gmail.com>

This caused a problem in later SetActionMap calls.

Fixes bug 29992
---
 dlls/dinput/joystick.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c
index 2d8a818..7a69631 100644
--- a/dlls/dinput/joystick.c
+++ b/dlls/dinput/joystick.c
@@ -453,7 +453,7 @@ HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface,
             if (type & object_types[j])
             {
                 /* Assure that the object exists */
-                LPDIOBJECTDATAFORMAT odf = dataformat_to_odf_by_type(This->base.data_format.wine_df, inst, DIDFT_BUTTON);
+                LPDIOBJECTDATAFORMAT odf = dataformat_to_odf_by_type(This->base.data_format.wine_df, inst, object_types[j]);
 
                 if (odf != NULL)
                 {
-- 
1.7.0.4




More information about the wine-patches mailing list