SDK: Add new string candidate for FName::ToString

praydog · Jul 7, 2023 · d79b481 · d79b481
1 parent c2e6225
commit d79b481
Showing 1 changed file with 43 additions and 34 deletions.
diff --git a/shared/sdk/FName.cpp b/shared/sdk/FName.cpp
@@ -176,55 +176,64 @@ std::optional<FName::ToStringFn> inlined_find_to_string() {
         return std::nullopt;
     }
 
-    const auto str_data = utility::scan_string(module, L"Commandlet %s finished execution (result %d)");
+    std::vector<std::wstring> candidates {
+        L" Bone: %s, Look At Location : %s, Target Location : %s)",
+        L"Commandlet %s finished execution (result %d)"
+    };
 
-    if (!str_data) {
-        SPDLOG_ERROR("FName::get_to_string: Failed to get string data");
-        return std::nullopt;
-    }
-
-    SPDLOG_INFO("FName::get_to_string: str_data={:x}", *str_data);
+    for (auto candidate : candidates) {
+        const auto str_data = utility::scan_string(module, candidate.data());
 
-    const auto str_ref = utility::scan_displacement_reference(module, *str_data);
+        if (!str_data) {
+            SPDLOG_ERROR("FName::get_to_string: Failed to get string data");
+            continue;
+        }
+
+        SPDLOG_INFO("FName::get_to_string: str_data={:x}", *str_data);
 
-    if (!str_ref) {
-        SPDLOG_ERROR("FName::get_to_string: Failed to get string reference");
-        return std::nullopt;
-    }
+        const auto str_ref = utility::scan_displacement_reference(module, *str_data);
 
-    SPDLOG_INFO("FName::get_to_string: str_ref={:x}", *str_ref);
+        if (!str_ref) {
+            SPDLOG_ERROR("FName::get_to_string: Failed to get string reference");
+            continue;
+        }
 
-    auto instructions = utility::get_disassembly_behind(*str_ref);
+        SPDLOG_INFO("FName::get_to_string: str_ref={:x}", *str_ref);
 
-    if (instructions.empty()) {
-        SPDLOG_ERROR("FName::get_to_string: Failed to get instructions");
-        return std::nullopt;
-    }
+        auto instructions = utility::get_disassembly_behind(*str_ref);
 
-    std::optional<FName::ToStringFn> result{};
+        if (instructions.empty()) {
+            SPDLOG_ERROR("FName::get_to_string: Failed to get instructions");
+            continue;
+        }
 
-    std::reverse(instructions.begin(), instructions.end());
-    for (auto& instr : instructions) {
-        if (std::string_view{instr.instrux.Mnemonic}.starts_with("CALL")) {
-            const auto displacement = utility::resolve_displacement(instr.addr);
+        std::optional<FName::ToStringFn> result{};
 
-            if (instr.instrux.BranchInfo.IsIndirect) {
-                if (!IsBadReadPtr((void*)*displacement, sizeof(void*))) {
-                    result = *(FName::ToStringFn*)*displacement;
+        std::reverse(instructions.begin(), instructions.end());
+        for (auto& instr : instructions) {
+            if (std::string_view{instr.instrux.Mnemonic}.starts_with("CALL")) {
+                const auto displacement = utility::resolve_displacement(instr.addr);
+
+                if (instr.instrux.BranchInfo.IsIndirect) {
+                    if (!IsBadReadPtr((void*)*displacement, sizeof(void*))) {
+                        result = *(FName::ToStringFn*)*displacement;
+                    }
+                } else {
+                    result = (FName::ToStringFn)*displacement;
                 }
-            } else {
-                result = (FName::ToStringFn)*displacement;
+                
+                break;
             }
-
-            break;
         }
-    }
 
-    if (result) {
-        SPDLOG_INFO("FName::get_to_string (inlined alternative): result={:x}", (uintptr_t)*result);
+        if (result) {
+            SPDLOG_INFO("FName::get_to_string (inlined alternative): result={:x}", (uintptr_t)*result);
+        }
+
+        return result;
     }
 
-    return result;
+    return std::nullopt;
 }
 
 std::optional<FName::ToStringFn> standard_find_to_string() {