Alex Henrie : mstask: Use CRT allocation functions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: abbc88f4a194ae773567be8ab3e6b4be8813e117
URL:    https://gitlab.winehq.org/wine/wine/-/commit/abbc88f4a194ae773567be8ab3e6b4b...

Author: Alex Henrie 
Date:   Thu Nov  2 21:47:27 2023 -0600

mstask: Use CRT allocation functions.

---

dlls/mstask/mstask_main.c    | 4 ++--
 dlls/mstask/mstask_private.h | 2 --
 dlls/mstask/task_scheduler.c | 8 ++++----
 dlls/mstask/task_trigger.c   | 4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/dlls/mstask/mstask_main.c b/dlls/mstask/mstask_main.c
index 481c26e9c2e..ab854f0a2b3 100644
--- a/dlls/mstask/mstask_main.c
+++ b/dlls/mstask/mstask_main.c
@@ -74,12 +74,12 @@ DWORD WINAPI NetrJobGetInfo_wrapper(ATSVC_HANDLE server_name, DWORD jobid, LPAT_

DECLSPEC_HIDDEN void __RPC_FAR *__RPC_USER MIDL_user_allocate(SIZE_T n)
 {
-    return HeapAlloc(GetProcessHeap(), 0, n);
+    return malloc(n);
 }

DECLSPEC_HIDDEN void __RPC_USER MIDL_user_free(void __RPC_FAR *p)
 {
-    HeapFree(GetProcessHeap(), 0, p);
+    free(p);
 }

DECLSPEC_HIDDEN handle_t __RPC_USER ATSVC_HANDLE_bind(ATSVC_HANDLE str)
diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h
index 326cd4743bd..34d34d65f61 100644
--- a/dlls/mstask/mstask_private.h
+++ b/dlls/mstask/mstask_private.h
@@ -19,8 +19,6 @@
 #ifndef __MSTASK_PRIVATE_H__
 #define __MSTASK_PRIVATE_H__

-#include "wine/heap.h"
-
 extern LONG dll_ref DECLSPEC_HIDDEN;

typedef struct ClassFactoryImpl ClassFactoryImpl;
diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c
index d8ccee37f59..4e4953654f3 100644
--- a/dlls/mstask/task_scheduler.c
+++ b/dlls/mstask/task_scheduler.c
@@ -60,7 +60,7 @@ static void TaskSchedulerDestructor(TaskSchedulerImpl *This)
 {
     TRACE("%p\n", This);
     ITaskService_Release(This->service);
-    heap_free(This);
+    free(This);
     InterlockedDecrement(&dll_ref);
 }

@@ -100,7 +100,7 @@ static ULONG WINAPI EnumWorkItems_Release(IEnumWorkItems *iface)
     {
         if (This->handle != INVALID_HANDLE_VALUE)
             FindClose(This->handle);
-        heap_free(This);
+        free(This);
         InterlockedDecrement(&dll_ref);
     }

@@ -259,7 +259,7 @@ static HRESULT create_task_enum(IEnumWorkItems **ret)

*ret = NULL;

-    tasks = heap_alloc(sizeof(*tasks));
+    tasks = malloc(sizeof(*tasks));
     if (!tasks)
         return E_OUTOFMEMORY;

@@ -523,7 +523,7 @@ HRESULT TaskSchedulerConstructor(LPVOID *ppObj)
         return hr;
     }

-    This = heap_alloc(sizeof(*This));
+    This = malloc(sizeof(*This));
     if (!This)
     {
         ITaskService_Release(service);
diff --git a/dlls/mstask/task_trigger.c b/dlls/mstask/task_trigger.c
index e3f190a315a..6cf470642bb 100644
--- a/dlls/mstask/task_trigger.c
+++ b/dlls/mstask/task_trigger.c
@@ -87,7 +87,7 @@ static ULONG WINAPI MSTASK_ITaskTrigger_Release(
     if (ref == 0)
     {
         ITask_Release(This->parent_task);
-        heap_free(This);
+        free(This);
         InterlockedDecrement(&dll_ref);
     }
     return ref;
@@ -139,7 +139,7 @@ HRESULT TaskTriggerConstructor(ITask *task, WORD idx, ITaskTrigger **trigger)

TRACE("(%p, %u, %p)\n", task, idx, trigger);

-    This = heap_alloc(sizeof(*This));
+    This = malloc(sizeof(*This));
     if (!This)
         return E_OUTOFMEMORY;