GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'managed_utf8_str_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-managed_utf8_str_fix

Browse Source
This commit is contained in:
Wojtek Figat
2023-09-10 10:52:08 +02:00
parent f20977732e afec6afe4c
commit 002d46cddd
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Engine/Engine/NativeInterop.Unmanaged.cs
View File

@@ -581,9 +581,9 @@ namespace FlaxEngine.Interop
} }
[UnmanagedCallersOnly] [UnmanagedCallersOnly]
internal static IntPtr NewStringLength(sbyte* text, int length) internal static IntPtr NewStringUTF8(sbyte* text, int length)
{ {
return ManagedString.ToNativeWeak(new string(text, 0, length)); return ManagedString.ToNativeWeak(new string(text, 0, length, System.Text.Encoding.UTF8));
} }
[UnmanagedCallersOnly] [UnmanagedCallersOnly]

4
Source/Engine/Scripting/Runtime/DotNet.cpp
View File

@@ -365,8 +365,8 @@ MString* MCore::String::GetEmpty(MDomain* domain)
MString* MCore::String::New(const char* str, int32 length, MDomain* domain) MString* MCore::String::New(const char* str, int32 length, MDomain* domain)
{ {
static void* NewStringLengthPtr = GetStaticMethodPointer(TEXT("NewStringLength")); static void* NewStringUTF8Ptr = GetStaticMethodPointer(TEXT("NewStringUTF8"));
return (MString*)CallStaticMethod<void*, const char*, int>(NewStringLengthPtr, str, length); return (MString*)CallStaticMethod<void*, const char*, int>(NewStringUTF8Ptr, str, length);
} }
MString* MCore::String::New(const Char* str, int32 length, MDomain* domain) MString* MCore::String::New(const Char* str, int32 length, MDomain* domain)