joy.cpl: Prevent crash on IDirectInputEffect_Release
Lucas Zawacki
lfzawacki at gmail.com
Mon Aug 20 01:39:07 CDT 2012
From: Lucas Zawacki <lfzawacki at gmail.com>
---
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 354dfd7..2958484 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);
}
--
1.7.9.5
More information about the wine-patches
mailing list