From 605a83215d8c52d8623e3a195df9f2417091445d Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Mon, 4 May 2020 11:08:41 +0200 Subject: [PATCH] Convert Runtime.GetHandleForINativeObject to use GCHandle. --- runtime/delegates.t4 | 2 +- src/ObjCRuntime/Runtime.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/delegates.t4 b/runtime/delegates.t4 index 9211e4e7d0..d681c77238 100644 --- a/runtime/delegates.t4 +++ b/runtime/delegates.t4 @@ -121,7 +121,7 @@ }, new XDelegate ("id", "IntPtr", "xamarin_get_handle_for_inativeobject", - "MonoObject *", "IntPtr", "obj" + "GCHandle->MonoObject *", "IntPtr", "obj_handle" ) { WrappedManagedFunction = "GetHandleForINativeObject", OnlyDynamicUsage = false, diff --git a/src/ObjCRuntime/Runtime.cs b/src/ObjCRuntime/Runtime.cs index b8ee62f3ee..32d2e26956 100644 --- a/src/ObjCRuntime/Runtime.cs +++ b/src/ObjCRuntime/Runtime.cs @@ -649,7 +649,7 @@ namespace ObjCRuntime { static IntPtr GetHandleForINativeObject (IntPtr ptr) { - return ((INativeObject) ObjectWrapper.Convert (ptr)).Handle; + return ((INativeObject) GetGCHandleTarget (ptr)).Handle; } static void UnregisterNSObject (IntPtr native_obj, IntPtr managed_obj)