Fixed ObjectDisposedException on delegates (#674)

* Fix ObjectDisposedException by resurrecting object reference of managed object which was returned. * Minor change.
microsoft · Jan 19, 2021 · 913244d · 913244d
1 parent 3a4dd0d
commit 913244d
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/WinRT.Runtime/ComWrappersSupport.net5.cs b/src/WinRT.Runtime/ComWrappersSupport.net5.cs
@@ -112,7 +112,18 @@ public static bool TryUnwrapObject(object o, out IObjectReference objRef)
 
         public static void RegisterObjectForInterface(object obj, IntPtr thisPtr) => TryRegisterObjectForInterface(obj, thisPtr);
 
-        public static object TryRegisterObjectForInterface(object obj, IntPtr thisPtr) => ComWrappers.GetOrRegisterObjectForComInstance(thisPtr, CreateObjectFlags.TrackerObject, obj);
+        public static object TryRegisterObjectForInterface(object obj, IntPtr thisPtr)
+        {
+            var rcw = ComWrappers.GetOrRegisterObjectForComInstance(thisPtr, CreateObjectFlags.TrackerObject, obj);
+
+            // Resurrect IWinRTObject's disposed IObjectReferences, if necessary
+            var target = rcw is Delegate del ? del.Target : rcw;
+            if (target is IWinRTObject winrtObj)
+            {
+                winrtObj.Resurrect();
+            }
+            return rcw;
+        }
 
         public static IObjectReference CreateCCWForObject(object obj)
         {