Alexandre Julliard : dinput: Add error check to silence a compiler warning.

Alexandre Julliard julliard at winehq.org
Wed Feb 13 15:30:41 CST 2019


Module: wine
Branch: master
Commit: 6925fb0bb6e9dfdc641295908cc6ed68f69f2e28
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=6925fb0bb6e9dfdc641295908cc6ed68f69f2e28

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Feb 13 19:38:36 2019 +0100

dinput: Add error check to silence a compiler warning.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/dinput/config.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c
index 885f1f4..db5878b 100644
--- a/dlls/dinput/config.c
+++ b/dlls/dinput/config.c
@@ -298,10 +298,11 @@ static void assign_action(HWND dialog)
     int obj = lv_get_cur_item(dialog);
     int old_action = lv_get_item_data(dialog, obj);
     int used_obj;
-
-    DIDEVICEOBJECTINSTANCEW ddo = device->ddo[obj];
+    DWORD type;
 
     if (old_action == action) return;
+    if (obj < 0) return;
+    type = device->ddo[obj].dwType;
 
     /* Clear old action */
     if (old_action != -1)
@@ -320,7 +321,7 @@ static void assign_action(HWND dialog)
     lv_set_action(dialog, used_obj, -1, lpdiaf);
 
     /* Set new action */
-    lpdiaf->rgoAction[action].dwObjID = ddo.dwType;
+    lpdiaf->rgoAction[action].dwObjID = type;
     lpdiaf->rgoAction[action].guidInstance = device->ddi.guidInstance;
     lpdiaf->rgoAction[action].dwHow = DIAH_USERCONFIG;
 




More information about the wine-cvs mailing list