Add support for exported type defintions

Author: Windows10CE

Cpp2IL.Core/Model/Contexts/AssemblyAnalysisContext.cs

@@ -30,6 +30,11 @@ public class AssemblyAnalysisContext : HasCustomAttributesAndName
     /// </summary>
     public IEnumerable<TypeAnalysisContext> TopLevelTypes => Types.Where(t => t.DeclaringType == null);
 
+    /// <summary>
+    /// The analysis context objects for all types exported by this assembly.
+    /// </summary>
+    public IEnumerable<TypeAnalysisContext> ExportedTypes => (Definition?.Image.ExportedTypes ?? []).Select(t => AppContext.ResolveContextForType(t)!);
+
     /// <summary>
     /// The code gen module for this assembly.
     ///
@@ -185,7 +190,7 @@ public AssemblyAnalysisContext(Il2CppAssemblyDefinition? assemblyDefinition, App
 
         InitCustomAttributeData();
 
-        foreach (var il2CppTypeDefinition in Definition.Image.Types!)
+        foreach (var il2CppTypeDefinition in Definition.Image.Types)
         {
             var typeContext = new TypeAnalysisContext(il2CppTypeDefinition, this);
             Types.Add(typeContext);

Cpp2IL.Core/Utils/AsmResolver/AsmResolverAssemblyPopulator.cs

@@ -41,6 +41,14 @@ public static void ConfigureHierarchy(AssemblyAnalysisContext asmCtx)
             foreach (var interfaceType in typeCtx.InterfaceContexts)
                 typeDefinition.Interfaces.Add(new(interfaceType.ToTypeSignature(typeDefinition.DeclaringModule!).ToTypeDefOrRef()));
         }
+
+        var assemblyDefinition = asmCtx.GetExtraData<AssemblyDefinition>("AsmResolverAssembly") ?? throw new("AsmResolver assembly not found in assembly analysis context for " + asmCtx);
+        var moduleDefinition = assemblyDefinition.ManifestModule!;
+        foreach (var typeCtx in asmCtx.ExportedTypes)
+        {
+            var owningAssembly = typeCtx.DeclaringAssembly.GetExtraData<AssemblyDefinition>("AsmResolverAssembly") ?? throw new("AsmResolver assembly not found in assembly analysis context for " + typeCtx.DeclaringAssembly);
+            moduleDefinition.ExportedTypes.Add(new ExportedType(owningAssembly.ToAssemblyReference(), typeCtx.Namespace, typeCtx.Name));
+        }
     }
 
     private static void PopulateGenericParamsForType(TypeAnalysisContext cppTypeDefinition, TypeDefinition ilTypeDefinition)

LibCpp2IL/Metadata/Il2CppImageDefinition.cs

@@ -21,12 +21,19 @@ public class Il2CppImageDefinition : ReadableClass
 
     public string? Name => OwningContext.Metadata.GetStringFromIndex(nameIndex);
 
-    public Il2CppTypeDefinition[]? Types => Enumerable
+    public Il2CppTypeDefinition[] Types => Enumerable
             .Range(firstTypeIndex.Value, (int)typeCount)
             .Select(Il2CppVariableWidthIndex<Il2CppTypeDefinition>.MakeTemporaryForFixedWidthUsage) // DynWidth: using Enumerable.Range, not read from file, so making temp is ok
             .Select(OwningContext.Metadata.GetTypeDefinitionFromIndex)
             .ToArray();
 
+    public Il2CppTypeDefinition[]? ExportedTypes => IsAtLeast(24)
+        ? Enumerable
+            .Range(exportedTypeStart.Value, (int)exportedTypeCount)
+            .Select(OwningContext.Metadata.GetExportedTypeDefintionFromIndex)
+            .ToArray()
+        : null;
+
     public override string ToString()
     {
         return $"Il2CppImageDefinition[Name={Name}]";

LibCpp2IL/Metadata/Il2CppMetadata.cs

@@ -52,6 +52,7 @@ public class Il2CppMetadata : ClassReadingBinaryReader
     public Il2CppFieldRef[] fieldRefs;
     private Il2CppGenericParameter[] genericParameters;
     public Il2CppVariableWidthIndex<Il2CppType>[] constraintIndices;
+    public int[] exportedTypes;
 
     public int[] referencedAssemblies;
 
@@ -360,6 +361,16 @@ private Il2CppMetadata(MemoryStream stream, UnityVersion unityVersion, float met
             stringLiterals = ReadMetadataClassArray<Il2CppStringLiteral>(metadataHeader.stringLiteral);
             LibLogger.VerboseNewline($"OK ({(DateTime.Now - start).TotalMilliseconds} ms)");
 
+            if (MetadataVersion > 24)
+            {
+                LibLogger.Verbose("\tReading exported types...");
+                start = DateTime.Now;
+
+                exportedTypes = ReadClassArrayAtRawAddr<int>(metadataHeader.exportedTypeDefinitions.Offset, metadataHeader.exportedTypeDefinitions.Size / sizeof(int));
+
+                LibLogger.VerboseNewline($"OK ({(DateTime.Now - start).TotalMilliseconds} ms)");
+            }
+
             if (MetadataVersion < 24.2f)
             {
                 LibLogger.Verbose("\tReading RGCTX data...");
@@ -675,6 +686,8 @@ internal string ReadStringFromIndexNoReadLock(int index)
     }
 
     public Il2CppTypeDefinition GetTypeDefinitionFromIndex(Il2CppVariableWidthIndex<Il2CppTypeDefinition> index) => typeDefs[index.Value];
+
+    public Il2CppTypeDefinition GetExportedTypeDefintionFromIndex(int index) => typeDefs[exportedTypes[index]];
 
     public Il2CppGenericContainer GetGenericContainerFromIndex(Il2CppVariableWidthIndex<Il2CppGenericContainer> index) => genericContainers[index.Value];