From 2b1aff5bd1b5c156ee58960a41b657d1acd15a02 Mon Sep 17 00:00:00 2001 From: Katy Coe Date: Sat, 18 Jul 2020 03:32:23 +0200 Subject: [PATCH] C++: Preserve function name in CppFnPtrType.FromSignature --- Il2CppInspector.Common/Cpp/CppType.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Il2CppInspector.Common/Cpp/CppType.cs b/Il2CppInspector.Common/Cpp/CppType.cs index 6fc4cf4..837c2af 100644 --- a/Il2CppInspector.Common/Cpp/CppType.cs +++ b/Il2CppInspector.Common/Cpp/CppType.cs @@ -128,6 +128,8 @@ namespace Il2CppInspector.Cpp var typedef = System.Text.RegularExpressions.Regex.Match(text, Regex); var returnType = types.GetType(typedef.Groups[1].Captures[0].ToString()); + var name = typedef.Groups[2].Captures[0].ToString(); + var argumentText = typedef.Groups[3].Captures[0].ToString().Split(','); if (argumentText.Length == 1 && argumentText[0] == "") argumentText = new string[0]; @@ -138,7 +140,7 @@ namespace Il2CppInspector.Cpp var arguments = argumentNames.Zip(argumentText, (name, argument) => (name, types.GetType(argument.Substring(0, argument.Length - name.Length)))).ToList(); - return new CppFnPtrType(types.WordSize, returnType, arguments); + return new CppFnPtrType(types.WordSize, returnType, arguments) {Name = name}; } // Output as a named field in a type