kernelbase: Redirect heap allocation functions to ntdll.

dlls/kernelbase/kernelbase.h

@@ -54,4 +54,9 @@ static inline BOOL set_ntstatus( NTSTATUS status )
     return !status;
 }
 
+/* make the kernel32 names available */
+#define HeapAlloc(heap, flags, size) RtlAllocateHeap(heap, flags, size)
+#define HeapReAlloc(heap, flags, ptr, size) RtlReAllocateHeap(heap, flags, ptr, size)
+#define HeapFree(heap, flags, ptr) RtlFreeHeap(heap, flags, ptr)
+
 #endif /* __WINE_KERNELBASE_H */

dlls/kernelbase/kernelbase.spec

@@ -775,7 +775,7 @@
 @ stdcall HeapCompact(long long)
 @ stdcall HeapCreate(long long long)
 @ stdcall HeapDestroy(long)
-@ stdcall HeapFree(long long ptr)
+@ stdcall HeapFree(long long ptr) ntdll.RtlFreeHeap
 @ stdcall HeapLock(long)
 @ stdcall HeapQueryInformation(long long ptr long ptr)
 @ stdcall HeapReAlloc(long long ptr long) ntdll.RtlReAllocateHeap

dlls/kernelbase/main.c

@@ -28,8 +28,8 @@
 #include "winternl.h"
 
 #include "wine/debug.h"
-#include "wine/heap.h"
 #include "kernelbase.h"
+#include "wine/heap.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(kernelbase);
 

dlls/kernelbase/path.c

@@ -29,6 +29,7 @@
 #include "intshcut.h"
 #include "winternl.h"
 
+#include "kernelbase.h"
 #include "wine/debug.h"
 #include "wine/heap.h"
 

dlls/kernelbase/string.c

@@ -24,6 +24,7 @@
 #include "shlwapi.h"
 #include "winternl.h"
 
+#include "kernelbase.h"
 #include "wine/debug.h"
 #include "wine/exception.h"