Update SlimDetours to the following custom version:

Commit:
https://github.com/KNSoft/KNSoft.SlimDetours/tree/34c4797be38422f04338597b2e89d8f0d495e25b

Unmerged PRs:
KNSoft/KNSoft.SlimDetours#10
KNSoft/KNSoft.SlimDetours#16
KNSoft/KNSoft.SlimDetours#17
KNSoft/KNSoft.SlimDetours#19

Author: m417z

src/MinHook.c

@@ -206,7 +206,6 @@ static MH_STATUS EnableHook(ULONG_PTR hookIdent, LPVOID pTarget, BOOL enable)
         if (pos != INVALID_HOOK_POS)
         {
             DETOUR_TRANSACTION_OPTIONS options = {
-                sizeof(options),
                 g_threadFreezeMethod != MH_FREEZE_METHOD_NONE_UNSAFE
             };
             hr = SlimDetoursTransactionBeginEx(&options);
@@ -286,7 +285,6 @@ static MH_STATUS EnableHook(ULONG_PTR hookIdent, LPVOID pTarget, BOOL enable)
             if (pHook->isEnabled != enable)
             {
                 DETOUR_TRANSACTION_OPTIONS options = {
-                    sizeof(options),
                     g_threadFreezeMethod != MH_FREEZE_METHOD_NONE_UNSAFE
                 };
                 hr = SlimDetoursTransactionBeginEx(&options);
@@ -389,7 +387,6 @@ static MH_STATUS ApplyQueued(ULONG_PTR hookIdent)
     if (pos != INVALID_HOOK_POS)
     {
         DETOUR_TRANSACTION_OPTIONS options = {
-            sizeof(options),
             g_threadFreezeMethod != MH_FREEZE_METHOD_NONE_UNSAFE
         };
         hr = SlimDetoursTransactionBeginEx(&options);

src/SlimDetours/Memory.c

@@ -141,14 +141,16 @@ detour_memory_free(
     return RtlFreeHeap(_detour_memory_heap, 0, BaseAddress);
 }
 
-VOID
+BOOL
 detour_memory_uninitialize(VOID)
 {
-    if (_detour_memory_heap != NULL)
+    if (_detour_memory_heap != NULL && _detour_memory_heap != NtGetProcessHeap())
     {
-        RtlDestroyHeap(_detour_memory_heap);
-        _detour_memory_heap = NULL;
+        _detour_memory_heap = RtlDestroyHeap(_detour_memory_heap);
+        return _detour_memory_heap == NULL;
     }
+
+    return TRUE;
 }
 
 BOOL

src/SlimDetours/SlimDetours.h

@@ -27,13 +27,8 @@ extern "C" {
 #define DETOUR_INSTRUCTION_TARGET_NONE ((PVOID)0)
 #define DETOUR_INSTRUCTION_TARGET_DYNAMIC ((PVOID)(LONG_PTR)-1)
 
-HRESULT
-NTAPI
-SlimDetoursTransactionBegin(VOID);
-
 typedef struct _DETOUR_TRANSACTION_OPTIONS
 {
-    ULONG cbSize;
     BOOL fSuspendThreads;
 } DETOUR_TRANSACTION_OPTIONS, *PDETOUR_TRANSACTION_OPTIONS;
 
@@ -44,6 +39,15 @@ NTAPI
 SlimDetoursTransactionBeginEx(
     _In_ PCDETOUR_TRANSACTION_OPTIONS pOptions);
 
+FORCEINLINE
+HRESULT
+SlimDetoursTransactionBegin(VOID)
+{
+    DETOUR_TRANSACTION_OPTIONS Options;
+    Options.fSuspendThreads = TRUE;
+    return SlimDetoursTransactionBeginEx(&Options);
+}
+
 HRESULT
 NTAPI
 SlimDetoursTransactionAbort(VOID);
@@ -58,11 +62,35 @@ SlimDetoursAttach(
     _Inout_ PVOID* ppPointer,
     _In_ PVOID pDetour);
 
+typedef struct _DETOUR_DETACH_OPTIONS
+{
+    PVOID *ppTrampolineToFreeManually;
+} DETOUR_DETACH_OPTIONS, *PDETOUR_DETACH_OPTIONS;
+
+typedef const DETOUR_DETACH_OPTIONS* PCDETOUR_DETACH_OPTIONS;
+
 HRESULT
 NTAPI
+SlimDetoursDetachEx(
+    _Inout_ PVOID* ppPointer,
+    _In_ PVOID pDetour,
+    _In_ PCDETOUR_DETACH_OPTIONS pOptions);
+
+FORCEINLINE
+HRESULT
 SlimDetoursDetach(
     _Inout_ PVOID* ppPointer,
-    _In_ PVOID pDetour);
+    _In_ PVOID pDetour)
+{
+    DETOUR_DETACH_OPTIONS Options;
+    Options.ppTrampolineToFreeManually = NULL;
+    return SlimDetoursDetachEx(ppPointer, pDetour, &Options);
+}
+
+HRESULT
+NTAPI
+SlimDetoursFreeTrampoline(
+    _In_ PVOID pTrampoline);
 
 PVOID
 NTAPI

src/SlimDetours/SlimDetours.inl

@@ -100,17 +100,24 @@ _STATIC_ASSERT(sizeof(DETOUR_TRAMPOLINE) == 96);
 _STATIC_ASSERT(sizeof(DETOUR_TRAMPOLINE) == 184);
 #endif
 
+enum
+{
+    DETOUR_OPERATION_NONE = 0,
+    DETOUR_OPERATION_ADD,
+    DETOUR_OPERATION_REMOVE,
+};
+
 typedef struct _DETOUR_OPERATION DETOUR_OPERATION, *PDETOUR_OPERATION;
 
 struct _DETOUR_OPERATION
 {
     PDETOUR_OPERATION pNext;
-    BOOL fIsAdd : 1;
-    BOOL fIsRemove : 1;
+    DWORD dwOperation;
     PBYTE* ppbPointer;
     PBYTE pbTarget;
     PDETOUR_TRAMPOLINE pTrampoline;
     ULONG dwPerm;
+    PVOID* ppTrampolineToFreeManually;
 };
 
 /* Memory management */
@@ -134,7 +141,7 @@ BOOL
 detour_memory_free(
     _Frees_ptr_ PVOID BaseAddress);
 
-VOID
+BOOL
 detour_memory_uninitialize(VOID);
 
 BOOL
@@ -269,6 +276,10 @@ detour_free_trampoline(
 
 VOID detour_free_unused_trampoline_regions(VOID);
 
+VOID
+detour_free_trampoline_region_if_unused(
+    _In_ PDETOUR_TRAMPOLINE pTrampoline);
+
 BYTE
 detour_align_from_trampoline(
     _In_ PDETOUR_TRAMPOLINE pTrampoline,

src/SlimDetours/Thread.c

@@ -23,6 +23,7 @@ detour_thread_suspend(
     HANDLE CurrentTID = (HANDLE)(ULONG_PTR)NtCurrentThreadId();
     BOOL ClosePrevThread = FALSE;
     HANDLE ThreadHandle = NULL;
+
     while (TRUE)
     {
         HANDLE NextThreadHandle;
@@ -44,21 +45,18 @@ detour_thread_suspend(
         ThreadHandle = NextThreadHandle;
         ClosePrevThread = TRUE;
 
+        /* Skip the current thread */
         if (!CurrentThreadSkipped)
         {
             THREAD_BASIC_INFORMATION BasicInformation;
-            if (!NT_SUCCESS(NtQueryInformationThread(
-                ThreadHandle,
-                ThreadBasicInformation,
-                &BasicInformation,
-                sizeof(BasicInformation),
-                NULL
-            )))
+            if (!NT_SUCCESS(NtQueryInformationThread(ThreadHandle,
+                                                     ThreadBasicInformation,
+                                                     &BasicInformation,
+                                                     sizeof(BasicInformation),
+                                                     NULL)))
             {
                 continue;
             }
-
-            /* Skip the current thread */
             if (BasicInformation.ClientId.UniqueThread == CurrentTID)
             {
                 CurrentThreadSkipped = TRUE;
@@ -82,6 +80,10 @@ detour_thread_suspend(
             if (Buffer == s_Handles)
             {
                 p = (PHANDLE)detour_memory_alloc(BufferCapacity * sizeof(HANDLE));
+                if (p)
+                {
+                    RtlCopyMemory(p, Buffer, SuspendedCount * sizeof(HANDLE));
+                }
             } else
             {
                 p = (PHANDLE)detour_memory_realloc(Buffer, BufferCapacity * sizeof(HANDLE));
@@ -186,7 +188,7 @@ detour_thread_update(
     bUpdateContext = FALSE;
     for (o = PendingOperations; o != NULL && !bUpdateContext; o = o->pNext)
     {
-        if (o->fIsRemove)
+        if (o->dwOperation == DETOUR_OPERATION_REMOVE)
         {
             if (cxt.CONTEXT_PC >= (ULONG_PTR)o->pTrampoline->rbCode &&
                 cxt.CONTEXT_PC < ((ULONG_PTR)o->pTrampoline->rbCode + RTL_FIELD_SIZE(DETOUR_TRAMPOLINE, rbCode)))
@@ -202,7 +204,7 @@ detour_thread_update(
                 bUpdateContext = TRUE;
             }
 #endif
-        } else if (o->fIsAdd)
+        } else if (o->dwOperation == DETOUR_OPERATION_ADD)
         {
             if (cxt.CONTEXT_PC >= (ULONG_PTR)o->pbTarget &&
                 cxt.CONTEXT_PC < ((ULONG_PTR)o->pbTarget + o->pTrampoline->cbRestore))

src/SlimDetours/Trampoline.c

@@ -400,24 +400,29 @@ detour_is_region_empty(
     return TRUE;
 }
 
+static
 VOID
-detour_free_unused_trampoline_regions(VOID)
+detour_free_region(
+    _In_ PDETOUR_REGION* ppRegionBase,
+    _In_ PDETOUR_REGION pRegion)
 {
-    PVOID pMem;
-    SIZE_T sMem;
+    *ppRegionBase = pRegion->pNext;
+    PVOID pMem = pRegion;
+    SIZE_T sMem = 0;
+    NtFreeVirtualMemory(NtCurrentProcess(), &pMem, &sMem, MEM_RELEASE);
+}
 
+VOID
+detour_free_unused_trampoline_regions(VOID)
+{
     PDETOUR_REGION* ppRegionBase = &s_pRegions;
     PDETOUR_REGION pRegion = s_pRegions;
 
     while (pRegion != NULL)
     {
         if (detour_is_region_empty(pRegion))
         {
-            *ppRegionBase = pRegion->pNext;
-
-            pMem = pRegion;
-            sMem = 0;
-            NtFreeVirtualMemory(NtCurrentProcess(), &pMem, &sMem, MEM_RELEASE);
+            detour_free_region(ppRegionBase, pRegion);
             s_pRegion = NULL;
         } else
         {
@@ -427,6 +432,32 @@ detour_free_unused_trampoline_regions(VOID)
     }
 }
 
+VOID
+detour_free_trampoline_region_if_unused(
+    _In_ PDETOUR_TRAMPOLINE pTrampoline)
+{
+    PDETOUR_REGION pTargetRegion = (PDETOUR_REGION)((ULONG_PTR)pTrampoline & ~(ULONG_PTR)0xffff);
+
+    PDETOUR_REGION* ppRegionBase = &s_pRegions;
+    PDETOUR_REGION pRegion = s_pRegions;
+
+    while (pRegion != NULL)
+    {
+        if (pRegion == pTargetRegion)
+        {
+            if (detour_is_region_empty(pRegion))
+            {
+                detour_free_region(ppRegionBase, pRegion);
+                s_pRegion = NULL;
+            }
+            break;
+        }
+
+        ppRegionBase = &pRegion->pNext;
+        pRegion = *ppRegionBase;
+    }
+}
+
 BYTE
 detour_align_from_trampoline(
     _In_ PDETOUR_TRAMPOLINE pTrampoline,