dinput: Corrected misuse of index in EnumDevicesBySemantics

Lucas Fialho Zawacki lfzawacki at gmail.com
Wed Jul 13 18:54:57 CDT 2011


I introduced this error in commit 13421a210b0c6d1b2f97b670744e37b6380945bc. The intention was to use the 'i' index for mouse/keyboard and 'j' for the actions but they got mixed.

---
 dlls/dinput/dinput_main.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c
index 821a9a0..b653307 100644
--- a/dlls/dinput/dinput_main.c
+++ b/dlls/dinput/dinput_main.c
@@ -902,7 +902,7 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics(
 
         /* If there's at least one action for the device it's priority 1 */
         for(j=0; j < lpdiActionFormat->dwActionSize; j++)
-            if ((lpdiActionFormat->rgoAction[j].dwSemantic & actionMasks[j]) == actionMasks[j])
+            if ((lpdiActionFormat->rgoAction[j].dwSemantic & actionMasks[i]) == actionMasks[i])
                 callbackFlags |= DIEDBS_MAPPEDPRI1;
 
         if (lpCallback(&didevi, lpdid, callbackFlags, sizeof(guids)/sizeof(guids[0]) - (i+1), pvRef) == DIENUM_STOP)
@@ -967,7 +967,7 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics(
 
         /* If there's at least one action for the device it's priority 1 */
         for(j=0; j < lpdiActionFormat->dwActionSize; j++)
-            if ((lpdiActionFormat->rgoAction[j].dwSemantic & actionMasks[j]) == actionMasks[j])
+            if ((lpdiActionFormat->rgoAction[j].dwSemantic & actionMasks[i]) == actionMasks[i])
                 callbackFlags |= DIEDBS_MAPPEDPRI1;
 
         if (lpCallback(&didevi, lpdid, callbackFlags, sizeof(guids)/sizeof(guids[0]) - (i+1), pvRef) == DIENUM_STOP)
-- 
1.7.0.4



More information about the wine-patches mailing list