Bring over changes from the .NET 6 projection to .NET standard projec…

…tion (#1298) * Bring over changes from the .NET 5 projection to .NET standard projection to have similar behavior * Remove namespace
microsoft · Mar 14, 2023 · 609cda8 · 609cda8
1 parent 8d8f1e1
commit 609cda8
Showing 1 changed file with 40 additions and 17 deletions.
diff --git a/src/WinRT.Runtime/ComWrappersSupport.netstandard2.0.cs b/src/WinRT.Runtime/ComWrappersSupport.netstandard2.0.cs
@@ -25,9 +25,14 @@ static partial class ComWrappersSupport
         private static ConcurrentDictionary<IntPtr, System.WeakReference<object>> RuntimeWrapperCache = new ConcurrentDictionary<IntPtr, System.WeakReference<object>>();
         private readonly static ConcurrentDictionary<Type, Func<object, IObjectReference>> TypeObjectRefFuncCache = new ConcurrentDictionary<Type, Func<object, IObjectReference>>();
 
-        internal static InspectableInfo GetInspectableInfo(IntPtr pThis) => UnmanagedObject.FindObject<ComCallableWrapper>(pThis).InspectableInfo;
+        internal static InspectableInfo GetInspectableInfo(IntPtr pThis) => UnmanagedObject.FindObject<ComCallableWrapper>(pThis).InspectableInfo;
+
+        public static T CreateRcwForComObject<T>(IntPtr ptr)
+        {
+            return CreateRcwForComObject<T>(ptr, true);
+        }
 
-        public static T CreateRcwForComObject<T>(IntPtr ptr)
+        private static T CreateRcwForComObject<T>(IntPtr ptr, bool tryUseCache)
         {
             if (ptr == IntPtr.Zero)
             {
@@ -47,9 +52,17 @@ public static T CreateRcwForComObject<T>(IntPtr ptr)
                 }
                 else if (identity.TryAs<IInspectable.Vftbl>(out var inspectableRef) == 0)
                 {
-                    var inspectable = new IInspectable(identity);
-                    Type runtimeClassType = GetRuntimeClassForTypeCreation(inspectable, typeof(T));
-                    runtimeWrapper = runtimeClassType == null ? inspectable : TypedObjectFactoryCacheForType.GetOrAdd(runtimeClassType, classType => CreateTypedRcwFactory(classType))(inspectable);
+                    var inspectable = new IInspectable(identity);
+
+                    if (typeof(T).IsSealed)
+                    {
+                        runtimeWrapper = TypedObjectFactoryCacheForType.GetOrAdd(typeof(T), classType => CreateTypedRcwFactory(classType))(inspectable);
+                    }
+                    else
+                    {
+                        Type runtimeClassType = GetRuntimeClassForTypeCreation(inspectable, typeof(T));
+                        runtimeWrapper = runtimeClassType == null ? inspectable : TypedObjectFactoryCacheForType.GetOrAdd(runtimeClassType, classType => CreateTypedRcwFactory(classType))(inspectable);
+                    }
                 }
                 else if (identity.TryAs<ABI.WinRT.Interop.IWeakReference.Vftbl>(out var weakRef) == 0)
                 {
@@ -62,17 +75,25 @@ public static T CreateRcwForComObject<T>(IntPtr ptr)
                 return runtimeWrapperReference;
             };
 
-            RuntimeWrapperCache.AddOrUpdate(
-                identity.ThisPtr,
-                rcwFactory,
-                (ptr, oldValue) =>
-                {
-                    if (!oldValue.TryGetTarget(out keepAliveSentinel))
-                    {
-                        return rcwFactory(ptr);
-                    }
-                    return oldValue;
-                }).TryGetTarget(out object rcw);
+            object rcw;
+            if (tryUseCache)
+            {
+                RuntimeWrapperCache.AddOrUpdate(
+                    identity.ThisPtr,
+                    rcwFactory,
+                    (ptr, oldValue) =>
+                    {
+                        if (!oldValue.TryGetTarget(out keepAliveSentinel))
+                        {
+                            return rcwFactory(ptr);
+                        }
+                        return oldValue;
+                    }).TryGetTarget(out rcw);
+            }
+            else
+            {
+                rcwFactory(ptr).TryGetTarget(out rcw);
+            }
 
             GC.KeepAlive(keepAliveSentinel);
 
@@ -86,7 +107,9 @@ public static T CreateRcwForComObject<T>(IntPtr ptr)
             return rcw switch
             {
                 ABI.System.Nullable nt => (T)nt.Value,
-                _ => (T)rcw
+                T castRcw => castRcw,
+                _ when tryUseCache => CreateRcwForComObject<T>(ptr, false),
+                _ => throw new ArgumentException(string.Format("Unable to create a wrapper object. The WinRT object {0} has type {1} which cannot be assigned to type {2}", ptr, rcw.GetType(), typeof(T)))
             };
         }