Remove/move internal vftbl types

src/WinRT.Runtime/ActivationFactory.cs

@@ -99,7 +99,7 @@ private DllModule(string fileName, IntPtr moduleHandle, void* getActivationFacto
  }
  }
 
- public (ObjectReference<IActivationFactoryVftbl> obj, int hr) GetActivationFactory(string runtimeClassId)
+ public (ObjectReference<IUnknownVftbl> obj, int hr) GetActivationFactory(string runtimeClassId)
  {
  IntPtr instancePtr = IntPtr.Zero;
  try
@@ -110,7 +110,7 @@ private DllModule(string fileName, IntPtr moduleHandle, void* getActivationFacto
  int hr = _GetActivationFactory(MarshalString.GetAbi(ref __runtimeClassId), &instancePtr);
  if (hr == 0)
  {
- var objRef = ObjectReference<IActivationFactoryVftbl>.Attach(ref instancePtr);
+ var objRef = ObjectReference<IUnknownVftbl>.Attach(ref instancePtr);
  return (objRef, hr);
  }
  else
@@ -205,8 +205,8 @@ public static IObjectReference Get(string typeName)
  {
  // Prefer the RoGetActivationFactory HRESULT failure over the LoadLibrary/etc. failure
  int hr;
- ObjectReference<IActivationFactoryVftbl> factory;
- (factory, hr) = WinRTModule.GetActivationFactory<IActivationFactoryVftbl>(typeName, InterfaceIIDs.IActivationFactory_IID);
+ ObjectReference<IUnknownVftbl> factory;
+ (factory, hr) = WinRTModule.GetActivationFactory<IUnknownVftbl>(typeName, InterfaceIIDs.IActivationFactory_IID);
  if (factory != null)
  {
  return factory;
@@ -271,7 +271,7 @@ public static ObjectReference<I> Get<I>(string typeName, Guid iid)
  DllModule module = null;
  if (DllModule.TryLoad(moduleName + ".dll", out module))
  {
- ObjectReference<IActivationFactoryVftbl> activationFactory;
+ ObjectReference<IUnknownVftbl> activationFactory;
  (activationFactory, hr) = module.GetActivationFactory(typeName);
  if (activationFactory != null)
  {

src/WinRT.Runtime/Interop/IDelegateVftbl.cs

@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System;
+
+namespace WinRT.Interop
+{
+ // This is internal both in the embedded case, but also if we're on modern .NET,
+ // because projections only use this vftbl type downlevel, and running older
+ // projections against a .NET version of CsWinRT is not supported.
+#if EMBED || NET
+ internal
+#else 
+ public
+#endif
+ struct IDelegateVftbl
+ {
+ public IUnknownVftbl IUnknownVftbl;
+ public IntPtr Invoke;
+ }
+}

src/WinRT.Runtime/Marshalers.cs

@@ -1668,10 +1668,10 @@ public static IObjectReference CreateMarshaler(object o, Guid delegateIID, bool
 
  if (unwrapObject && ComWrappersSupport.TryUnwrapObject(o, out var objRef))
  {
- return objRef.As<IDelegateVftbl>(delegateIID);
+ return objRef.As<IUnknownVftbl>(delegateIID);
  }
 
- return ComWrappersSupport.CreateCCWForObject<IDelegateVftbl>(o, delegateIID);
+ return ComWrappersSupport.CreateCCWForObject<IUnknownVftbl>(o, delegateIID);
  }
 
  public static ObjectReferenceValue CreateMarshaler2(object o, Guid delegateIID, bool unwrapObject = true)

src/cswinrt/code_writers.h

@@ -8652,7 +8652,7 @@ return MarshalDelegate.FromAbi<%>(nativeDelegate);
 
 public static % CreateRcw(IntPtr ptr)
 {
-return new %(new NativeDelegateWrapper(ComWrappersSupport.GetObjectReferenceForInterface<IDelegateVftbl>(ptr, GuidGenerator.GetIID(typeof(@%)))).Invoke);
+return new %(new NativeDelegateWrapper(ComWrappersSupport.GetObjectReferenceForInterface<IUnknownVftbl>(ptr, GuidGenerator.GetIID(typeof(@%)))).Invoke);
 }
 
 [global::WinRT.ObjectReferenceWrapper(nameof(_nativeDelegate))]
@@ -8662,9 +8662,9 @@ private sealed class NativeDelegateWrapper
 private sealed class NativeDelegateWrapper : IWinRTObject
 #endif
 {
-private readonly ObjectReference<global::WinRT.Interop.IDelegateVftbl> _nativeDelegate;
+private readonly ObjectReference<global::WinRT.Interop.IUnknownVftbl> _nativeDelegate;
 
-public NativeDelegateWrapper(ObjectReference<global::WinRT.Interop.IDelegateVftbl> nativeDelegate)
+public NativeDelegateWrapper(ObjectReference<global::WinRT.Interop.IUnknownVftbl> nativeDelegate)
 {
 _nativeDelegate = nativeDelegate;
 }
@@ -8792,7 +8792,7 @@ AbiToProjectionVftable = new global::WinRT.Interop.IDelegateVftbl
 IUnknownVftbl = global::WinRT.Interop.IUnknownVftbl.AbiToProjectionVftbl,
 Invoke = Marshal.GetFunctionPointerForDelegate(AbiInvokeDelegate)
 };
-var nativeVftbl = ComWrappersSupport.AllocateVtableMemory(typeof(@%), Marshal.SizeOf<global::WinRT.Interop.IDelegateVftbl>());
+var nativeVftbl = ComWrappersSupport.AllocateVtableMemory(typeof(@%), sizeof(IntPtr) * 4);
 Marshal.StructureToPtr(AbiToProjectionVftable, nativeVftbl, false);
 AbiToProjectionVftablePtr = nativeVftbl;
 )",
@@ -8802,7 +8802,7 @@ AbiToProjectionVftablePtr = nativeVftbl;
  else if (!is_generic)
  {
  w.write(R"(
-AbiToProjectionVftablePtr = ComWrappersSupport.AllocateVtableMemory(typeof(@), sizeof(global::WinRT.Interop.IDelegateVftbl));
+AbiToProjectionVftablePtr = ComWrappersSupport.AllocateVtableMemory(typeof(@), sizeof(IntPtr) * 4);
 *(global::WinRT.Interop.IUnknownVftbl*)AbiToProjectionVftablePtr = global::WinRT.Interop.IUnknownVftbl.AbiToProjectionVftbl;
 ((delegate* unmanaged[Stdcall]<%, int>*)AbiToProjectionVftablePtr)[3] = &Do_Abi_Invoke;
 )",
@@ -8817,7 +8817,7 @@ AbiToProjectionVftablePtr = ComWrappersSupport.AllocateVtableMemory(typeof(@), s
 if (RuntimeFeature.IsDynamicCodeCompiled && %.AbiToProjectionVftablePtr == default)
 {
 AbiInvokeDelegate = %;
-AbiToProjectionVftablePtr = ComWrappersSupport.AllocateVtableMemory(typeof(@%), sizeof(global::WinRT.Interop.IDelegateVftbl));
+AbiToProjectionVftablePtr = ComWrappersSupport.AllocateVtableMemory(typeof(@%), sizeof(IntPtr) * 4);
 *(global::WinRT.Interop.IUnknownVftbl*)AbiToProjectionVftablePtr = global::WinRT.Interop.IUnknownVftbl.AbiToProjectionVftbl;
 ((IntPtr*)AbiToProjectionVftablePtr)[3] = Marshal.GetFunctionPointerForDelegate(AbiInvokeDelegate);
 }
@@ -8915,17 +8915,17 @@ else
  {
  if (have_generic_params)
  {
- w.write("var abiInvoke = Marshal.GetDelegateForFunctionPointer(_nativeDelegate.Vftbl.Invoke, Abi_Invoke_Type);");
+ w.write("var abiInvoke = Marshal.GetDelegateForFunctionPointer((IntPtr)(*(void***)_nativeDelegate.ThisPtr)[3], Abi_Invoke_Type);");
  }
  else
  {
- w.write("var abiInvoke = Marshal.GetDelegateForFunctionPointer<%>(_nativeDelegate.Vftbl.Invoke);",
+ w.write("var abiInvoke = Marshal.GetDelegateForFunctionPointer<%>((IntPtr)(*(void***)_nativeDelegate.ThisPtr)[3]);",
  is_generic ? w.write_temp("@_Delegates.Invoke", type.TypeName()) : "Abi_Invoke");
  }
  }
  else
  {
- w.write("var abiInvoke = (delegate* unmanaged[Stdcall]<%, int>)(_nativeDelegate.Vftbl.Invoke);",
+ w.write("var abiInvoke = (delegate* unmanaged[Stdcall]<%, int>)(*(void***)_nativeDelegate.ThisPtr)[3];",
  bind<write_abi_parameter_types_pointer>(signature));
  }
  }),

src/cswinrt/cswinrt.vcxproj

@@ -112,7 +112,6 @@
  <None Include="strings\additions\Windows.UI\Windows.UI.cs" />
  <None Include="strings\ComInteropHelpers.cs" />
  <None Include="strings\WinRT.cs" />
- <None Include="strings\WinRT_Interop.cs" />
  </ItemGroup>
  <ItemGroup>
  <Midl Include="WinRT.Interop.idl" />

src/cswinrt/cswinrt.vcxproj.filters

@@ -57,9 +57,6 @@
  <Filter>strings</Filter>
  </None>
  <None Include="packages.config" />
- <None Include="strings\WinRT_Interop.cs">
- <Filter>strings</Filter>
- </None>
  <None Include="strings\additions\Windows.Foundation\Windows.Foundation.cs">
  <Filter>strings\additions\Windows.Foundation</Filter>
  </None>

src/cswinrt/strings/WinRT.cs

@@ -124,7 +124,7 @@ public void Dispose()
  public void InitalizeReferenceTracking(IntPtr ptr)
  {
  eventInvokePtr = ptr;
- int hr = Marshal.QueryInterface(ptr, ref Unsafe.AsRef(IReferenceTrackerTargetVftbl.IID), out referenceTrackerTargetPtr);
+ int hr = Marshal.QueryInterface(ptr, ref Unsafe.AsRef(in InterfaceIIDs.IReferenceTrackerTarget_IID), out referenceTrackerTargetPtr);
  if (hr != 0)
  {
  referenceTrackerTargetPtr = default;
@@ -152,9 +152,14 @@ public unsafe bool HasComReferences()
 
  if (referenceTrackerTargetPtr != default)
  {
- IReferenceTrackerTargetVftbl vftblReferenceTracker = **(IReferenceTrackerTargetVftbl**)referenceTrackerTargetPtr;
- vftblReferenceTracker.AddRefFromReferenceTracker(referenceTrackerTargetPtr);
- uint refTrackerCount = vftblReferenceTracker.ReleaseFromReferenceTracker(referenceTrackerTargetPtr);
+ void** vftblReferenceTracker = *(void***)referenceTrackerTargetPtr;
+
+ // AddRefFromReferenceTracker
+ _ = ((delegate* unmanaged[Stdcall]<IntPtr, uint>)(vftblReferenceTracker[3]))(referenceTrackerTargetPtr);
+
+ // ReleaseFromReferenceTracker
+ uint refTrackerCount = ((delegate* unmanaged[Stdcall]<IntPtr, uint>)(vftblReferenceTracker[4]))(referenceTrackerTargetPtr);
+
  if (refTrackerCount != 0)
  {
  // Note we can't tell if the reference tracker ref is pegged or not, so this is best effort where if there
@@ -465,6 +470,7 @@ internal static class InterfaceIIDs
  internal static readonly Guid IMarshal_IID = new Guid(new global::System.ReadOnlySpan<byte>(new byte[] { 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 }));
  internal static readonly Guid IContextCallback_IID = new Guid(new global::System.ReadOnlySpan<byte>(new byte[] { 0xDA, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 }));
  internal static readonly Guid ICallbackWithNoReentrancyToApplicationSTA_IID = new Guid(new global::System.ReadOnlySpan<byte>(new byte[] { 0x74, 0x97, 0x29, 0x0A, 0x4E, 0x3E, 0x42, 0xFC, 0x1D, 0x9D, 0x72, 0xCE, 0xE1, 0x05, 0xCA, 0x57 }));
+ internal static readonly Guid IReferenceTrackerTarget_IID = new Guid(new global::System.ReadOnlySpan<byte>(new byte[] { 0xF8, 0x43, 0xBD, 0x64, 0xEE, 0xBF, 0xC4, 0x4E, 0xB7, 0xEB, 0x29, 0x35, 0x15, 0x8D, 0xAE, 0x21 }));
 #else
  internal static readonly Guid IInspectable_IID = new(0xAF86E2E0, 0xB12D, 0x4c6a, 0x9C, 0x5A, 0xD7, 0xAA, 0x65, 0x10, 0x1E, 0x90);
  internal static readonly Guid IUnknown_IID = new(0, 0, 0, 0xC0, 0, 0, 0, 0, 0, 0, 0x46);
@@ -475,6 +481,7 @@ internal static class InterfaceIIDs
  internal static readonly Guid IMarshal_IID = new(0x00000003, 0, 0, 0xc0, 0, 0, 0, 0, 0, 0, 0x46);
  internal static readonly Guid IContextCallback_IID = new(0x000001da, 0, 0, 0xC0, 0, 0, 0, 0, 0, 0, 0x46);
  internal static readonly Guid ICallbackWithNoReentrancyToApplicationSTA_IID = new(0x0A299774, 0x3E4E, 0xFC42, 0x1D, 0x9D, 0x72, 0xCE, 0xE1, 0x05, 0xCA, 0x57);
+ internal static readonly Guid IReferenceTrackerTarget_IID = new(0x64BD43F8, 0xbFEE, 0x4EC4, 0xB7, 0xEB, 0x29, 0x35, 0x15, 0x8D, 0xAE, 0x21);
 #endif
  }
 }