Merge 54a7d37 into d1a5478

UE4SS-RE · Sep 12, 2024 · a094eb6 · a094eb6
2 parents d1a5478 + 54a7d37
commit a094eb6
Show file tree

Hide file tree

Showing 37 changed files with 90 additions and 144 deletions.
diff --git a/UE4SS/include/CrashDumper.hpp b/UE4SS/include/CrashDumper.hpp
@@ -2,10 +2,7 @@
 
 #include <memory>
 
-namespace PLH
-{
-    class IatHook;
-}
+#include <safetyhook.hpp>
 
 namespace RC
 {
@@ -14,8 +11,7 @@ namespace RC
       private:
         bool enabled = false;
         void* m_previous_exception_filter = nullptr;
-        std::unique_ptr<PLH::IatHook> m_set_unhandled_exception_filter_hook;
-        uint64_t m_hook_trampoline_set_unhandled_exception_filter_hook;
+        SafetyHookInline m_set_unhandled_exception_filter_hook;
 
       public:
         CrashDumper();

diff --git a/UE4SS/include/UE4SSProgram.hpp b/UE4SS/include/UE4SSProgram.hpp
@@ -21,6 +21,7 @@
 #include <Unreal/Core/Containers/Array.hpp>
 #include <Unreal/UnrealVersion.hpp>
 
+#include <safetyhook.hpp>
 #include <String/StringType.hpp>
 
 // Used to set up ImGui context and allocator in DLL mods
@@ -133,17 +134,10 @@ namespace RC
         std::mutex m_event_queue_mutex{};
 
       private:
-        std::unique_ptr<PLH::IatHook> m_load_library_a_hook;
-        uint64_t m_hook_trampoline_load_library_a;
-
-        std::unique_ptr<PLH::IatHook> m_load_library_ex_a_hook;
-        uint64_t m_hook_trampoline_load_library_ex_a;
-
-        std::unique_ptr<PLH::IatHook> m_load_library_w_hook;
-        uint64_t m_hook_trampoline_load_library_w;
-
-        std::unique_ptr<PLH::IatHook> m_load_library_ex_w_hook;
-        uint64_t m_hook_trampoline_load_library_ex_w;
+        SafetyHookInline m_load_library_a_hook;
+        SafetyHookInline m_load_library_ex_a_hook;
+        SafetyHookInline m_load_library_w_hook;
+        SafetyHookInline m_load_library_ex_w_hook;
 
       public:
         std::vector<std::unique_ptr<Mod>> m_mods;

diff --git a/UE4SS/proxy_generator/proxy/xmake.lua b/UE4SS/proxy_generator/proxy/xmake.lua
@@ -5,7 +5,7 @@ option("ue4ssProxyPath")
 target("proxy")
     set_kind("shared")
     add_options("ue4ssProxyPath")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("c++", "asm")
 

diff --git a/UE4SS/proxy_generator/xmake.lua b/UE4SS/proxy_generator/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "proxy_generator"
 
 target(projectName)
     set_kind("binary")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
 
     add_files("main.cpp")

diff --git a/UE4SS/src/CrashDumper.cpp b/UE4SS/src/CrashDumper.cpp
@@ -6,7 +6,6 @@
 #include <UE4SSProgram.hpp>
 #include <Unreal/Core/Windows/WindowsHWrapper.hpp>
 
-#include <polyhook2/PE/IatHook.hpp>
 #include <dbghelp.h>
 
 #include <String/StringType.hpp>
@@ -77,21 +76,15 @@ namespace RC
 
     CrashDumper::~CrashDumper()
     {
-        m_set_unhandled_exception_filter_hook->unHook();
+        m_set_unhandled_exception_filter_hook = {};
         SetUnhandledExceptionFilter(reinterpret_cast<LPTOP_LEVEL_EXCEPTION_FILTER>(m_previous_exception_filter));
     }
 
     void CrashDumper::enable()
     {
         SetErrorMode(SEM_FAILCRITICALERRORS);
         m_previous_exception_filter = SetUnhandledExceptionFilter(ExceptionHandler);
-
-        m_set_unhandled_exception_filter_hook = std::make_unique<PLH::IatHook>("kernel32.dll",
-                                                                               "SetUnhandledExceptionFilter",
-                                                                               std::bit_cast<uint64_t>(&HookedSetUnhandledExceptionFilter),
-                                                                               &m_hook_trampoline_set_unhandled_exception_filter_hook,
-                                                                               L"");
-        m_set_unhandled_exception_filter_hook->hook();
+        m_set_unhandled_exception_filter_hook = safetyhook::create_inline(SetUnhandledExceptionFilter, HookedSetUnhandledExceptionFilter);
         this->enabled = true;
     }
 

diff --git a/UE4SS/src/UE4SSProgram.cpp b/UE4SS/src/UE4SSProgram.cpp
@@ -55,8 +55,6 @@
 #include <Unreal/World.hpp>
 #include <UnrealDef.hpp>
 
-#include <polyhook2/PE/IatHook.hpp>
-
 namespace RC
 {
     // Commented out because this system (turn off hotkeys when in-game console is open) it doesn't work properly.
@@ -132,31 +130,31 @@ namespace RC
     void* HookedLoadLibraryA(const char* dll_name)
     {
         UE4SSProgram& program = UE4SSProgram::get_program();
-        HMODULE lib = PLH::FnCast(program.m_hook_trampoline_load_library_a, &LoadLibraryA)(dll_name);
+        HMODULE lib = program.m_load_library_a_hook.call<HMODULE>(dll_name);
         program.fire_dll_load_for_cpp_mods(ensure_str(dll_name));
         return lib;
     }
 
     void* HookedLoadLibraryExA(const char* dll_name, void* file, int32_t flags)
     {
         UE4SSProgram& program = UE4SSProgram::get_program();
-        HMODULE lib = PLH::FnCast(program.m_hook_trampoline_load_library_ex_a, &LoadLibraryExA)(dll_name, file, flags);
+        HMODULE lib = program.m_load_library_ex_a_hook.call<HMODULE>(dll_name, file, flags);
         program.fire_dll_load_for_cpp_mods(ensure_str(dll_name));
         return lib;
     }
 
     void* HookedLoadLibraryW(const wchar_t* dll_name)
     {
         UE4SSProgram& program = UE4SSProgram::get_program();
-        HMODULE lib = PLH::FnCast(program.m_hook_trampoline_load_library_w, &LoadLibraryW)(dll_name);
+        HMODULE lib = program.m_load_library_w_hook.call<HMODULE>(dll_name);
         program.fire_dll_load_for_cpp_mods(ToCharTypePtr(dll_name));
         return lib;
     }
 
     void* HookedLoadLibraryExW(const wchar_t* dll_name, void* file, int32_t flags)
     {
         UE4SSProgram& program = UE4SSProgram::get_program();
-        HMODULE lib = PLH::FnCast(program.m_hook_trampoline_load_library_ex_w, &LoadLibraryExW)(dll_name, file, flags);
+        HMODULE lib = program.m_load_library_ex_w_hook.call<HMODULE>(dll_name, file, flags);
         program.fire_dll_load_for_cpp_mods(ToCharTypePtr(dll_name));
         return lib;
     }
@@ -232,35 +230,10 @@ namespace RC
 #define UE4SS_COMPILER STR("MSVC")
 #endif
 
-            Output::send(STR("UE4SS Build Configuration: {} ({})\n"), ensure_str(UE4SS_CONFIGURATION), UE4SS_COMPILER);
-
-            m_load_library_a_hook = std::make_unique<PLH::IatHook>("kernel32.dll",
-                                                                   "LoadLibraryA",
-                                                                   std::bit_cast<uint64_t>(&HookedLoadLibraryA),
-                                                                   &m_hook_trampoline_load_library_a,
-                                                                   L"");
-            m_load_library_a_hook->hook();
-
-            m_load_library_ex_a_hook = std::make_unique<PLH::IatHook>("kernel32.dll",
-                                                                      "LoadLibraryExA",
-                                                                      std::bit_cast<uint64_t>(&HookedLoadLibraryExA),
-                                                                      &m_hook_trampoline_load_library_ex_a,
-                                                                      L"");
-            m_load_library_ex_a_hook->hook();
-
-            m_load_library_w_hook = std::make_unique<PLH::IatHook>("kernel32.dll",
-                                                                   "LoadLibraryW",
-                                                                   std::bit_cast<uint64_t>(&HookedLoadLibraryW),
-                                                                   &m_hook_trampoline_load_library_w,
-                                                                   L"");
-            m_load_library_w_hook->hook();
-
-            m_load_library_ex_w_hook = std::make_unique<PLH::IatHook>("kernel32.dll",
-                                                                      "LoadLibraryExW",
-                                                                      std::bit_cast<uint64_t>(&HookedLoadLibraryExW),
-                                                                      &m_hook_trampoline_load_library_ex_w,
-                                                                      L"");
-            m_load_library_ex_w_hook->hook();
+            m_load_library_a_hook = safetyhook::create_inline(LoadLibraryA, HookedLoadLibraryA);
+            m_load_library_ex_a_hook = safetyhook::create_inline(LoadLibraryExA, HookedLoadLibraryExA);
+            m_load_library_w_hook = safetyhook::create_inline(LoadLibraryW, HookedLoadLibraryW);
+            m_load_library_ex_w_hook = safetyhook::create_inline(LoadLibraryExW, HookedLoadLibraryExW);
 
             Unreal::UnrealInitializer::SetupUnrealModules();
 

diff --git a/UE4SS/xmake.lua b/UE4SS/xmake.lua
@@ -7,6 +7,7 @@ add_requires("glfw 3.3.9", { debug = is_mode_debug() , configs = {runtimes = get
 add_requires("opengl", { debug = is_mode_debug(), configs = {runtimes = get_mode_runtimes()} })
 add_requires("glaze v2.9.5", { debug = is_mode_debug(), configs = {runtimes = get_mode_runtimes()} })
 add_requires("fmt 10.2.1", { debug = is_mode_debug(), configs = {runtimes = get_mode_runtimes()} })
+add_requires("safetyhook v0.4.1", { debug = is_mode_debug(), configs = {runtimes = get_mode_runtimes()} })
 
 option("ue4ssBetaIsStarted")
     set_default(true)
@@ -77,7 +78,7 @@ target(projectName)
 
     add_packages("imgui", "ImGuiTextEdit", "IconFontCppHeaders", "glfw", "opengl", { public = true })
 
-    add_packages("glaze", "polyhook_2", { public = true })
+    add_packages("glaze", "safetyhook", { public = true })
 
     add_links("dbghelp", "psapi", "d3d11", { public = true })
 

diff --git a/UVTD/xmake.lua b/UVTD/xmake.lua
@@ -4,7 +4,7 @@ add_requires("raw_pdb", { debug = is_mode_debug(), configs = {runtimes = get_mod
 
 target(projectName)
     set_kind("binary")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
 
     add_includedirs("include", { public = true })

diff --git a/deps/first/ASMHelper/include/ASMHelper/ASMHelper.hpp b/deps/first/ASMHelper/include/ASMHelper/ASMHelper.hpp
@@ -9,7 +9,7 @@ namespace RC::ASM
     {
         void* address{};
         ZydisDecodedInstruction raw{};
-        ZydisDecodedOperand* operands{};
+        ZydisDecodedOperand operands[ZYDIS_MAX_OPERAND_COUNT]{};
     };
 
     RC_ASM_API auto resolve_jmp(void* instruction_ptr) -> void*;

diff --git a/deps/first/ASMHelper/src/ASMHelper.cpp b/deps/first/ASMHelper/src/ASMHelper.cpp
@@ -12,13 +12,13 @@ namespace RC::ASM
         ZydisDecoder decoder{};
         ZydisDecoderInit(&decoder, ZYDIS_MACHINE_MODE_LONG_64, ZYDIS_STACK_WIDTH_64);
         ZyanUSize offset = 0;
-        ZydisDecodedInstruction instruction{};
-        ZydisDecodedOperand operands[10]{};
-        while (ZYAN_SUCCESS(ZydisDecoderDecodeFull(&decoder, instruction_ptr + offset, 16 - offset, &instruction, operands)))
+
+        Instruction instruction{in_instruction_ptr, {}, {}};
+        while (ZYAN_SUCCESS(ZydisDecoderDecodeFull(&decoder, instruction_ptr + offset, 16 - offset, &instruction.raw, instruction.operands)))
         {
             break;
         }
-        return {in_instruction_ptr, instruction, operands};
+        return instruction;
     }
 
     auto resolve_absolute_address(void* in_instruction_ptr) -> void*

diff --git a/deps/first/ASMHelper/xmake.lua b/deps/first/ASMHelper/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "ASMHelper"
 
 target(projectName)
     set_kind("static")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
 

diff --git a/deps/first/ArgsParser/xmake.lua b/deps/first/ArgsParser/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "ArgsParser"
 
 target(projectName)
     set_kind("binary")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
 

diff --git a/deps/first/Constructs/xmake.lua b/deps/first/Constructs/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "Constructs"
 
 target(projectName)
     set_kind("headeronly")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
 

diff --git a/deps/first/DynamicOutput/xmake.lua b/deps/first/DynamicOutput/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "DynamicOutput"
 
 target(projectName)
     set_kind("static")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
 

diff --git a/deps/first/File/xmake.lua b/deps/first/File/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "File"
 
 target(projectName)
     set_kind("static")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
 

diff --git a/deps/first/Function/xmake.lua b/deps/first/Function/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "Function"
 
 target(projectName)
     set_kind("headeronly")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
 

diff --git a/deps/first/Helpers/include/Helpers/Hook.hpp b/deps/first/Helpers/include/Helpers/Hook.hpp
@@ -0,0 +1,21 @@
+#pragma once
+
+#include <Function/Function.hpp>
+
+#include <safetyhook.hpp>
+
+namespace RC::Helper::Hook
+{
+    template <typename>
+    class call_hook;
+
+    template <typename ReturnType, typename... Params>
+    class call_hook<Function<ReturnType(Params...)>>
+    {
+      public:
+        ReturnType operator()(SafetyHookInline& hook, Params... args)
+        {
+            return hook.call<ReturnType, Params...>(std::forward<Params>(args)...);
+        }
+    };
+} // namespace RC::Helper::Hook
diff --git a/deps/first/Helpers/xmake.lua b/deps/first/Helpers/xmake.lua
@@ -2,11 +2,12 @@ local projectName = "Helpers"
 
 target(projectName)
     set_kind("static")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
 
     add_deps("String")
+    add_packages("safetyhook")
 
     add_includedirs("include", { public = true })
     add_headerfiles("include/**.hpp")

diff --git a/deps/first/IniParser/xmake.lua b/deps/first/IniParser/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "IniParser"
 
 target(projectName)
     set_kind("static")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
 

diff --git a/deps/first/Input/xmake.lua b/deps/first/Input/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "Input"
 
 target(projectName)
     set_kind("static")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
 

diff --git a/deps/first/JSON/xmake.lua b/deps/first/JSON/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "JSON"
 
 target(projectName)
     set_kind("static")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
 

diff --git a/deps/first/LuaMadeSimple/xmake.lua b/deps/first/LuaMadeSimple/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "LuaMadeSimple"
 
 target(projectName)
     set_kind("static")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
 

diff --git a/deps/first/LuaRaw/xmake.lua b/deps/first/LuaRaw/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "LuaRaw"
 
 target(projectName)
     set_kind("static")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
     add_includedirs("include", { public = true })

diff --git a/deps/first/MProgram/xmake.lua b/deps/first/MProgram/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "MProgram"
 
 target(projectName)
     set_kind("headeronly")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")
 

diff --git a/deps/first/ParserBase/xmake.lua b/deps/first/ParserBase/xmake.lua
@@ -2,7 +2,7 @@ local projectName = "ParserBase"
 
 target(projectName)
     set_kind("static")
-    set_languages("cxx20")
+    set_languages("cxx23")
     set_exceptions("cxx")
     add_rules("ue4ss.dependency")