Nikolay Sivov : explorerframe/tests: Use CRT memory allocation functions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: cc2b468b6252af3997830601e87267f20c307847
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=cc2b468b6252af3997830601e...

Author: Nikolay Sivov 
Date:   Mon Apr  4 19:39:09 2022 +0300

explorerframe/tests: Use CRT memory allocation functions.

Signed-off-by: Nikolay Sivov 
Signed-off-by: Alexandre Julliard

---

dlls/explorerframe/tests/msg.h  | 9 ++++-----
 dlls/explorerframe/tests/nstc.c | 6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/dlls/explorerframe/tests/msg.h b/dlls/explorerframe/tests/msg.h
index 857278e4ef2..2a1752fda9f 100644
--- a/dlls/explorerframe/tests/msg.h
+++ b/dlls/explorerframe/tests/msg.h
@@ -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));
 }
diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c
index f11ae0b1923..e8c771f7eec 100644
--- a/dlls/explorerframe/tests/nstc.c
+++ b/dlls/explorerframe/tests/nstc.c
@@ -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);