Support UTF-8 file path

Add UTF-8 file path support for GLFW window and SDL window.
dotnet · Nov 23, 2023 · 5ba45e1 · 5ba45e1
1 parent d4d5534
commit 5ba45e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Windowing/Silk.NET.Windowing.Glfw/GlfwWindow.cs b/src/Windowing/Silk.NET.Windowing.Glfw/GlfwWindow.cs
@@ -731,7 +731,7 @@ protected override void RegisterCallbacks()
                 for (var i = 0; i < count; i++)
                 {
                     var p = Marshal.ReadIntPtr(paths, i * IntPtr.Size);
-                    arrayOfPaths[i] = Marshal.PtrToStringAnsi(p);
+                    arrayOfPaths[i] = SilkMarshal.PtrToString((nint) p, NativeStringEncoding.UTF8) ?? "";
                 }
 
                 FileDrop?.Invoke(arrayOfPaths);

diff --git a/src/Windowing/Silk.NET.Windowing.Sdl/SdlWindow.cs b/src/Windowing/Silk.NET.Windowing.Sdl/SdlWindow.cs
@@ -7,6 +7,7 @@
 using System.Runtime.CompilerServices;
 using Silk.NET.Core;
 using Silk.NET.Core.Contexts;
+using Silk.NET.Core.Native;
 using Silk.NET.Maths;
 using Silk.NET.SDL;
 using Point = System.Drawing.Point;
@@ -402,7 +403,8 @@ public override void ProcessEvents()
                     }
                     case EventType.Dropfile:
                     {
-                        _droppedFiles.Add(new string((sbyte*) @event.Drop.File));
+                        string path = SilkMarshal.PtrToString((nint) @event.Drop.File, NativeStringEncoding.UTF8) ?? "";
+                        _droppedFiles.Add(path);
                         break;
                     }
                     default: