feat(hook): accept calling convention in make_hook

Curve · Jun 20, 2024 · a9c06d8 · a9c06d8
1 parent 3df2b67
commit a9c06d8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.21)
-project(lime LANGUAGES CXX VERSION 5.1)
+project(lime LANGUAGES CXX VERSION 6.1)
 
 # --------------------------------------------------------------------------------------------------------
 # Library options

diff --git a/include/lime/hooks/hook.hpp b/include/lime/hooks/hook.hpp
@@ -95,10 +95,10 @@ namespace lime
         static rtn_t<std::add_pointer_t> create(Source source, Callable &&target);
     };
 
-    template <detail::function_pointer Signature, typename Callable>
+    template <detail::function_pointer Signature, convention Convention = convention::automatic, typename Callable>
     auto make_hook(Signature source, Callable &&target);
 
-    template <typename Signature, typename Callable>
+    template <typename Signature, convention Convention = convention::automatic, typename Callable>
     auto make_hook(detail::address auto source, Callable &&target);
 } // namespace lime
 

diff --git a/include/lime/hooks/hook.inl b/include/lime/hooks/hook.inl
@@ -57,15 +57,15 @@ namespace lime
         return rtn;
     }
 
-    template <detail::function_pointer Signature, typename Callable>
+    template <detail::function_pointer Signature, convention Convention, typename Callable>
     auto make_hook(Signature source, Callable &&target)
     {
-        return hook<std::remove_pointer_t<Signature>>::create(source, std::forward<Callable>(target));
+        return hook<std::remove_pointer_t<Signature>, Convention>::create(source, std::forward<Callable>(target));
     }
 
-    template <typename Signature, typename Callable>
+    template <typename Signature, convention Convention, typename Callable>
     auto make_hook(detail::address auto source, Callable &&target)
     {
-        return hook<Signature>::create(source, std::forward<Callable>(target));
+        return hook<Signature, Convention>::create(source, std::forward<Callable>(target));
     }
 } // namespace lime
diff --git a/tests/hook.test.cpp b/tests/hook.test.cpp
@@ -61,6 +61,14 @@ suite<"Hooks"> hook_suite = []
                        delete hook;
                        return ret;
                    });
+
+    lime::make_hook<int(void *, int), lime::convention::automatic>(0xDEADBEEF,
+                                                                   [&](auto *hook, void *thiz, int param) -> int
+                                                                   {
+                                                                       auto ret = hook->original()(thiz, param);
+                                                                       delete hook;
+                                                                       return ret;
+                                                                   });
 #endif
 
     expect(eq(test_fn(10), 20));