fix x86 build issuefixed bugs with context saving; (perfectly saved f…

…or now) added more functionality to naked hooks; add more tests
kin4stat · Sep 18, 2022 · bbc7ed0 · bbc7ed0
1 parent 455960d
commit bbc7ed0
Show file tree

Hide file tree

Showing 14 changed files with 1,148 additions and 259 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,6 +16,12 @@ target_include_directories(${PROJECT_NAME} INTERFACE $<BUILD_INTERFACE:${CMAKE_C
 
 target_link_libraries(${PROJECT_NAME} INTERFACE ktsignal xbyak hde)
 
+target_compile_definitions(${PROJECT_NAME} INTERFACE NOMINMAX)
+
 if(KTHOOK_TEST)
+    if (MSVC)
+        STRING (REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
+        add_compile_options("/GS-")
+    endif()
     add_subdirectory("tests")
 endif()
diff --git a/include/kthook/x64/kthook_detail.hpp b/include/kthook/x64/kthook_detail.hpp
@@ -22,7 +22,7 @@ constexpr relay_args_info internal_get_head_and_tail_size(std::size_t integral_r
     bool used = false;
     if constexpr (!std::is_void_v<Ret>) {
         auto res =
-            (!(std::is_trivial_v<Ret> && std::is_standard_layout_v<Ret> && (sizeof(Ret) % 2 == 0) && sizeof(Ret) <= 8));
+            (!(std::is_trivial_v<Ret> && std::is_standard_layout_v<Ret> && (sizeof(Ret) % 2 == 0 || sizeof(Ret) == 1) && sizeof(Ret) <= 8));
         if (res) used = true;
         used_integral_registers += res;
     }