ryujinx/SDL2-CS
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL2-CS.git synced 2025-03-04 21:09:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make all UTF8 conversions nullable.

Browse source 
Trying to avoid null strings was far too invasive and kept creating bugs in the wrapper, and the wrapper should not have enough code to create bugs in the first place.
This commit is contained in:
Ethan Lee 2021-05-15 09:10:02 -04:00 committed by GitHub
parent fadd0135c3
commit a234470e39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/SDL2.cs
View file

@ -47,24 +47,10 @@ namespace SDL2
/* Used for stack allocated string marshaling. */ /* Used for stack allocated string marshaling. */
internal static int Utf8Size(string str) internal static int Utf8Size(string str)
{
Debug.Assert(str != null);
return (str.Length * 4) + 1;
}
internal static int Utf8SizeNullable(string str)
{ {
return str != null ? (str.Length * 4) + 1 : 0; return str != null ? (str.Length * 4) + 1 : 0;
} }
internal static unsafe byte* Utf8Encode(string str, byte* buffer, int bufferSize) internal static unsafe byte* Utf8Encode(string str, byte* buffer, int bufferSize)
{
Debug.Assert(str != null);
fixed (char* strPtr = str)
{
Encoding.UTF8.GetBytes(strPtr, str.Length + 1, buffer, bufferSize);
}
return buffer;
}
internal static unsafe byte* Utf8EncodeNullable(string str, byte* buffer, int bufferSize)
{ {
if (str == null) if (str == null)
{ {
@ -1234,16 +1220,16 @@ namespace SDL2
string message, string message,
IntPtr window IntPtr window
) { ) {
int utf8TitleBufSize = Utf8SizeNullable(title); int utf8TitleBufSize = Utf8Size(title);
byte* utf8Title = stackalloc byte[utf8TitleBufSize]; byte* utf8Title = stackalloc byte[utf8TitleBufSize];
int utf8MessageBufSize = Utf8SizeNullable(message); int utf8MessageBufSize = Utf8Size(message);
byte* utf8Message = stackalloc byte[utf8MessageBufSize]; byte* utf8Message = stackalloc byte[utf8MessageBufSize];
return INTERNAL_SDL_ShowSimpleMessageBox( return INTERNAL_SDL_ShowSimpleMessageBox(
flags, flags,
Utf8EncodeNullable(title, utf8Title, utf8TitleBufSize), Utf8Encode(title, utf8Title, utf8TitleBufSize),
Utf8EncodeNullable(message, utf8Message, utf8MessageBufSize), Utf8Encode(message, utf8Message, utf8MessageBufSize),
window window
); );
} }
@ -1497,10 +1483,10 @@ namespace SDL2
int h, int h,
SDL_WindowFlags flags SDL_WindowFlags flags
) { ) {
int utf8TitleBufSize = Utf8SizeNullable(title); int utf8TitleBufSize = Utf8Size(title);
byte* utf8Title = stackalloc byte[utf8TitleBufSize]; byte* utf8Title = stackalloc byte[utf8TitleBufSize];
return INTERNAL_SDL_CreateWindow( return INTERNAL_SDL_CreateWindow(
Utf8EncodeNullable(title, utf8Title, utf8TitleBufSize), Utf8Encode(title, utf8Title, utf8TitleBufSize),
x, y, w, h, x, y, w, h,
flags flags
); );
@ -1822,7 +1808,7 @@ namespace SDL2
); );
public static unsafe SDL_bool SDL_GL_ExtensionSupported(string extension) public static unsafe SDL_bool SDL_GL_ExtensionSupported(string extension)
{ {
int utf8ExtensionBufSize = Utf8SizeNullable(extension); int utf8ExtensionBufSize = Utf8Size(extension);
byte* utf8Extension = stackalloc byte[utf8ExtensionBufSize]; byte* utf8Extension = stackalloc byte[utf8ExtensionBufSize];
return INTERNAL_SDL_GL_ExtensionSupported( return INTERNAL_SDL_GL_ExtensionSupported(
Utf8Encode(extension, utf8Extension, utf8ExtensionBufSize) Utf8Encode(extension, utf8Extension, utf8ExtensionBufSize)
@ -8106,16 +8092,16 @@ namespace SDL2
); );
public static unsafe string SDL_GetPrefPath(string org, string app) public static unsafe string SDL_GetPrefPath(string org, string app)
{ {
int utf8OrgBufSize = Utf8SizeNullable(org); int utf8OrgBufSize = Utf8Size(org);
byte* utf8Org = stackalloc byte[utf8OrgBufSize]; byte* utf8Org = stackalloc byte[utf8OrgBufSize];
int utf8AppBufSize = Utf8SizeNullable(app); int utf8AppBufSize = Utf8Size(app);
byte* utf8App = stackalloc byte[utf8AppBufSize]; byte* utf8App = stackalloc byte[utf8AppBufSize];
return UTF8_ToManaged( return UTF8_ToManaged(
INTERNAL_SDL_GetPrefPath( INTERNAL_SDL_GetPrefPath(
Utf8EncodeNullable(org, utf8Org, utf8OrgBufSize), Utf8Encode(org, utf8Org, utf8OrgBufSize),
Utf8EncodeNullable(app, utf8App, utf8AppBufSize) Utf8Encode(app, utf8App, utf8AppBufSize)
), ),
true true
); );