ReadirectInternalLogs: Fix Unity output log not working

Author: ghorsington

src/RedirectInternalLogs/InternalUnityLogger.cs

@@ -24,7 +24,7 @@ public static class InternalUnityLogger
     {
         public static event EventHandler<UnityLogEventArgs> OnUnityInternalLog;
 
-        internal static void OnUnityLog(InternalLogLevel logLevel, string message, IntPtr parts)
+        internal static void OnUnityLog(InternalLogLevel logLevel, IntPtr message, IntPtr parts)
         {
             try
             {

src/RedirectInternalLogs/Platforms/X64Patcher.cs

@@ -33,13 +33,13 @@ protected override void Apply(IntPtr from)
             det.Apply();
         }
 
-        private static void OnUnityLog(ulong type, string message, IntPtr args)
+        private static void OnUnityLog(ulong type, IntPtr message, IntPtr args)
         {
             InternalUnityLogger.OnUnityLog((InternalLogLevel) type, message, args);
             original(type, message, args);
         }
 
         [UnmanagedFunctionPointer(CallingConvention.FastCall)]
-        private delegate void PrintFDelegate(ulong type, [MarshalAs(UnmanagedType.LPStr)] string pattern, IntPtr parts);
+        private delegate void PrintFDelegate(ulong type, IntPtr pattern, IntPtr parts);
     }
 }

src/RedirectInternalLogs/Platforms/X86Patcher.cs

@@ -53,7 +53,7 @@ protected virtual void Apply(IntPtr from)
             det.Apply();
         }
 
-        private static void OnLogHook(uint type, string pattern, IntPtr args)
+        private static void OnLogHook(uint type, IntPtr pattern, IntPtr args)
         {
             InternalUnityLogger.OnUnityLog((InternalLogLevel) type, pattern, args);
             original(type, pattern, args);
@@ -82,6 +82,6 @@ private unsafe IntPtr FindMatch(IntPtr start, int maxSize)
         }
 
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-        private delegate void PrintFDelegate(uint type, [MarshalAs(UnmanagedType.LPStr)] string pattern, IntPtr parts);
+        private delegate void PrintFDelegate(uint type, IntPtr pattern, IntPtr parts);
     }
 }

src/RedirectInternalLogs/RedirectInternalLogsPatcher.cs

@@ -82,7 +82,7 @@ private static void InitializeFileLog()
 
         private static void InternalUnityLoggerOnOnUnityInternalLog(object sender, UnityLogEventArgs e)
         {
-            writer.Write($"[{e.LogLevel}] {e.Message}");
+            writer.WriteLine($"[{e.LogLevel}] {e.Message.Trim()}");
         }
     }
 }

src/RedirectInternalLogs/Util/LibcHelper.cs

@@ -10,7 +10,7 @@ internal static class LibcHelper
     {
         [DynDllImport("libc", "vsprintf_s")] private static readonly VsPrintFsDelegate VsPrintF = null;
 
-        public static string Format(string format, IntPtr args, int buffer = 8192)
+        public static string Format(IntPtr format, IntPtr args, int buffer = 8192)
         {
             var sb = new StringBuilder(buffer);
             VsPrintF(sb, sb.Capacity, format, args);
@@ -31,7 +31,6 @@ public static void Init()
         }
 
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-        private delegate int VsPrintFsDelegate([MarshalAs(UnmanagedType.LPStr)] StringBuilder dest, int size,
-            [MarshalAs(UnmanagedType.LPStr)] string fmt, IntPtr vaList);
+        private delegate int VsPrintFsDelegate([MarshalAs(UnmanagedType.LPStr)] StringBuilder dest, int size, IntPtr fmt, IntPtr vaList);
     }
 }