Add the ObjectReferenceWrapper attribute to enable unwrapping WinRT.I…

…Inspectable instances. (#273) * Add the ObjectReferenceWrapper attribute to enable unwrapping WinRT.IInspectable instances. * Add unit test.
microsoft · May 13, 2020 · e23f6e9 · e23f6e9
1 parent 2c569ef
commit e23f6e9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/UnitTest/TestComponentCSharp_Tests.cs b/UnitTest/TestComponentCSharp_Tests.cs
@@ -1496,5 +1496,12 @@ public void WeakReferenceOfNativeObjectRehydratedAfterWrapperIsCollected()
  Assert.True(winrt.TryGetTarget(out _));
  GC.KeepAlive(objRef);
  }
+
+ [Fact]
+ public void TestUnwrapInspectable()
+ {
+ var inspectable = IInspectable.FromAbi(TestObject.ThisPtr);
+ Assert.True(ComWrappersSupport.TryUnwrapObject(inspectable, out _));
+ }
  }
 }
diff --git a/WinRT.Runtime/IInspectable.cs b/WinRT.Runtime/IInspectable.cs
@@ -14,6 +14,7 @@ public enum TrustLevel
  }
 
  // IInspectable
+ [ObjectReferenceWrapper(nameof(_obj))]
  [Guid("AF86E2E0-B12D-4c6a-9C5A-D7AA65101E90")]
  public class IInspectable
  {
@@ -104,9 +105,9 @@ public unsafe string GetRuntimeClassName(bool noThrow = false)
  try
  {
  var hr = _obj.Vftbl.GetRuntimeClassName(ThisPtr, out __retval);
- if (hr != 0)
- {
- if (noThrow)
+ if (hr != 0)
+ {
+ if (noThrow)
  return null;
  Marshal.ThrowExceptionForHR(hr);
  }