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

Minor tweaks to dotnet interop

Browse Source
This commit is contained in:
Wojciech Figat
2022-12-30 15:36:35 +01:00
parent af7b53814d
commit 71e2cbe856
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Engine/Engine/NativeInterop.cs
View File

@@ -1908,6 +1908,8 @@ namespace FlaxEngine
[UnmanagedCallersOnly]
internal static unsafe IntPtr GetArrayPointerToElement(IntPtr arrayHandle, int size, int index)
{
if (arrayHandle == IntPtr.Zero)
return IntPtr.Zero;
ManagedArray managedArray = Unsafe.As<ManagedArray>(GCHandle.FromIntPtr(arrayHandle).Target);
if (managedArray.Length == 0)
return IntPtr.Zero;
@@ -1918,6 +1920,8 @@ namespace FlaxEngine
[UnmanagedCallersOnly]
internal static int GetArrayLength(IntPtr arrayHandle)
{
if (arrayHandle == IntPtr.Zero)
return 0;
ManagedArray managedArray = Unsafe.As<ManagedArray>(GCHandle.FromIntPtr(arrayHandle).Target);
return managedArray.Length;
}
@@ -1925,7 +1929,7 @@ namespace FlaxEngine
[UnmanagedCallersOnly]
internal static IntPtr GetStringEmpty()
{
return ManagedString.ToNative(string.Empty);
return GCHandle.ToIntPtr(ManagedString.EmptyStringHandle);
}
[UnmanagedCallersOnly]
@@ -2037,7 +2041,8 @@ namespace FlaxEngine
}
catch (Exception exception)
{
Marshal.WriteIntPtr(exceptionPtr, GCHandle.ToIntPtr(GCHandle.Alloc(exception, GCHandleType.Weak)));
if (exceptionPtr != IntPtr.Zero)
Marshal.WriteIntPtr(exceptionPtr, GCHandle.ToIntPtr(GCHandle.Alloc(exception, GCHandleType.Weak)));
return IntPtr.Zero;
}
return returnValue;
@@ -2655,7 +2660,8 @@ namespace FlaxEngine
{
// Returned exception is the last parameter
IntPtr exceptionPtr = nativePtrs[parameterTypes.Length];
Marshal.WriteIntPtr(exceptionPtr, GCHandle.ToIntPtr(GCHandle.Alloc(exception, GCHandleType.Weak)));
if (exceptionPtr != IntPtr.Zero)
Marshal.WriteIntPtr(exceptionPtr, GCHandle.ToIntPtr(GCHandle.Alloc(exception, GCHandleType.Weak)));
return IntPtr.Zero;
}
return returnValue;
@@ -2677,7 +2683,8 @@ namespace FlaxEngine
{
// Returned exception is the last parameter
IntPtr exceptionPtr = nativePtrs[numParams];
Marshal.WriteIntPtr(exceptionPtr, GCHandle.ToIntPtr(GCHandle.Alloc(exception, GCHandleType.Weak)));
if (exceptionPtr != IntPtr.Zero)
Marshal.WriteIntPtr(exceptionPtr, GCHandle.ToIntPtr(GCHandle.Alloc(exception, GCHandleType.Weak)));
return IntPtr.Zero;
}

3
Source/Engine/Scripting/DotNet/MonoApi.cpp
View File

@@ -800,9 +800,6 @@ MONO_API MonoMethod* mono_object_get_virtual_method(MonoObject* obj, MonoMethod*
MONO_API MONO_RT_EXTERNAL_ONLY MonoObject* mono_runtime_invoke(MonoMethod* method, void* obj, void** params, MonoObject** exc)
{
static void* InvokeMethodPtr = CoreCLR::GetStaticMethodPointer(TEXT("InvokeMethod"));
MonoObject* execTmp = nullptr;
if (!exc)
exc = &execTmp;
return (MonoObject*)CoreCLR::CallStaticMethod<void*, void*, void*, void*, void*>(InvokeMethodPtr, obj, ((CoreCLRMethod*)method)->GetMethodHandle(), params, exc);
}