Avoid some addref/release.

microsoft · Nov 6, 2023 · 2445e5b · 2445e5b
1 parent 50255b9
commit 2445e5b
Showing 1 changed file with 19 additions and 6 deletions.
diff --git a/src/cswinrt/strings/WinRT.cs b/src/cswinrt/strings/WinRT.cs
@@ -488,7 +488,18 @@ internal sealed class FactoryObjectReference<
     {
         private readonly IntPtr _contextToken;
 
-        internal FactoryObjectReference(IntPtr thisPtr) : 
+        public static FactoryObjectReference<T> Attach(ref IntPtr thisPtr)
+        {
+            if (thisPtr == IntPtr.Zero)
+            {
+                return null;
+            }
+            var obj = new FactoryObjectReference<T>(thisPtr);
+            thisPtr = IntPtr.Zero;
+            return obj;
+        }
+
+        internal FactoryObjectReference(IntPtr thisPtr) :
             base(thisPtr)
         {
             if (!IsFreeThreaded(this))
@@ -626,14 +637,16 @@ public static ObjectReference<I> Get<
                     if (activationFactory != null)
                     {
                         using (activationFactory)
-#if NET
-                        using (var objRef = activationFactory.As<I>(iid))
                         {
-                            return FactoryObjectReference<I>.FromAbi(objRef.ThisPtr);
-                        }
+#if NET
+                            if (activationFactory.TryAs(iid, out IntPtr iidPtr) >= 0)
+                            {
+                                return FactoryObjectReference<I>.Attach(ref iidPtr);
+                            }
 #else
-                        return activationFactory.As<I>(iid);
+                            return activationFactory.As<I>(iid);
 #endif
+                        }
                     }
                 }
             }