From b51c0974d357cda597ab3a242f5723ab516f5503 Mon Sep 17 00:00:00 2001
From: Daan Leijen <daan@microsoft.com>
Date: Thu, 19 Dec 2024 14:00:54 -0800
Subject: [PATCH 1/7] fix cmake for visual studio on arm64

---
 CMakeLists.txt | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8896dfd7..e371a33d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,6 +88,11 @@ if (NOT CMAKE_BUILD_TYPE)
   endif()
 endif()
 
+if (CMAKE_GENERATOR MATCHES "^Visual Studio.*$")
+  message(STATUS "Note: when building with Visual Studio the build type is specified when building.")
+  message(STATUS "For example: 'cmake --build . --config=Release")  
+endif()
+
 if("${CMAKE_BINARY_DIR}" MATCHES ".*(S|s)ecure$")
   message(STATUS "Default to secure build")
   set(MI_SECURE "ON")
@@ -326,11 +331,11 @@ set(MI_OPT_ARCH_FLAGS "")
 set(MI_ARCH "unknown")
 if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86|i[3456]86)$" OR CMAKE_GENERATOR_PLATFORM MATCHES "^(x86|Win32)$")
   set(MI_ARCH "x86")
-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|x64|amd64|AMD64)$" OR CMAKE_GENERATOR_PLATFORM STREQUAL "x64")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|x64|amd64|AMD64)$" OR CMAKE_GENERATOR_PLATFORM STREQUAL "x64") # must be before arm64
   set(MI_ARCH "x64")
-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64|armv8.?)$" OR CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64|armv8.?|ARM64)$" OR CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64")
   set(MI_ARCH "arm64")
-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm|armv[34567])$")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm|armv[34567]|ARM)$")
   set(MI_ARCH "arm32")
 elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(riscv|riscv32|riscv64)$")
   if(CMAKE_SIZEOF_VOID_P==4)
@@ -341,7 +346,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(riscv|riscv32|riscv64)$")
 else()
   set(MI_ARCH ${CMAKE_SYSTEM_PROCESSOR})
 endif()
-message(STATUS "Architecture: ${MI_ARCH}")
+message(STATUS "Architecture: ${MI_ARCH}") # (${CMAKE_SYSTEM_PROCESSOR}, ${CMAKE_GENERATOR_PLATFORM}, ${CMAKE_GENERATOR})")
 
 # Check /proc/cpuinfo for an SV39 MMU and limit the virtual address bits.
 # (this will skip the aligned hinting in that case. Issue #939, #949)
@@ -533,8 +538,14 @@ if(MI_BUILD_SHARED)
   )
   if(WIN32 AND MI_WIN_REDIRECT)
     # On windows, link and copy the mimalloc redirection dll too.
-    if(MI_ARCH STREQUAL "x64")
+    if(CMAKE_GENERATOR_PLATFORM STREQUAL "arm64ec")
+      set(MIMALLOC_REDIRECT_SUFFIX "-arm64ec")
+    elseif(MI_ARCH STREQUAL "x64")
       set(MIMALLOC_REDIRECT_SUFFIX "")
+      if(CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64")
+        message(STATUS "Note: x64 code emulated on Windows for arm64 should use an arm64ec build of 'mimalloc-override.dll'") 
+        message(STATUS "      with 'mimalloc-redirect-arm64ec.dll'. See the 'bin\\readme.md' for more information.")
+      endif()
     elseif(MI_ARCH STREQUAL "x86")
       set(MIMALLOC_REDIRECT_SUFFIX "32")
     else()

From 3a9c402e5107984324bfea6424370aac37c97a88 Mon Sep 17 00:00:00 2001
From: Daan Leijen <daan@microsoft.com>
Date: Thu, 19 Dec 2024 14:18:16 -0800
Subject: [PATCH 2/7] update readme for cmake on windows

---
 readme.md | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/readme.md b/readme.md
index a0296b43..7fa5eb54 100644
--- a/readme.md
+++ b/readme.md
@@ -164,7 +164,7 @@ The `mimalloc` project builds a static library (in `out/msvc-x64`), while the
 `mimalloc-override` project builds a DLL for overriding malloc
 in the entire program.
 
-## macOS, Linux, BSD, etc.
+## Linux, macOS, BSD, etc.
 
 We use [`cmake`](https://cmake.org)<sup>1</sup> as the build system:
 
@@ -200,13 +200,25 @@ free lists, etc., as:
 > make
 ```
 This will name the shared library as `libmimalloc-secure.so`.
-Use `ccmake`<sup>2</sup> instead of `cmake`
-to see and customize all the available build options.
+Use `cmake ../.. -LH` to see all the available build options.
 
-Notes:
-1. Install CMake: `sudo apt-get install cmake`
-2. Install CCMake: `sudo apt-get install cmake-curses-gui`
+The examples use the default compiler. If you like to use another, use:
+```
+> CC=clang CXX=clang++ cmake ../..
+```
 
+## Cmake with Visual Studio
+
+You can also use cmake on Windows. Open a Visual Studio development prompt 
+and invoke `cmake` with the right generator and architecture, like:
+```
+> cmake ..\.. -G "Visual Studio 17 2022" -A x64 -DMI_OVERRIDE=ON
+```
+
+The cmake build type is specified when actually building, for example:
+```
+> cmake --build . --config=Release
+```
 
 ## Single source
 

From 7456d22fe36b21a025b2be33ab043256a9e6a3e3 Mon Sep 17 00:00:00 2001
From: Daan Leijen <daan@microsoft.com>
Date: Thu, 19 Dec 2024 14:22:10 -0800
Subject: [PATCH 3/7] add link for VS generator

---
 readme.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 7fa5eb54..564ac6d7 100644
--- a/readme.md
+++ b/readme.md
@@ -210,7 +210,8 @@ The examples use the default compiler. If you like to use another, use:
 ## Cmake with Visual Studio
 
 You can also use cmake on Windows. Open a Visual Studio development prompt 
-and invoke `cmake` with the right generator and architecture, like:
+and invoke `cmake` with the right [generator](https://cmake.org/cmake/help/latest/generator/Visual%20Studio%2017%202022.html) 
+and architecture, like:
 ```
 > cmake ..\.. -G "Visual Studio 17 2022" -A x64 -DMI_OVERRIDE=ON
 ```

From f8a253e6e8e0f3a811745d7a9449cd73e49509f2 Mon Sep 17 00:00:00 2001
From: Daan Leijen <daan@microsoft.com>
Date: Fri, 20 Dec 2024 12:51:13 -0800
Subject: [PATCH 4/7] update IDE settings to match cmake output; in particular
 mimalloc-override.dll -> mimalloc.dll

---
 ide/vs2022/mimalloc-override-test.vcxproj |  2 +-
 ide/vs2022/mimalloc-override.vcxproj      | 18 +++++++++---------
 ide/vs2022/mimalloc-test.vcxproj          |  2 +-
 ide/vs2022/mimalloc.vcxproj               |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ide/vs2022/mimalloc-override-test.vcxproj b/ide/vs2022/mimalloc-override-test.vcxproj
index 97803b9c..0e87cf36 100644
--- a/ide/vs2022/mimalloc-override-test.vcxproj
+++ b/ide/vs2022/mimalloc-override-test.vcxproj
@@ -39,7 +39,7 @@
     <ProjectGuid>{FEF7868F-750E-4C21-A04D-22707CC66879}</ProjectGuid>
     <RootNamespace>mimalloc-override-test</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ProjectName>mimalloc-override-test</ProjectName>
+    <ProjectName>mimalloc-test-override</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/ide/vs2022/mimalloc-override.vcxproj b/ide/vs2022/mimalloc-override.vcxproj
index 9de18895..1278cd0f 100644
--- a/ide/vs2022/mimalloc-override.vcxproj
+++ b/ide/vs2022/mimalloc-override.vcxproj
@@ -39,7 +39,7 @@
     <ProjectGuid>{ABB5EAE7-B3E6-432E-B636-333449892EA7}</ProjectGuid>
     <RootNamespace>mimalloc-override</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ProjectName>mimalloc-override</ProjectName>
+    <ProjectName>mimalloc-override-dll</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -116,49 +116,49 @@
     <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
     <TargetExt>.dll</TargetExt>
-    <TargetName>mimalloc-override</TargetName>
+    <TargetName>mimalloc</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
     <TargetExt>.dll</TargetExt>
-    <TargetName>mimalloc-override</TargetName>
+    <TargetName>mimalloc</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
     <TargetExt>.dll</TargetExt>
-    <TargetName>mimalloc-override</TargetName>
+    <TargetName>mimalloc</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
     <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
     <TargetExt>.dll</TargetExt>
-    <TargetName>mimalloc-override</TargetName>
+    <TargetName>mimalloc</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
     <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
     <TargetExt>.dll</TargetExt>
-    <TargetName>mimalloc-override</TargetName>
+    <TargetName>mimalloc</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
     <TargetExt>.dll</TargetExt>
-    <TargetName>mimalloc-override</TargetName>
+    <TargetName>mimalloc</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
     <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
     <TargetExt>.dll</TargetExt>
-    <TargetName>mimalloc-override</TargetName>
+    <TargetName>mimalloc</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
     <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
     <TargetExt>.dll</TargetExt>
-    <TargetName>mimalloc-override</TargetName>
+    <TargetName>mimalloc</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/ide/vs2022/mimalloc-test.vcxproj b/ide/vs2022/mimalloc-test.vcxproj
index fc9e9102..a8b36d5e 100644
--- a/ide/vs2022/mimalloc-test.vcxproj
+++ b/ide/vs2022/mimalloc-test.vcxproj
@@ -39,7 +39,7 @@
     <ProjectGuid>{FEF7858F-750E-4C21-A04D-22707CC66878}</ProjectGuid>
     <RootNamespace>mimalloctest</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ProjectName>mimalloc-test</ProjectName>
+    <ProjectName>mimalloc-test-static</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/ide/vs2022/mimalloc.vcxproj b/ide/vs2022/mimalloc.vcxproj
index 34a9317a..9964310d 100644
--- a/ide/vs2022/mimalloc.vcxproj
+++ b/ide/vs2022/mimalloc.vcxproj
@@ -39,7 +39,7 @@
     <ProjectGuid>{ABB5EAE7-B3E6-432E-B636-333449892EA6}</ProjectGuid>
     <RootNamespace>mimalloc</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ProjectName>mimalloc</ProjectName>
+    <ProjectName>mimalloc-lib</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

From 4b7313914ee702f1abe16d9021f5ac4867894cf4 Mon Sep 17 00:00:00 2001
From: Daan Leijen <daan@microsoft.com>
Date: Fri, 20 Dec 2024 12:52:00 -0800
Subject: [PATCH 5/7] add updated minject v1.2 that defaults to mimalloc.dll
 instead of mimalloc-override.dll

---
 bin/minject-arm64.exe | Bin 20992 -> 20992 bytes
 bin/minject.exe       | Bin 22016 -> 22016 bytes
 bin/minject32.exe     | Bin 18944 -> 18944 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/bin/minject-arm64.exe b/bin/minject-arm64.exe
index 97188c4f14e644b66d938ce44a940f3058153a13..637c95d91576043ff83cf2f0ceb5a5555c544764 100644
GIT binary patch
delta 1656
zcmY*ZZERCz6h7zPwrjU_9qqc+t)m}<SvJ;{(yerWv?vvb%(@I%AZ8Sqb|FI+XT%sn
z3qK@6aF>Hwh(CnD57uBdb|nEqU?Uo;B+3v7BuX~HglNpB#2=N7d2T;~-lTax&d2+n
z_rAUH(-=RE!&($i-Rz<wtQPtks1A>)OCtbQ$x($j=|1{}%e7<_TJeG$70#kCrjZS*
zODIIc@(s07ZH$Hk69z~h1ZZ*r3~Rf>@>F36@nc$2Y+AX$0FK%9;L`$3<Dc`T39&r6
zSMiE-9@;YA9`@ozInR;x-lGI}*u{|vT`m&JM!MMx=Dldv+o5>cTwWsUb<%jTY0(yr
zoY3SVW7)_?_8{+#XT1pN^_zvz0eV~S-HQ96{hkvfGeB8N7!BCYLvN71^9eZrHxFT8
z-v#lu$1g*mIKyGMvRf0-<$0GTpvm(dO+d`^sD_^C9rJ$`q3r#A@Kx^20(^eH3DKOq
z{%mgGfk@txttiovl1gpGe&{F{<85@fw4GFj5A_(jSP1c3hXwF`iS&t~6^ZT}UY93I
zi?L+Y?A$<Fgrw3+ct-!s^Wp)y!MGD~gpQk*<0-mhN(m^^7iD82qK@7&@6~J(i;6l$
zdQebKGv<iRh1x@XP8f{Uh6d}g@X%V;F*gpzjKQ=P3+0{Vh@u1Z^lnA3*oX!6u%a8E
z${Q?KQ7}KHlFBv#p3?Tp5&V(NRet=2HdIyN73!|~N$3vKtJd|Fo^ZgWf+oHdHvuiu
zFQO$mDOMz#Y0w%}a(=f~<0jHoQ(ZbeH^67quk8*8QflyJIG3k{T=`^`G|9tGr73A`
zrkUz(_$|FTzp>{&7iRj09Mau9chqoldGc0XC!87meO_aWbR*A0^LSqs$?JKYFiKzN
zITlG{c^)c~u29tGpjMkfHTHsZE+>q5n%PnupwDa_0vc(`<`kj@WU_x}_J%In)X-}$
zg!UK@qFkhym;SOZM=!Y@NBL!qIa0!;iVit93F9hy=xh_Nts#GnGlFXA9`c3G{@?l`
zs+MlEjwASh+vv0RtY6D{I*1?DErdax4$_%(<J{+(m%OG9*hzAk<jXaBRF=E3z$=Wu
zLURkk)hC1LCw!53o9Chc?b~<_75APLO-Vb-+ZS#|M7mU4ZwYCnQL*zb@UyQ*yfgdJ
z)xlX2q+Xh>jTlcp5Aw^HhJ=PXU%VzbO5_^X&mxtI7e*E@6YA_<2%^%VG=~c3$JhLS
zovNp)mh!^sx~zRhk#2d|-KIgWEH?dtr1dYN7Qa>Q^oK-sric7_%kk_d&c9+EZCkO-
z7^wwt_jT>*ThOyhN$F^olPi8hy@$8p-VyENdBG!}eCZujr&K}v2c!=!ZJXia6*yp7
z%-d>Ein6$ydHg@R7=l_J6%sR#9yY;l?c{-(M@p?Sp0yF+HvbNC?d?YSXz-a%9$g<o
zJ_irsYoG4p!NA@QaHbx>0i%#&T*x@h=wZK~7gGFT#uKbd-2fX|#~9Blnw$4AK4x44
zA@q0v)-mp3e1kE?nCZuO2UZKyO8^?Uewi0wC5*0u3rwonxW|}a>{yyjILLUJ8(Vw;
xU9cMCIaE#|#=bJqv35dnR4!@N2xYFJ;LzG39ytQQpGV%U_Jq77@&ig9-M_fB&<X$m

delta 1742
zcmY*aZA?>V6h7zPmfk{3p?rft+wswgAYc)Sy0sVu-DFBoNz5`};!2!O9GJO8ZFNqa
zOt~B<?kj;rHmDky7h_zOjQVFpvxv@3O=bd{iDqsQv&;;qvU6LyWjAS`^E~Ig=RN1#
z_icSA(RUJuB@_jHGsR%0P*X&6@rbr~HNYI%nt@Yv3(JM}d@>8Qcu#2(PNU%0DJIQV
zC|IkN%UZM6Y^`=pm|*%KK$#t2Sjw$d9z=T(&ryjXVac!#j#-T0lmMpiVU|20CI?Qb
znqgMM?2z_3YrdFS%^KGF$j=!*WzU3u*5e6#dRTKuw5G7ut!mP2oIk96KvxY3j)Uy!
zjhgiY!=8PtK}5S6)^?N8xL&|Rw8>byA$S1lZ`wdk0!SPaMqSzGpbZW}ea8Vf_a`@D
zV%-kDx_e8(WeC|YobJ%M^btE(=ZcEhg*ulQv8_7#!)VP)&_H6@ei)gZnTzM=oDh=&
z-#(k^F=(hXb^`|KNNl?4#sO$Z7JYS{0yxj0NQX_UNMqV*Eb&~32H&-i9HjS6wW!c7
z)60e;-st|wiMj$!|8`m&+d#vy^@=^tfU)sUXL_bZ2&mg!e@a#HrMOn<h~JF(E=`&j
zVFzU<j0q4!cN2o56(u^AxJ!Ho)2Se-HCsac;dUDgdh<MkFS0FR^kHui4tmY*=^B(2
zB?(dNL!|S`ZQ=vaQ$b2Aey4nx@(l`iAJe+DI^o)53Z$LIetIRnJhSKVOiv2eUx6@^
z2rz!}J@;ReVoJbwF-h*CFVlY#9MyC*V`XY#wac!7GCn}#fT{A&VroE*ljvcF+v2Ep
zWh1nOoYpkC&wS$J2JSx`oGjaE%^Y%Eo}THk19V9oJ*EX`$mX=%YdGy>hCInL36e3h
z2S1_y%=ueR@tRN;k5wLs*w*JbE;(>A!u_@o@BNoo%AZASPdt~J68I>>{bu=i#Kstz
zBDN=n+x28Ez<vB(tnsJIJJ_(&r7SbH((SAUVKR}*vu%PWnl@x#N^168$ksxeB^v6z
zT)%n*z0Fi<S%l5B!_v*KQg0m-`n2@Db)6t<slZkz>|IWKY_{5<R=$aR6~Z^Q3#?J{
zb>=<<CvX~L_=I*z9H$3gw>}pJ^?H~Njf-Rd<GkhGDCL38hU!KMIi-TUjH+{%;{`gB
zlYv1ckh327_zHOi0_tdfUJ@>)WqGU3O*(m0eDz1*hle`_9vyv=cTvE2Wpn;*@$9?`
zVeZXRaHAR!H;byx&u<I=&wcagN@a5NKtWh;RB4eiTvQi@C5l+~JEmIf8(TItb-dAT
zX?@F*|K^UC?b};7w&Xi#YN10Pp@o!IK1Yf$#aUh@D!$5N;h)5m#Vg3SIMpoW0~EEl
zyxpF&Wvg0CT)7fh{3{w8xzM7GP3=vrH7b42zmD2R8n>mNjP3<>BV_;rJI3d6@rCN5
zFxvToR`4gn4d9k|7~p?$=a(|rCQa^paz|aO4&nNIfX-q7H?Qq1R=VBK^p1)%JKN5j
z{ac9XJb!%a)KHZ(u|9p*Yu^34?+@uNM?KmSx9Y|rUJ9TbT3LgHFCE>(Ljp@Z*T|(<
zVHA9fxr_sh#jMwGIjZhu>}5X2xR$wvw?D0N#&*VDE@c^b@E+p|#^MryHH<#SP(H>V
zph_4h1t{e8Q;bVs^aa?q03efvE=E6NoHHEYX8f8Hk2AJF6;^QHDyp;bvaa@hte#LD
hRbp$Sgv6Sm#v$(z_r`xv1_n#7y;mt&eFf!W{XYp<>%ag2

diff --git a/bin/minject.exe b/bin/minject.exe
index 53c42f5d6dc7f643c03e832ff9e0aff42b2fc265..bb445706b65269a336d6e6b3ba2eca4f7399acd4 100644
GIT binary patch
delta 6740
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
B3n>5q

delta 6993
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
S-3#26?pimT4scroBK`r<)^nr)

diff --git a/bin/minject32.exe b/bin/minject32.exe
index 926facfda8018cf58df19310837661b76dac67c9..6dcb8da9ccb189f0e31daf31b06aa9449c840f9d 100644
GIT binary patch
delta 3508
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

delta 3670
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
PDzpoSQHSe=oILK|rd?g|


From 4ed44f96210c71f6d1945ae950387bc262a75f20 Mon Sep 17 00:00:00 2001
From: Daan Leijen <daan@microsoft.com>
Date: Fri, 20 Dec 2024 12:52:34 -0800
Subject: [PATCH 6/7] update readme to use mimalloc.dll (instead of
 mimalloc-override.dll)

---
 bin/readme.md | 38 ++++++++++++++++++------------------
 readme.md     | 53 ++++++++++++++++++++++++++++-----------------------
 2 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/bin/readme.md b/bin/readme.md
index d6c3775f..bc115ce1 100644
--- a/bin/readme.md
+++ b/bin/readme.md
@@ -9,20 +9,20 @@ There are four requirements to make the overriding work well:
 
 1. Use the C-runtime library as a DLL (using the `/MD` or `/MDd` switch).
 
-2. Link your program explicitly with the `mimalloc-override.lib` export library for
-   the `mimalloc-override.dll` -- which contains all mimalloc functionality.
-   To ensure the `mimalloc-override.dll` is actually loaded at run-time it is easiest 
+2. Link your program explicitly with the `mimalloc.lib` export library for
+   the `mimalloc.dll` -- which contains all mimalloc functionality.
+   To ensure the `mimalloc.dll` is actually loaded at run-time it is easiest 
    to insert some call to the mimalloc API in the `main` function, like `mi_version()`
    (or use the `/include:mi_version` switch on the linker, or
-   use `#pragma comment(linker, "/include:mi_version")` in some source file). 
-   See the `mimalloc-override-test` project for an example on how to use this. 
+   similarly, `#pragma comment(linker, "/include:mi_version")` in some source file). 
+   See the `mimalloc-test-override` project for an example on how to use this. 
 
 3. The `mimalloc-redirect.dll` must be put in the same folder as the main 
-   `mimalloc-override.dll` at runtime (as it is a dependency of that DLL).
+   `mimalloc.dll` at runtime (as it is a dependency of that DLL).
    The redirection DLL ensures that all calls to the C runtime malloc API get 
-   redirected to mimalloc functions (which reside in `mimalloc-override.dll`).
+   redirected to mimalloc functions (which reside in `mimalloc.dll`).
 
-4. Ensure the `mimalloc-override.dll` comes as early as possible in the import
+4. Ensure the `mimalloc.dll` comes as early as possible in the import
    list of the final executable (so it can intercept all potential allocations).
    You can use `minject -l <exe>` to check this if needed.
 
@@ -37,8 +37,8 @@ redirected.
 
 ### Other Platforms
 
-You always link with `mimalloc-override.dll` but for different platforms you may 
-need a specific `mimalloc-redirect.dll`:
+You always link with `mimalloc.dll` but for different platforms you may 
+need a specific redirection DLL:
 
 - __x64__: `mimalloc-redirect.dll`.
 - __x86__: `mimalloc-redirect32.dll`. Use for older 32-bit Windows programs.
@@ -47,12 +47,12 @@ need a specific `mimalloc-redirect.dll`:
   mode on Windows arm64. Unfortunately we cannot run x64 code emulated on Windows arm64 with
   the x64 mimalloc override directly (since the C runtime always uses `arm64ec`). Instead:
   1. Build the program as normal for x64 and link as normal with the x64 
-     `mimalloc-override.lib` export library.
-  2. Now separately build `mimalloc-override.dll` in `arm64ec` mode and _overwrite_ your
-     previous (x64) `mimalloc-override.dll` -- the loader can handle the mix of arm64ec
+     `mimalloc.lib` export library.
+  2. Now separately build `mimalloc.dll` in `arm64ec` mode and _overwrite_ your
+     previous (x64) `mimalloc.dll` -- the loader can handle the mix of arm64ec
      and x64 code. Now use `mimalloc-redirect-arm64ec.dll` to match your new
-     arm64ec `mimalloc-override.dll`. The main program stays as is and can be fully x64 
-     or contain more arm64ec modules. At runtime, the arm64ec `mimalloc-override.dll` will
+     arm64ec `mimalloc.dll`. The main program stays as is and can be fully x64 
+     or contain more arm64ec modules. At runtime, the arm64ec `mimalloc.dll` will
      run with native arm64 instructions while the rest of the program runs emulated x64.
 
 [arm64ec]: https://learn.microsoft.com/en-us/windows/arm/arm64ec
@@ -60,11 +60,11 @@ need a specific `mimalloc-redirect.dll`:
 
 ### Minject
 
-We cannot always re-link an executable with `mimalloc-override.dll`, and similarly, we 
+We cannot always re-link an executable with `mimalloc.dll`, and similarly, we 
 cannot always ensure that the DLL comes first in the import table of the final executable.
 In many cases though we can patch existing executables without any recompilation
 if they are linked with the dynamic C runtime (`ucrtbase.dll`) -- just put the 
-`mimalloc-override.dll` into the import table (and put `mimalloc-redirect.dll` in the same 
+`mimalloc.dll` into the import table (and put `mimalloc-redirect.dll` in the same 
 directory) Such patching can be done for example with [CFF Explorer](https://ntcore.com/?page_id=388).
 
 The `minject` program can also do this from the command line
@@ -86,8 +86,8 @@ options:
   -l   --list        only list imported modules
   -i   --inplace     update the exe in-place (make sure there is a backup!)
   -f   --force       always overwrite without prompting
-       --postfix=<p> use <p> as a postfix to the mimalloc dll (default is 'override')
-                     e.g. use --postfix=override-debug to link with mimalloc-override-debug.dll
+       --postfix=<p> use <p> as a postfix to the mimalloc dll.
+                     e.g. use --postfix=debug to link with mimalloc-debug.dll
 
 notes:
   Without '--inplace' an injected <exe> is generated with the same name ending in '-mi'.
diff --git a/readme.md b/readme.md
index 564ac6d7..11f62da4 100644
--- a/readme.md
+++ b/readme.md
@@ -428,43 +428,48 @@ Note that certain security restrictions may apply when doing this from
 the [shell](https://stackoverflow.com/questions/43941322/dyld-insert-libraries-ignored-when-calling-application-through-bash).
 
 
-### Dynamic Override on Windows
+# Windows Override
 
 <span id="override_on_windows">Dynamically overriding on mimalloc on Windows</span> 
-is robust and has the particular advantage to be able to redirect all malloc/free calls that go through
-the (dynamic) C runtime allocator, including those from other DLL's or libraries.
-As it intercepts all allocation calls on a low level, it can be used reliably 
+is robust and has the particular advantage to be able to redirect all malloc/free calls 
+that go through the (dynamic) C runtime allocator, including those from other DLL's or 
+libraries. As it intercepts all allocation calls on a low level, it can be used reliably 
 on large programs that include other 3rd party components.
-There are four requirements to make the overriding work robustly:
+There are four requirements to make the overriding work well:
 
 1. Use the C-runtime library as a DLL (using the `/MD` or `/MDd` switch).
-2. Link your program explicitly with `mimalloc-override.dll` library.
-   To ensure the `mimalloc-override.dll` is loaded at run-time it is easiest to insert some
-    call to the mimalloc API in the `main` function, like `mi_version()`
-    (or use the `/INCLUDE:mi_version` switch on the linker). See the `mimalloc-override-test` project
-    for an example on how to use this. 
-3. The [`mimalloc-redirect.dll`](bin) (or `mimalloc-redirect32.dll`) must be put
-   in the same folder as the main `mimalloc-override.dll` at runtime (as it is a dependency of that DLL).
-   The redirection DLL ensures that all calls to the C runtime malloc API get redirected to
-   mimalloc functions (which reside in `mimalloc-override.dll`).
-4. Ensure the `mimalloc-override.dll` comes as early as possible in the import
+
+2. Link your program explicitly with the `mimalloc.lib` export library for the `mimalloc.dll`.
+   (which must be compiled with `-DMI_OVERRIDE=ON`, which is the default though).
+   To ensure the `mimalloc.dll` is actually loaded at run-time it is easiest 
+   to insert some call to the mimalloc API in the `main` function, like `mi_version()`
+   (or use the `/include:mi_version` switch on the linker command, or
+   similarly, `#pragma comment(linker, "/include:mi_version")` in some source file). 
+   See the `mimalloc-test-override` project for an example on how to use this. 
+
+3. The `mimalloc-redirect.dll` must be put in the same folder as the main 
+   `mimalloc.dll` at runtime (as it is a dependency of that DLL).
+   The redirection DLL ensures that all calls to the C runtime malloc API get 
+   redirected to mimalloc functions (which reside in `mimalloc.dll`).
+
+4. Ensure the `mimalloc.dll` comes as early as possible in the import
    list of the final executable (so it can intercept all potential allocations).
+   You can use `minject -l <exe>` to check this if needed.
 
 For best performance on Windows with C++, it
 is also recommended to also override the `new`/`delete` operations (by including
-[`mimalloc-new-delete.h`](include/mimalloc-new-delete.h) 
+[`mimalloc-new-delete.h`](../include/mimalloc-new-delete.h) 
 a single(!) source file in your project).
 
 The environment variable `MIMALLOC_DISABLE_REDIRECT=1` can be used to disable dynamic
-overriding at run-time. Use `MIMALLOC_VERBOSE=1` to check if mimalloc was successfully redirected.
+overriding at run-time. Use `MIMALLOC_VERBOSE=1` to check if mimalloc was successfully 
+redirected.
+
+For different platforms than x64, you may need a specific [redirection dll](bin).
+Furthermore, we cannot always re-link an executable or ensure `mimalloc.dll` comes
+first in the import table. In such cases the [`minject`](bin) tool can be used
+to patch the executable's import tables.
 
-We cannot always re-link an executable with `mimalloc-override.dll`, and similarly, we cannot always
-ensure the the DLL comes first in the import table of the final executable.
-In many cases though we can patch existing executables without any recompilation
-if they are linked with the dynamic C runtime (`ucrtbase.dll`) -- just put the `mimalloc-override.dll`
-into the import table (and put `mimalloc-redirect.dll` in the same folder)
-Such patching can be done for example with [CFF Explorer](https://ntcore.com/?page_id=388) or
-the [`minject`](bin) program.
 
 ## Static override
 

From 26eaa1f4e2804fc7dd3cc3997a481c55d484b4f1 Mon Sep 17 00:00:00 2001
From: Daan Leijen <daan@microsoft.com>
Date: Fri, 20 Dec 2024 12:52:58 -0800
Subject: [PATCH 7/7] fix cmake to generate mimalloc.dll on windows

---
 CMakeLists.txt | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e371a33d..e84283fa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -667,12 +667,7 @@ endif()
 # -----------------------------------------------------------------------------
 if (MI_OVERRIDE)
   if (MI_BUILD_SHARED)
-    target_compile_definitions(mimalloc PRIVATE MI_MALLOC_OVERRIDE)
-    if (WIN32)
-      # on windows we should generate mimalloc-override.dll.
-      string(REPLACE "mimalloc" "mimalloc-override" mi_override_output_name ${mi_basename})
-      set_target_properties(mimalloc PROPERTIES OUTPUT_NAME ${mi_override_output_name})
-    endif()
+    target_compile_definitions(mimalloc PRIVATE MI_MALLOC_OVERRIDE)    
   endif()
   if(NOT WIN32)
     # It is only possible to override malloc on Windows when building as a DLL.