explorerframe/tests: Use CRT memory allocation functions.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
a45a4b0b48
commit
cc2b468b62
|
@ -20,7 +20,6 @@
|
|||
|
||||
#include <assert.h>
|
||||
#include <windows.h>
|
||||
#include "wine/heap.h"
|
||||
#include "wine/test.h"
|
||||
|
||||
/* undocumented SWP flags - from SDK 3.1 */
|
||||
|
@ -67,13 +66,13 @@ static void add_message(struct msg_sequence **seq, int sequence_index,
|
|||
if (!msg_seq->sequence)
|
||||
{
|
||||
msg_seq->size = 10;
|
||||
msg_seq->sequence = heap_alloc(msg_seq->size * sizeof (struct message));
|
||||
msg_seq->sequence = malloc(msg_seq->size * sizeof (struct message));
|
||||
}
|
||||
|
||||
if (msg_seq->count == msg_seq->size)
|
||||
{
|
||||
msg_seq->size *= 2;
|
||||
msg_seq->sequence = heap_realloc(msg_seq->sequence, msg_seq->size * sizeof (struct message));
|
||||
msg_seq->sequence = realloc(msg_seq->sequence, msg_seq->size * sizeof (struct message));
|
||||
}
|
||||
|
||||
assert(msg_seq->sequence);
|
||||
|
@ -90,7 +89,7 @@ static void add_message(struct msg_sequence **seq, int sequence_index,
|
|||
static void flush_sequence(struct msg_sequence **seg, int 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->count = msg_seq->size = 0;
|
||||
}
|
||||
|
@ -110,5 +109,5 @@ static void init_msg_sequences(struct msg_sequence **seq, int n)
|
|||
int i;
|
||||
|
||||
for (i = 0; i < n; i++)
|
||||
seq[i] = heap_alloc_zero(sizeof(struct msg_sequence));
|
||||
seq[i] = calloc(1, sizeof(**seq));
|
||||
}
|
||||
|
|
|
@ -364,7 +364,7 @@ static INameSpaceTreeControlEventsImpl *create_nstc_events(void)
|
|||
{
|
||||
INameSpaceTreeControlEventsImpl *This;
|
||||
|
||||
This = heap_alloc(sizeof(*This));
|
||||
This = malloc(sizeof(*This));
|
||||
This->INameSpaceTreeControlEvents_iface.lpVtbl = &vt_NSTCEvents;
|
||||
This->ref = 1;
|
||||
|
||||
|
@ -2351,8 +2351,8 @@ static void test_events(void)
|
|||
if(!res)
|
||||
{
|
||||
/* Freeing these prematurely causes a crash. */
|
||||
heap_free(pnstceimpl);
|
||||
heap_free(pnstceimpl2);
|
||||
free(pnstceimpl);
|
||||
free(pnstceimpl2);
|
||||
}
|
||||
|
||||
IShellItem_Release(psi);
|
||||
|
|
Loading…
Reference in New Issue