From 8498a9d1efc08da657fd338a4d2964b52895c651 Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov@codeweavers.com>
Date: Thu, 31 Mar 2022 15:00:23 +0300
Subject: [PATCH] explorerframe: Use CRT memory allocation functions.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/explorerframe/nstc.c        | 15 +++++++--------
 dlls/explorerframe/taskbarlist.c |  5 ++---
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c
index 315316f7e7a..3b56d33367a 100644
--- a/dlls/explorerframe/nstc.c
+++ b/dlls/explorerframe/nstc.c
@@ -33,7 +33,6 @@
 
 #include "wine/list.h"
 #include "wine/debug.h"
-#include "wine/heap.h"
 
 #include "explorerframe_main.h"
 
@@ -852,7 +851,7 @@ static ULONG WINAPI NSTC2_fnRelease(INameSpaceTreeControl2* iface)
     if(!ref)
     {
         TRACE("Freeing.\n");
-        heap_free(This);
+        free(This);
         EFRAME_UnlockModule();
     }
 
@@ -989,7 +988,7 @@ static HRESULT WINAPI NSTC2_fnInsertRoot(INameSpaceTreeControl2* iface,
 
     TRACE("%p, %d, %p, %lx, %lx, %p\n", This, iIndex, psiRoot, grfEnumFlags, grfRootStyle, pif);
 
-    new_root = heap_alloc(sizeof(*new_root));
+    new_root = malloc(sizeof(*new_root));
     if(!new_root)
         return E_OUTOFMEMORY;
 
@@ -1013,7 +1012,7 @@ static HRESULT WINAPI NSTC2_fnInsertRoot(INameSpaceTreeControl2* iface,
     if(!new_root->htreeitem)
     {
         WARN("Failed to add the root.\n");
-        heap_free(new_root);
+        free(new_root);
         return E_FAIL;
     }
 
@@ -1081,7 +1080,7 @@ static HRESULT WINAPI NSTC2_fnRemoveRoot(INameSpaceTreeControl2* iface,
         events_OnItemDeleted(This, root->psi, TRUE);
         SendMessageW(This->hwnd_tv, TVM_DELETEITEM, 0, (LPARAM)root->htreeitem);
         list_remove(&root->entry);
-        heap_free(root);
+        free(root);
         return S_OK;
     }
     else
@@ -1123,7 +1122,7 @@ static HRESULT WINAPI NSTC2_fnGetRootItems(INameSpaceTreeControl2* iface,
     if(!count)
         return E_INVALIDARG;
 
-    array = heap_alloc(sizeof(LPITEMIDLIST)*count);
+    array = malloc(sizeof(LPITEMIDLIST)*count);
 
     i = 0;
     LIST_FOR_EACH_ENTRY(root, &This->roots, nstc_root, entry)
@@ -1137,7 +1136,7 @@ static HRESULT WINAPI NSTC2_fnGetRootItems(INameSpaceTreeControl2* iface,
     for(i = 0; i < count; i++)
         ILFree(array[i]);
 
-    heap_free(array);
+    free(array);
 
     return hr;
 }
@@ -1598,7 +1597,7 @@ HRESULT NamespaceTreeControl_Constructor(IUnknown *pUnkOuter, REFIID riid, void
 
     EFRAME_LockModule();
 
-    nstc = heap_alloc_zero(sizeof(*nstc));
+    nstc = calloc(1, sizeof(*nstc));
     if (!nstc)
         return E_OUTOFMEMORY;
 
diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c
index b4bc104cd6b..dd61cc62ae4 100644
--- a/dlls/explorerframe/taskbarlist.c
+++ b/dlls/explorerframe/taskbarlist.c
@@ -21,7 +21,6 @@
 #include "explorerframe_main.h"
 
 #include "wine/debug.h"
-#include "wine/heap.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(explorerframe);
 
@@ -81,7 +80,7 @@ static ULONG STDMETHODCALLTYPE taskbar_list_Release(ITaskbarList4 *iface)
 
     if (!refcount)
     {
-        heap_free(This);
+        free(This);
         EFRAME_UnlockModule();
     }
 
@@ -309,7 +308,7 @@ HRESULT TaskbarList_Constructor(IUnknown *outer, REFIID riid, void **taskbar_lis
         return CLASS_E_NOAGGREGATION;
     }
 
-    object = heap_alloc(sizeof(*object));
+    object = malloc(sizeof(*object));
     if (!object)
     {
         ERR("Failed to allocate taskbar list object memory\n");
-- 
2.11.4.GIT