[PATCH 2/4] user32: Use malloc/realloc/free instead of heap_* helpers.
Rémi Bernon
rbernon at codeweavers.com
Fri Apr 16 06:48:10 CDT 2021
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
---
dlls/user32/rawinput.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c
index da3824b10ee..02cdcd87820 100644
--- a/dlls/user32/rawinput.c
+++ b/dlls/user32/rawinput.c
@@ -80,8 +80,8 @@ static BOOL array_reserve(void **elements, unsigned int *capacity, unsigned int
if (new_capacity < count)
new_capacity = max_capacity;
- if (!(new_elements = heap_realloc(*elements, new_capacity * size)))
- return FALSE;
+ if (!*elements) new_elements = malloc(new_capacity * size);
+ else new_elements = realloc(*elements, new_capacity * size);
*elements = new_elements;
*capacity = new_capacity;
@@ -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());
return FALSE;
}
- if (!(detail = heap_alloc(size)))
+ if (!(detail = malloc(size)))
{
ERR("Failed to allocate memory.\n");
return FALSE;
@@ -117,7 +117,7 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface)
if (file == INVALID_HANDLE_VALUE)
{
ERR("Failed to open device file %s, error %u.\n", debugstr_w(detail->DevicePath), GetLastError());
- heap_free(detail);
+ free(detail);
return NULL;
}
@@ -126,7 +126,7 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface)
{
ERR("Failed to allocate memory.\n");
CloseHandle(file);
- heap_free(detail);
+ free(detail);
return NULL;
}
@@ -162,7 +162,7 @@ static void find_devices(void)
for (idx = 0; idx < rawinput_devices_count; ++idx)
{
CloseHandle(rawinput_devices[idx].file);
- heap_free(rawinput_devices[idx].detail);
+ free(rawinput_devices[idx].detail);
}
rawinput_devices_count = 0;
--
2.31.0
More information about the wine-devel
mailing list