Attempt to fix EOS module

LavaGang · Aug 20, 2024 · ce711e7 · ce711e7
1 parent 4dd884b
commit ce711e7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 54 deletions.
diff --git a/Dependencies/CompatibilityLayers/EOS/Module.cs b/Dependencies/CompatibilityLayers/EOS/Module.cs
@@ -22,34 +22,35 @@ internal class EOS_Module : MelonModule
         private delegate IntPtr LoadLibraryDetour(IntPtr path);
         private NativeHook<LoadLibraryDetour> _hookWin;
 
-        //private delegate IntPtr dlopenDetour(IntPtr path, int flags);
-        //private NativeHook<dlopenDetour> _hookUnix;
-
         public override void OnInitialize()
         {
-            IntPtr ldlib = NativeLibrary.AgnosticGetLoadLibraryPtr();
-            if (ldlib == IntPtr.Zero)
-                return;
-
             var platform = Environment.OSVersion.Platform;
             switch (platform)
             {
                 case PlatformID.Win32S:
                 case PlatformID.Win32Windows:
                 case PlatformID.Win32NT:
                 case PlatformID.WinCE:
-                    _hookWin = new NativeHook<LoadLibraryDetour>(ldlib, 
-                        Marshal.GetFunctionPointerForDelegate(DetourWin));
-                    _hookWin.Attach();
+                    NativeLibrary lib = NativeLibrary.Load("kernel32");
+                    if (lib != null)
+                    {
+                        IntPtr loadLibraryWPtr = lib.GetExport("LoadLibraryW");
+                        if (loadLibraryWPtr != IntPtr.Zero)
+                        {
+                            _hookWin = new NativeHook<LoadLibraryDetour>(loadLibraryWPtr,
+                                Marshal.GetFunctionPointerForDelegate(DetourWin));
+                            _hookWin.Attach();
+                        }
+                    }
                     break;
 
                 case PlatformID.Unix:
                 case PlatformID.MacOSX:
+
                     // TO-DO
 
-                    //_hookUnix = new NativeHook<dlopenDetour>(ldlib,
-                    //    Marshal.GetFunctionPointerForDelegate(DetourUnix));
-                    //_hookUnix.Attach();
+                    // libdl.so.2
+                    // dlopen
 
                     break;
             }
@@ -61,7 +62,8 @@ private IntPtr DetourWin(IntPtr path)
                 return _hookWin.Trampoline(path);
 
             var pathString = Marshal.PtrToStringUni(path);
-            if (pathString.EndsWith("EOSOVH-Win64-Shipping.dll") || pathString.EndsWith("EOSOVH-Win32-Shipping.dll"))
+            if (pathString.EndsWith("EOSOVH-Win64-Shipping.dll")
+                || pathString.EndsWith("EOSOVH-Win32-Shipping.dll"))
             {
                 _hookWin.Detach();
                 return IntPtr.Zero;
@@ -70,30 +72,10 @@ private IntPtr DetourWin(IntPtr path)
             return _hookWin.Trampoline(path);
         }
 
-        /*
-        private IntPtr DetourUnix(IntPtr path, int flags)
-        {
-            if (path == IntPtr.Zero)
-                return _hookUnix.Trampoline(path, flags);
-
-            var pathString = Marshal.PtrToStringUni(path);
-            if (pathString.StartsWith("EOSOVH-"))
-            {
-                _hookUnix.Detach();
-                return IntPtr.Zero;
-            }
-
-            return _hookUnix.Trampoline(path, flags);
-        }
-        */
-
         ~EOS_Module()
         {
             _hookWin?.Detach();
             _hookWin = null;
-
-            //_hookUnix?.Detach();
-            //_hookUnix = null;
         }
     }
 }
diff --git a/MelonLoader/Utils/NativeLibrary.cs b/MelonLoader/Utils/NativeLibrary.cs
@@ -92,26 +92,6 @@ public static IntPtr AgnosticGetProcAddress(IntPtr hModule, string lpProcName)
             throw new PlatformNotSupportedException($"Unsupported platform: {platform}");
         }
 
-        public static IntPtr AgnosticGetLoadLibraryPtr()
-        {
-            var platform = Environment.OSVersion.Platform;
-
-            switch (platform)
-            {
-                case PlatformID.Win32S:
-                case PlatformID.Win32Windows:
-                case PlatformID.Win32NT:
-                case PlatformID.WinCE:
-                    return Marshal.GetFunctionPointerForDelegate(LoadLibrary);
-
-                case PlatformID.Unix:
-                case PlatformID.MacOSX:
-                    return Marshal.GetFunctionPointerForDelegate(dlopen);
-            }
-
-            throw new PlatformNotSupportedException($"Unsupported platform: {platform}");
-        }
-
         [DllImport("kernel32", CharSet = CharSet.Unicode)]
         private static extern IntPtr LoadLibrary(string lpLibFileName);
         [DllImport("kernel32")]