ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

explorerframe/tests: Use global memory allocation helpers. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2018-02-25 19:34:09 +03:00 committed by Alexandre Julliard
parent 9e8f152dc9
commit 4f35819843
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/explorerframe/tests/msg.h
View File

@ -20,6 +20,7 @@
#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 */
@ -66,16 +67,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 = HeapAlloc(GetProcessHeap(), 0, msg_seq->sequence = heap_alloc(msg_seq->size * sizeof (struct message));
msg_seq->size * sizeof (struct message));
} }
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 = HeapReAlloc(GetProcessHeap(), 0, msg_seq->sequence = heap_realloc(msg_seq->sequence, msg_seq->size * sizeof (struct message));
msg_seq->sequence,
msg_seq->size * sizeof (struct message));
} }
assert(msg_seq->sequence); assert(msg_seq->sequence);
@ -92,7 +90,7 @@ static void add_message(struct msg_sequence **seq, int sequence_index,
static void flush_sequence(struct msg_sequence **seg, int sequence_index) static 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];
HeapFree(GetProcessHeap(), 0, msg_seq->sequence); heap_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;
} }
@ -112,5 +110,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] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct msg_sequence)); seq[i] = heap_alloc_zero(sizeof(struct msg_sequence));
} }

7
dlls/explorerframe/tests/nstc.c
View File

@ -363,7 +363,8 @@ static const INameSpaceTreeControlEventsVtbl vt_NSTCEvents = {
static INameSpaceTreeControlEventsImpl *create_nstc_events(void) static INameSpaceTreeControlEventsImpl *create_nstc_events(void)
{ {
INameSpaceTreeControlEventsImpl *This; INameSpaceTreeControlEventsImpl *This;
This = HeapAlloc(GetProcessHeap(), 0, sizeof(INameSpaceTreeControlEventsImpl));
This = heap_alloc(sizeof(*This));
This->INameSpaceTreeControlEvents_iface.lpVtbl = &vt_NSTCEvents; This->INameSpaceTreeControlEvents_iface.lpVtbl = &vt_NSTCEvents;
This->ref = 1; This->ref = 1;
@ -2377,8 +2378,8 @@ static void test_events(void)
if(!res) if(!res)
{ {
/* Freeing these prematurely causes a crash. */ /* Freeing these prematurely causes a crash. */
HeapFree(GetProcessHeap(), 0, pnstceimpl); heap_free(pnstceimpl);
HeapFree(GetProcessHeap(), 0, pnstceimpl2); heap_free(pnstceimpl2);
} }
IShellItem_Release(psi); IShellItem_Release(psi);