ryujinx-backup/Opentk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #630 from UnknownShadow200/develop

Browse source 
Allocate SystemDefaultCharSize instead of 1 byte per char for buffer used in WinGLNative.HandleDropFiles
This commit is contained in:
Fraser Waters 2017-08-06 17:55:32 +01:00 committed by GitHub
commit feb8e8f6e3
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/OpenTK/Platform/Windows/WinGLNative.cs
View file

@ -692,15 +692,15 @@ namespace OpenTK.Platform.Windows
for (uint i = 0; i < filesCounter; ++i) for (uint i = 0; i < filesCounter; ++i)
{ {
// Don't forget about \0 at the end // Don't forget about \0 at the end
uint fileNameSize = Functions.DragQueryFile(hDrop, i, IntPtr.Zero, 0) + 1; uint filenameChars = Functions.DragQueryFile(hDrop, i, IntPtr.Zero, 0) + 1;
IntPtr str = Marshal.AllocHGlobal((int)fileNameSize); int filenameSize = (int)(filenameChars * Marshal.SystemDefaultCharSize);
IntPtr str = Marshal.AllocHGlobal(filenameSize);
Functions.DragQueryFile(hDrop, i, str, fileNameSize); Functions.DragQueryFile(hDrop, i, str, filenameChars);
string dropString = Marshal.PtrToStringAuto(str); string dropString = Marshal.PtrToStringAuto(str);
OnFileDrop(dropString);
Marshal.FreeHGlobal(str); Marshal.FreeHGlobal(str);
OnFileDrop(dropString);
} }
Functions.DragFinish(hDrop); Functions.DragFinish(hDrop);