Property Setter do not use INVOKEKIND.INVOKE_PROPERTYPUTREF (#308)

* fix: Correct use of INVOKEKIND.INVOKE_PROPERTYPUTREF
dspace-group · Nov 22, 2024 · 7fa354e · 7fa354e
1 parent 5a446e7
commit 7fa354e
Show file tree

Hide file tree

Showing 2 changed files with 95 additions and 3 deletions.
diff --git a/src/dscom.test/tests/PropertyTest.cs b/src/dscom.test/tests/PropertyTest.cs
@@ -59,6 +59,79 @@ public void PropertyInInterfaceWithComInterfaceType_Found(ComInterfaceType inter
         typeInfo!.ContainsFuncDescByName("TestProperty").Should().Be(true);
     }
 
+    [Fact]
+    public void PropertyInInterfaceWithComInterface_ShouldHavePutRef()
+    {
+        var result = CreateAssembly()
+                        .WithInterface("TestSourceInterface")
+                        .Build(out var testSourceInterfaceType)
+                       .WithInterface("TestInterface")
+                           .WithCustomAttribute<InterfaceTypeAttribute>(ComInterfaceType.InterfaceIsDual)
+                           .WithProperty("TestProperty", testSourceInterfaceType!)
+                           .Build()
+                       .Build()
+                   .Build();
+
+        //check for source-interface
+        var typeSourceInfo = result.TypeLib.GetTypeInfoByName("TestSourceInterface");
+        typeSourceInfo.Should().NotBeNull("TestSourceInterface not found");
+
+        //check for test-interface
+        var typeInfo = result.TypeLib.GetTypeInfoByName("TestInterface");
+        typeInfo.Should().NotBeNull("TestInterface not found");
+
+        //check for setter
+        using var funcDescByName = typeInfo!.GetFuncDescByName("TestProperty", invokeKind: INVOKEKIND.INVOKE_PROPERTYPUTREF);
+        funcDescByName.Should().NotBeNull();
+    }
+
+    [Theory]
+    [InlineData(typeof(byte), INVOKEKIND.INVOKE_PROPERTYPUT)]
+    [InlineData(typeof(sbyte), INVOKEKIND.INVOKE_PROPERTYPUT)]
+    [InlineData(typeof(short), INVOKEKIND.INVOKE_PROPERTYPUT)]
+    [InlineData(typeof(ushort), INVOKEKIND.INVOKE_PROPERTYPUT)]
+    [InlineData(typeof(uint), INVOKEKIND.INVOKE_PROPERTYPUT)]
+    [InlineData(typeof(int), INVOKEKIND.INVOKE_PROPERTYPUT)]
+    [InlineData(typeof(ulong), INVOKEKIND.INVOKE_PROPERTYPUT)]
+    [InlineData(typeof(long), INVOKEKIND.INVOKE_PROPERTYPUT)]
+    [InlineData(typeof(float), INVOKEKIND.INVOKE_PROPERTYPUT)]
+    [InlineData(typeof(double), INVOKEKIND.INVOKE_PROPERTYPUT)]
+    [InlineData(typeof(string), INVOKEKIND.INVOKE_PROPERTYPUT)]
+    [InlineData(typeof(bool), INVOKEKIND.INVOKE_PROPERTYPUT)]
+    [InlineData(typeof(char), INVOKEKIND.INVOKE_PROPERTYPUT)]
+    [InlineData(typeof(object), INVOKEKIND.INVOKE_PROPERTYPUTREF)]
+    [InlineData(typeof(object[]), INVOKEKIND.INVOKE_PROPERTYPUTREF)]
+    [InlineData(typeof(System.Collections.IEnumerator), INVOKEKIND.INVOKE_PROPERTYPUTREF)]
+    [InlineData(typeof(DateTime), INVOKEKIND.INVOKE_PROPERTYPUT)]
+    [InlineData(typeof(Guid), INVOKEKIND.INVOKE_PROPERTYPUT)]
+    [InlineData(typeof(System.Drawing.Color), INVOKEKIND.INVOKE_PROPERTYPUT)]
+    [InlineData(typeof(decimal), INVOKEKIND.INVOKE_PROPERTYPUT)]
+    [InlineData(typeof(Delegate), INVOKEKIND.INVOKE_PROPERTYPUTREF)]
+    [InlineData(typeof(IntPtr), INVOKEKIND.INVOKE_PROPERTYPUT)]
+    [InlineData(typeof(IDispatch), INVOKEKIND.INVOKE_PROPERTYPUTREF)]
+    [InlineData(typeof(IUnknown), INVOKEKIND.INVOKE_PROPERTYPUTREF)]
+    public void SetterPropertyInInterface_ShouldHaveInvokeKind(Type type, INVOKEKIND invokeKind)
+    {
+        var result = CreateAssembly()
+                       .WithInterface("TestInterface")
+                           .WithCustomAttribute<InterfaceTypeAttribute>(ComInterfaceType.InterfaceIsDual)
+                           .WithProperty("TestProperty", type, true, false)
+                           .Build()
+                       .Build()
+                   .Build();
+
+        //check for interface
+        var typeInfo = result.TypeLib.GetTypeInfoByName("TestInterface");
+        typeInfo.Should().NotBeNull("TestInterface not found");
+
+        //check for setter
+        using var funcDescByName = typeInfo!.GetFuncDescByName("TestProperty");
+        funcDescByName.Should().NotBeNull();
+
+        //check for invokekind
+        funcDescByName!.Value.invkind.Should().Be(invokeKind);
+    }
+
     [Theory]
     [InlineData(typeof(byte))]
     [InlineData(typeof(sbyte))]

diff --git a/src/dscom/writer/PropertySetMethodWriter.cs b/src/dscom/writer/PropertySetMethodWriter.cs
@@ -29,9 +29,28 @@ public override void Create()
         {
             if (MethodInfo.GetParameters().Any(p =>
              {
-                 return p.ParameterType == typeof(object) ||
-                 p.ParameterType.ToString() == typeof(IDispatch).FullName ||
-                     p.ParameterType.IsInterface;
+                 var type = p.ParameterType;
+
+                 // Object is not 'IsClass'
+                 if (type == typeof(object))
+                 {
+                     return true;
+                 }
+
+                 // every class except special ones (e.g. String)
+                 // are handles as references
+                 if (type.IsClass && !type.IsSpecialHandledClass())
+                 {
+                     return true;
+                 }
+
+                 // interfaces are same as classes
+                 if (type.IsInterface)
+                 {
+                     return true;
+                 }
+
+                 return false;
              }))
             {
                 InvokeKind = INVOKEKIND.INVOKE_PROPERTYPUTREF;