Backups/UnityExplorer
1
0
Fork 0
mirror of https://github.com/sinai-dev/UnityExplorer.git synced 2025-01-08 10:33:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use Il2CppObjectBase instead of Il2CppSystem.Object where possible.

Browse Source 
Attempt to fix il2cpp lists/dicts, not currently working properly. Will probably wait for Unhollower rewrite.
This commit is contained in:
Sinai 2021-05-15 18:00:16 +10:00
parent bf8f838f01
commit 83f15c7168
5 changed files with 228 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

192
src/Core/Reflection/Il2CppReflection.cs
View File

@ -222,7 +222,7 @@ namespace UnityExplorer
// from il2cpp objects... // from il2cpp objects...
if (!(obj is Il2CppSystem.Object cppObj)) if (!(obj is Il2CppObjectBase cppObj))
return obj; return obj;
// from Il2CppSystem.Object to a struct // from Il2CppSystem.Object to a struct
@ -267,7 +267,7 @@ namespace UnityExplorer
internal static readonly Dictionary<string, MethodInfo> unboxMethods = new Dictionary<string, MethodInfo>(); internal static readonly Dictionary<string, MethodInfo> unboxMethods = new Dictionary<string, MethodInfo>();
// Unbox an il2cpp object to a struct or System primitive. // Unbox an il2cpp object to a struct or System primitive.
public object UnboxCppObject(Il2CppSystem.Object cppObj, Type toType) public object UnboxCppObject(Il2CppObjectBase cppObj, Type toType)
{ {
if (!toType.IsValueType) if (!toType.IsValueType)
return null; return null;
@ -411,7 +411,6 @@ namespace UnityExplorer
#endregion #endregion
#region Singleton finder #region Singleton finder
internal override void Internal_FindSingleton(string[] possibleNames, Type type, BF flags, List<object> instances) internal override void Internal_FindSingleton(string[] possibleNames, Type type, BF flags, List<object> instances)
@ -480,8 +479,6 @@ namespace UnityExplorer
#endregion #endregion
#region Il2cpp reflection blacklist #region Il2cpp reflection blacklist
public override string DefaultReflectionBlacklist => string.Join(";", defaultIl2CppBlacklist); public override string DefaultReflectionBlacklist => string.Join(";", defaultIl2CppBlacklist);
@ -629,6 +626,191 @@ namespace UnityExplorer
}; };
#endregion #endregion
// (Disabled)
#region Temp il2cpp list/dictionary fixes
//// Temp fix until Unhollower interface support improves
//
//internal static IntPtr s_cppEnumerableClassPtr;
//internal static IntPtr s_cppDictionaryClassPtr;
//
//public override bool Internal_IsEnumerable(Type type)
//{
// if (base.Internal_IsEnumerable(type))
// return true;
//
// try
// {
// if (s_cppEnumerableClassPtr == IntPtr.Zero)
// Il2CppTypeNotNull(typeof(Il2CppSystem.Collections.IEnumerable), out s_cppEnumerableClassPtr);
//
// if (s_cppEnumerableClassPtr != IntPtr.Zero
// && Il2CppTypeNotNull(type, out IntPtr assignFromPtr)
// && il2cpp_class_is_assignable_from(s_cppEnumerableClassPtr, assignFromPtr))
// {
// return true;
// }
// }
// catch { }
//
// return false;
//}
//
//// Lists
//
//internal static readonly Dictionary<Type, MethodInfo> s_getEnumeratorMethods = new Dictionary<Type, MethodInfo>();
//
//internal static readonly Dictionary<Type, EnumeratorInfo> s_enumeratorInfos = new Dictionary<Type, EnumeratorInfo>();
//
//internal class EnumeratorInfo
//{
// internal MethodInfo moveNext;
// internal PropertyInfo current;
//}
//
//internal static IEnumerator EnumerateCppList(object list)
//{
// if (list == null)
// yield break;
//
// var cppEnumerable = list.TryCast<Il2CppSystem.Collections.IEnumerable>();
// if (cppEnumerable == null)
// {
// ExplorerCore.LogWarning("Failed to cast an IEnumerable to the interface!");
// yield break;
// }
//
// // Some ugly reflection to use the il2cpp interface for the instance type
//
// var type = cppEnumerable.GetActualType();
// if (!s_getEnumeratorMethods.ContainsKey(type))
// s_getEnumeratorMethods.Add(type, type.GetMethod("GetEnumerator"));
//
// var enumerator = s_getEnumeratorMethods[type].Invoke(cppEnumerable.TryCast(type), null);
// var enumeratorType = enumerator.GetType();
//
// if (!s_enumeratorInfos.ContainsKey(enumeratorType))
// {
// s_enumeratorInfos.Add(enumeratorType, new EnumeratorInfo
// {
// current = enumeratorType.GetProperty("Current"),
// moveNext = enumeratorType.GetMethod("MoveNext"),
// });
// }
// var info = s_enumeratorInfos[enumeratorType];
//
// // Yield and return the actual entries
// while ((bool)info.moveNext.Invoke(enumerator, null))
// yield return info.current.GetValue(enumerator);
//}
//
//// Dicts todo
//
//public override bool Internal_IsDictionary(Type type)
//{
// if (base.Internal_IsDictionary(type))
// return true;
//
// try
// {
// if (s_cppDictionaryClassPtr == IntPtr.Zero)
// if (!Il2CppTypeNotNull(typeof(Il2CppSystem.Collections.IDictionary), out s_cppDictionaryClassPtr))
// return false;
//
// if (Il2CppTypeNotNull(type, out IntPtr classPtr))
// {
// if (il2cpp_class_is_assignable_from(s_cppDictionaryClassPtr, classPtr))
// return true;
// }
// }
// catch { }
//
// return false;
//}
//
//internal static IEnumerator<KeyValuePair<object, object>> EnumerateCppDictionary(object dictionary)
//{
// var cppDict = dictionary?.TryCast<Il2CppSystem.Collections.IDictionary>();
// if (cppDict == null)
// yield break;
//
//}
//
//
//
////public IDictionary EnumerateDictionary(object value)
////{
//// var valueType = value.GetActualType();
////
//// Type typeOfKeys, typeOfValues;
//// if (valueType.IsGenericType && valueType.GetGenericArguments() is var args && args.Length == 2)
//// {
//// typeOfKeys = args[0];
//// typeOfValues = args[1];
//// }
//// else
//// typeOfKeys = typeOfValues = typeof(object);
////
//// var keyList = new List<object>();
//// var valueList = new List<object>();
////
//// var hashtable = value.TryCast<Il2CppSystem.Collections.Hashtable>();
////
//// if (hashtable != null)
//// {
//// EnumerateCppHashtable(hashtable, keyList, valueList);
//// }
//// else
//// {
//// var keys = valueType.GetProperty("Keys").GetValue(value, null);
//// EnumerateCppCollection(keys, keyList);
////
//// var values = valueType.GetProperty("Values").GetValue(value, null);
//// EnumerateCppCollection(values, valueList);
//// }
////
//// var dict = Activator.CreateInstance(typeof(Dictionary<,>)
//// .MakeGenericType(typeOfKeys, typeOfValues))
//// as IDictionary;
////
//// for (int i = 0; i < keyList.Count; i++)
//// dict.Add(keyList[i], valueList[i]);
////
//// return dict;
////}
////
////private void EnumerateCppCollection(object collection, List<object> list)
////{
//// // invoke GetEnumerator
//// var enumerator = collection.GetType().GetMethod("GetEnumerator").Invoke(collection, null);
//// // get the type of it
//// var enumeratorType = enumerator.GetType();
//// // reflect MoveNext and Current
//// var moveNext = enumeratorType.GetMethod("MoveNext");
//// var current = enumeratorType.GetProperty("Current");
//// // iterate
//// while ((bool)moveNext.Invoke(enumerator, null))
//// {
//// list.Add(current.GetValue(enumerator, null));
//// }
////}
////
////private void EnumerateCppHashtable(Il2CppSystem.Collections.Hashtable hashtable, List<object> keys, List<object> values)
////{
//// for (int i = 0; i < hashtable.buckets.Count; i++)
//// {
//// var bucket = hashtable.buckets[i];
//// if (bucket == null || bucket.key == null)
//// continue;
//// keys.Add(bucket.key);
//// values.Add(bucket.val);
//// }
////}
#endregion
} }
} }

27
src/Core/Reflection/ReflectionUtility.cs
View File

@ -206,6 +206,7 @@ namespace UnityExplorer
#endregion #endregion
#region Type and Generic Parameter implementation cache #region Type and Generic Parameter implementation cache
// cache for GetImplementationsOf // cache for GetImplementationsOf
@ -340,6 +341,7 @@ namespace UnityExplorer
#endregion #endregion
#region Internal MemberInfo Cache #region Internal MemberInfo Cache
internal static Dictionary<Type, Dictionary<string, FieldInfo>> fieldInfos = new Dictionary<Type, Dictionary<string, FieldInfo>>(); internal static Dictionary<Type, Dictionary<string, FieldInfo>> fieldInfos = new Dictionary<Type, Dictionary<string, FieldInfo>>();
@ -411,6 +413,7 @@ namespace UnityExplorer
#endregion #endregion
#region Reflection Blacklist #region Reflection Blacklist
public virtual string DefaultReflectionBlacklist => string.Empty; public virtual string DefaultReflectionBlacklist => string.Empty;
@ -454,5 +457,29 @@ namespace UnityExplorer
#endregion #endregion
// This is NOT working properly. Fails on IL2CPP IList, probably more stuff too.
//// Temp fix for IL2CPP until interface support improves
//
//public static bool IsEnumerable(Type type)
//{
// return Instance.Internal_IsEnumerable(type);
//}
//
//public virtual bool Internal_IsEnumerable(Type type)
//{
// return typeof(IEnumerable).IsAssignableFrom(type);
//}
//
//public static bool IsDictionary(Type type)
//{
// return Instance.Internal_IsDictionary(type);
//}
//
//public virtual bool Internal_IsDictionary(Type type)
//{
// return typeof(IDictionary).IsAssignableFrom(type);
//}
} }
} }

4
src/UI/CacheObject/CacheObjectBase.cs
View File

@ -183,9 +183,9 @@ namespace UnityExplorer.UI.CacheObject
return ValueState.Color; return ValueState.Color;
else if (InteractiveValueStruct.SupportsType(type)) else if (InteractiveValueStruct.SupportsType(type))
return ValueState.ValueStruct; return ValueState.ValueStruct;
else if (typeof(IDictionary).IsAssignableFrom(type)) else if (typeof(IDictionary).IsAssignableFrom(type)) //(ReflectionUtility.IsDictionary(type))
return ValueState.Dictionary; return ValueState.Dictionary;
else if (!typeof(Transform).IsAssignableFrom(type) && typeof(IEnumerable).IsAssignableFrom(type)) else if (!typeof(Transform).IsAssignableFrom(type) && typeof(IEnumerable).IsAssignableFrom(type)) //ReflectionUtility.IsEnumerable(type))
return ValueState.Collection; return ValueState.Collection;
else else
return ValueState.Unsupported; return ValueState.Unsupported;

1
src/UI/IValues/InteractiveDictionary.cs
View File

@ -53,6 +53,7 @@ namespace UnityExplorer.UI.IValues
private void ClearAndRelease() private void ClearAndRelease()
{ {
RefIDictionary = null;
keys.Clear(); keys.Clear();
values.Clear(); values.Clear();

20
src/UI/IValues/InteractiveList.cs
View File

@ -22,7 +22,7 @@ namespace UnityExplorer.UI.IValues
public override bool CanWrite => base.CanWrite && RefIList != null && !RefIList.IsReadOnly; public override bool CanWrite => base.CanWrite && RefIList != null && !RefIList.IsReadOnly;
public Type EntryType; public Type EntryType;
public IEnumerable RefIEnumerable; //public IEnumerable RefIEnumerable;
public IList RefIList; public IList RefIList;
public int ItemCount => values.Count; public int ItemCount => values.Count;
@ -49,6 +49,8 @@ namespace UnityExplorer.UI.IValues
private void ClearAndRelease() private void ClearAndRelease()
{ {
//RefIEnumerable = null;
RefIList = null;
values.Clear(); values.Clear();
foreach (var entry in cachedEntries) foreach (var entry in cachedEntries)
@ -90,20 +92,20 @@ namespace UnityExplorer.UI.IValues
private void CacheEntries(object value) private void CacheEntries(object value)
{ {
RefIEnumerable = value as IEnumerable;
RefIList = value as IList; RefIList = value as IList;
if (RefIEnumerable == null) IEnumerator enumerator = (value as IEnumerable).GetEnumerator();
{
// todo il2cpp //if (value is IEnumerable enumerable)
return; // enumerator = enumerable.GetEnumerator();
} //else
// enumerator = Il2CppReflection.EnumerateCppList(value);
values.Clear(); values.Clear();
int idx = 0; int idx = 0;
foreach (var entry in RefIEnumerable) while (enumerator.MoveNext())
{ {
// var entry = item.TryCast(); var entry = enumerator.Current;
values.Add(entry); values.Add(entry);