From 2c5e34c72442c734608e44c91074d3eef822491b Mon Sep 17 00:00:00 2001
From: Katy Coe <djkaty@users.noreply.github.com>
Date: Wed, 9 Sep 2020 17:49:05 +0200
Subject: [PATCH] C++: Output *__TypeInfo double-indirected to avoid having to
 call init_il2cpp() repeatedly

---
 .../Properties/Resources.Designer.cs                   |  5 ++---
 Il2CppInspector.Common/Properties/Resources.resx       | 10 +++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Il2CppInspector.Common/Properties/Resources.Designer.cs b/Il2CppInspector.Common/Properties/Resources.Designer.cs
index 3feb28f..261cc07 100644
--- a/Il2CppInspector.Common/Properties/Resources.Designer.cs
+++ b/Il2CppInspector.Common/Properties/Resources.Designer.cs
@@ -307,8 +307,7 @@ namespace Il2CppInspector.Properties {
         ///      &lt;Filter&gt;framework&lt;/Filter&gt;
         ///    &lt;/ClCompile&gt;
         ///    &lt;ClCompile Include=&quot;framework\il2cpp-init.cpp&quot;&gt;
-        ///      &lt;Filter&gt;framework&lt;/Filter&gt;
-        ///     [rest of string was truncated]&quot;;.
+        ///      &lt;Filter&gt;framework&lt; [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string CppProjFilters {
             get {
@@ -328,7 +327,7 @@ namespace Il2CppInspector.Properties {
         ///      &lt;Configuration&gt;Release&lt;/Configuration&gt;
         ///      &lt;Platform&gt;Win32&lt;/Platform&gt;
         ///    &lt;/ProjectConfiguration&gt;
-        ///    &lt;ProjectConfiguration  [rest of string was truncated]&quot;;.
+        ///    &lt;ProjectCon [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string CppProjTemplate {
             get {
diff --git a/Il2CppInspector.Common/Properties/Resources.resx b/Il2CppInspector.Common/Properties/Resources.resx
index 11bf449..4bd51e7 100644
--- a/Il2CppInspector.Common/Properties/Resources.resx
+++ b/Il2CppInspector.Common/Properties/Resources.resx
@@ -314,6 +314,7 @@ void Run()
     &lt;ClInclude Include="appdata\il2cpp-api-functions.h" /&gt;
     &lt;ClInclude Include="appdata\il2cpp-api-functions-ptr.h" /&gt;
     &lt;ClInclude Include="appdata\il2cpp-functions.h" /&gt;
+	  &lt;ClInclude Include="appdata\il2cpp-metadata-version.h" /&gt;
     &lt;ClInclude Include="appdata\il2cpp-types-ptr.h" /&gt;
     &lt;ClInclude Include="appdata\il2cpp-types.h" /&gt;
     &lt;ClInclude Include="framework\helpers.h" /&gt;
@@ -1180,7 +1181,7 @@ namespace app {
 #undef DO_APP_FUNC
 
 // TypeInfo pointers
-#define DO_TYPEDEF(a, n) extern n ## __Class* n ## __TypeInfo
+#define DO_TYPEDEF(a, n) extern n ## __Class** n ## __TypeInfo
 namespace app {
 	#include "il2cpp-types-ptr.h"
 }
@@ -1209,7 +1210,7 @@ namespace app {
 #undef DO_APP_FUNC
 
 // TypeInfo pointers
-#define DO_TYPEDEF(a, n) n ## __Class* n ## __TypeInfo
+#define DO_TYPEDEF(a, n) n ## __Class** n ## __TypeInfo
 namespace app {
 #include "il2cpp-types-ptr.h"
 }
@@ -1234,7 +1235,7 @@ void init_il2cpp()
 	#undef DO_APP_FUNC
 
 	// Define TypeInfo variables
-	#define DO_TYPEDEF(a, n) n ## __TypeInfo = *(n ## __Class**) (baseAddress + a);
+	#define DO_TYPEDEF(a, n) n ## __TypeInfo = (n ## __Class**) (baseAddress + a);
 	#include "il2cpp-types-ptr.h"
 	#undef DO_TYPEDEF
 }</value>
@@ -1303,6 +1304,9 @@ void Run();</value>
     &lt;ClInclude Include="appdata\il2cpp-functions.h"&gt;
       &lt;Filter&gt;appdata&lt;/Filter&gt;
     &lt;/ClInclude&gt;
+    &lt;ClInclude Include="appdata\il2cpp-metadata-version.h"&gt;
+      &lt;Filter&gt;appdata&lt;/Filter&gt;
+    &lt;/ClInclude&gt;
     &lt;ClInclude Include="appdata\il2cpp-types.h"&gt;
       &lt;Filter&gt;appdata&lt;/Filter&gt;
     &lt;/ClInclude&gt;