system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-02 13:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

joy.cpl: Use msvcrt memory allocation functions.

Browse source 
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Rémi Bernon 2021-09-23 14:01:50 +02:00 committed by Alexandre Julliard
parent 6fb0f321fe
commit 0a777f0bcc
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dlls/joy.cpl/main.c
View file

@ -112,7 +112,7 @@ static void initialize_joysticks(struct JoystickData *data)
data->num_joysticks = 0;
data->cur_joystick = 0;
IDirectInput8_EnumDevices(data->di, DI8DEVCLASS_GAMECTRL, enum_callback, data, DIEDFL_ATTACHEDONLY);
data->joysticks = HeapAlloc(GetProcessHeap(), 0, sizeof(struct Joystick) * data->num_joysticks);
data->joysticks = malloc(sizeof(struct Joystick) * data->num_joysticks);
/* Get all the joysticks */
IDirectInput8_EnumDevices(data->di, DI8DEVCLASS_GAMECTRL, enum_callback, data, DIEDFL_ATTACHEDONLY);
@ -134,14 +134,14 @@ static void destroy_joysticks(struct JoystickData *data)
if (data->joysticks[i].effects[j].effect)
IDirectInputEffect_Release(data->joysticks[i].effects[j].effect);
HeapFree(GetProcessHeap(), 0, data->joysticks[i].effects);
free(data->joysticks[i].effects);
}
IDirectInputDevice8_Unacquire(data->joysticks[i].device);
IDirectInputDevice8_Release(data->joysticks[i].device);
}
HeapFree(GetProcessHeap(), 0, data->joysticks);
free(data->joysticks);
}
static void initialize_joysticks_list(HWND hwnd, struct JoystickData *data)
@ -823,7 +823,7 @@ static INT_PTR CALLBACK ff_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp
joy->num_effects = 0;
joy->effects = NULL;
IDirectInputDevice8_EnumEffects(joy->device, ff_effects_callback, (void *) joy, 0);
joy->effects = HeapAlloc(GetProcessHeap(), 0, sizeof(struct Effect) * joy->num_effects);
joy->effects = malloc(sizeof(struct Effect) * joy->num_effects);
joy->cur_effect = 0;
IDirectInputDevice8_EnumEffects(joy->device, ff_effects_callback, (void*) joy, 0);