Lucas Zawacki : joy.cpl: Prevent crash on IDirectInputEffect_Release.
Alexandre Julliard
julliard at winehq.org
Tue Aug 21 13:40:19 CDT 2012
Module: wine
Branch: master
Commit: e3af37eb1c7875456621b85a6bee6de7c0e271b6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3af37eb1c7875456621b85a6bee6de7c0e271b6
Author: Lucas Zawacki <lfzawacki at gmail.com>
Date: Mon Aug 20 03:39:07 2012 -0300
joy.cpl: Prevent crash on IDirectInputEffect_Release.
---
dlls/joy.cpl/main.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c
index b84a0aa..0631466 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);
}
More information about the wine-cvs
mailing list