guozanhua/MeloNX
1
0
Fork 0
forked from MeloNX/MeloNX
Code Pull Requests Activity

fix release bionic crash

Browse Source
This commit is contained in:
Emmanuel Hansen 2023-06-27 19:26:02 +00:00
parent d988dfa781
commit 3af84d0715
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/LibRyujinx/JniExportedMethods.cs
View File

@ -19,6 +19,9 @@ namespace LibRyujinx
{ {
public static partial class LibRyujinx public static partial class LibRyujinx
{ {
[DllImport("libryujinxjni")]
private extern static IntPtr getStringPointer(JEnvRef jEnv, JStringLocalRef s);
public delegate IntPtr JniCreateSurface(IntPtr native_surface, IntPtr instance); public delegate IntPtr JniCreateSurface(IntPtr native_surface, IntPtr instance);
[UnmanagedCallersOnly(EntryPoint = "JNI_OnLoad")] [UnmanagedCallersOnly(EntryPoint = "JNI_OnLoad")]
@ -31,7 +34,7 @@ namespace LibRyujinx
public static JBoolean JniInitialize(JEnvRef jEnv, JObjectLocalRef jObj, JStringLocalRef jpath) public static JBoolean JniInitialize(JEnvRef jEnv, JObjectLocalRef jObj, JStringLocalRef jpath)
{ {
var path = GetString(jEnv, jpath); var path = GetString(jEnv, jpath);
//"/storage/emulated/0/Android/data/org.ryujinx.k/files";
Ryujinx.Common.SystemInfo.SystemInfo.IsBionic = true; Ryujinx.Common.SystemInfo.SystemInfo.IsBionic = true;
var init = Initialize(path); var init = Initialize(path);
@ -48,7 +51,7 @@ namespace LibRyujinx
private static string GetString(JEnvRef jEnv, JStringLocalRef jString) private static string GetString(JEnvRef jEnv, JStringLocalRef jString)
{ {
JEnvValue value = jEnv.Environment; /*JEnvValue value = jEnv.Environment;
ref JNativeInterface jInterface = ref value.Functions; ref JNativeInterface jInterface = ref value.Functions;
IntPtr newStringPtr = jInterface.GetStringUtfCharsPointer; IntPtr newStringPtr = jInterface.GetStringUtfCharsPointer;
@ -60,9 +63,13 @@ namespace LibRyujinx
var str = stringPtr.AsString(); var str = stringPtr.AsString();
releaseString(jEnv, jString, stringPtr); releaseString(jEnv, jString, stringPtr);*/
return str; var stringPtr = getStringPointer(jEnv, jString);
var s = Marshal.PtrToStringAnsi(stringPtr);
Marshal.FreeHGlobal(stringPtr);
return s;
} }
private static JStringLocalRef CreateString(in IReadOnlyFixedContext<Char> ctx, JEnvRef jEnv) private static JStringLocalRef CreateString(in IReadOnlyFixedContext<Char> ctx, JEnvRef jEnv)