Fix GameAssembly base address and memory size on macOS

Author: sptndc

Il2CppInterop.Common/XrefScans/XrefScanMethodDb.cs

@@ -22,26 +22,19 @@ static XrefScanMethodDb()
 
         if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
         {
-            IntPtr errorPtr;
+            var errorPtr = IntPtr.Zero;
             var libHandle = dlopen("GameAssembly.dylib", 2);
 
-            if (libHandle == IntPtr.Zero)
+            if (libHandle == IntPtr.Zero
+                && Process.GetCurrentProcess().MainModule?.FileName is { } procPath
+                && Directory.GetParent(procPath)?.Parent?.FullName is { } appContentsPath
+                && Path.GetFileName(appContentsPath) == "Contents")
             {
-                var currentProcessPath = Process.GetCurrentProcess().MainModule?.FileName;
+                var gameAssemblyPath = Path.Combine(appContentsPath, "Frameworks", "GameAssembly.dylib");
 
-                if (!string.IsNullOrEmpty(currentProcessPath))
+                if (File.Exists(gameAssemblyPath))
                 {
-                    var appContentsPath = Path.GetDirectoryName(Path.GetDirectoryName(currentProcessPath));
-
-                    if (!string.IsNullOrEmpty(appContentsPath) && Path.GetFileName(appContentsPath) == "Contents")
-                    {
-                        var gameAssemblyPath = Path.Combine(appContentsPath, "Frameworks", "GameAssembly.dylib");
-
-                        if (File.Exists(gameAssemblyPath))
-                        {
-                            libHandle = dlopen(gameAssemblyPath, 2);
-                        }
-                    }
+                    libHandle = dlopen(gameAssemblyPath, 2);
                 }
             }
 
@@ -54,7 +47,7 @@ static XrefScanMethodDb()
                     : "Unknown dlopen failure";
 
                 throw new DllNotFoundException(
-                    $"Failed to load GameAssembly.dylib with error message: {errorMessage}");
+                    $"Failed to load \"GameAssembly.dylib\" with error message: {errorMessage}");
             }
 
             // Clear any previous error state.
@@ -134,19 +127,17 @@ private struct DlInfo
         public IntPtr dli_saddr;
     }
 
-    [DllImport("libSystem.dylib", EntryPoint = "dlopen",
-        CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    [DllImport("libSystem.dylib", EntryPoint = "dlopen", CallingConvention = CallingConvention.Cdecl,
+        CharSet = CharSet.Ansi)]
     private static extern IntPtr dlopen(string filename, int flags);
 
-    [DllImport("libSystem.dylib", EntryPoint = "dlerror",
-        CallingConvention = CallingConvention.Cdecl)]
+    [DllImport("libSystem.dylib", EntryPoint = "dlerror", CallingConvention = CallingConvention.Cdecl)]
     private static extern IntPtr dlerror();
 
-    [DllImport("libSystem.dylib", EntryPoint = "dlsym",
-        CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+    [DllImport("libSystem.dylib", EntryPoint = "dlsym", CallingConvention = CallingConvention.Cdecl,
+        CharSet = CharSet.Ansi)]
     private static extern IntPtr dlsym(IntPtr handle, string symbol);
 
-    [DllImport("libSystem.dylib", EntryPoint = "dladdr",
-        CallingConvention = CallingConvention.Cdecl)]
+    [DllImport("libSystem.dylib", EntryPoint = "dladdr", CallingConvention = CallingConvention.Cdecl)]
     private static extern int dladdr(IntPtr addr, out DlInfo info);
 }

Il2CppInterop.Runtime/Injection/Hooks/Class_GetFieldDefaultValue_Hook.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Runtime.InteropServices;
 using Il2CppInterop.Common;
@@ -141,7 +141,7 @@ public override IntPtr FindTargetMethod()
             // inlined but we'll treat it the same even though it doesn't receive the type parameter the RDX register
             // doesn't get cleared so we still get the same parameters
             var classGetDefaultFieldValue = s_Signatures
-                .Select(s => MemoryUtils.FindSignatureInModule(InjectorHelpers.Il2CppModule, s))
+                .Select(s => MemoryUtils.FindSignatureInBlock(InjectorHelpers.GameAssemblyBaseAddress, InjectorHelpers.GameAssemblyMemorySize, s))
                 .FirstOrDefault(p => p != 0);
 
             if (classGetDefaultFieldValue == 0)

Il2CppInterop.Runtime/Injection/Hooks/GenericMethod_GetMethod_Hook.cs

@@ -60,7 +60,7 @@ internal unsafe class GenericMethod_GetMethod_Hook : Hook<GenericMethod_GetMetho
         public override IntPtr FindTargetMethod()
         {
             var genericMethodGetMethod = s_Signatures
-                .Select(s => MemoryUtils.FindSignatureInModule(InjectorHelpers.Il2CppModule, s))
+                .Select(s => MemoryUtils.FindSignatureInBlock(InjectorHelpers.GameAssemblyBaseAddress, InjectorHelpers.GameAssemblyMemorySize, s))
                 .FirstOrDefault(p => p != 0);
 
             if (genericMethodGetMethod == 0)