Add new proposed API to Ancillary.Interop

[jtschuster]

Adds the new APIs from Jeremy's proposal to Ancillary.Interop project and makes the minimum changes not break the build and tests of the VTable generator.

[ghost]

Tagging subscribers to this area: @dotnet/interop-contrib
See info in area-owners.md if you want to be subscribed.

Issue Details

---

Adds the new APIs from Jeremy's proposal to Ancillary.Interop project and makes the minimum changes not break the build and tests of the VTable generator.

Author:	jtschuster
Assignees:	jtschuster
Labels:	area-System.Runtime.InteropServices
Milestone:	-

[jtschuster]

ImplicitThisTests.cs generated code:

// <auto-generated/> ManagedToNativeStubs.g.cs
namespace ComInterfaceGenerator.Tests
{
    internal unsafe partial class NativeExportsNE
    {
        internal unsafe partial class ImplicitThis
        {
            internal unsafe partial interface INativeObject
            {
                internal unsafe partial interface Native
                {
                    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Interop.ComInterfaceGenerator", "42.42.42.42")]
                    [System.Runtime.CompilerServices.SkipLocalsInitAttribute]
                    int INativeObject.GetData()
                    {
                        var(__this, __vtable_native) = ((System.Runtime.InteropServices.Marshalling.IUnmanagedVirtualMethodTableProvider)this).GetVirtualMethodTableInfoForKey(typeof(global::ComInterfaceGenerator.Tests.NativeExportsNE.ImplicitThis.INativeObject));
                        int __retVal;
                        {
                            __retVal = ((delegate* unmanaged<void*, int> )__vtable_native[0])(__this);
                        }

                        return __retVal;
                    }
                }
            }
        }
    }
}
namespace ComInterfaceGenerator.Tests
{
    internal unsafe partial class NativeExportsNE
    {
        internal unsafe partial class ImplicitThis
        {
            internal unsafe partial interface INativeObject
            {
                internal unsafe partial interface Native
                {
                    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Interop.ComInterfaceGenerator", "42.42.42.42")]
                    [System.Runtime.CompilerServices.SkipLocalsInitAttribute]
                    void INativeObject.SetData(int x)
                    {
                        var(__this, __vtable_native) = ((System.Runtime.InteropServices.Marshalling.IUnmanagedVirtualMethodTableProvider)this).GetVirtualMethodTableInfoForKey(typeof(global::ComInterfaceGenerator.Tests.NativeExportsNE.ImplicitThis.INativeObject));
                        {
                            ((delegate* unmanaged<void*, int, void> )__vtable_native[1])(__this, x);
                        }
                    }
                }
            }
        }
    }
}

// <auto-generated/> NativeInterfaces.g.cs
namespace ComInterfaceGenerator.Tests
{
    internal unsafe partial class NativeExportsNE
    {
        internal unsafe partial class ImplicitThis
        {
            internal unsafe partial interface INativeObject
            {
                [System.Runtime.InteropServices.DynamicInterfaceCastableImplementationAttribute]
                internal partial interface Native : INativeObject
                {
                }
            }
        }
    }
}

// <auto-generated/> NativeToManagedStubs.g.cs
namespace ComInterfaceGenerator.Tests
{
    internal unsafe partial class NativeExportsNE
    {
        internal unsafe partial class ImplicitThis
        {
            internal unsafe partial interface INativeObject
            {
                internal unsafe partial interface Native
                {
                    [System.Runtime.InteropServices.UnmanagedCallersOnlyAttribute]
                    internal static int ABI_GetData(void* __this_native)
                    {
                        global::ComInterfaceGenerator.Tests.NativeExportsNE.ImplicitThis.INativeObject @this;
                        int __retVal = default;
                        // Unmarshal - Convert native data to managed data.
                        @this = (global::ComInterfaceGenerator.Tests.NativeExportsNE.ImplicitThis.INativeObject)System.Runtime.InteropServices.Marshalling.UnmanagedObjectUnwrapper.GetObjectForUnmanagedWrapper<ComInterfaceGenerator.Tests.VTableGCHandlePair<ComInterfaceGenerator.Tests.NativeExportsNE.ImplicitThis.INativeObject>>(__this_native);
                        __retVal = @this.GetData();
                        return __retVal;
                    }
                }
            }
        }
    }
}
namespace ComInterfaceGenerator.Tests
{
    internal unsafe partial class NativeExportsNE
    {
        internal unsafe partial class ImplicitThis
        {
            internal unsafe partial interface INativeObject
            {
                internal unsafe partial interface Native
                {
                    [System.Runtime.InteropServices.UnmanagedCallersOnlyAttribute]
                    internal static void ABI_SetData(void* __this_native, int x)
                    {
                        global::ComInterfaceGenerator.Tests.NativeExportsNE.ImplicitThis.INativeObject @this;
                        // Unmarshal - Convert native data to managed data.
                        @this = (global::ComInterfaceGenerator.Tests.NativeExportsNE.ImplicitThis.INativeObject)System.Runtime.InteropServices.Marshalling.UnmanagedObjectUnwrapper.GetObjectForUnmanagedWrapper<ComInterfaceGenerator.Tests.VTableGCHandlePair<ComInterfaceGenerator.Tests.NativeExportsNE.ImplicitThis.INativeObject>>(__this_native);
                        @this.SetData(x);
                    }
                }
            }
        }
    }
}


// <auto-generated/> PopulateVTable.g.cs
namespace ComInterfaceGenerator.Tests
{
    internal unsafe partial class NativeExportsNE
    {
        internal unsafe partial class ImplicitThis
        {
            internal unsafe partial interface INativeObject
            {
                internal unsafe partial interface Native
                {
                    internal static void PopulateUnmanagedVirtualMethodTable(void** vtable)
                    {
                        vtable[0] = (void*)(delegate* unmanaged<void*, int> )&ABI_GetData;
                        vtable[1] = (void*)(delegate* unmanaged<void*, int, void> )&ABI_SetData;
                    }
                }
            }
        }
    }
}

NoImplicitThis.cs generated code:

// <auto-generated/> NativeInterfaces.g.cs
namespace ComInterfaceGenerator.Tests
{
    internal unsafe partial class NativeExportsNE
    {
        internal unsafe partial class NoImplicitThis
        {
            internal unsafe partial interface IStaticMethodTable
            {
                [System.Runtime.InteropServices.DynamicInterfaceCastableImplementationAttribute]
                internal partial interface Native : IStaticMethodTable
                {
                }
            }
        }
    }
}


// <auto-generated/> ManagedToNativeStubs.g.cs
namespace ComInterfaceGenerator.Tests
{
    internal unsafe partial class NativeExportsNE
    {
        internal unsafe partial class NoImplicitThis
        {
            internal unsafe partial interface IStaticMethodTable
            {
                internal unsafe partial interface Native
                {
                    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Interop.ComInterfaceGenerator", "42.42.42.42")]
                    [System.Runtime.CompilerServices.SkipLocalsInitAttribute]
                    int IStaticMethodTable.Add(int x, int y)
                    {
                        var(__this, __vtable_native) = ((System.Runtime.InteropServices.Marshalling.IUnmanagedVirtualMethodTableProvider)this).GetVirtualMethodTableInfoForKey(typeof(global::ComInterfaceGenerator.Tests.NativeExportsNE.NoImplicitThis.IStaticMethodTable));
                        int __retVal;
                        {
                            __retVal = ((delegate* unmanaged<int, int, int> )__vtable_native[0])(x, y);
                        }

                        return __retVal;
                    }
                }
            }
        }
    }
}
namespace ComInterfaceGenerator.Tests
{
    internal unsafe partial class NativeExportsNE
    {
        internal unsafe partial class NoImplicitThis
        {
            internal unsafe partial interface IStaticMethodTable
            {
                internal unsafe partial interface Native
                {
                    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Interop.ComInterfaceGenerator", "42.42.42.42")]
                    [System.Runtime.CompilerServices.SkipLocalsInitAttribute]
                    int IStaticMethodTable.Multiply(int x, int y)
                    {
                        var(__this, __vtable_native) = ((System.Runtime.InteropServices.Marshalling.IUnmanagedVirtualMethodTableProvider)this).GetVirtualMethodTableInfoForKey(typeof(global::ComInterfaceGenerator.Tests.NativeExportsNE.NoImplicitThis.IStaticMethodTable));
                        int __retVal;
                        {
                            __retVal = ((delegate* unmanaged<int, int, int> )__vtable_native[1])(x, y);
                        }

                        return __retVal;
                    }
                }
            }
        }
    }
}

[jkoritzinsky]

Just one more nit.

After that's fixed and the files are moved from file-scoped namespaces back to traditional namespaces, this will be ready to merge!

[jkoritzinsky]

Looks like there were some conflicts from the COM source generator skeleton PR. Can we resolve those and retrigger CI?

[jkoritzinsky]

It looks like you need to build this locally to update the Xlf files. I know it's a pain, I wish we could cloud-automate it.

[elinor-fung]

Just minor comments - nothing that I think is worth resetting CI for. Feel free to address in a future change.

[elinor-fung]

nit: single quote around type names

[elinor-fung]

Do we need this?

[elinor-fung]

nit: newlines after the single-line blocks

[elinor-fung]

(for later change) We should probably have a different ID for the diagnostics here.

[elinor-fung]

I assume this is just prep for later? I don't see it used yet.

[jtschuster]

Yes, this is unused but may be needed later.