[SLIMDETOURS] Improve initialization

KNSoft · Mar 24, 2024 · d7fb083 · d7fb083
1 parent bfd5da9
commit d7fb083
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 30 deletions.
diff --git a/Source/SlimDetours/Instruction.c b/Source/SlimDetours/Instruction.c
@@ -606,3 +606,8 @@ ULONG detour_is_code_filler(_In_ PBYTE pbCode)
 }
 
 #endif // defined(_M_ARM64)
+
+PVOID NTAPI SlimDetoursCodeFromPointer(_In_ PVOID pPointer)
+{
+    return detour_skip_jmp((PBYTE)pPointer);
+}
diff --git a/Source/SlimDetours/SlimDetours.c b/Source/SlimDetours/SlimDetours.c
diff --git a/Source/SlimDetours/SlimDetours.cpp b/Source/SlimDetours/SlimDetours.cpp
@@ -0,0 +1,16 @@
+/*
+ * KNSoft SlimDetours (https://github.com/KNSoft/SlimDetours) Core Functionality
+ * Copyright (c) KNSoft.org (https://github.com/KNSoft). All rights reserved.
+ * Licensed under the MPL-2.0 license.
+ */
+
+#include "SlimDetours.inl"
+
+static BOOL g_Initialized = detour_init();
+
+BOOL detour_init()
+{
+    detour_memory_init();
+
+    return TRUE;
+}
diff --git a/Source/SlimDetours/SlimDetours.inl b/Source/SlimDetours/SlimDetours.inl
@@ -24,7 +24,7 @@
 
 EXTERN_C_START
 
-VOID detour_init();
+BOOL detour_init();
 
 /* Basic structures */
 

diff --git a/Source/SlimDetours/SlimDetours.vcxproj b/Source/SlimDetours/SlimDetours.vcxproj
@@ -29,7 +29,7 @@
   <ItemGroup>
     <ClCompile Include="Instruction.c" />
     <ClCompile Include="Memory.c" />
-    <ClCompile Include="SlimDetours.c" />
+    <ClCompile Include="SlimDetours.cpp" />
     <ClCompile Include="Disasm.c" />
     <ClCompile Include="Thread.c" />
     <ClCompile Include="Trampoline.c" />

diff --git a/Source/SlimDetours/SlimDetours.vcxproj.filters b/Source/SlimDetours/SlimDetours.vcxproj.filters
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="Disasm.c" />
-    <ClCompile Include="SlimDetours.c" />
+    <ClCompile Include="SlimDetours.cpp" />
     <ClCompile Include="Memory.c" />
     <ClCompile Include="Instruction.c" />
     <ClCompile Include="Trampoline.c" />

diff --git a/Source/SlimDetours/Transaction.c b/Source/SlimDetours/Transaction.c
@@ -51,8 +51,6 @@ NTSTATUS NTAPI SlimDetoursTransactionBegin()
         return STATUS_TRANSACTIONAL_CONFLICT;
     }
 
-    detour_init();
-
     // Make sure the trampoline pages are writable.
     Status = detour_writable_trampoline_regions();
     if (!NT_SUCCESS(Status))
@@ -638,8 +636,6 @@ NTSTATUS NTAPI SlimDetoursDelayAttach(
     PVOID DllBase;
     PDETOUR_DELAY_ATTACH NewNode;
 
-    detour_init();
-
     /* Check if Dll is already loaded */
     RtlInitUnicodeStringEx(&DllNameString, DllName);
     Status = LdrGetDllHandle(NULL, NULL, &DllNameString, &DllBase);