fix: remove _set_allocator.

msvc/ucxxrt.vcxproj

@@ -346,7 +346,6 @@
     <ClCompile Include="..\src\ucrt\heap\kfree.cpp" />
     <ClCompile Include="..\src\ucrt\heap\malloc.cpp" />
     <ClCompile Include="..\src\ucrt\heap\kmalloc.cpp" />
-    <ClCompile Include="..\src\ucrt\heap\moverride.cpp" />
     <ClCompile Include="..\src\ucrt\heap\msize.cpp" />
     <ClCompile Include="..\src\ucrt\heap\new_handler.cpp" />
     <ClCompile Include="..\src\ucrt\heap\new_mode.cpp" />

msvc/ucxxrt.vcxproj.filters

@@ -677,9 +677,6 @@
     <ClCompile Include="..\src\crt\vcruntime\new_km.cpp">
       <Filter>ucxxrt\crt\vcruntime</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\ucrt\heap\moverride.cpp">
-      <Filter>ucxxrt\ucrt\heap</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\ucrt\heap\stdalloc.cpp">
       <Filter>ucxxrt\ucrt\heap</Filter>
     </ClCompile>

src/crt/vcruntime/internal_shared.h

@@ -22,9 +22,6 @@ _CRT_BEGIN_C_HEADER
 extern ULONG                __ucxxrt_tag;
 extern IMAGE_DOS_HEADER     __ImageBase;
 
-extern volatile _malloc_t   __override_malloc;
-extern volatile _free_t     __override_free;
-extern volatile _msize_t    __override_msize;
 
 
 //-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
@@ -252,6 +249,10 @@ extern "C++"
 //
 //-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 
+_CRT_HYBRIDPATCHABLE __declspec(noinline) _CRTRESTRICT void* __cdecl std_malloc(size_t const size);
+_CRT_HYBRIDPATCHABLE __declspec(noinline) void __cdecl std_free(void* const block);
+_CRT_HYBRIDPATCHABLE __declspec(noinline) size_t __cdecl std_msize(void* const block);
+
 // When building for vcruntime*.dll, we are not a part of the UCRT or OS so we
 // should use the public allocation functions exported by the UCRT.
 #define _calloc_crt   calloc

src/crt/vcruntime/utility.cpp

@@ -147,8 +147,6 @@ extern "C" void __cdecl __scrt_initialize_memory()
 {
     // Nx
     ExInitializeDriverRuntime(DrvRtPoolNxOptIn);
-
-    _set_allocator(nullptr, nullptr, nullptr);
 }
 
 extern "C" bool __cdecl __scrt_initialize_crt()

src/ucrt/heap/free.cpp

@@ -17,5 +17,5 @@
 // with either other function or vice versa.
 extern "C" _CRT_HYBRIDPATCHABLE __declspec(noinline) void __cdecl free(void* const block)
 {
-    return __override_free(block);
+    return std_free(block);
 }

src/ucrt/heap/malloc.cpp

@@ -28,7 +28,7 @@ extern "C" _CRT_HYBRIDPATCHABLE __declspec(noinline) _CRTRESTRICT void* __cdecl
 
     for (;;)
     {
-        void* const block = __override_malloc(size);
+        void* const block = std_malloc(size);
         if (block)
             return block;
 

src/ucrt/heap/msize.cpp

@@ -19,5 +19,5 @@
 // with either other function or vice versa.
 extern "C" _CRT_HYBRIDPATCHABLE __declspec(noinline) size_t __cdecl _msize(void* const block)
 {
-    return __override_msize(block);
+    return std_msize(block);
 }

src/ucrt/heap/stdalloc.cpp

@@ -1,7 +1,7 @@
 /*
  * PROJECT:   Universal C++ RunTime (UCXXRT)
  * FILE:      stdalloc.cpp
- * DATA:      2022/06/17
+ * DATA:      2022/11/17
  *
  * PURPOSE:   Universal C++ RunTime
  *

src/ucxxrt.h

@@ -84,13 +84,6 @@ namespace ucxxrt
 #endif
 
 
-typedef void* (__cdecl* _malloc_t)(size_t const size);
-typedef void  (__cdecl* _free_t  )(void* const block);
-typedef size_t(__cdecl* _msize_t )(void* const block);
-
-EXTERN_C void __cdecl _set_allocator(_malloc_t _malloc, _free_t _free, _msize_t _msize);
-
-
 #if _MSC_VER >= 1200
 #pragma warning(pop)
 #endif

src/ucxxrt.inl

@@ -92,6 +92,8 @@
 #include <cstdint>
 
 #include "ucxxrt.h"
+#include "kext/kmalloc.h"
+#include "kext/knew.h"
 
 #if _MSC_VER >= 1200
 #pragma warning(pop)