Commit da42d96a authored by Alex Henrie's avatar Alex Henrie Committed by Alexandre Julliard

uxtheme/tests: Use CRT allocation functions.

parent 0c3530d6
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <assert.h> #include <assert.h>
#include <windows.h> #include <windows.h>
#include "wine/heap.h"
#include "wine/test.h" #include "wine/test.h"
/* undocumented SWP flags - from SDK 3.1 */ /* undocumented SWP flags - from SDK 3.1 */
...@@ -69,13 +68,13 @@ static void add_message(struct msg_sequence **seq, int sequence_index, ...@@ -69,13 +68,13 @@ static void add_message(struct msg_sequence **seq, int sequence_index,
if (!msg_seq->sequence) if (!msg_seq->sequence)
{ {
msg_seq->size = 10; msg_seq->size = 10;
msg_seq->sequence = heap_alloc(msg_seq->size * sizeof (*msg_seq->sequence)); msg_seq->sequence = malloc(msg_seq->size * sizeof(*msg_seq->sequence));
} }
if (msg_seq->count == msg_seq->size) if (msg_seq->count == msg_seq->size)
{ {
msg_seq->size *= 2; msg_seq->size *= 2;
msg_seq->sequence = heap_realloc(msg_seq->sequence, msg_seq->size * sizeof (*msg_seq->sequence)); msg_seq->sequence = realloc(msg_seq->sequence, msg_seq->size * sizeof(*msg_seq->sequence));
} }
assert(msg_seq->sequence); assert(msg_seq->sequence);
...@@ -87,7 +86,7 @@ static void add_message(struct msg_sequence **seq, int sequence_index, ...@@ -87,7 +86,7 @@ static void add_message(struct msg_sequence **seq, int sequence_index,
static inline void flush_sequence(struct msg_sequence **seg, int sequence_index) static inline void flush_sequence(struct msg_sequence **seg, int sequence_index)
{ {
struct msg_sequence *msg_seq = seg[sequence_index]; struct msg_sequence *msg_seq = seg[sequence_index];
heap_free(msg_seq->sequence); free(msg_seq->sequence);
msg_seq->sequence = NULL; msg_seq->sequence = NULL;
msg_seq->count = msg_seq->size = 0; msg_seq->count = msg_seq->size = 0;
} }
...@@ -405,5 +404,5 @@ static void init_msg_sequences(struct msg_sequence **seq, int n) ...@@ -405,5 +404,5 @@ static void init_msg_sequences(struct msg_sequence **seq, int n)
int i; int i;
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
seq[i] = heap_alloc_zero(sizeof(*seq[i])); seq[i] = calloc(1, sizeof(*seq[i]));
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment