Add a test for signature collision

Author: jkoritzinsky

src/tests/Interop/COM/NETClients/IDispatch/Program.cs

@@ -346,6 +346,19 @@ static void Validate_ValueCoerce_ReturnToManaged()
             Assert.Equal("True", dispatchCoerceTesting.BoolToString());
         }
 
+        static void Validate_GetDispId_Methods()
+        {
+            var dispatchTesting = new DispatchTesting();
+
+            Console.WriteLine($"Calling {nameof(DispatchTesting.GetDispIdAsString)} ...");
+            string result1 = dispatchTesting.GetDispIdAsString();
+            Assert.Equal("1000", result1);
+
+            Console.WriteLine($"Calling {nameof(DispatchTesting.GetDispIdAsString2)} ...");
+            string result2 = dispatchTesting.GetDispIdAsString2();
+            Assert.Equal("1001", result2);
+        }
+
         [Fact]
         public static int TestEntryPoint()
         {
@@ -365,6 +378,7 @@ public static int TestEntryPoint()
                 Validate_LCID_Marshaled();
                 Validate_Enumerator();
                 Validate_ValueCoerce_ReturnToManaged();
+                Validate_GetDispId_Methods();
             }
             catch (Exception e)
             {

src/tests/Interop/COM/NETServer/DispatchTesting.cs

@@ -102,4 +102,16 @@ public object TriggerCustomMarshaler(object objIn, ref object objRef)
         objRef = objIn;
         return ret;
     }
+
+    [DispId(1000)]
+    public string GetDispIdAsString()
+    {
+        return "1000";
+    }
+
+    [DispId(1001)]
+    public string GetDispIdAsString2()
+    {
+        return "1001";
+    }
 }

src/tests/Interop/COM/NativeServer/DispatchTesting.h

@@ -184,6 +184,14 @@ class DispatchTesting : public UnknownImpl, public IDispatchTesting
                 V_UNKNOWN(pVarResult) = new Enumerator(10);
                 return S_OK;
             }
+            case 1000:
+            {
+                return GetDispIdAsString_Proxy(pVarResult);
+            }
+            case 1001:
+            {
+                return GetDispIdAsString2_Proxy(pVarResult);
+            }
             }
 
             return E_NOTIMPL;
@@ -275,6 +283,20 @@ class DispatchTesting : public UnknownImpl, public IDispatchTesting
         return S_OK;
     }
 
+    HRESULT STDMETHODCALLTYPE GetDispIdAsString(
+        /* [out,retval] */ BSTR *pRetVal)
+    {
+        *pRetVal = SysAllocString(W("1000"));
+        return S_OK;
+    }
+
+    HRESULT STDMETHODCALLTYPE GetDispIdAsString2(
+        /* [out,retval] */ BSTR *pRetVal)
+    {
+        *pRetVal = SysAllocString(W("1001"));
+        return S_OK;
+    }
+
 private:
     HRESULT DoubleNumeric_ReturnByRef_Proxy(_In_ DISPPARAMS *pDispParams)
     {
@@ -521,6 +543,30 @@ class DispatchTesting : public UnknownImpl, public IDispatchTesting
         return S_OK;
     }
 
+    HRESULT GetDispIdAsString_Proxy(_Inout_ VARIANT *pVarResult)
+    {
+        if (pVarResult == nullptr)
+            return E_POINTER;
+
+        RETURN_IF_FAILED(::VariantChangeType(pVarResult, pVarResult, 0, VT_BSTR));
+        BSTR result = nullptr;
+        RETURN_IF_FAILED(GetDispIdAsString(&result));
+        V_BSTR(pVarResult) = result;
+        return S_OK;
+    }
+
+    HRESULT GetDispIdAsString2_Proxy(_Inout_ VARIANT *pVarResult)
+    {
+        if (pVarResult == nullptr)
+            return E_POINTER;
+
+        RETURN_IF_FAILED(::VariantChangeType(pVarResult, pVarResult, 0, VT_BSTR));
+        BSTR result = nullptr;
+        RETURN_IF_FAILED(GetDispIdAsString2(&result));
+        V_BSTR(pVarResult) = result;
+        return S_OK;
+    }
+
 public: // IUnknown
     STDMETHOD(QueryInterface)(
         /* [in] */ REFIID riid,

src/tests/Interop/COM/ServerContracts/Server.Contracts.cs

@@ -310,6 +310,14 @@ void DoubleNumeric_ReturnByRef (
 
         [DispId(/*DISPID_NEWENUM*/-4)]
         System.Collections.IEnumerator GetEnumerator();
+
+        // Test matching signatures and different metadata (ie DISPID)
+
+        [DispId(1000)]
+        string GetDispIdAsString();
+
+        [DispId(1001)]
+        string GetDispIdAsString2();
     }
 
     [ComVisible(true)]