ryujinx/SDL2-CS
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL2-CS.git synced 2024-09-29 04:02:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Guid is a thing. Grumble.

Browse source
This commit is contained in:
Ethan Lee 2014-05-12 17:34:53 -04:00
parent eb23cc18a7
commit 48bae22f0e
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/SDL2.cs
View file

@ -4441,12 +4441,6 @@ namespace SDL2
public const byte SDL_HAT_LEFTUP = SDL_HAT_LEFT | SDL_HAT_UP; public const byte SDL_HAT_LEFTUP = SDL_HAT_LEFT | SDL_HAT_UP;
public const byte SDL_HAT_LEFTDOWN = SDL_HAT_LEFT | SDL_HAT_DOWN; public const byte SDL_HAT_LEFTDOWN = SDL_HAT_LEFT | SDL_HAT_DOWN;
[StructLayout(LayoutKind.Sequential)]
public unsafe struct SDL_JoystickGUID
{
public fixed byte data[16];
}
/* joystick refers to an SDL_Joystick* */ /* joystick refers to an SDL_Joystick* */
[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
public static extern void SDL_JoystickClose(IntPtr joystick); public static extern void SDL_JoystickClose(IntPtr joystick);
@ -4534,25 +4528,25 @@ namespace SDL2
public static extern int SDL_NumJoysticks(); public static extern int SDL_NumJoysticks();
[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
public static extern SDL_JoystickGUID SDL_JoystickGetDeviceGUID( public static extern Guid SDL_JoystickGetDeviceGUID(
int device_index int device_index
); );
/* joystick refers to an SDL_Joystick* */ /* joystick refers to an SDL_Joystick* */
[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
public static extern SDL_JoystickGUID SDL_JoystickGetGUID( public static extern Guid SDL_JoystickGetGUID(
IntPtr joystick IntPtr joystick
); );
[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
public static extern void SDL_JoystickGetGUIDString( public static extern void SDL_JoystickGetGUIDString(
SDL_JoystickGUID guid, Guid guid,
char[] pszGUID, byte[] pszGUID,
int cbGUID int cbGUID
); );
[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
public static extern SDL_JoystickGUID SDL_JoystickGetGUIDFromString( public static extern Guid SDL_JoystickGetGUIDFromString(
[In()] [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(LPUtf8StrMarshaler))] [In()] [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(LPUtf8StrMarshaler))]
string pchGUID string pchGUID
); );
@ -4654,8 +4648,9 @@ namespace SDL2
[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
[return : MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(LPUtf8StrMarshaler), MarshalCookie = LPUtf8StrMarshaler.LeaveAllocated)] [return : MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(LPUtf8StrMarshaler), MarshalCookie = LPUtf8StrMarshaler.LeaveAllocated)]
public static extern string SDL_GameControllerMappingForGUID( public static extern string SDL_GameControllerMappingForGUID(
SDL_JoystickGUID guid Guid guid
); );
/* gamecontroller refers to an SDL_GameController* */ /* gamecontroller refers to an SDL_GameController* */
[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
[return : MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(LPUtf8StrMarshaler), MarshalCookie = LPUtf8StrMarshaler.LeaveAllocated)] [return : MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(LPUtf8StrMarshaler), MarshalCookie = LPUtf8StrMarshaler.LeaveAllocated)]