user32: Use malloc/realloc/free instead of heap_* helpers.
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
b3111f3a32
commit
95c5654c34
|
@ -80,7 +80,7 @@ static BOOL array_reserve(void **elements, unsigned int *capacity, unsigned int
|
||||||
if (new_capacity < count)
|
if (new_capacity < count)
|
||||||
new_capacity = max_capacity;
|
new_capacity = max_capacity;
|
||||||
|
|
||||||
if (!(new_elements = heap_realloc(*elements, new_capacity * size)))
|
if (!(new_elements = realloc(*elements, new_capacity * size)))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
*elements = new_elements;
|
*elements = new_elements;
|
||||||
|
@ -102,7 +102,7 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface)
|
||||||
ERR("Failed to get device path, error %#x.\n", GetLastError());
|
ERR("Failed to get device path, error %#x.\n", GetLastError());
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
if (!(detail = heap_alloc(size)))
|
if (!(detail = malloc(size)))
|
||||||
{
|
{
|
||||||
ERR("Failed to allocate memory.\n");
|
ERR("Failed to allocate memory.\n");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
@ -117,7 +117,7 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface)
|
||||||
if (file == INVALID_HANDLE_VALUE)
|
if (file == INVALID_HANDLE_VALUE)
|
||||||
{
|
{
|
||||||
ERR("Failed to open device file %s, error %u.\n", debugstr_w(detail->DevicePath), GetLastError());
|
ERR("Failed to open device file %s, error %u.\n", debugstr_w(detail->DevicePath), GetLastError());
|
||||||
heap_free(detail);
|
free(detail);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -126,7 +126,7 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface)
|
||||||
{
|
{
|
||||||
ERR("Failed to allocate memory.\n");
|
ERR("Failed to allocate memory.\n");
|
||||||
CloseHandle(file);
|
CloseHandle(file);
|
||||||
heap_free(detail);
|
free(detail);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -162,7 +162,7 @@ static void find_devices(void)
|
||||||
for (idx = 0; idx < rawinput_devices_count; ++idx)
|
for (idx = 0; idx < rawinput_devices_count; ++idx)
|
||||||
{
|
{
|
||||||
CloseHandle(rawinput_devices[idx].file);
|
CloseHandle(rawinput_devices[idx].file);
|
||||||
heap_free(rawinput_devices[idx].detail);
|
free(rawinput_devices[idx].detail);
|
||||||
}
|
}
|
||||||
rawinput_devices_count = 0;
|
rawinput_devices_count = 0;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue