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

Output: Fix crash outputting undefined enum value (use cast instead) (#11)

Browse Source
This commit is contained in:
Katy Coe
2020-01-06 11:00:29 +01:00
parent 0b868aae36
commit 140e31b206
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Il2CppInspector/Reflection/Extensions.cs
View File

@@ -1,5 +1,5 @@
/* /*
Copyright 2017-2019 Katy Coe - http://www.hearthcode.org - http://www.djkaty.com Copyright 2017-2020 Katy Coe - http://www.hearthcode.org - http://www.djkaty.com
All rights reserved. All rights reserved.
*/ */
@@ -96,15 +96,21 @@ namespace Il2CppInspector.Reflection
if (type.IsEnum) { if (type.IsEnum) {
var flags = type.GetCustomAttributes("System.FlagsAttribute").Any(); var flags = type.GetCustomAttributes("System.FlagsAttribute").Any();
var values = type.GetEnumNames().Zip(type.GetEnumValues().OfType<object>(), (k, v) => new {k, v}).ToDictionary(x => x.k, x => x.v); var values = type.GetEnumNames().Zip(type.GetEnumValues().OfType<object>(), (k, v) => new {k, v}).ToDictionary(x => x.k, x => x.v);
var typePrefix = type.GetScopedCSharpName(usingScope) + "."; var typeName = type.GetScopedCSharpName(usingScope);
// We don't know what type the enumeration or value is, so we use Object.Equals() to do content-based equality testing // We don't know what type the enumeration or value is, so we use Object.Equals() to do content-based equality testing
if (!flags) if (!flags) {
return typePrefix + values.First(v => v.Value.Equals(value)).Key; // Defined enum name
if (values.FirstOrDefault(v => v.Value.Equals(value)).Key is string enumValue)
return typeName + "." + enumValue;
// Undefined enum value (return a cast)
return "(" + typeName + ") " + value;
}
// Logical OR a series of flags together // Logical OR a series of flags together
var flagValue = Convert.ToInt64(value); var flagValue = Convert.ToInt64(value);
var setFlags = values.Where(x => (Convert.ToInt64(x.Value) & flagValue) == Convert.ToInt64(x.Value)).Select(x => typePrefix + x.Key); var setFlags = values.Where(x => (Convert.ToInt64(x.Value) & flagValue) == Convert.ToInt64(x.Value)).Select(x => typeName + "." + x.Key);
return string.Join(" | ", setFlags); return string.Join(" | ", setFlags);
} }
// Structs and generic type parameters must use 'default' rather than 'null' // Structs and generic type parameters must use 'default' rather than 'null'