Add better il2cpp_array_size_t definition for script outputs in versi…

…ons post 2017.2.1, fix some other cpp gen issues
LukeFZ · Dec 2, 2023 · e9434f4 · e9434f4
1 parent f1cb0d1
commit e9434f4
Show file tree

Hide file tree

Showing 6 changed files with 2,815 additions and 2,769 deletions.
diff --git a/Il2CppInspector.Common/Cpp/CppDeclarationGenerator.cs b/Il2CppInspector.Common/Cpp/CppDeclarationGenerator.cs
@@ -575,7 +575,7 @@ private static CppNamespace CreateNamespace() {
             }
             /* Reserve commonly defined C++ symbols for MSVC DLL projects */
             /* This is not an exhaustive list! (windows.h etc.) */
-            foreach (var symbol in new[] {"_int32", "DEFAULT_CHARSET", "FILETIME", "NULL", "SYSTEMTIME", "stderr", "stdin", "stdout"}) {
+            foreach (var symbol in new[] {"_int8", "_int16", "_int32", "_int64", "DEFAULT_CHARSET", "FILETIME", "NULL", "SYSTEMTIME", "stderr", "stdin", "stdout"}) {
                 ns.ReserveName(symbol);
             }
             /* Reserve builtin keywords in IDA */
@@ -586,7 +586,7 @@ private static CppNamespace CreateNamespace() {
                 "__ptr32", "__ptr64", "__pure", "__restrict", "__return_ptr", "__shifted", "__spoils", "__stdcall", "__struct_ptr",
                 "__thiscall", "__thread", "__unaligned", "__usercall", "__userpurge",
                 "_cs", "_ds", "_es", "_ss", "far", "flat", "near",
-                "Mask", "Region", "Pointer", "GC" }) {
+                "Mask", "Region", "Pointer", "GC", "Time" /* wtf? */ }) {
                 ns.ReserveName(keyword);
             }
             /* Reserve builtin keywords for Ghidra */

diff --git a/Il2CppInspector.Common/Cpp/CppType.cs b/Il2CppInspector.Common/Cpp/CppType.cs
@@ -383,7 +383,7 @@ public override string ToString(string format = "") {
 
             sb.Append(Name + (Name.Length > 0 ? " " : ""));
 
-            sb.Append("{");
+            sb.Append('{');
             foreach (var field in Fields.Values.SelectMany(f => f)) {
                 var fieldString = field.ToString(format);
                 var suffix = ";";
@@ -399,18 +399,19 @@ public override string ToString(string format = "") {
                     suffix = "";
                 }
 
-                sb.Append("\n    ");
-                foreach (var fieldStr in fieldString.Split('\n'))
+                var parts = fieldString.Split('\n');
+                foreach (var part in parts)
                 {
-                    sb.Append(fieldStr);
                     sb.Append("\n    ");
+                    sb.Append(part);
                 }
+
                 sb.Append(suffix);
             }
 
             sb.Append($"\n}}{(format == "o"? $" /* Size: 0x{SizeBytes:x2} */" : "")};");
 
-            sb.Append("\n");
+            sb.Append('\n');
             return sb.ToString();
         }
     }