Remove generated VftblPtr type

microsoft · Nov 26, 2023 · e185a67 · e185a67
1 parent 38a732b
commit e185a67
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/WinRT.Runtime/Interop/IUnknownVftbl.cs b/src/WinRT.Runtime/Interop/IUnknownVftbl.cs
@@ -4,6 +4,14 @@
 using System;
 using System.Runtime.InteropServices;
 
+namespace WinRT
+{
+ internal struct VftblPtr
+ {
+ public IntPtr Vftbl;
+ }
+}
+
 namespace WinRT.Interop
 {
  [Guid("00000000-0000-0000-C000-000000000046")]

diff --git a/src/cswinrt/code_writers.h b/src/cswinrt/code_writers.h
@@ -6706,9 +6706,7 @@ internal IInspectable.Vftbl IInspectableVftbl;
  w.write(R"(%
 internal unsafe Vftbl(IntPtr thisPtr) : this()
 {
-var vftblPtr = Marshal.PtrToStructure<VftblPtr>(thisPtr);
-var vftbl = (IntPtr*)vftblPtr.Vftbl;
-IInspectableVftbl = Marshal.PtrToStructure<IInspectable.Vftbl>(vftblPtr.Vftbl);
+IInspectableVftbl = *(IInspectable.Vftbl*)*(void***)thisPtr;
 %}
 )",
  bind_each([&](writer& w, MethodDef const& method)

diff --git a/src/cswinrt/strings/WinRT.cs b/src/cswinrt/strings/WinRT.cs
@@ -258,10 +258,6 @@ internal static unsafe int RoGetAgileReference(uint options, ref Guid iid, IntPt
  }
  }
 
- internal struct VftblPtr
- {
- public IntPtr Vftbl;
- }
  internal static partial class Context
  {
  [DllImport("api-ms-win-core-com-l1-1-0.dll")]