Merge pull request #43 from apple1417/master

support delegate properties

Author: apple1417

changelog.md

@@ -5,6 +5,11 @@
   `UObject` header layout.
 
   [aca70889](https://github.com/bl-sdk/unrealsdk/commit/aca70889)
+
+- Added support for Delegate and Multicast Delegate properties.
+
+  [4e17d06d](https://github.com/bl-sdk/unrealsdk/commit/4e17d06d),
+  [270ef4bf](https://github.com/bl-sdk/unrealsdk/commit/270ef4bf)
 
 ## v1.3.0
 - Added a `WeakPointer` wrapper class with better ergonomics, including an emulated implementation

src/shared/dllmain.cpp

@@ -32,7 +32,7 @@ DWORD WINAPI startup_thread(LPVOID /*unused*/) {
  * @param ul_reason_for_call Reason this is being called.
  * @return True if loaded successfully, false otherwise.
  */
-// NOLINTNEXTLINE(readability-identifier-naming)  - for `DllMain`
+// NOLINTNEXTLINE(misc-use-internal-linkage, readability-identifier-naming)
 BOOL APIENTRY DllMain(HMODULE h_module, DWORD ul_reason_for_call, LPVOID /*unused*/) {
     switch (ul_reason_for_call) {
         case DLL_PROCESS_ATTACH:

src/unrealsdk/commands.cpp

@@ -88,7 +88,7 @@ std::pair<DLLSafeCallback*, size_t> find_matching_command(std::wstring_view line
         return {callback, 0};
     }
 
-    auto non_space = std::find_if_not(line.begin(), line.end(), &std::iswspace);
+    auto non_space = std::ranges::find_if_not(line, &std::iswspace);
     if (non_space == line.end()) {
         return {nullptr, 0};
     }

src/unrealsdk/game/bl2/hooks.cpp

@@ -72,7 +72,10 @@ void __fastcall process_event_hook(UObject* obj,
             // Copy args so that hooks can't modify them, for parity with call function
             const WrappedStruct args_base{func, params};
             WrappedStruct args = args_base.copy_params_only();
-            hook_manager::Details hook{obj, &args, {func->find_return_param()}, {func, obj}};
+            hook_manager::Details hook{.obj = obj,
+                                       .args = &args,
+                                       .ret = {func->find_return_param()},
+                                       .func = {.func = func, .object = obj}};
 
             const bool block_execution =
                 hook_manager::impl::run_hooks_of_type(*data, hook_manager::Type::PRE, hook);
@@ -184,7 +187,10 @@ void __fastcall call_function_hook(UObject* obj,
             WrappedStruct args{func};
             auto original_code = stack->extract_current_args(args);
 
-            hook_manager::Details hook{obj, &args, {func->find_return_param()}, {func, obj}};
+            hook_manager::Details hook{.obj = obj,
+                                       .args = &args,
+                                       .ret = {func->find_return_param()},
+                                       .func = {.func = func, .object = obj}};
 
             const bool block_execution =
                 hook_manager::impl::run_hooks_of_type(*data, hook_manager::Type::PRE, hook);

src/unrealsdk/game/bl2/object.cpp

@@ -78,6 +78,8 @@ UObject* BL2Hook::construct_object(UClass* cls,
 // function is used to tell if to call a hook, it's called all the time.
 // Stick with a native function call for speed.
 
+namespace {
+
 #if defined(__MINGW32__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wattributes"  // thiscall on non-class
@@ -105,6 +107,8 @@ const constinit Pattern<15> GET_PATH_NAME_PATTERN{
     "85 F6"     // test esi, esi
 };
 
+}  // namespace
+
 void BL2Hook::find_get_path_name(void) {
     get_path_name_ptr = GET_PATH_NAME_PATTERN.sigscan_nullable<get_path_name_func>();
     LOG(MISC, "GetPathName: {:p}", reinterpret_cast<void*>(get_path_name_ptr));

src/unrealsdk/game/bl3/hooks.cpp

@@ -34,16 +34,17 @@ const constinit Pattern<19> PROCESS_EVENT_SIG{
     "48 81 EC F0000000"  // sub rsp, 000000F0
 };
 
-}  // namespace
-
 void process_event_hook(UObject* obj, UFunction* func, void* params) {
     try {
         auto data = hook_manager::impl::preprocess_hook("ProcessEvent", func, obj);
         if (data != nullptr) {
             // Copy args so that hooks can't modify them, for parity with call function
             const WrappedStruct args_base{func, params};
             WrappedStruct args = args_base.copy_params_only();
-            hook_manager::Details hook{obj, &args, {func->find_return_param()}, {func, obj}};
+            hook_manager::Details hook{.obj = obj,
+                                       .args = &args,
+                                       .ret = {func->find_return_param()},
+                                       .func = {.func = func, .object = obj}};
 
             const bool block_execution =
                 hook_manager::impl::run_hooks_of_type(*data, hook_manager::Type::PRE, hook);
@@ -104,6 +105,8 @@ bool locking(void) {
     return locking;
 }
 
+}  // namespace
+
 void BL3Hook::hook_process_event(void) {
     detour(PROCESS_EVENT_SIG, locking() ? locking_process_event_hook : process_event_hook,
            &process_event_ptr, "ProcessEvent");
@@ -135,8 +138,6 @@ const constinit Pattern<20> CALL_FUNCTION_SIG{
     "48 81 EC 28010000"  // sub rsp, 00000128
 };
 
-}  // namespace
-
 void call_function_hook(UObject* obj, FFrame* stack, void* result, UFunction* func) {
     try {
         /*
@@ -167,7 +168,10 @@ void call_function_hook(UObject* obj, FFrame* stack, void* result, UFunction* fu
             WrappedStruct args{func};
             auto original_code = stack->extract_current_args(args);
 
-            hook_manager::Details hook{obj, &args, {func->find_return_param()}, {func, obj}};
+            hook_manager::Details hook{.obj = obj,
+                                       .args = &args,
+                                       .ret = {func->find_return_param()},
+                                       .func = {.func = func, .object = obj}};
 
             const bool block_execution =
                 hook_manager::impl::run_hooks_of_type(*data, hook_manager::Type::PRE, hook);
@@ -212,6 +216,8 @@ void call_function_hook(UObject* obj, FFrame* stack, void* result, UFunction* fu
 static_assert(std::is_same_v<decltype(call_function_hook), call_function_func>,
               "call_function signature is incorrect");
 
+}  // namespace
+
 void BL3Hook::hook_call_function(void) {
     detour(CALL_FUNCTION_SIG, call_function_hook, &call_function_ptr, "CallFunction");
 }

src/unrealsdk/logging.cpp

@@ -293,6 +293,7 @@ void builtin_logger(const LogMessage* msg) {
 #pragma region Public Interface Implementations
 #ifndef UNREALSDK_IMPORTING
 namespace impl {
+namespace {
 
 void enqueue_log_msg(uint64_t unix_time_ms,
                      Level level,
@@ -326,11 +327,11 @@ void add_callback(log_callback callback) {
 void remove_callback(log_callback callback) {
     const std::lock_guard<std::mutex> lock(callback_mutex);
 
-    all_log_callbacks.erase(
-        std::remove(all_log_callbacks.begin(), all_log_callbacks.end(), callback),
-        all_log_callbacks.end());
+    auto [begin, end] = std::ranges::remove(all_log_callbacks, callback);
+    all_log_callbacks.erase(begin, end);
 }
 
+}  // namespace
 }  // namespace impl
 
 void init(const std::filesystem::path& file, bool unreal_console) {

src/unrealsdk/pch.h

@@ -44,6 +44,7 @@
 #include <mutex>
 #include <optional>
 #include <queue>
+#include <ranges>
 #include <sstream>
 #include <stdexcept>
 #include <string>

src/unrealsdk/unreal/cast.h

@@ -14,8 +14,10 @@
 #include "unrealsdk/unreal/classes/properties/ubyteproperty.h"
 #include "unrealsdk/unreal/classes/properties/uclassproperty.h"
 #include "unrealsdk/unreal/classes/properties/ucomponentproperty.h"
+#include "unrealsdk/unreal/classes/properties/udelegateproperty.h"
 #include "unrealsdk/unreal/classes/properties/uenumproperty.h"
 #include "unrealsdk/unreal/classes/properties/uinterfaceproperty.h"
+#include "unrealsdk/unreal/classes/properties/umulticastdelegateproperty.h"
 #include "unrealsdk/unreal/classes/properties/uobjectproperty.h"
 #include "unrealsdk/unreal/classes/properties/ustrproperty.h"
 #include "unrealsdk/unreal/classes/properties/ustructproperty.h"
@@ -48,6 +50,7 @@ using all_unreal_classes = std::tuple<  //
     UClassProperty,
     UComponentProperty,
     UConst,
+    UDelegateProperty,
     UDoubleProperty,
     UEnum,
     UEnumProperty,
@@ -62,6 +65,7 @@ using all_unreal_classes = std::tuple<  //
     UInterfaceProperty,
     UIntProperty,
     ULazyObjectProperty,
+    UMulticastDelegateProperty,
     UNameProperty,
     UObject,
     UObjectProperty,

src/unrealsdk/unreal/classes/properties/udelegateproperty.cpp

@@ -0,0 +1,27 @@
+#include "unrealsdk/pch.h"
+#include "unrealsdk/unreal/classes/properties/udelegateproperty.h"
+#include "unrealsdk/unreal/prop_traits.h"
+#include "unrealsdk/unreal/structs/fscriptdelegate.h"
+#include "unrealsdk/unreal/wrappers/unreal_pointer.h"
+
+namespace unrealsdk::unreal {
+
+UFunction* UDelegateProperty::get_signature(void) const {
+    return this->read_field(&UDelegateProperty::Signature);
+}
+
+PropTraits<UDelegateProperty>::Value PropTraits<UDelegateProperty>::get(
+    const UDelegateProperty* /*prop*/,
+    uintptr_t addr,
+    const UnrealPointer<void>& /*parent*/) {
+    return reinterpret_cast<FScriptDelegate*>(addr)->as_function();
+}
+
+void PropTraits<UDelegateProperty>::set(const UDelegateProperty* prop,
+                                        uintptr_t addr,
+                                        const Value& value) {
+    FScriptDelegate::validate_signature(value, prop->get_signature());
+    reinterpret_cast<FScriptDelegate*>(addr)->bind(value);
+}
+
+}  // namespace unrealsdk::unreal