From e3af37eb1c7875456621b85a6bee6de7c0e271b6 Mon Sep 17 00:00:00 2001 From: Lucas Zawacki Date: Mon, 20 Aug 2012 03:39:07 -0300 Subject: [PATCH] joy.cpl: Prevent crash on IDirectInputEffect_Release. --- dlls/joy.cpl/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index b84a0aab56f..06314666558 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -90,6 +90,7 @@ static BOOL CALLBACK enum_callback(const DIDEVICEINSTANCEW *instance, void *cont joystick->num_buttons = caps.dwButtons; joystick->num_axes = caps.dwAxes; joystick->forcefeedback = caps.dwFlags & DIDC_FORCEFEEDBACK; + joystick->num_effects = 0; if (joystick->forcefeedback) data->num_ff++; @@ -130,10 +131,10 @@ static void destroy_joysticks(struct JoystickData *data) for (i = 0; i < data->num_joysticks; i++) { - if (data->joysticks[i].forcefeedback) + if (data->joysticks[i].forcefeedback && data->joysticks[i].num_effects > 0) { for (j = 0; j < data->joysticks[i].num_effects; j++) - IDirectInputEffect_Release(data->joysticks[i].effects[j].effect); + IDirectInputEffect_Release(data->joysticks[i].effects[j].effect); HeapFree(GetProcessHeap(), 0, data->joysticks[i].effects); }