From 5f158997b803cd94410f4b1f291735f6b0f34f16 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Sun, 6 Aug 2017 08:36:51 +1000 Subject: [PATCH] Use Marshal.SystemDefaultCharSize instead of hardcoding 2 bytes per char Also move Marshal.FreeHGlobal up because buffer doesn't need to persist after PtrToStringAuto was called. --- src/OpenTK/Platform/Windows/WinGLNative.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/OpenTK/Platform/Windows/WinGLNative.cs b/src/OpenTK/Platform/Windows/WinGLNative.cs index 5b31bac0..c1cd5fc3 100644 --- a/src/OpenTK/Platform/Windows/WinGLNative.cs +++ b/src/OpenTK/Platform/Windows/WinGLNative.cs @@ -693,15 +693,14 @@ namespace OpenTK.Platform.Windows { // Don't forget about \0 at the end uint filenameChars = Functions.DragQueryFile(hDrop, i, IntPtr.Zero, 0) + 1; - int filenameSize = (int)(filenameChars * 2); // for unicode char set, 2 bytes per character + int filenameSize = (int)(filenameChars * Marshal.SystemDefaultCharSize); IntPtr str = Marshal.AllocHGlobal(filenameSize); Functions.DragQueryFile(hDrop, i, str, filenameChars); string dropString = Marshal.PtrToStringAuto(str); - OnFileDrop(dropString); - Marshal.FreeHGlobal(str); + OnFileDrop(dropString); } Functions.DragFinish(hDrop);