quartznet/raylib-cs
2
0
Fork 0
mirror of https://github.com/raylib-cs/raylib-cs synced 2025-04-03 11:09:40 -04:00
Code Activity

Fix pinvoke crashes when returning strings for GetMonitorName, GetClipboardText and GetGamepadName

Browse Source 
- These functions return native memory to strings. However it was trying to free the native memory.
- I changed it so they return IntPtr internally and the public versions use Marshal.PtrToStringAnsi to copy it into a
string which fixes this issue.
This commit is contained in:
ChrisDill 2020-12-29 18:32:54 +00:00
parent 701434ef99
commit b1f46d3307
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Raylib-cs/Raylib.cs
View File

@ -1004,12 +1004,20 @@ namespace Raylib_cs
public static extern Vector2 GetWindowScaleDPI(); public static extern Vector2 GetWindowScaleDPI();
// Get the human-readable, UTF-8 encoded name of the primary monitor // Get the human-readable, UTF-8 encoded name of the primary monitor
[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] [DllImport(nativeLibName, EntryPoint = "GetMonitorName", CallingConvention = CallingConvention.Cdecl)]
public static extern string GetMonitorName(int monitor); private static extern IntPtr INTERNAL_GetMonitorName(int monitor);
public static string GetMonitorName(int monitor)
{
return Marshal.PtrToStringAnsi(INTERNAL_GetMonitorName(monitor));
}
// Get clipboard text content // Get clipboard text content
[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] [DllImport(nativeLibName, EntryPoint = "GetClipboardText", CallingConvention = CallingConvention.Cdecl)]
public static extern string GetClipboardText(); private static extern IntPtr INTERNAL_GetClipboardText();
public static string GetClipboardText()
{
return Marshal.PtrToStringAnsi(INTERNAL_GetClipboardText());
}
// Set clipboard text content // Set clipboard text content
[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
@ -1280,8 +1288,12 @@ namespace Raylib_cs
public static extern bool IsGamepadName(GamepadNumber gamepad, string name); public static extern bool IsGamepadName(GamepadNumber gamepad, string name);
// Return gamepad internal name id // Return gamepad internal name id
[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] [DllImport(nativeLibName, EntryPoint = "GetGamepadName", CallingConvention = CallingConvention.Cdecl)]
public static extern string GetGamepadName(GamepadNumber gamepad); public static extern IntPtr INTERNAL_GetGamepadName(GamepadNumber gamepad);
public static string GetGamepadName(GamepadNumber gamepad)
{
return Marshal.PtrToStringAnsi(INTERNAL_GetGamepadName(gamepad));
}
// Detect if a gamepad button has been pressed once // Detect if a gamepad button has been pressed once
[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
@ -1637,7 +1649,7 @@ namespace Raylib_cs
[return: MarshalAs(UnmanagedType.I1)] [return: MarshalAs(UnmanagedType.I1)]
public static extern bool CheckCollisionPointTriangle(Vector2 point, Vector2 p1, Vector2 p2, Vector2 p3); public static extern bool CheckCollisionPointTriangle(Vector2 point, Vector2 p1, Vector2 p2, Vector2 p3);
// Check the collision between two lines defined by two points each, returns collision point by reference // Check the collision between two lines defined by two points each, returns collision point by reference
[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
[return: MarshalAs(UnmanagedType.I1)] [return: MarshalAs(UnmanagedType.I1)]
public static extern bool CheckCollisionLines(Vector2 startPos1, Vector2 endPos1, Vector2 startPos2, Vector2 endPos2, ref Vector2 collisionPoint); public static extern bool CheckCollisionLines(Vector2 startPos1, Vector2 endPos1, Vector2 startPos2, Vector2 endPos2, ref Vector2 collisionPoint);