[WIP] Bad, fix, good!

grendello · grendello · commit b5e434d8f6eb · 2022-06-06T11:40:30.000+02:00
diff --git a/src/Mono.Android/Android.Runtime/AndroidRuntime.cs b/src/Mono.Android/Android.Runtime/AndroidRuntime.cs
@@ -325,11 +325,16 @@ protected override IEnumerable<string> GetSimpleReferences (Type type)
 		}
 
 		[DllImport (AndroidRuntime.InternalDllName, CallingConvention = CallingConvention.Cdecl)]
-		static extern string? _monodroid_lookup_replacement_type (string jniSimpleReference);
+		static extern IntPtr _monodroid_lookup_replacement_type (string jniSimpleReference);
 
 		protected override string? GetReplacementTypeCore (string jniSimpleReference)
 		{
-			return _monodroid_lookup_replacement_type (jniSimpleReference);
+			IntPtr ret = _monodroid_lookup_replacement_type (jniSimpleReference);
+			if (ret == IntPtr.Zero) {
+				return null;
+			}
+
+			return Marshal.PtrToStringAnsi (ret);
 		}
 
 		[DllImport (AndroidRuntime.InternalDllName, CallingConvention = CallingConvention.Cdecl)]

Original file line number	Diff line number	Diff line change
`@@ -325,11 +325,16 @@ protected override IEnumerable<string> GetSimpleReferences (Type type)`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`[DllImport (AndroidRuntime.InternalDllName, CallingConvention = CallingConvention.Cdecl)]`
`328`		`- static extern string? _monodroid_lookup_replacement_type (string jniSimpleReference);`
	`328`	`+ static extern IntPtr _monodroid_lookup_replacement_type (string jniSimpleReference);`
`329`	`329`
`330`	`330`	`protected override string? GetReplacementTypeCore (string jniSimpleReference)`
`331`	`331`	`{`
`332`		`- return _monodroid_lookup_replacement_type (jniSimpleReference);`
	`332`	`+ IntPtr ret = _monodroid_lookup_replacement_type (jniSimpleReference);`
	`333`	`+ if (ret == IntPtr.Zero) {`
	`334`	`+ return null;`
	`335`	`+ }`
	`336`	`+`
	`337`	`+ return Marshal.PtrToStringAnsi (ret);`
`333`	`338`	`}`
`334`	`339`
`335`	`340`	`[DllImport (AndroidRuntime.InternalDllName, CallingConvention = CallingConvention.Cdecl)]`