chizui/Il2CppInspectorRedux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AppModel/C++: Fix regression in handling of C# primitive pointer types

Browse Source
This commit is contained in:
Katy Coe
2020-07-20 18:15:41 +02:00
parent 58309b9943
commit e37de64839
3 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Il2CppInspector.Common/Cpp/CppDeclarationGenerator.cs
View File

@@ -102,7 +102,7 @@ namespace Il2CppInspector.Cpp
private void VisitFieldStructs(TypeInfo ti) { private void VisitFieldStructs(TypeInfo ti) {
if (VisitedFieldStructs.Contains(ti)) if (VisitedFieldStructs.Contains(ti))
return; return;
if (ti.IsByRef || ti.IsPointer || ti.ContainsGenericParameters) if (ti.IsByRef || ti.ContainsGenericParameters)
return; return;
VisitedFieldStructs.Add(ti); VisitedFieldStructs.Add(ti);

18
Il2CppInspector.Common/Model/AppModel.cs
View File

@@ -178,22 +178,8 @@ namespace Il2CppInspector.Model
AddTypes(declarationGenerator.GenerateRemainingTypeDeclarations()); AddTypes(declarationGenerator.GenerateRemainingTypeDeclarations());
if (usage.Type == MetadataUsageType.TypeInfo) if (usage.Type == MetadataUsageType.TypeInfo)
// .NET unsafe pointer type that has not been mapped by IL2CPP to a C type // Regular type definition
// (often void* or byte* in metadata v23 and v24.0) Types[type].TypeClassAddress = address;
if (!Types.ContainsKey(type)) {
Debug.Assert(type.IsPointer);
// TODO: This should really be handled by CppDeclarationGenerator, and doesn't generate the full definition
var cppType = CppTypeCollection.Struct(declarationGenerator.TypeNamer.GetName(type));
var cppObjectType = (CppComplexType) CppTypeCollection["Il2CppObject"];
cppType.Fields = new SortedDictionary<int, List<CppField>>(cppObjectType.Fields);
DependencyOrderedCppTypes.Add(cppType);
Types.Add(type, cppType, new AppType(type, cppType, cppClassPtr: address) {Group = Group});
}
else
// Regular type definition
Types[type].TypeClassAddress = address;
else if (!Types.ContainsKey(type)) else if (!Types.ContainsKey(type))
// Generic type definition has no associated C++ type, therefore no dictionary sub-key // Generic type definition has no associated C++ type, therefore no dictionary sub-key

2
Il2CppInspector.Common/Reflection/Extensions.cs
View File

@@ -85,6 +85,8 @@ namespace Il2CppInspector.Reflection
} }
public static string ToCIdentifier(this string str) { public static string ToCIdentifier(this string str) {
// replace * with Ptr
str = str.Replace("*", "Ptr");
// replace illegal characters // replace illegal characters
str = Regex.Replace(str, "[^a-zA-Z0-9_]", "_"); str = Regex.Replace(str, "[^a-zA-Z0-9_]", "_");
// ensure identifier starts with a letter or _ (and is non-empty) // ensure identifier starts with a letter or _ (and is non-empty)