Fix vlc logs

UnigramDev · Dec 5, 2024 · 16c9ea1 · 16c9ea1
1 parent c8d5dc1
commit 16c9ea1
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 39 deletions.
diff --git a/Telegram.Native/NativeUtils.cpp b/Telegram.Native/NativeUtils.cpp
@@ -684,4 +684,17 @@ namespace winrt::Telegram::Native::implementation
         *ciao = 42;
     }
 
+    hstring NativeUtils::GetLogMessage(int64_t format, int64_t args)
+    {
+        int byteLength = vsnprintf(NULL, NULL, (char*)format, (va_list)args) + 1;
+        if (byteLength <= 1)
+            return L"";
+
+        char* buffer = new char[byteLength];
+        vsprintf(buffer, (char*)format, (va_list)args);
+        hstring result = winrt::to_hstring(std::string(buffer, byteLength));
+        delete[] buffer;
+        return result;
+    }
+
 } // namespace winrt::Telegram::Native::implementation
diff --git a/Telegram.Native/NativeUtils.h b/Telegram.Native/NativeUtils.h
@@ -49,6 +49,8 @@ namespace winrt::Telegram::Native::implementation
         static winrt::Telegram::Native::FatalError GetFatalError(bool onlyNative);
         static winrt::Telegram::Native::FatalError GetBackTrace(DWORD code);
 
+        static hstring GetLogMessage(int64_t format, int64_t args);
+
         static void Crash();
 
         static FatalErrorCallback Callback;

diff --git a/Telegram.Native/NativeUtils.idl b/Telegram.Native/NativeUtils.idl
@@ -54,6 +54,8 @@ namespace Telegram.Native
         static FatalError GetFatalError(Boolean onlyNative);
         static FatalError GetBackTrace(UInt64 code);
 
+        static String GetLogMessage(Int64 format, Int64 args);
+
         static void Crash();
     }
 } // namespace Telegram.Native
diff --git a/Telegram/Videolan/Shared/Helpers/MarshalUtils.cs b/Telegram/Videolan/Shared/Helpers/MarshalUtils.cs
@@ -42,36 +42,11 @@ internal readonly struct Native
 #endif
             [DllImport(Constants.LibraryName, CallingConvention = CallingConvention.Cdecl, EntryPoint = "libvlc_free", SetLastError = true)]
             public static extern void LibVLCFree(IntPtr ptr);
-
-            [DllImport(Constants.Msvcrt, EntryPoint = "vsprintf", CallingConvention = CallingConvention.Cdecl)]
-            public static extern int vsprintf_windows(IntPtr buffer, IntPtr format, IntPtr args);
-
-            [DllImport(Constants.Msvcrt, EntryPoint = "vsnprintf", CallingConvention = CallingConvention.Cdecl)]
-            public static extern int vsnprintf_windows(IntPtr buffer, UIntPtr size, IntPtr format, IntPtr args);
 #pragma warning restore IDE1006 // Naming Styles
         }
 
         #region logging
 
-        internal static string GetLogMessage(IntPtr format, IntPtr args)
-        {
-            var byteLength = vsnprintf(IntPtr.Zero, UIntPtr.Zero, format, args) + 1;
-            if (byteLength <= 1)
-                return string.Empty;
-
-            var buffer = IntPtr.Zero;
-            try
-            {
-                buffer = Marshal.AllocHGlobal(byteLength);
-                vsprintf(buffer, format, args);
-                return buffer.FromUtf8()!;
-            }
-            finally
-            {
-                Marshal.FreeHGlobal(buffer);
-            }
-        }
-
         static string UseStructurePointer<T>(T structure, Func<IntPtr, string> action) where T : notnull
         {
             var structurePointer = IntPtr.Zero;
@@ -102,20 +77,7 @@ static void UseStructurePointer<T>(T structure, Action<IntPtr> action) where T :
             }
         }
 
-#pragma warning disable IDE1006 // Naming Styles
-        static int vsnprintf(IntPtr buffer, UIntPtr size, IntPtr format, IntPtr args)
-        {
-            return Native.vsnprintf_windows(buffer, size, format, args);
-        }
-
-        static int vsprintf(IntPtr buffer, IntPtr format, IntPtr args)
-        {
-            return Native.vsprintf_windows(buffer, format, args);
-        }
-
         #endregion
-#pragma warning restore IDE1006 // Naming Styles
-
         /// <summary>
         /// Helper for libvlc_new
         /// </summary>

diff --git a/Telegram/Videolan/Shared/LibVLC.cs b/Telegram/Videolan/Shared/LibVLC.cs
@@ -5,6 +5,7 @@
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
+using Telegram.Native;
 
 namespace LibVLCSharp.Shared
 {
@@ -828,7 +829,7 @@ private static void LogCallback(IntPtr libVLCHandle, LogLevel logLevel, IntPtr l
 
             try
             {
-                var message = MarshalUtils.GetLogMessage(format, args);
+                var message = NativeUtils.GetLogMessage((long)format, (long)args);
 
                 GetLogContext(logContext, out var module, out var file, out var line);