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

simplify custom attribute logic a bit by always returning arrays as ConstantBlobArrayElement

Browse Source
This commit is contained in:
LukeFZ
2023-12-01 06:46:58 +01:00
parent 6aa96b431d
commit 227aefedef
5 changed files with 19 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Il2CppInspector.Common/Utils/BlobReader.cs
View File

@@ -78,28 +78,25 @@ public static class BlobReader
var arrayElementType = ReadEncodedTypeEnum(inspector, blob, out var arrayElementDef);
var arrayElementsAreDifferent = blob.ReadByte();
var array = new ConstantBlobArrayElement[length];
if (arrayElementsAreDifferent == kArrayTypeWithDifferentElements)
{
var array = new ConstantBlobArrayElement[length];
for (int i = 0; i < length; i++)
{
var elementType = ReadEncodedTypeEnum(inspector, blob, out var elementTypeDef);
array[i] = new ConstantBlobArrayElement(elementTypeDef, GetConstantValueFromBlob(inspector, elementType, blob), elementType);
}
value = new ConstantBlobArray(arrayElementDef, array, true, arrayElementType);
}
else
{
var array = new object[length];
for (int i = 0; i < length; i++)
{
array[i] = GetConstantValueFromBlob(inspector, arrayElementType, blob);
array[i] = new ConstantBlobArrayElement(arrayElementDef, GetConstantValueFromBlob(inspector, arrayElementType, blob), arrayElementType);
}
value = new ConstantBlobArray(arrayElementDef, array, false, arrayElementType);
}
value = new ConstantBlobArray(arrayElementDef, array, arrayElementType);
break;
case Il2CppTypeEnum.IL2CPP_TYPE_CLASS:
@@ -133,9 +130,9 @@ public static class BlobReader
var typeIndex = blob.ReadCompressedInt32();
var typeHandle = (uint)inspector.TypeReferences[typeIndex].datapoint;
enumType = inspector.TypeDefinitions[typeHandle];
var elementTypeHandle = inspector.TypeReferences[enumType.elementTypeIndex].datapoint;
var elementType = inspector.TypeDefinitions[elementTypeHandle];
typeEnum = inspector.TypeReferences[elementType.byvalTypeIndex].type;
}
// This technically also handles SZARRAY (System.Array) and all others by just returning their system type
@@ -143,7 +140,7 @@ public static class BlobReader
return typeEnum;
}
public record ConstantBlobArray(Il2CppTypeDefinition ArrayTypeDef, object[] Elements, bool DifferentElements, Il2CppTypeEnum ArrayTypeEnum);
public record ConstantBlobArray(Il2CppTypeDefinition ArrayTypeDef, ConstantBlobArrayElement[] Elements, Il2CppTypeEnum ArrayTypeEnum);
public record ConstantBlobArrayElement(Il2CppTypeDefinition TypeDef, object Value, Il2CppTypeEnum TypeEnum);
}