special casing for IReference[String] and KeyValuePair (#153)

microsoft · Apr 17, 2020 · 90d9954 · 90d9954
1 parent 9ebe644
commit 90d9954
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 4 deletions.
diff --git a/UnitTest/TestComponentCSharp_Tests.cs b/UnitTest/TestComponentCSharp_Tests.cs
@@ -126,7 +126,7 @@ public void TestKeyValuePair()
  TestObject.RaiseStringPairChanged();
  }
 
- [Fact(Skip = "System.ExecutionEngineException in Marshal.PtrToStructure<T>(vftblPtr.Vftbl)")]
+ [Fact]
  public void TestObjectCasting()
  {
  var expected = new KeyValuePair<string, string>("key", "value");
@@ -168,7 +168,7 @@ public void TestStringMap()
  }
  }
 
- [Fact(Skip = "System.ExecutionEngineException in Marshal.PtrToStructure<T>(vftblPtr.Vftbl)")]
+ [Fact]
  public void TestPropertySet()
  {
  var map = new Dictionary<string, string> { ["foo"] = "bar", ["hello"] = "world" };
@@ -184,7 +184,7 @@ public void TestPropertySet()
  }
  }
 
- [Fact(Skip = "System.ExecutionEngineException in Marshal.PtrToStructure<T>(vftblPtr.Vftbl)")]
+ [Fact]
  public void TestValueSet()
  {
  var map = new Dictionary<string, string> { ["foo"] = "bar", ["hello"] = "world" };

diff --git a/WinRT.Runtime/ComWrappersSupport.cs b/WinRT.Runtime/ComWrappersSupport.cs
@@ -222,6 +222,14 @@ private static bool IsIReferenceArray(Type implementationType)
  return implementationType.FullName.StartsWith("Windows.Foundation.IReferenceArray`1");
  }
 
+ private static Func<IInspectable, object> CreateKeyValuePairFactory(Type type)
+ {
+ var parms = new[] { Expression.Parameter(typeof(IInspectable), "obj") };
+ return Expression.Lambda<Func<IInspectable, object>>(
+ Expression.Call(type.GetHelperType().GetMethod("CreateRcw", BindingFlags.Public | BindingFlags.Static), 
+ parms), parms).Compile();
+ }
+
  private static Func<IInspectable, object> CreateNullableTFactory(Type implementationType)
  {
  Type helperType = implementationType.GetHelperType();
@@ -252,8 +260,19 @@ private static Func<IInspectable, object> CreateArrayFactory(Type implementation
 
  internal static Func<IInspectable, object> CreateTypedRcwFactory(string runtimeClassName)
  {
+ // PropertySet and ValueSet can return IReference<String> but Nullable<String> is illegal
+ if (runtimeClassName == "Windows.Foundation.IReference`1<String>")
+ {
+ return (IInspectable obj) => new ABI.System.Nullable<String>(obj.ObjRef).Value;
+ }
+
  var (implementationType, _) = TypeNameSupport.FindTypeByName(runtimeClassName.AsSpan());
 
+ if (implementationType.IsGenericType && implementationType.GetGenericTypeDefinition() == typeof(System.Collections.Generic.KeyValuePair<,>))
+ {
+ return CreateKeyValuePairFactory(implementationType);
+ }
+
  if (implementationType.IsValueType)
  {
  if (IsNullableT(implementationType))

diff --git a/WinRT.Runtime/IInspectable.cs b/WinRT.Runtime/IInspectable.cs
@@ -91,6 +91,7 @@ public static IInspectable FromAbi(IntPtr thisPtr) =>
  public static implicit operator IInspectable(IObjectReference obj) => obj.As<Vftbl>();
  public static implicit operator IInspectable(ObjectReference<Vftbl> obj) => new IInspectable(obj);
  public ObjectReference<I> As<I>() => _obj.As<I>();
+ public IObjectReference ObjRef { get => _obj; }
  public IInspectable(IObjectReference obj) : this(obj.As<Vftbl>()) { }
  public IInspectable(ObjectReference<Vftbl> obj)
  {

diff --git a/WinRT.Runtime/Projections/KeyValuePair.cs b/WinRT.Runtime/Projections/KeyValuePair.cs
@@ -36,6 +36,12 @@ public static IObjectReference CreateMarshaler(global::System.Collections.Generi
  public static IntPtr GetAbi(IObjectReference objRef) =>
  objRef?.ThisPtr ?? IntPtr.Zero;
 
+ public static object CreateRcw(IInspectable obj)
+ {
+ var pair = new KeyValuePair<K, V>(obj.As<Vftbl>());
+ return (object)new global::System.Collections.Generic.KeyValuePair<K, V>(pair.Key, pair.Value);
+ }
+
  public static global::System.Collections.Generic.KeyValuePair<K, V> FromAbi(IntPtr thisPtr)
  {
  var pair = new KeyValuePair<K, V>(KeyValuePair<K, V>._FromAbi(thisPtr));

diff --git a/WinRT.Runtime/TypeNameSupport.cs b/WinRT.Runtime/TypeNameSupport.cs
@@ -148,7 +148,11 @@ private static (string genericTypeName, Type[] genericTypes, int remaining) Pars
  continue;
  }
  else if (remainingTypeName[0] == '>')
- {
+ {
+ // Skip the space after nested '>'
+ var skip = (remainingTypeName.Length > 1 && remainingTypeName[1] == ' ') ? 2 : 1;
+ remainingIndex += skip;
+ remainingTypeName = remainingTypeName.Slice(skip);
  break;
  }
  else

diff --git a/WinUI/WinUIDesktopSample.Package/NoBuild.Targets b/WinUI/WinUIDesktopSample.Package/NoBuild.Targets
@@ -5,4 +5,6 @@
  project from the command line.
  -->
  <Target Name="Build" />
+ <Target Name="Rebuild" />
+ <Target Name="Clean" />
 </Project>