diff --git a/src/Generator/Program.cs b/src/Generator/Program.cs
index 3207b0b..cd087e4 100644
--- a/src/Generator/Program.cs
+++ b/src/Generator/Program.cs
@@ -51,7 +51,7 @@ public static class Program
         { "Foundation.BOOL", "Bool32" },
         { "Foundation.BOOLEAN", "byte" },
         { "Foundation.BSTR", "char*" },
-        { "Foundation.HANDLE", "IntPtr" },
+        { "Foundation.HANDLE", "Handle" },
         { "Foundation.HINSTANCE", "IntPtr" },
         { "Foundation.HRESULT", "HResult" },
         { "Foundation.HWND", "IntPtr" },
@@ -88,7 +88,9 @@ public static class Program
 
         { "Graphics.Direct3D.D3DVECTOR", "Vector3" },
         { "Graphics.Direct3D.D3DMATRIX", "Matrix4x4" },
+        { "Graphics.Dxgi.DXGI_MATRIX_3X2_F", "Matrix3x2" },
         { "Graphics.Direct2D.Common.D2D_MATRIX_3X2_F", "Matrix3x2" },
+        { "Graphics.DirectWrite.DWRITE_MATRIX", "Matrix3x2" },
         { "Graphics.Direct2D.Common.D2D_MATRIX_4X3_F", "Matrix4x3" },
         { "Graphics.Direct2D.Common.D2D_MATRIX_4X4_F", "Matrix4x4" },
         { "Graphics.Direct2D.Common.D2D_MATRIX_5X4_F", "Matrix5x4" },
@@ -109,6 +111,9 @@ public static class Program
         { "Graphics.Direct2D.Matrix4x4F", "Matrix4x4" },
         { "Graphics.Direct2D.Matrix5x4F", "Matrix5x4" },
 
+        { "Graphics.Direct3D11.D3D11_VIEWPORT", "Viewport" },
+        { "Graphics.Direct3D12.D3D12_VIEWPORT", "Viewport" },
+
         // TODO: Understand those ->
         { "Foundation.RECT", "RawRect" },
         { "Foundation.RECTL", "RawRect" },
@@ -119,14 +124,7 @@ public static class Program
 
     private static readonly Dictionary<string, string> s_partRenames = new()
     {
-        { "NONPREROTATED", "NonPrerotated" },
-        { "POINTLIST", "PointList" },
-        { "LINELIST", "LineList" },
-        { "LINESTRIP", "LineStrip" },
-        { "TRIANGLELIST", "TriangleList" },
-        { "TRIANGLESTRIP", "TriangleStrip" },
-        { "PATCHLIST", "PatchList" },
-
+        
         { "CBUFFER", "CBuffer" },
         { "TBUFFER", "TBuffer" },
         { "NOPERSPECTIVE", "NoPerspective" },
@@ -660,6 +658,14 @@ public static class Program
         "SubProperty",
         "TableTransfer",
         "WhiteLevelAdjustment",
+        "LookupTable3D",
+        "NonPrerotated",
+        "PointList",
+        "LineList",
+        "LineStrip",
+        "TriangleList",
+        "TriangleStrip",
+        "PatchList",
     };
 
     private static readonly HashSet<string> s_preserveCaps = new(StringComparer.OrdinalIgnoreCase)
@@ -832,6 +838,7 @@ public static class Program
         { "DXGI_ENUM_MODES", "EnumModesFlags" },
         { "DXGI_MWA", "WindowAssociationFlags" },
         { "DXGI_PRESENT", "PresentFlags" },
+        { "DXGI_DEBUG_RLO_FLAGS", "ReportLiveObjectFlags" },
 
         // D3D11
         { "D3D11_RLDO_FLAGS", "ReportLiveDeviceObjectFlags" },
@@ -863,6 +870,7 @@ public static class Program
         { "DXGI_SWAP_CHAIN_DESC::Flags", "DXGI_SWAP_CHAIN_FLAG" },
         { "DXGI_SWAP_CHAIN_DESC1::BufferUsage", "Usage" },
         { "DXGI_SWAP_CHAIN_DESC1::Flags", "DXGI_SWAP_CHAIN_FLAG" },
+        { "DXGI_DECODE_SWAP_CHAIN_DESC::Flags", "DXGI_SWAP_CHAIN_FLAG" },
 
         // D3D11
         { "D3D11_BUFFER_DESC::BindFlags", "D3D11_BIND_FLAG" },
@@ -2305,6 +2313,14 @@ public static class Program
                 {
                     sb.Append("Flags");
                 }
+                else if (part == "FLAG2")
+                {
+                    sb.Append("Flags2");
+                }
+                else if (part == "FLAG3")
+                {
+                    sb.Append("Flags3");
+                }
                 else
                 {
                     sb.Append(char.ToUpper(part[0]));
@@ -2676,6 +2692,7 @@ public static class Program
             case "ULargeInteger":
             case "Luid":
             case "HResult":
+            case "Handle":
                 return true;
 
             case "System.Drawing.Point":
@@ -2695,6 +2712,7 @@ public static class Program
 
             case "Matrix4x3":
             case "Matrix5x4":
+            case "Viewport":
                 return true;
         }
 
@@ -2764,6 +2782,7 @@ public static class Program
 
             case "Bool32":
             case "HResult":
+            case "Handle":
                 return false;
 
             case "LargeInteger":
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct2D.cs b/src/Vortice.Win32/Generated/Graphics/Direct2D.cs
index 1a2b883..46f1fc8 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct2D.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct2D.cs
@@ -4100,7 +4100,7 @@ public enum HighlightSandShadowsInputGamma : uint
 
 /// <include file='../Direct2D.xml' path='doc/member[@name="D2D1_LOOKUPTABLE3D_PROP"]/*' />
 /// <unmanaged>D2D1_LOOKUPTABLE3D_PROP</unmanaged>
-public enum Lookuptable3dProp : uint
+public enum LookupTable3DProp : uint
 {
 	/// <include file='../Direct2D.xml' path='doc/member[@name="D2D1_LOOKUPTABLE3D_PROP::D2D1_LOOKUPTABLE3D_PROP_LUT"]/*' />
 	/// <unmanaged>D2D1_LOOKUPTABLE3D_PROP_LUT</unmanaged>
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D11.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D11.cs
index 646ba46..ed25cc1 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct3D11.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct3D11.cs
@@ -8482,29 +8482,6 @@ public partial struct SODeclarationEntry
 	public byte OutputSlot;
 }
 
-/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_VIEWPORT"]/*' />
-/// <unmanaged>D3D11_VIEWPORT</unmanaged>
-public partial struct Viewport
-{
-	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_VIEWPORT::TopLeftX"]/*' />
-	public float TopLeftX;
-
-	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_VIEWPORT::TopLeftY"]/*' />
-	public float TopLeftY;
-
-	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_VIEWPORT::Width"]/*' />
-	public float Width;
-
-	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_VIEWPORT::Height"]/*' />
-	public float Height;
-
-	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_VIEWPORT::MinDepth"]/*' />
-	public float MinDepth;
-
-	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_VIEWPORT::MaxDepth"]/*' />
-	public float MaxDepth;
-}
-
 /// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_DRAW_INSTANCED_INDIRECT_ARGS"]/*' />
 /// <unmanaged>D3D11_DRAW_INSTANCED_INDIRECT_ARGS</unmanaged>
 public partial struct DrawInstancedIndirectArgs
@@ -10890,7 +10867,7 @@ public partial struct AuthenticatedQueryInput
 	public Guid QueryType;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_QUERY_INPUT::hChannel"]/*' />
-	public IntPtr hChannel;
+	public Handle hChannel;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_QUERY_INPUT::SequenceNumber"]/*' />
 	public uint SequenceNumber;
@@ -10907,7 +10884,7 @@ public partial struct AuthenticatedQueryOutput
 	public Guid QueryType;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_QUERY_OUTPUT::hChannel"]/*' />
-	public IntPtr hChannel;
+	public Handle hChannel;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_QUERY_OUTPUT::SequenceNumber"]/*' />
 	public uint SequenceNumber;
@@ -10946,7 +10923,7 @@ public partial struct AuthenticatedQueryDeviceHandleOutput
 	public AuthenticatedQueryOutput Output;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_QUERY_DEVICE_HANDLE_OUTPUT::DeviceHandle"]/*' />
-	public IntPtr DeviceHandle;
+	public Handle DeviceHandle;
 }
 
 /// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_QUERY_CRYPTO_SESSION_INPUT"]/*' />
@@ -10957,7 +10934,7 @@ public partial struct AuthenticatedQueryCryptoSessionInput
 	public AuthenticatedQueryInput Input;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_QUERY_CRYPTO_SESSION_INPUT::DecoderHandle"]/*' />
-	public IntPtr DecoderHandle;
+	public Handle DecoderHandle;
 }
 
 /// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_QUERY_CRYPTO_SESSION_OUTPUT"]/*' />
@@ -10968,13 +10945,13 @@ public partial struct AuthenticatedQueryCryptoSessionOutput
 	public AuthenticatedQueryOutput Output;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_QUERY_CRYPTO_SESSION_OUTPUT::DecoderHandle"]/*' />
-	public IntPtr DecoderHandle;
+	public Handle DecoderHandle;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_QUERY_CRYPTO_SESSION_OUTPUT::CryptoSessionHandle"]/*' />
-	public IntPtr CryptoSessionHandle;
+	public Handle CryptoSessionHandle;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_QUERY_CRYPTO_SESSION_OUTPUT::DeviceHandle"]/*' />
-	public IntPtr DeviceHandle;
+	public Handle DeviceHandle;
 }
 
 /// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_QUERY_RESTRICTED_SHARED_RESOURCE_PROCESS_COUNT_OUTPUT"]/*' />
@@ -11013,7 +10990,7 @@ public partial struct AuthenticatedQueryRestrictedSharedResourceProcessOutput
 	public AuthenticatedProcessIdentifierType ProcessIdentifier;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_QUERY_RESTRICTED_SHARED_RESOURCE_PROCESS_OUTPUT::ProcessHandle"]/*' />
-	public IntPtr ProcessHandle;
+	public Handle ProcessHandle;
 }
 
 /// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_QUERY_UNRESTRICTED_PROTECTED_SHARED_RESOURCE_COUNT_OUTPUT"]/*' />
@@ -11035,10 +11012,10 @@ public partial struct AuthenticatedQueryOutputIdCountInput
 	public AuthenticatedQueryInput Input;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_QUERY_OUTPUT_ID_COUNT_INPUT::DeviceHandle"]/*' />
-	public IntPtr DeviceHandle;
+	public Handle DeviceHandle;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_QUERY_OUTPUT_ID_COUNT_INPUT::CryptoSessionHandle"]/*' />
-	public IntPtr CryptoSessionHandle;
+	public Handle CryptoSessionHandle;
 }
 
 /// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_QUERY_OUTPUT_ID_COUNT_OUTPUT"]/*' />
@@ -11049,10 +11026,10 @@ public partial struct AuthenticatedQueryOutputIdCountOutput
 	public AuthenticatedQueryOutput Output;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_QUERY_OUTPUT_ID_COUNT_OUTPUT::DeviceHandle"]/*' />
-	public IntPtr DeviceHandle;
+	public Handle DeviceHandle;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_QUERY_OUTPUT_ID_COUNT_OUTPUT::CryptoSessionHandle"]/*' />
-	public IntPtr CryptoSessionHandle;
+	public Handle CryptoSessionHandle;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_QUERY_OUTPUT_ID_COUNT_OUTPUT::OutputIDCount"]/*' />
 	public uint OutputIDCount;
@@ -11066,10 +11043,10 @@ public partial struct AuthenticatedQueryOutputIdInput
 	public AuthenticatedQueryInput Input;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_QUERY_OUTPUT_ID_INPUT::DeviceHandle"]/*' />
-	public IntPtr DeviceHandle;
+	public Handle DeviceHandle;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_QUERY_OUTPUT_ID_INPUT::CryptoSessionHandle"]/*' />
-	public IntPtr CryptoSessionHandle;
+	public Handle CryptoSessionHandle;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_QUERY_OUTPUT_ID_INPUT::OutputIDIndex"]/*' />
 	public uint OutputIDIndex;
@@ -11083,10 +11060,10 @@ public partial struct AuthenticatedQueryOutputIdOutput
 	public AuthenticatedQueryOutput Output;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_QUERY_OUTPUT_ID_OUTPUT::DeviceHandle"]/*' />
-	public IntPtr DeviceHandle;
+	public Handle DeviceHandle;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_QUERY_OUTPUT_ID_OUTPUT::CryptoSessionHandle"]/*' />
-	public IntPtr CryptoSessionHandle;
+	public Handle CryptoSessionHandle;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_QUERY_OUTPUT_ID_OUTPUT::OutputIDIndex"]/*' />
 	public uint OutputIDIndex;
@@ -11170,7 +11147,7 @@ public partial struct AuthenticatedConfigureInput
 	public Guid ConfigureType;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_CONFIGURE_INPUT::hChannel"]/*' />
-	public IntPtr hChannel;
+	public Handle hChannel;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_CONFIGURE_INPUT::SequenceNumber"]/*' />
 	public uint SequenceNumber;
@@ -11187,7 +11164,7 @@ public partial struct AuthenticatedConfigureOutput
 	public Guid ConfigureType;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_CONFIGURE_OUTPUT::hChannel"]/*' />
-	public IntPtr hChannel;
+	public Handle hChannel;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_CONFIGURE_OUTPUT::SequenceNumber"]/*' />
 	public uint SequenceNumber;
@@ -11229,13 +11206,13 @@ public partial struct AuthenticatedConfigureCryptoSessionInput
 	public AuthenticatedConfigureInput Parameters;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_CONFIGURE_CRYPTO_SESSION_INPUT::DecoderHandle"]/*' />
-	public IntPtr DecoderHandle;
+	public Handle DecoderHandle;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_CONFIGURE_CRYPTO_SESSION_INPUT::CryptoSessionHandle"]/*' />
-	public IntPtr CryptoSessionHandle;
+	public Handle CryptoSessionHandle;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_CONFIGURE_CRYPTO_SESSION_INPUT::DeviceHandle"]/*' />
-	public IntPtr DeviceHandle;
+	public Handle DeviceHandle;
 }
 
 /// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_CONFIGURE_SHARED_RESOURCE_INPUT"]/*' />
@@ -11249,7 +11226,7 @@ public partial struct AuthenticatedConfigureSharedResourceInput
 	public AuthenticatedProcessIdentifierType ProcessType;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_CONFIGURE_SHARED_RESOURCE_INPUT::ProcessHandle"]/*' />
-	public IntPtr ProcessHandle;
+	public Handle ProcessHandle;
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_AUTHENTICATED_CONFIGURE_SHARED_RESOURCE_INPUT::AllowAccess"]/*' />
 	public Bool32 AllowAccess;
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11AuthenticatedChannel.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11AuthenticatedChannel.cs
index f540760..02cf631 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11AuthenticatedChannel.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11AuthenticatedChannel.cs
@@ -126,9 +126,9 @@ public unsafe partial struct ID3D11AuthenticatedChannel
 	/// <include file='../../Direct3D11.xml' path='doc/member[@name="ID3D11AuthenticatedChannel::GetChannelHandle"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(9)]
-	public void GetChannelHandle(IntPtr* pChannelHandle)
+	public void GetChannelHandle(Handle* pChannelHandle)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11AuthenticatedChannel*, IntPtr*, void>)(lpVtbl[9]))((ID3D11AuthenticatedChannel*)Unsafe.AsPointer(ref this), pChannelHandle);
+		((delegate* unmanaged[Stdcall]<ID3D11AuthenticatedChannel*, Handle*, void>)(lpVtbl[9]))((ID3D11AuthenticatedChannel*)Unsafe.AsPointer(ref this), pChannelHandle);
 	}
 }
 
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11CryptoSession.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11CryptoSession.cs
index 8b419ec..3a1a991 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11CryptoSession.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11CryptoSession.cs
@@ -142,9 +142,9 @@ public unsafe partial struct ID3D11CryptoSession
 	/// <include file='../../Direct3D11.xml' path='doc/member[@name="ID3D11CryptoSession::GetCryptoSessionHandle"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(11)]
-	public void GetCryptoSessionHandle(IntPtr* pCryptoSessionHandle)
+	public void GetCryptoSessionHandle(Handle* pCryptoSessionHandle)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11CryptoSession*, IntPtr*, void>)(lpVtbl[11]))((ID3D11CryptoSession*)Unsafe.AsPointer(ref this), pCryptoSessionHandle);
+		((delegate* unmanaged[Stdcall]<ID3D11CryptoSession*, Handle*, void>)(lpVtbl[11]))((ID3D11CryptoSession*)Unsafe.AsPointer(ref this), pCryptoSessionHandle);
 	}
 }
 
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11Device.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11Device.cs
index 33ee352..3e1e4a2 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11Device.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11Device.cs
@@ -278,9 +278,9 @@ public unsafe partial struct ID3D11Device
 	/// <include file='../../Direct3D11.xml' path='doc/member[@name="ID3D11Device::OpenSharedResource"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(28)]
-	public HResult OpenSharedResource(IntPtr hResource, Guid* ReturnedInterface, void** ppResource)
+	public HResult OpenSharedResource(Handle hResource, Guid* ReturnedInterface, void** ppResource)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D11Device*, IntPtr, Guid*, void**, int>)(lpVtbl[28]))((ID3D11Device*)Unsafe.AsPointer(ref this), hResource, ReturnedInterface, ppResource);
+		return ((delegate* unmanaged[Stdcall]<ID3D11Device*, Handle, Guid*, void**, int>)(lpVtbl[28]))((ID3D11Device*)Unsafe.AsPointer(ref this), hResource, ReturnedInterface, ppResource);
 	}
 
 	/// <include file='../../Direct3D11.xml' path='doc/member[@name="ID3D11Device::CheckFormatSupport"]/*' />
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11Device1.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11Device1.cs
index 1e57aa0..0838f1b 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11Device1.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11Device1.cs
@@ -278,9 +278,9 @@ public unsafe partial struct ID3D11Device1
 	/// <inheritdoc cref="ID3D11Device.OpenSharedResource" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(28)]
-	public HResult OpenSharedResource(IntPtr hResource, Guid* ReturnedInterface, void** ppResource)
+	public HResult OpenSharedResource(Handle hResource, Guid* ReturnedInterface, void** ppResource)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D11Device1*, IntPtr, Guid*, void**, int>)(lpVtbl[28]))((ID3D11Device1*)Unsafe.AsPointer(ref this), hResource, ReturnedInterface, ppResource);
+		return ((delegate* unmanaged[Stdcall]<ID3D11Device1*, Handle, Guid*, void**, int>)(lpVtbl[28]))((ID3D11Device1*)Unsafe.AsPointer(ref this), hResource, ReturnedInterface, ppResource);
 	}
 
 	/// <inheritdoc cref="ID3D11Device.CheckFormatSupport" />
@@ -438,9 +438,9 @@ public unsafe partial struct ID3D11Device1
 	/// <include file='../../Direct3D11.xml' path='doc/member[@name="ID3D11Device1::OpenSharedResource1"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(48)]
-	public HResult OpenSharedResource1(IntPtr hResource, Guid* returnedInterface, void** ppResource)
+	public HResult OpenSharedResource1(Handle hResource, Guid* returnedInterface, void** ppResource)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D11Device1*, IntPtr, Guid*, void**, int>)(lpVtbl[48]))((ID3D11Device1*)Unsafe.AsPointer(ref this), hResource, returnedInterface, ppResource);
+		return ((delegate* unmanaged[Stdcall]<ID3D11Device1*, Handle, Guid*, void**, int>)(lpVtbl[48]))((ID3D11Device1*)Unsafe.AsPointer(ref this), hResource, returnedInterface, ppResource);
 	}
 
 	/// <include file='../../Direct3D11.xml' path='doc/member[@name="ID3D11Device1::OpenSharedResourceByName"]/*' />
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11Device2.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11Device2.cs
index 0dd3104..e92b0d4 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11Device2.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11Device2.cs
@@ -278,9 +278,9 @@ public unsafe partial struct ID3D11Device2
 	/// <inheritdoc cref="ID3D11Device.OpenSharedResource" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(28)]
-	public HResult OpenSharedResource(IntPtr hResource, Guid* ReturnedInterface, void** ppResource)
+	public HResult OpenSharedResource(Handle hResource, Guid* ReturnedInterface, void** ppResource)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D11Device2*, IntPtr, Guid*, void**, int>)(lpVtbl[28]))((ID3D11Device2*)Unsafe.AsPointer(ref this), hResource, ReturnedInterface, ppResource);
+		return ((delegate* unmanaged[Stdcall]<ID3D11Device2*, Handle, Guid*, void**, int>)(lpVtbl[28]))((ID3D11Device2*)Unsafe.AsPointer(ref this), hResource, ReturnedInterface, ppResource);
 	}
 
 	/// <inheritdoc cref="ID3D11Device.CheckFormatSupport" />
@@ -438,9 +438,9 @@ public unsafe partial struct ID3D11Device2
 	/// <inheritdoc cref="ID3D11Device1.OpenSharedResource1" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(48)]
-	public HResult OpenSharedResource1(IntPtr hResource, Guid* returnedInterface, void** ppResource)
+	public HResult OpenSharedResource1(Handle hResource, Guid* returnedInterface, void** ppResource)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D11Device2*, IntPtr, Guid*, void**, int>)(lpVtbl[48]))((ID3D11Device2*)Unsafe.AsPointer(ref this), hResource, returnedInterface, ppResource);
+		return ((delegate* unmanaged[Stdcall]<ID3D11Device2*, Handle, Guid*, void**, int>)(lpVtbl[48]))((ID3D11Device2*)Unsafe.AsPointer(ref this), hResource, returnedInterface, ppResource);
 	}
 
 	/// <inheritdoc cref="ID3D11Device1.OpenSharedResourceByName" />
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11Device3.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11Device3.cs
index bada5b8..ff452f6 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11Device3.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11Device3.cs
@@ -278,9 +278,9 @@ public unsafe partial struct ID3D11Device3
 	/// <inheritdoc cref="ID3D11Device.OpenSharedResource" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(28)]
-	public HResult OpenSharedResource(IntPtr hResource, Guid* ReturnedInterface, void** ppResource)
+	public HResult OpenSharedResource(Handle hResource, Guid* ReturnedInterface, void** ppResource)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D11Device3*, IntPtr, Guid*, void**, int>)(lpVtbl[28]))((ID3D11Device3*)Unsafe.AsPointer(ref this), hResource, ReturnedInterface, ppResource);
+		return ((delegate* unmanaged[Stdcall]<ID3D11Device3*, Handle, Guid*, void**, int>)(lpVtbl[28]))((ID3D11Device3*)Unsafe.AsPointer(ref this), hResource, ReturnedInterface, ppResource);
 	}
 
 	/// <inheritdoc cref="ID3D11Device.CheckFormatSupport" />
@@ -438,9 +438,9 @@ public unsafe partial struct ID3D11Device3
 	/// <inheritdoc cref="ID3D11Device1.OpenSharedResource1" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(48)]
-	public HResult OpenSharedResource1(IntPtr hResource, Guid* returnedInterface, void** ppResource)
+	public HResult OpenSharedResource1(Handle hResource, Guid* returnedInterface, void** ppResource)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D11Device3*, IntPtr, Guid*, void**, int>)(lpVtbl[48]))((ID3D11Device3*)Unsafe.AsPointer(ref this), hResource, returnedInterface, ppResource);
+		return ((delegate* unmanaged[Stdcall]<ID3D11Device3*, Handle, Guid*, void**, int>)(lpVtbl[48]))((ID3D11Device3*)Unsafe.AsPointer(ref this), hResource, returnedInterface, ppResource);
 	}
 
 	/// <inheritdoc cref="ID3D11Device1.OpenSharedResourceByName" />
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11Device4.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11Device4.cs
index 2a9e8ac..e92f685 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11Device4.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11Device4.cs
@@ -278,9 +278,9 @@ public unsafe partial struct ID3D11Device4
 	/// <inheritdoc cref="ID3D11Device.OpenSharedResource" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(28)]
-	public HResult OpenSharedResource(IntPtr hResource, Guid* ReturnedInterface, void** ppResource)
+	public HResult OpenSharedResource(Handle hResource, Guid* ReturnedInterface, void** ppResource)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D11Device4*, IntPtr, Guid*, void**, int>)(lpVtbl[28]))((ID3D11Device4*)Unsafe.AsPointer(ref this), hResource, ReturnedInterface, ppResource);
+		return ((delegate* unmanaged[Stdcall]<ID3D11Device4*, Handle, Guid*, void**, int>)(lpVtbl[28]))((ID3D11Device4*)Unsafe.AsPointer(ref this), hResource, ReturnedInterface, ppResource);
 	}
 
 	/// <inheritdoc cref="ID3D11Device.CheckFormatSupport" />
@@ -438,9 +438,9 @@ public unsafe partial struct ID3D11Device4
 	/// <inheritdoc cref="ID3D11Device1.OpenSharedResource1" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(48)]
-	public HResult OpenSharedResource1(IntPtr hResource, Guid* returnedInterface, void** ppResource)
+	public HResult OpenSharedResource1(Handle hResource, Guid* returnedInterface, void** ppResource)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D11Device4*, IntPtr, Guid*, void**, int>)(lpVtbl[48]))((ID3D11Device4*)Unsafe.AsPointer(ref this), hResource, returnedInterface, ppResource);
+		return ((delegate* unmanaged[Stdcall]<ID3D11Device4*, Handle, Guid*, void**, int>)(lpVtbl[48]))((ID3D11Device4*)Unsafe.AsPointer(ref this), hResource, returnedInterface, ppResource);
 	}
 
 	/// <inheritdoc cref="ID3D11Device1.OpenSharedResourceByName" />
@@ -574,9 +574,9 @@ public unsafe partial struct ID3D11Device4
 	/// <include file='../../Direct3D11.xml' path='doc/member[@name="ID3D11Device4::RegisterDeviceRemovedEvent"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(65)]
-	public HResult RegisterDeviceRemovedEvent(IntPtr hEvent, uint* pdwCookie)
+	public HResult RegisterDeviceRemovedEvent(Handle hEvent, uint* pdwCookie)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D11Device4*, IntPtr, uint*, int>)(lpVtbl[65]))((ID3D11Device4*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
+		return ((delegate* unmanaged[Stdcall]<ID3D11Device4*, Handle, uint*, int>)(lpVtbl[65]))((ID3D11Device4*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
 	}
 
 	/// <include file='../../Direct3D11.xml' path='doc/member[@name="ID3D11Device4::UnregisterDeviceRemoved"]/*' />
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11Device5.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11Device5.cs
index b29edcb..8961805 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11Device5.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11Device5.cs
@@ -278,9 +278,9 @@ public unsafe partial struct ID3D11Device5
 	/// <inheritdoc cref="ID3D11Device.OpenSharedResource" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(28)]
-	public HResult OpenSharedResource(IntPtr hResource, Guid* ReturnedInterface, void** ppResource)
+	public HResult OpenSharedResource(Handle hResource, Guid* ReturnedInterface, void** ppResource)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D11Device5*, IntPtr, Guid*, void**, int>)(lpVtbl[28]))((ID3D11Device5*)Unsafe.AsPointer(ref this), hResource, ReturnedInterface, ppResource);
+		return ((delegate* unmanaged[Stdcall]<ID3D11Device5*, Handle, Guid*, void**, int>)(lpVtbl[28]))((ID3D11Device5*)Unsafe.AsPointer(ref this), hResource, ReturnedInterface, ppResource);
 	}
 
 	/// <inheritdoc cref="ID3D11Device.CheckFormatSupport" />
@@ -438,9 +438,9 @@ public unsafe partial struct ID3D11Device5
 	/// <inheritdoc cref="ID3D11Device1.OpenSharedResource1" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(48)]
-	public HResult OpenSharedResource1(IntPtr hResource, Guid* returnedInterface, void** ppResource)
+	public HResult OpenSharedResource1(Handle hResource, Guid* returnedInterface, void** ppResource)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D11Device5*, IntPtr, Guid*, void**, int>)(lpVtbl[48]))((ID3D11Device5*)Unsafe.AsPointer(ref this), hResource, returnedInterface, ppResource);
+		return ((delegate* unmanaged[Stdcall]<ID3D11Device5*, Handle, Guid*, void**, int>)(lpVtbl[48]))((ID3D11Device5*)Unsafe.AsPointer(ref this), hResource, returnedInterface, ppResource);
 	}
 
 	/// <inheritdoc cref="ID3D11Device1.OpenSharedResourceByName" />
@@ -574,9 +574,9 @@ public unsafe partial struct ID3D11Device5
 	/// <inheritdoc cref="ID3D11Device4.RegisterDeviceRemovedEvent" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(65)]
-	public HResult RegisterDeviceRemovedEvent(IntPtr hEvent, uint* pdwCookie)
+	public HResult RegisterDeviceRemovedEvent(Handle hEvent, uint* pdwCookie)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D11Device5*, IntPtr, uint*, int>)(lpVtbl[65]))((ID3D11Device5*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
+		return ((delegate* unmanaged[Stdcall]<ID3D11Device5*, Handle, uint*, int>)(lpVtbl[65]))((ID3D11Device5*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
 	}
 
 	/// <inheritdoc cref="ID3D11Device4.UnregisterDeviceRemoved" />
@@ -590,9 +590,9 @@ public unsafe partial struct ID3D11Device5
 	/// <include file='../../Direct3D11.xml' path='doc/member[@name="ID3D11Device5::OpenSharedFence"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(67)]
-	public HResult OpenSharedFence(IntPtr hFence, Guid* ReturnedInterface, void** ppFence)
+	public HResult OpenSharedFence(Handle hFence, Guid* ReturnedInterface, void** ppFence)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D11Device5*, IntPtr, Guid*, void**, int>)(lpVtbl[67]))((ID3D11Device5*)Unsafe.AsPointer(ref this), hFence, ReturnedInterface, ppFence);
+		return ((delegate* unmanaged[Stdcall]<ID3D11Device5*, Handle, Guid*, void**, int>)(lpVtbl[67]))((ID3D11Device5*)Unsafe.AsPointer(ref this), hFence, ReturnedInterface, ppFence);
 	}
 
 	/// <include file='../../Direct3D11.xml' path='doc/member[@name="ID3D11Device5::CreateFence"]/*' />
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11DeviceContext3.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11DeviceContext3.cs
index 46ff4d8..39415ed 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11DeviceContext3.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11DeviceContext3.cs
@@ -1206,9 +1206,9 @@ public unsafe partial struct ID3D11DeviceContext3
 	/// <include file='../../Direct3D11.xml' path='doc/member[@name="ID3D11DeviceContext3::Flush1"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(144)]
-	public void Flush1(ContextType ContextType, IntPtr hEvent)
+	public void Flush1(ContextType ContextType, Handle hEvent)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext3*, ContextType, IntPtr, void>)(lpVtbl[144]))((ID3D11DeviceContext3*)Unsafe.AsPointer(ref this), ContextType, hEvent);
+		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext3*, ContextType, Handle, void>)(lpVtbl[144]))((ID3D11DeviceContext3*)Unsafe.AsPointer(ref this), ContextType, hEvent);
 	}
 
 	/// <include file='../../Direct3D11.xml' path='doc/member[@name="ID3D11DeviceContext3::SetHardwareProtectionState"]/*' />
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11DeviceContext4.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11DeviceContext4.cs
index bff952b..2697133 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11DeviceContext4.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11DeviceContext4.cs
@@ -1206,9 +1206,9 @@ public unsafe partial struct ID3D11DeviceContext4
 	/// <inheritdoc cref="ID3D11DeviceContext3.Flush1" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(144)]
-	public void Flush1(ContextType ContextType, IntPtr hEvent)
+	public void Flush1(ContextType ContextType, Handle hEvent)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext4*, ContextType, IntPtr, void>)(lpVtbl[144]))((ID3D11DeviceContext4*)Unsafe.AsPointer(ref this), ContextType, hEvent);
+		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext4*, ContextType, Handle, void>)(lpVtbl[144]))((ID3D11DeviceContext4*)Unsafe.AsPointer(ref this), ContextType, hEvent);
 	}
 
 	/// <inheritdoc cref="ID3D11DeviceContext3.SetHardwareProtectionState" />
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11Fence.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11Fence.cs
index 6f25366..458ef00 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11Fence.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11Fence.cs
@@ -110,9 +110,9 @@ public unsafe partial struct ID3D11Fence
 	/// <include file='../../Direct3D11.xml' path='doc/member[@name="ID3D11Fence::CreateSharedHandle"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(7)]
-	public HResult CreateSharedHandle(Security.SECURITY_ATTRIBUTES* pAttributes, uint dwAccess, ushort* lpName, IntPtr* pHandle)
+	public HResult CreateSharedHandle(Security.SECURITY_ATTRIBUTES* pAttributes, uint dwAccess, ushort* lpName, Handle* pHandle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D11Fence*, Security.SECURITY_ATTRIBUTES*, uint, ushort*, IntPtr*, int>)(lpVtbl[7]))((ID3D11Fence*)Unsafe.AsPointer(ref this), pAttributes, dwAccess, lpName, pHandle);
+		return ((delegate* unmanaged[Stdcall]<ID3D11Fence*, Security.SECURITY_ATTRIBUTES*, uint, ushort*, Handle*, int>)(lpVtbl[7]))((ID3D11Fence*)Unsafe.AsPointer(ref this), pAttributes, dwAccess, lpName, pHandle);
 	}
 
 	/// <include file='../../Direct3D11.xml' path='doc/member[@name="ID3D11Fence::GetCompletedValue"]/*' />
@@ -126,9 +126,9 @@ public unsafe partial struct ID3D11Fence
 	/// <include file='../../Direct3D11.xml' path='doc/member[@name="ID3D11Fence::SetEventOnCompletion"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(9)]
-	public HResult SetEventOnCompletion(ulong Value, IntPtr hEvent)
+	public HResult SetEventOnCompletion(ulong Value, Handle hEvent)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D11Fence*, ulong, IntPtr, int>)(lpVtbl[9]))((ID3D11Fence*)Unsafe.AsPointer(ref this), Value, hEvent);
+		return ((delegate* unmanaged[Stdcall]<ID3D11Fence*, ulong, Handle, int>)(lpVtbl[9]))((ID3D11Fence*)Unsafe.AsPointer(ref this), Value, hEvent);
 	}
 }
 
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11VideoDecoder.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11VideoDecoder.cs
index a075907..bb5a324 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11VideoDecoder.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct3D11/ID3D11VideoDecoder.cs
@@ -118,9 +118,9 @@ public unsafe partial struct ID3D11VideoDecoder
 	/// <include file='../../Direct3D11.xml' path='doc/member[@name="ID3D11VideoDecoder::GetDriverHandle"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(8)]
-	public HResult GetDriverHandle(IntPtr* pDriverHandle)
+	public HResult GetDriverHandle(Handle* pDriverHandle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D11VideoDecoder*, IntPtr*, int>)(lpVtbl[8]))((ID3D11VideoDecoder*)Unsafe.AsPointer(ref this), pDriverHandle);
+		return ((delegate* unmanaged[Stdcall]<ID3D11VideoDecoder*, Handle*, int>)(lpVtbl[8]))((ID3D11VideoDecoder*)Unsafe.AsPointer(ref this), pDriverHandle);
 	}
 }
 
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D12.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D12.cs
index 78a56da..6539977 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct3D12.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct3D12.cs
@@ -6991,29 +6991,6 @@ public partial struct SODeclarationEntry
 	public byte OutputSlot;
 }
 
-/// <include file='../Direct3D12.xml' path='doc/member[@name="D3D12_VIEWPORT"]/*' />
-/// <unmanaged>D3D12_VIEWPORT</unmanaged>
-public partial struct Viewport
-{
-	/// <include file='../Direct3D12.xml' path='doc/member[@name="D3D12_VIEWPORT::TopLeftX"]/*' />
-	public float TopLeftX;
-
-	/// <include file='../Direct3D12.xml' path='doc/member[@name="D3D12_VIEWPORT::TopLeftY"]/*' />
-	public float TopLeftY;
-
-	/// <include file='../Direct3D12.xml' path='doc/member[@name="D3D12_VIEWPORT::Width"]/*' />
-	public float Width;
-
-	/// <include file='../Direct3D12.xml' path='doc/member[@name="D3D12_VIEWPORT::Height"]/*' />
-	public float Height;
-
-	/// <include file='../Direct3D12.xml' path='doc/member[@name="D3D12_VIEWPORT::MinDepth"]/*' />
-	public float MinDepth;
-
-	/// <include file='../Direct3D12.xml' path='doc/member[@name="D3D12_VIEWPORT::MaxDepth"]/*' />
-	public float MaxDepth;
-}
-
 /// <include file='../Direct3D12.xml' path='doc/member[@name="D3D12_BOX"]/*' />
 /// <unmanaged>D3D12_BOX</unmanaged>
 public partial struct Box
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device.cs
index a52c962..bb5d672 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device.cs
@@ -304,25 +304,25 @@ public unsafe partial struct ID3D12Device
 	/// <include file='../../Direct3D12.xml' path='doc/member[@name="ID3D12Device::CreateSharedHandle"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, IntPtr* pHandle)
+	public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, Handle* pHandle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device*, ID3D12DeviceChild*, Security.SECURITY_ATTRIBUTES*, uint, ushort*, IntPtr*, int>)(lpVtbl[31]))((ID3D12Device*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device*, ID3D12DeviceChild*, Security.SECURITY_ATTRIBUTES*, uint, ushort*, Handle*, int>)(lpVtbl[31]))((ID3D12Device*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle);
 	}
 
 	/// <include file='../../Direct3D12.xml' path='doc/member[@name="ID3D12Device::OpenSharedHandle"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(32)]
-	public HResult OpenSharedHandle(IntPtr NTHandle, Guid* riid, void** ppvObj)
+	public HResult OpenSharedHandle(Handle NTHandle, Guid* riid, void** ppvObj)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device*, IntPtr, Guid*, void**, int>)(lpVtbl[32]))((ID3D12Device*)Unsafe.AsPointer(ref this), NTHandle, riid, ppvObj);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device*, Handle, Guid*, void**, int>)(lpVtbl[32]))((ID3D12Device*)Unsafe.AsPointer(ref this), NTHandle, riid, ppvObj);
 	}
 
 	/// <include file='../../Direct3D12.xml' path='doc/member[@name="ID3D12Device::OpenSharedHandleByName"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(33)]
-	public HResult OpenSharedHandleByName(ushort* Name, uint Access, IntPtr* pNTHandle)
+	public HResult OpenSharedHandleByName(ushort* Name, uint Access, Handle* pNTHandle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device*, ushort*, uint, IntPtr*, int>)(lpVtbl[33]))((ID3D12Device*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device*, ushort*, uint, Handle*, int>)(lpVtbl[33]))((ID3D12Device*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle);
 	}
 
 	/// <include file='../../Direct3D12.xml' path='doc/member[@name="ID3D12Device::MakeResident"]/*' />
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device1.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device1.cs
index fda4c15..0f72b98 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device1.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device1.cs
@@ -304,25 +304,25 @@ public unsafe partial struct ID3D12Device1
 	/// <inheritdoc cref="ID3D12Device.CreateSharedHandle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, IntPtr* pHandle)
+	public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, Handle* pHandle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device1*, ID3D12DeviceChild*, Security.SECURITY_ATTRIBUTES*, uint, ushort*, IntPtr*, int>)(lpVtbl[31]))((ID3D12Device1*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device1*, ID3D12DeviceChild*, Security.SECURITY_ATTRIBUTES*, uint, ushort*, Handle*, int>)(lpVtbl[31]))((ID3D12Device1*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.OpenSharedHandle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(32)]
-	public HResult OpenSharedHandle(IntPtr NTHandle, Guid* riid, void** ppvObj)
+	public HResult OpenSharedHandle(Handle NTHandle, Guid* riid, void** ppvObj)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device1*, IntPtr, Guid*, void**, int>)(lpVtbl[32]))((ID3D12Device1*)Unsafe.AsPointer(ref this), NTHandle, riid, ppvObj);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device1*, Handle, Guid*, void**, int>)(lpVtbl[32]))((ID3D12Device1*)Unsafe.AsPointer(ref this), NTHandle, riid, ppvObj);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.OpenSharedHandleByName" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(33)]
-	public HResult OpenSharedHandleByName(ushort* Name, uint Access, IntPtr* pNTHandle)
+	public HResult OpenSharedHandleByName(ushort* Name, uint Access, Handle* pNTHandle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device1*, ushort*, uint, IntPtr*, int>)(lpVtbl[33]))((ID3D12Device1*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device1*, ushort*, uint, Handle*, int>)(lpVtbl[33]))((ID3D12Device1*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.MakeResident" />
@@ -417,9 +417,9 @@ public unsafe partial struct ID3D12Device1
 	/// <include file='../../Direct3D12.xml' path='doc/member[@name="ID3D12Device1::SetEventOnMultipleFenceCompletion"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(45)]
-	public HResult SetEventOnMultipleFenceCompletion(ID3D12Fence** ppFences, ulong* pFenceValues, uint NumFences, MultipleFenceWaitFlags Flags, IntPtr hEvent)
+	public HResult SetEventOnMultipleFenceCompletion(ID3D12Fence** ppFences, ulong* pFenceValues, uint NumFences, MultipleFenceWaitFlags Flags, Handle hEvent)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device1*, ID3D12Fence**, ulong*, uint, MultipleFenceWaitFlags, IntPtr, int>)(lpVtbl[45]))((ID3D12Device1*)Unsafe.AsPointer(ref this), ppFences, pFenceValues, NumFences, Flags, hEvent);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device1*, ID3D12Fence**, ulong*, uint, MultipleFenceWaitFlags, Handle, int>)(lpVtbl[45]))((ID3D12Device1*)Unsafe.AsPointer(ref this), ppFences, pFenceValues, NumFences, Flags, hEvent);
 	}
 
 	/// <include file='../../Direct3D12.xml' path='doc/member[@name="ID3D12Device1::SetResidencyPriority"]/*' />
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device2.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device2.cs
index 8723c10..c7d57cb 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device2.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device2.cs
@@ -304,25 +304,25 @@ public unsafe partial struct ID3D12Device2
 	/// <inheritdoc cref="ID3D12Device.CreateSharedHandle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, IntPtr* pHandle)
+	public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, Handle* pHandle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device2*, ID3D12DeviceChild*, Security.SECURITY_ATTRIBUTES*, uint, ushort*, IntPtr*, int>)(lpVtbl[31]))((ID3D12Device2*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device2*, ID3D12DeviceChild*, Security.SECURITY_ATTRIBUTES*, uint, ushort*, Handle*, int>)(lpVtbl[31]))((ID3D12Device2*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.OpenSharedHandle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(32)]
-	public HResult OpenSharedHandle(IntPtr NTHandle, Guid* riid, void** ppvObj)
+	public HResult OpenSharedHandle(Handle NTHandle, Guid* riid, void** ppvObj)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device2*, IntPtr, Guid*, void**, int>)(lpVtbl[32]))((ID3D12Device2*)Unsafe.AsPointer(ref this), NTHandle, riid, ppvObj);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device2*, Handle, Guid*, void**, int>)(lpVtbl[32]))((ID3D12Device2*)Unsafe.AsPointer(ref this), NTHandle, riid, ppvObj);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.OpenSharedHandleByName" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(33)]
-	public HResult OpenSharedHandleByName(ushort* Name, uint Access, IntPtr* pNTHandle)
+	public HResult OpenSharedHandleByName(ushort* Name, uint Access, Handle* pNTHandle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device2*, ushort*, uint, IntPtr*, int>)(lpVtbl[33]))((ID3D12Device2*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device2*, ushort*, uint, Handle*, int>)(lpVtbl[33]))((ID3D12Device2*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.MakeResident" />
@@ -417,9 +417,9 @@ public unsafe partial struct ID3D12Device2
 	/// <inheritdoc cref="ID3D12Device1.SetEventOnMultipleFenceCompletion" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(45)]
-	public HResult SetEventOnMultipleFenceCompletion(ID3D12Fence** ppFences, ulong* pFenceValues, uint NumFences, MultipleFenceWaitFlags Flags, IntPtr hEvent)
+	public HResult SetEventOnMultipleFenceCompletion(ID3D12Fence** ppFences, ulong* pFenceValues, uint NumFences, MultipleFenceWaitFlags Flags, Handle hEvent)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device2*, ID3D12Fence**, ulong*, uint, MultipleFenceWaitFlags, IntPtr, int>)(lpVtbl[45]))((ID3D12Device2*)Unsafe.AsPointer(ref this), ppFences, pFenceValues, NumFences, Flags, hEvent);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device2*, ID3D12Fence**, ulong*, uint, MultipleFenceWaitFlags, Handle, int>)(lpVtbl[45]))((ID3D12Device2*)Unsafe.AsPointer(ref this), ppFences, pFenceValues, NumFences, Flags, hEvent);
 	}
 
 	/// <inheritdoc cref="ID3D12Device1.SetResidencyPriority" />
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device3.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device3.cs
index e2a5ab5..a0952a2 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device3.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device3.cs
@@ -304,25 +304,25 @@ public unsafe partial struct ID3D12Device3
 	/// <inheritdoc cref="ID3D12Device.CreateSharedHandle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, IntPtr* pHandle)
+	public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, Handle* pHandle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device3*, ID3D12DeviceChild*, Security.SECURITY_ATTRIBUTES*, uint, ushort*, IntPtr*, int>)(lpVtbl[31]))((ID3D12Device3*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device3*, ID3D12DeviceChild*, Security.SECURITY_ATTRIBUTES*, uint, ushort*, Handle*, int>)(lpVtbl[31]))((ID3D12Device3*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.OpenSharedHandle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(32)]
-	public HResult OpenSharedHandle(IntPtr NTHandle, Guid* riid, void** ppvObj)
+	public HResult OpenSharedHandle(Handle NTHandle, Guid* riid, void** ppvObj)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device3*, IntPtr, Guid*, void**, int>)(lpVtbl[32]))((ID3D12Device3*)Unsafe.AsPointer(ref this), NTHandle, riid, ppvObj);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device3*, Handle, Guid*, void**, int>)(lpVtbl[32]))((ID3D12Device3*)Unsafe.AsPointer(ref this), NTHandle, riid, ppvObj);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.OpenSharedHandleByName" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(33)]
-	public HResult OpenSharedHandleByName(ushort* Name, uint Access, IntPtr* pNTHandle)
+	public HResult OpenSharedHandleByName(ushort* Name, uint Access, Handle* pNTHandle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device3*, ushort*, uint, IntPtr*, int>)(lpVtbl[33]))((ID3D12Device3*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device3*, ushort*, uint, Handle*, int>)(lpVtbl[33]))((ID3D12Device3*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.MakeResident" />
@@ -417,9 +417,9 @@ public unsafe partial struct ID3D12Device3
 	/// <inheritdoc cref="ID3D12Device1.SetEventOnMultipleFenceCompletion" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(45)]
-	public HResult SetEventOnMultipleFenceCompletion(ID3D12Fence** ppFences, ulong* pFenceValues, uint NumFences, MultipleFenceWaitFlags Flags, IntPtr hEvent)
+	public HResult SetEventOnMultipleFenceCompletion(ID3D12Fence** ppFences, ulong* pFenceValues, uint NumFences, MultipleFenceWaitFlags Flags, Handle hEvent)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device3*, ID3D12Fence**, ulong*, uint, MultipleFenceWaitFlags, IntPtr, int>)(lpVtbl[45]))((ID3D12Device3*)Unsafe.AsPointer(ref this), ppFences, pFenceValues, NumFences, Flags, hEvent);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device3*, ID3D12Fence**, ulong*, uint, MultipleFenceWaitFlags, Handle, int>)(lpVtbl[45]))((ID3D12Device3*)Unsafe.AsPointer(ref this), ppFences, pFenceValues, NumFences, Flags, hEvent);
 	}
 
 	/// <inheritdoc cref="ID3D12Device1.SetResidencyPriority" />
@@ -449,9 +449,9 @@ public unsafe partial struct ID3D12Device3
 	/// <include file='../../Direct3D12.xml' path='doc/member[@name="ID3D12Device3::OpenExistingHeapFromFileMapping"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(49)]
-	public HResult OpenExistingHeapFromFileMapping(IntPtr hFileMapping, Guid* riid, void** ppvHeap)
+	public HResult OpenExistingHeapFromFileMapping(Handle hFileMapping, Guid* riid, void** ppvHeap)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device3*, IntPtr, Guid*, void**, int>)(lpVtbl[49]))((ID3D12Device3*)Unsafe.AsPointer(ref this), hFileMapping, riid, ppvHeap);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device3*, Handle, Guid*, void**, int>)(lpVtbl[49]))((ID3D12Device3*)Unsafe.AsPointer(ref this), hFileMapping, riid, ppvHeap);
 	}
 
 	/// <include file='../../Direct3D12.xml' path='doc/member[@name="ID3D12Device3::EnqueueMakeResident"]/*' />
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device4.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device4.cs
index ef2976b..7e79d2c 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device4.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device4.cs
@@ -304,25 +304,25 @@ public unsafe partial struct ID3D12Device4
 	/// <inheritdoc cref="ID3D12Device.CreateSharedHandle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, IntPtr* pHandle)
+	public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, Handle* pHandle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device4*, ID3D12DeviceChild*, Security.SECURITY_ATTRIBUTES*, uint, ushort*, IntPtr*, int>)(lpVtbl[31]))((ID3D12Device4*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device4*, ID3D12DeviceChild*, Security.SECURITY_ATTRIBUTES*, uint, ushort*, Handle*, int>)(lpVtbl[31]))((ID3D12Device4*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.OpenSharedHandle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(32)]
-	public HResult OpenSharedHandle(IntPtr NTHandle, Guid* riid, void** ppvObj)
+	public HResult OpenSharedHandle(Handle NTHandle, Guid* riid, void** ppvObj)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device4*, IntPtr, Guid*, void**, int>)(lpVtbl[32]))((ID3D12Device4*)Unsafe.AsPointer(ref this), NTHandle, riid, ppvObj);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device4*, Handle, Guid*, void**, int>)(lpVtbl[32]))((ID3D12Device4*)Unsafe.AsPointer(ref this), NTHandle, riid, ppvObj);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.OpenSharedHandleByName" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(33)]
-	public HResult OpenSharedHandleByName(ushort* Name, uint Access, IntPtr* pNTHandle)
+	public HResult OpenSharedHandleByName(ushort* Name, uint Access, Handle* pNTHandle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device4*, ushort*, uint, IntPtr*, int>)(lpVtbl[33]))((ID3D12Device4*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device4*, ushort*, uint, Handle*, int>)(lpVtbl[33]))((ID3D12Device4*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.MakeResident" />
@@ -417,9 +417,9 @@ public unsafe partial struct ID3D12Device4
 	/// <inheritdoc cref="ID3D12Device1.SetEventOnMultipleFenceCompletion" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(45)]
-	public HResult SetEventOnMultipleFenceCompletion(ID3D12Fence** ppFences, ulong* pFenceValues, uint NumFences, MultipleFenceWaitFlags Flags, IntPtr hEvent)
+	public HResult SetEventOnMultipleFenceCompletion(ID3D12Fence** ppFences, ulong* pFenceValues, uint NumFences, MultipleFenceWaitFlags Flags, Handle hEvent)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device4*, ID3D12Fence**, ulong*, uint, MultipleFenceWaitFlags, IntPtr, int>)(lpVtbl[45]))((ID3D12Device4*)Unsafe.AsPointer(ref this), ppFences, pFenceValues, NumFences, Flags, hEvent);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device4*, ID3D12Fence**, ulong*, uint, MultipleFenceWaitFlags, Handle, int>)(lpVtbl[45]))((ID3D12Device4*)Unsafe.AsPointer(ref this), ppFences, pFenceValues, NumFences, Flags, hEvent);
 	}
 
 	/// <inheritdoc cref="ID3D12Device1.SetResidencyPriority" />
@@ -449,9 +449,9 @@ public unsafe partial struct ID3D12Device4
 	/// <inheritdoc cref="ID3D12Device3.OpenExistingHeapFromFileMapping" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(49)]
-	public HResult OpenExistingHeapFromFileMapping(IntPtr hFileMapping, Guid* riid, void** ppvHeap)
+	public HResult OpenExistingHeapFromFileMapping(Handle hFileMapping, Guid* riid, void** ppvHeap)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device4*, IntPtr, Guid*, void**, int>)(lpVtbl[49]))((ID3D12Device4*)Unsafe.AsPointer(ref this), hFileMapping, riid, ppvHeap);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device4*, Handle, Guid*, void**, int>)(lpVtbl[49]))((ID3D12Device4*)Unsafe.AsPointer(ref this), hFileMapping, riid, ppvHeap);
 	}
 
 	/// <inheritdoc cref="ID3D12Device3.EnqueueMakeResident" />
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device5.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device5.cs
index 55fb364..428f69e 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device5.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device5.cs
@@ -304,25 +304,25 @@ public unsafe partial struct ID3D12Device5
 	/// <inheritdoc cref="ID3D12Device.CreateSharedHandle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, IntPtr* pHandle)
+	public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, Handle* pHandle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device5*, ID3D12DeviceChild*, Security.SECURITY_ATTRIBUTES*, uint, ushort*, IntPtr*, int>)(lpVtbl[31]))((ID3D12Device5*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device5*, ID3D12DeviceChild*, Security.SECURITY_ATTRIBUTES*, uint, ushort*, Handle*, int>)(lpVtbl[31]))((ID3D12Device5*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.OpenSharedHandle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(32)]
-	public HResult OpenSharedHandle(IntPtr NTHandle, Guid* riid, void** ppvObj)
+	public HResult OpenSharedHandle(Handle NTHandle, Guid* riid, void** ppvObj)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device5*, IntPtr, Guid*, void**, int>)(lpVtbl[32]))((ID3D12Device5*)Unsafe.AsPointer(ref this), NTHandle, riid, ppvObj);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device5*, Handle, Guid*, void**, int>)(lpVtbl[32]))((ID3D12Device5*)Unsafe.AsPointer(ref this), NTHandle, riid, ppvObj);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.OpenSharedHandleByName" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(33)]
-	public HResult OpenSharedHandleByName(ushort* Name, uint Access, IntPtr* pNTHandle)
+	public HResult OpenSharedHandleByName(ushort* Name, uint Access, Handle* pNTHandle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device5*, ushort*, uint, IntPtr*, int>)(lpVtbl[33]))((ID3D12Device5*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device5*, ushort*, uint, Handle*, int>)(lpVtbl[33]))((ID3D12Device5*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.MakeResident" />
@@ -417,9 +417,9 @@ public unsafe partial struct ID3D12Device5
 	/// <inheritdoc cref="ID3D12Device1.SetEventOnMultipleFenceCompletion" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(45)]
-	public HResult SetEventOnMultipleFenceCompletion(ID3D12Fence** ppFences, ulong* pFenceValues, uint NumFences, MultipleFenceWaitFlags Flags, IntPtr hEvent)
+	public HResult SetEventOnMultipleFenceCompletion(ID3D12Fence** ppFences, ulong* pFenceValues, uint NumFences, MultipleFenceWaitFlags Flags, Handle hEvent)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device5*, ID3D12Fence**, ulong*, uint, MultipleFenceWaitFlags, IntPtr, int>)(lpVtbl[45]))((ID3D12Device5*)Unsafe.AsPointer(ref this), ppFences, pFenceValues, NumFences, Flags, hEvent);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device5*, ID3D12Fence**, ulong*, uint, MultipleFenceWaitFlags, Handle, int>)(lpVtbl[45]))((ID3D12Device5*)Unsafe.AsPointer(ref this), ppFences, pFenceValues, NumFences, Flags, hEvent);
 	}
 
 	/// <inheritdoc cref="ID3D12Device1.SetResidencyPriority" />
@@ -449,9 +449,9 @@ public unsafe partial struct ID3D12Device5
 	/// <inheritdoc cref="ID3D12Device3.OpenExistingHeapFromFileMapping" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(49)]
-	public HResult OpenExistingHeapFromFileMapping(IntPtr hFileMapping, Guid* riid, void** ppvHeap)
+	public HResult OpenExistingHeapFromFileMapping(Handle hFileMapping, Guid* riid, void** ppvHeap)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device5*, IntPtr, Guid*, void**, int>)(lpVtbl[49]))((ID3D12Device5*)Unsafe.AsPointer(ref this), hFileMapping, riid, ppvHeap);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device5*, Handle, Guid*, void**, int>)(lpVtbl[49]))((ID3D12Device5*)Unsafe.AsPointer(ref this), hFileMapping, riid, ppvHeap);
 	}
 
 	/// <inheritdoc cref="ID3D12Device3.EnqueueMakeResident" />
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device6.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device6.cs
index b10a40d..0bafba3 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device6.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device6.cs
@@ -304,25 +304,25 @@ public unsafe partial struct ID3D12Device6
 	/// <inheritdoc cref="ID3D12Device.CreateSharedHandle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, IntPtr* pHandle)
+	public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, Handle* pHandle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device6*, ID3D12DeviceChild*, Security.SECURITY_ATTRIBUTES*, uint, ushort*, IntPtr*, int>)(lpVtbl[31]))((ID3D12Device6*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device6*, ID3D12DeviceChild*, Security.SECURITY_ATTRIBUTES*, uint, ushort*, Handle*, int>)(lpVtbl[31]))((ID3D12Device6*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.OpenSharedHandle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(32)]
-	public HResult OpenSharedHandle(IntPtr NTHandle, Guid* riid, void** ppvObj)
+	public HResult OpenSharedHandle(Handle NTHandle, Guid* riid, void** ppvObj)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device6*, IntPtr, Guid*, void**, int>)(lpVtbl[32]))((ID3D12Device6*)Unsafe.AsPointer(ref this), NTHandle, riid, ppvObj);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device6*, Handle, Guid*, void**, int>)(lpVtbl[32]))((ID3D12Device6*)Unsafe.AsPointer(ref this), NTHandle, riid, ppvObj);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.OpenSharedHandleByName" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(33)]
-	public HResult OpenSharedHandleByName(ushort* Name, uint Access, IntPtr* pNTHandle)
+	public HResult OpenSharedHandleByName(ushort* Name, uint Access, Handle* pNTHandle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device6*, ushort*, uint, IntPtr*, int>)(lpVtbl[33]))((ID3D12Device6*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device6*, ushort*, uint, Handle*, int>)(lpVtbl[33]))((ID3D12Device6*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.MakeResident" />
@@ -417,9 +417,9 @@ public unsafe partial struct ID3D12Device6
 	/// <inheritdoc cref="ID3D12Device1.SetEventOnMultipleFenceCompletion" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(45)]
-	public HResult SetEventOnMultipleFenceCompletion(ID3D12Fence** ppFences, ulong* pFenceValues, uint NumFences, MultipleFenceWaitFlags Flags, IntPtr hEvent)
+	public HResult SetEventOnMultipleFenceCompletion(ID3D12Fence** ppFences, ulong* pFenceValues, uint NumFences, MultipleFenceWaitFlags Flags, Handle hEvent)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device6*, ID3D12Fence**, ulong*, uint, MultipleFenceWaitFlags, IntPtr, int>)(lpVtbl[45]))((ID3D12Device6*)Unsafe.AsPointer(ref this), ppFences, pFenceValues, NumFences, Flags, hEvent);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device6*, ID3D12Fence**, ulong*, uint, MultipleFenceWaitFlags, Handle, int>)(lpVtbl[45]))((ID3D12Device6*)Unsafe.AsPointer(ref this), ppFences, pFenceValues, NumFences, Flags, hEvent);
 	}
 
 	/// <inheritdoc cref="ID3D12Device1.SetResidencyPriority" />
@@ -449,9 +449,9 @@ public unsafe partial struct ID3D12Device6
 	/// <inheritdoc cref="ID3D12Device3.OpenExistingHeapFromFileMapping" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(49)]
-	public HResult OpenExistingHeapFromFileMapping(IntPtr hFileMapping, Guid* riid, void** ppvHeap)
+	public HResult OpenExistingHeapFromFileMapping(Handle hFileMapping, Guid* riid, void** ppvHeap)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device6*, IntPtr, Guid*, void**, int>)(lpVtbl[49]))((ID3D12Device6*)Unsafe.AsPointer(ref this), hFileMapping, riid, ppvHeap);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device6*, Handle, Guid*, void**, int>)(lpVtbl[49]))((ID3D12Device6*)Unsafe.AsPointer(ref this), hFileMapping, riid, ppvHeap);
 	}
 
 	/// <inheritdoc cref="ID3D12Device3.EnqueueMakeResident" />
@@ -578,9 +578,9 @@ public unsafe partial struct ID3D12Device6
 	/// <include file='../../Direct3D12.xml' path='doc/member[@name="ID3D12Device6::SetBackgroundProcessingMode"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(65)]
-	public HResult SetBackgroundProcessingMode(BackgroundProcessingMode Mode, MeasurementsAction MeasurementsAction, IntPtr hEventToSignalUponCompletion, Bool32* pbFurtherMeasurementsDesired)
+	public HResult SetBackgroundProcessingMode(BackgroundProcessingMode Mode, MeasurementsAction MeasurementsAction, Handle hEventToSignalUponCompletion, Bool32* pbFurtherMeasurementsDesired)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device6*, BackgroundProcessingMode, MeasurementsAction, IntPtr, Bool32*, int>)(lpVtbl[65]))((ID3D12Device6*)Unsafe.AsPointer(ref this), Mode, MeasurementsAction, hEventToSignalUponCompletion, pbFurtherMeasurementsDesired);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device6*, BackgroundProcessingMode, MeasurementsAction, Handle, Bool32*, int>)(lpVtbl[65]))((ID3D12Device6*)Unsafe.AsPointer(ref this), Mode, MeasurementsAction, hEventToSignalUponCompletion, pbFurtherMeasurementsDesired);
 	}
 }
 
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device7.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device7.cs
index 2ae7857..3b876da 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device7.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device7.cs
@@ -304,25 +304,25 @@ public unsafe partial struct ID3D12Device7
 	/// <inheritdoc cref="ID3D12Device.CreateSharedHandle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, IntPtr* pHandle)
+	public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, Handle* pHandle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device7*, ID3D12DeviceChild*, Security.SECURITY_ATTRIBUTES*, uint, ushort*, IntPtr*, int>)(lpVtbl[31]))((ID3D12Device7*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device7*, ID3D12DeviceChild*, Security.SECURITY_ATTRIBUTES*, uint, ushort*, Handle*, int>)(lpVtbl[31]))((ID3D12Device7*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.OpenSharedHandle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(32)]
-	public HResult OpenSharedHandle(IntPtr NTHandle, Guid* riid, void** ppvObj)
+	public HResult OpenSharedHandle(Handle NTHandle, Guid* riid, void** ppvObj)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device7*, IntPtr, Guid*, void**, int>)(lpVtbl[32]))((ID3D12Device7*)Unsafe.AsPointer(ref this), NTHandle, riid, ppvObj);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device7*, Handle, Guid*, void**, int>)(lpVtbl[32]))((ID3D12Device7*)Unsafe.AsPointer(ref this), NTHandle, riid, ppvObj);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.OpenSharedHandleByName" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(33)]
-	public HResult OpenSharedHandleByName(ushort* Name, uint Access, IntPtr* pNTHandle)
+	public HResult OpenSharedHandleByName(ushort* Name, uint Access, Handle* pNTHandle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device7*, ushort*, uint, IntPtr*, int>)(lpVtbl[33]))((ID3D12Device7*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device7*, ushort*, uint, Handle*, int>)(lpVtbl[33]))((ID3D12Device7*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.MakeResident" />
@@ -417,9 +417,9 @@ public unsafe partial struct ID3D12Device7
 	/// <inheritdoc cref="ID3D12Device1.SetEventOnMultipleFenceCompletion" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(45)]
-	public HResult SetEventOnMultipleFenceCompletion(ID3D12Fence** ppFences, ulong* pFenceValues, uint NumFences, MultipleFenceWaitFlags Flags, IntPtr hEvent)
+	public HResult SetEventOnMultipleFenceCompletion(ID3D12Fence** ppFences, ulong* pFenceValues, uint NumFences, MultipleFenceWaitFlags Flags, Handle hEvent)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device7*, ID3D12Fence**, ulong*, uint, MultipleFenceWaitFlags, IntPtr, int>)(lpVtbl[45]))((ID3D12Device7*)Unsafe.AsPointer(ref this), ppFences, pFenceValues, NumFences, Flags, hEvent);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device7*, ID3D12Fence**, ulong*, uint, MultipleFenceWaitFlags, Handle, int>)(lpVtbl[45]))((ID3D12Device7*)Unsafe.AsPointer(ref this), ppFences, pFenceValues, NumFences, Flags, hEvent);
 	}
 
 	/// <inheritdoc cref="ID3D12Device1.SetResidencyPriority" />
@@ -449,9 +449,9 @@ public unsafe partial struct ID3D12Device7
 	/// <inheritdoc cref="ID3D12Device3.OpenExistingHeapFromFileMapping" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(49)]
-	public HResult OpenExistingHeapFromFileMapping(IntPtr hFileMapping, Guid* riid, void** ppvHeap)
+	public HResult OpenExistingHeapFromFileMapping(Handle hFileMapping, Guid* riid, void** ppvHeap)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device7*, IntPtr, Guid*, void**, int>)(lpVtbl[49]))((ID3D12Device7*)Unsafe.AsPointer(ref this), hFileMapping, riid, ppvHeap);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device7*, Handle, Guid*, void**, int>)(lpVtbl[49]))((ID3D12Device7*)Unsafe.AsPointer(ref this), hFileMapping, riid, ppvHeap);
 	}
 
 	/// <inheritdoc cref="ID3D12Device3.EnqueueMakeResident" />
@@ -578,9 +578,9 @@ public unsafe partial struct ID3D12Device7
 	/// <inheritdoc cref="ID3D12Device6.SetBackgroundProcessingMode" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(65)]
-	public HResult SetBackgroundProcessingMode(BackgroundProcessingMode Mode, MeasurementsAction MeasurementsAction, IntPtr hEventToSignalUponCompletion, Bool32* pbFurtherMeasurementsDesired)
+	public HResult SetBackgroundProcessingMode(BackgroundProcessingMode Mode, MeasurementsAction MeasurementsAction, Handle hEventToSignalUponCompletion, Bool32* pbFurtherMeasurementsDesired)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device7*, BackgroundProcessingMode, MeasurementsAction, IntPtr, Bool32*, int>)(lpVtbl[65]))((ID3D12Device7*)Unsafe.AsPointer(ref this), Mode, MeasurementsAction, hEventToSignalUponCompletion, pbFurtherMeasurementsDesired);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device7*, BackgroundProcessingMode, MeasurementsAction, Handle, Bool32*, int>)(lpVtbl[65]))((ID3D12Device7*)Unsafe.AsPointer(ref this), Mode, MeasurementsAction, hEventToSignalUponCompletion, pbFurtherMeasurementsDesired);
 	}
 
 	/// <include file='../../Direct3D12.xml' path='doc/member[@name="ID3D12Device7::AddToStateObject"]/*' />
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device8.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device8.cs
index eae961c..480f09d 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device8.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device8.cs
@@ -304,25 +304,25 @@ public unsafe partial struct ID3D12Device8
 	/// <inheritdoc cref="ID3D12Device.CreateSharedHandle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, IntPtr* pHandle)
+	public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, Handle* pHandle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device8*, ID3D12DeviceChild*, Security.SECURITY_ATTRIBUTES*, uint, ushort*, IntPtr*, int>)(lpVtbl[31]))((ID3D12Device8*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device8*, ID3D12DeviceChild*, Security.SECURITY_ATTRIBUTES*, uint, ushort*, Handle*, int>)(lpVtbl[31]))((ID3D12Device8*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.OpenSharedHandle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(32)]
-	public HResult OpenSharedHandle(IntPtr NTHandle, Guid* riid, void** ppvObj)
+	public HResult OpenSharedHandle(Handle NTHandle, Guid* riid, void** ppvObj)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device8*, IntPtr, Guid*, void**, int>)(lpVtbl[32]))((ID3D12Device8*)Unsafe.AsPointer(ref this), NTHandle, riid, ppvObj);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device8*, Handle, Guid*, void**, int>)(lpVtbl[32]))((ID3D12Device8*)Unsafe.AsPointer(ref this), NTHandle, riid, ppvObj);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.OpenSharedHandleByName" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(33)]
-	public HResult OpenSharedHandleByName(ushort* Name, uint Access, IntPtr* pNTHandle)
+	public HResult OpenSharedHandleByName(ushort* Name, uint Access, Handle* pNTHandle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device8*, ushort*, uint, IntPtr*, int>)(lpVtbl[33]))((ID3D12Device8*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device8*, ushort*, uint, Handle*, int>)(lpVtbl[33]))((ID3D12Device8*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.MakeResident" />
@@ -417,9 +417,9 @@ public unsafe partial struct ID3D12Device8
 	/// <inheritdoc cref="ID3D12Device1.SetEventOnMultipleFenceCompletion" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(45)]
-	public HResult SetEventOnMultipleFenceCompletion(ID3D12Fence** ppFences, ulong* pFenceValues, uint NumFences, MultipleFenceWaitFlags Flags, IntPtr hEvent)
+	public HResult SetEventOnMultipleFenceCompletion(ID3D12Fence** ppFences, ulong* pFenceValues, uint NumFences, MultipleFenceWaitFlags Flags, Handle hEvent)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device8*, ID3D12Fence**, ulong*, uint, MultipleFenceWaitFlags, IntPtr, int>)(lpVtbl[45]))((ID3D12Device8*)Unsafe.AsPointer(ref this), ppFences, pFenceValues, NumFences, Flags, hEvent);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device8*, ID3D12Fence**, ulong*, uint, MultipleFenceWaitFlags, Handle, int>)(lpVtbl[45]))((ID3D12Device8*)Unsafe.AsPointer(ref this), ppFences, pFenceValues, NumFences, Flags, hEvent);
 	}
 
 	/// <inheritdoc cref="ID3D12Device1.SetResidencyPriority" />
@@ -449,9 +449,9 @@ public unsafe partial struct ID3D12Device8
 	/// <inheritdoc cref="ID3D12Device3.OpenExistingHeapFromFileMapping" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(49)]
-	public HResult OpenExistingHeapFromFileMapping(IntPtr hFileMapping, Guid* riid, void** ppvHeap)
+	public HResult OpenExistingHeapFromFileMapping(Handle hFileMapping, Guid* riid, void** ppvHeap)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device8*, IntPtr, Guid*, void**, int>)(lpVtbl[49]))((ID3D12Device8*)Unsafe.AsPointer(ref this), hFileMapping, riid, ppvHeap);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device8*, Handle, Guid*, void**, int>)(lpVtbl[49]))((ID3D12Device8*)Unsafe.AsPointer(ref this), hFileMapping, riid, ppvHeap);
 	}
 
 	/// <inheritdoc cref="ID3D12Device3.EnqueueMakeResident" />
@@ -578,9 +578,9 @@ public unsafe partial struct ID3D12Device8
 	/// <inheritdoc cref="ID3D12Device6.SetBackgroundProcessingMode" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(65)]
-	public HResult SetBackgroundProcessingMode(BackgroundProcessingMode Mode, MeasurementsAction MeasurementsAction, IntPtr hEventToSignalUponCompletion, Bool32* pbFurtherMeasurementsDesired)
+	public HResult SetBackgroundProcessingMode(BackgroundProcessingMode Mode, MeasurementsAction MeasurementsAction, Handle hEventToSignalUponCompletion, Bool32* pbFurtherMeasurementsDesired)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device8*, BackgroundProcessingMode, MeasurementsAction, IntPtr, Bool32*, int>)(lpVtbl[65]))((ID3D12Device8*)Unsafe.AsPointer(ref this), Mode, MeasurementsAction, hEventToSignalUponCompletion, pbFurtherMeasurementsDesired);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device8*, BackgroundProcessingMode, MeasurementsAction, Handle, Bool32*, int>)(lpVtbl[65]))((ID3D12Device8*)Unsafe.AsPointer(ref this), Mode, MeasurementsAction, hEventToSignalUponCompletion, pbFurtherMeasurementsDesired);
 	}
 
 	/// <inheritdoc cref="ID3D12Device7.AddToStateObject" />
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device9.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device9.cs
index 9bb4748..46c56d3 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device9.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Device9.cs
@@ -304,25 +304,25 @@ public unsafe partial struct ID3D12Device9
 	/// <inheritdoc cref="ID3D12Device.CreateSharedHandle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, IntPtr* pHandle)
+	public HResult CreateSharedHandle(ID3D12DeviceChild* pObject, Security.SECURITY_ATTRIBUTES* pAttributes, uint Access, ushort* Name, Handle* pHandle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device9*, ID3D12DeviceChild*, Security.SECURITY_ATTRIBUTES*, uint, ushort*, IntPtr*, int>)(lpVtbl[31]))((ID3D12Device9*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device9*, ID3D12DeviceChild*, Security.SECURITY_ATTRIBUTES*, uint, ushort*, Handle*, int>)(lpVtbl[31]))((ID3D12Device9*)Unsafe.AsPointer(ref this), pObject, pAttributes, Access, Name, pHandle);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.OpenSharedHandle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(32)]
-	public HResult OpenSharedHandle(IntPtr NTHandle, Guid* riid, void** ppvObj)
+	public HResult OpenSharedHandle(Handle NTHandle, Guid* riid, void** ppvObj)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device9*, IntPtr, Guid*, void**, int>)(lpVtbl[32]))((ID3D12Device9*)Unsafe.AsPointer(ref this), NTHandle, riid, ppvObj);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device9*, Handle, Guid*, void**, int>)(lpVtbl[32]))((ID3D12Device9*)Unsafe.AsPointer(ref this), NTHandle, riid, ppvObj);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.OpenSharedHandleByName" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(33)]
-	public HResult OpenSharedHandleByName(ushort* Name, uint Access, IntPtr* pNTHandle)
+	public HResult OpenSharedHandleByName(ushort* Name, uint Access, Handle* pNTHandle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device9*, ushort*, uint, IntPtr*, int>)(lpVtbl[33]))((ID3D12Device9*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device9*, ushort*, uint, Handle*, int>)(lpVtbl[33]))((ID3D12Device9*)Unsafe.AsPointer(ref this), Name, Access, pNTHandle);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.MakeResident" />
@@ -417,9 +417,9 @@ public unsafe partial struct ID3D12Device9
 	/// <inheritdoc cref="ID3D12Device1.SetEventOnMultipleFenceCompletion" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(45)]
-	public HResult SetEventOnMultipleFenceCompletion(ID3D12Fence** ppFences, ulong* pFenceValues, uint NumFences, MultipleFenceWaitFlags Flags, IntPtr hEvent)
+	public HResult SetEventOnMultipleFenceCompletion(ID3D12Fence** ppFences, ulong* pFenceValues, uint NumFences, MultipleFenceWaitFlags Flags, Handle hEvent)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device9*, ID3D12Fence**, ulong*, uint, MultipleFenceWaitFlags, IntPtr, int>)(lpVtbl[45]))((ID3D12Device9*)Unsafe.AsPointer(ref this), ppFences, pFenceValues, NumFences, Flags, hEvent);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device9*, ID3D12Fence**, ulong*, uint, MultipleFenceWaitFlags, Handle, int>)(lpVtbl[45]))((ID3D12Device9*)Unsafe.AsPointer(ref this), ppFences, pFenceValues, NumFences, Flags, hEvent);
 	}
 
 	/// <inheritdoc cref="ID3D12Device1.SetResidencyPriority" />
@@ -449,9 +449,9 @@ public unsafe partial struct ID3D12Device9
 	/// <inheritdoc cref="ID3D12Device3.OpenExistingHeapFromFileMapping" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(49)]
-	public HResult OpenExistingHeapFromFileMapping(IntPtr hFileMapping, Guid* riid, void** ppvHeap)
+	public HResult OpenExistingHeapFromFileMapping(Handle hFileMapping, Guid* riid, void** ppvHeap)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device9*, IntPtr, Guid*, void**, int>)(lpVtbl[49]))((ID3D12Device9*)Unsafe.AsPointer(ref this), hFileMapping, riid, ppvHeap);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device9*, Handle, Guid*, void**, int>)(lpVtbl[49]))((ID3D12Device9*)Unsafe.AsPointer(ref this), hFileMapping, riid, ppvHeap);
 	}
 
 	/// <inheritdoc cref="ID3D12Device3.EnqueueMakeResident" />
@@ -578,9 +578,9 @@ public unsafe partial struct ID3D12Device9
 	/// <inheritdoc cref="ID3D12Device6.SetBackgroundProcessingMode" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(65)]
-	public HResult SetBackgroundProcessingMode(BackgroundProcessingMode Mode, MeasurementsAction MeasurementsAction, IntPtr hEventToSignalUponCompletion, Bool32* pbFurtherMeasurementsDesired)
+	public HResult SetBackgroundProcessingMode(BackgroundProcessingMode Mode, MeasurementsAction MeasurementsAction, Handle hEventToSignalUponCompletion, Bool32* pbFurtherMeasurementsDesired)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Device9*, BackgroundProcessingMode, MeasurementsAction, IntPtr, Bool32*, int>)(lpVtbl[65]))((ID3D12Device9*)Unsafe.AsPointer(ref this), Mode, MeasurementsAction, hEventToSignalUponCompletion, pbFurtherMeasurementsDesired);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Device9*, BackgroundProcessingMode, MeasurementsAction, Handle, Bool32*, int>)(lpVtbl[65]))((ID3D12Device9*)Unsafe.AsPointer(ref this), Mode, MeasurementsAction, hEventToSignalUponCompletion, pbFurtherMeasurementsDesired);
 	}
 
 	/// <inheritdoc cref="ID3D12Device7.AddToStateObject" />
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Fence.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Fence.cs
index 5c0236d..976c05b 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Fence.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Fence.cs
@@ -126,9 +126,9 @@ public unsafe partial struct ID3D12Fence
 	/// <include file='../../Direct3D12.xml' path='doc/member[@name="ID3D12Fence::SetEventOnCompletion"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(9)]
-	public HResult SetEventOnCompletion(ulong Value, IntPtr hEvent)
+	public HResult SetEventOnCompletion(ulong Value, Handle hEvent)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Fence*, ulong, IntPtr, int>)(lpVtbl[9]))((ID3D12Fence*)Unsafe.AsPointer(ref this), Value, hEvent);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Fence*, ulong, Handle, int>)(lpVtbl[9]))((ID3D12Fence*)Unsafe.AsPointer(ref this), Value, hEvent);
 	}
 
 	/// <include file='../../Direct3D12.xml' path='doc/member[@name="ID3D12Fence::Signal"]/*' />
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Fence1.cs b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Fence1.cs
index b2defae..f8b634a 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Fence1.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct3D12/ID3D12Fence1.cs
@@ -126,9 +126,9 @@ public unsafe partial struct ID3D12Fence1
 	/// <inheritdoc cref="ID3D12Fence.SetEventOnCompletion" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(9)]
-	public HResult SetEventOnCompletion(ulong Value, IntPtr hEvent)
+	public HResult SetEventOnCompletion(ulong Value, Handle hEvent)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID3D12Fence1*, ulong, IntPtr, int>)(lpVtbl[9]))((ID3D12Fence1*)Unsafe.AsPointer(ref this), Value, hEvent);
+		return ((delegate* unmanaged[Stdcall]<ID3D12Fence1*, ulong, Handle, int>)(lpVtbl[9]))((ID3D12Fence1*)Unsafe.AsPointer(ref this), Value, hEvent);
 	}
 
 	/// <inheritdoc cref="ID3D12Fence.Signal" />
diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite.cs b/src/Vortice.Win32/Generated/Graphics/DirectWrite.cs
index e281699..c2296f5 100644
--- a/src/Vortice.Win32/Generated/Graphics/DirectWrite.cs
+++ b/src/Vortice.Win32/Generated/Graphics/DirectWrite.cs
@@ -2430,29 +2430,6 @@ public partial struct GlyphOffset
 	public float ascenderOffset;
 }
 
-/// <include file='../DirectWrite.xml' path='doc/member[@name="DWRITE_MATRIX"]/*' />
-/// <unmanaged>DWRITE_MATRIX</unmanaged>
-public partial struct Matrix
-{
-	/// <include file='../DirectWrite.xml' path='doc/member[@name="DWRITE_MATRIX::m11"]/*' />
-	public float m11;
-
-	/// <include file='../DirectWrite.xml' path='doc/member[@name="DWRITE_MATRIX::m12"]/*' />
-	public float m12;
-
-	/// <include file='../DirectWrite.xml' path='doc/member[@name="DWRITE_MATRIX::m21"]/*' />
-	public float m21;
-
-	/// <include file='../DirectWrite.xml' path='doc/member[@name="DWRITE_MATRIX::m22"]/*' />
-	public float m22;
-
-	/// <include file='../DirectWrite.xml' path='doc/member[@name="DWRITE_MATRIX::dx"]/*' />
-	public float dx;
-
-	/// <include file='../DirectWrite.xml' path='doc/member[@name="DWRITE_MATRIX::dy"]/*' />
-	public float dy;
-}
-
 /// <include file='../DirectWrite.xml' path='doc/member[@name="DWRITE_TEXT_RANGE"]/*' />
 /// <unmanaged>DWRITE_TEXT_RANGE</unmanaged>
 public partial struct TextRange
diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteAsyncResult.cs b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteAsyncResult.cs
index 1b22cf7..0f5d607 100644
--- a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteAsyncResult.cs
+++ b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteAsyncResult.cs
@@ -78,9 +78,9 @@ public unsafe partial struct IDWriteAsyncResult
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteAsyncResult::GetWaitHandle"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(3)]
-	public IntPtr GetWaitHandle()
+	public Handle GetWaitHandle()
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteAsyncResult*, IntPtr>)(lpVtbl[3]))((IDWriteAsyncResult*)Unsafe.AsPointer(ref this));
+		return ((delegate* unmanaged[Stdcall]<IDWriteAsyncResult*, Handle>)(lpVtbl[3]))((IDWriteAsyncResult*)Unsafe.AsPointer(ref this));
 	}
 
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteAsyncResult::GetResult"]/*' />
diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteBitmapRenderTarget.cs b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteBitmapRenderTarget.cs
index e7ad5f0..a5e7141 100644
--- a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteBitmapRenderTarget.cs
+++ b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteBitmapRenderTarget.cs
@@ -110,17 +110,17 @@ public unsafe partial struct IDWriteBitmapRenderTarget
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteBitmapRenderTarget::GetCurrentTransform"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(7)]
-	public HResult GetCurrentTransform(Matrix* transform)
+	public HResult GetCurrentTransform(Matrix3x2* transform)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteBitmapRenderTarget*, Matrix*, int>)(lpVtbl[7]))((IDWriteBitmapRenderTarget*)Unsafe.AsPointer(ref this), transform);
+		return ((delegate* unmanaged[Stdcall]<IDWriteBitmapRenderTarget*, Matrix3x2*, int>)(lpVtbl[7]))((IDWriteBitmapRenderTarget*)Unsafe.AsPointer(ref this), transform);
 	}
 
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteBitmapRenderTarget::SetCurrentTransform"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(8)]
-	public HResult SetCurrentTransform(Matrix* transform)
+	public HResult SetCurrentTransform(Matrix3x2* transform)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteBitmapRenderTarget*, Matrix*, int>)(lpVtbl[8]))((IDWriteBitmapRenderTarget*)Unsafe.AsPointer(ref this), transform);
+		return ((delegate* unmanaged[Stdcall]<IDWriteBitmapRenderTarget*, Matrix3x2*, int>)(lpVtbl[8]))((IDWriteBitmapRenderTarget*)Unsafe.AsPointer(ref this), transform);
 	}
 
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteBitmapRenderTarget::GetSize"]/*' />
diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteBitmapRenderTarget1.cs b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteBitmapRenderTarget1.cs
index 5b47d21..9f44846 100644
--- a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteBitmapRenderTarget1.cs
+++ b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteBitmapRenderTarget1.cs
@@ -110,17 +110,17 @@ public unsafe partial struct IDWriteBitmapRenderTarget1
 	/// <inheritdoc cref="IDWriteBitmapRenderTarget.GetCurrentTransform" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(7)]
-	public HResult GetCurrentTransform(Matrix* transform)
+	public HResult GetCurrentTransform(Matrix3x2* transform)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteBitmapRenderTarget1*, Matrix*, int>)(lpVtbl[7]))((IDWriteBitmapRenderTarget1*)Unsafe.AsPointer(ref this), transform);
+		return ((delegate* unmanaged[Stdcall]<IDWriteBitmapRenderTarget1*, Matrix3x2*, int>)(lpVtbl[7]))((IDWriteBitmapRenderTarget1*)Unsafe.AsPointer(ref this), transform);
 	}
 
 	/// <inheritdoc cref="IDWriteBitmapRenderTarget.SetCurrentTransform" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(8)]
-	public HResult SetCurrentTransform(Matrix* transform)
+	public HResult SetCurrentTransform(Matrix3x2* transform)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteBitmapRenderTarget1*, Matrix*, int>)(lpVtbl[8]))((IDWriteBitmapRenderTarget1*)Unsafe.AsPointer(ref this), transform);
+		return ((delegate* unmanaged[Stdcall]<IDWriteBitmapRenderTarget1*, Matrix3x2*, int>)(lpVtbl[8]))((IDWriteBitmapRenderTarget1*)Unsafe.AsPointer(ref this), transform);
 	}
 
 	/// <inheritdoc cref="IDWriteBitmapRenderTarget.GetSize" />
diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory.cs b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory.cs
index 98343ee..8b44632 100644
--- a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory.cs
+++ b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory.cs
@@ -206,9 +206,9 @@ public unsafe partial struct IDWriteFactory
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteFactory::CreateGdiCompatibleTextLayout"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public HResult CreateGdiCompatibleTextLayout(ushort* @string, uint stringLength, IDWriteTextFormat* textFormat, float layoutWidth, float layoutHeight, float pixelsPerDip, Matrix* transform, Bool32 useGdiNatural, IDWriteTextLayout** textLayout)
+	public HResult CreateGdiCompatibleTextLayout(ushort* @string, uint stringLength, IDWriteTextFormat* textFormat, float layoutWidth, float layoutHeight, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, IDWriteTextLayout** textLayout)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory*, ushort*, uint, IDWriteTextFormat*, float, float, float, Matrix*, Bool32, IDWriteTextLayout**, int>)(lpVtbl[19]))((IDWriteFactory*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutWidth, layoutHeight, pixelsPerDip, transform, useGdiNatural, textLayout);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory*, ushort*, uint, IDWriteTextFormat*, float, float, float, Matrix3x2*, Bool32, IDWriteTextLayout**, int>)(lpVtbl[19]))((IDWriteFactory*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutWidth, layoutHeight, pixelsPerDip, transform, useGdiNatural, textLayout);
 	}
 
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteFactory::CreateEllipsisTrimmingSign"]/*' />
@@ -238,9 +238,9 @@ public unsafe partial struct IDWriteFactory
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteFactory::CreateGlyphRunAnalysis"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(23)]
-	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, float pixelsPerDip, Matrix* transform, RenderingMode renderingMode, MeasuringMode measuringMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
+	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, float pixelsPerDip, Matrix3x2* transform, RenderingMode renderingMode, MeasuringMode measuringMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory*, GlyphRun*, float, Matrix*, RenderingMode, MeasuringMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[23]))((IDWriteFactory*)Unsafe.AsPointer(ref this), glyphRun, pixelsPerDip, transform, renderingMode, measuringMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory*, GlyphRun*, float, Matrix3x2*, RenderingMode, MeasuringMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[23]))((IDWriteFactory*)Unsafe.AsPointer(ref this), glyphRun, pixelsPerDip, transform, renderingMode, measuringMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
 	}
 }
 
diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory1.cs b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory1.cs
index a6cc34a..1edc969 100644
--- a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory1.cs
+++ b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory1.cs
@@ -206,9 +206,9 @@ public unsafe partial struct IDWriteFactory1
 	/// <inheritdoc cref="IDWriteFactory.CreateGdiCompatibleTextLayout" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public HResult CreateGdiCompatibleTextLayout(ushort* @string, uint stringLength, IDWriteTextFormat* textFormat, float layoutWidth, float layoutHeight, float pixelsPerDip, Matrix* transform, Bool32 useGdiNatural, IDWriteTextLayout** textLayout)
+	public HResult CreateGdiCompatibleTextLayout(ushort* @string, uint stringLength, IDWriteTextFormat* textFormat, float layoutWidth, float layoutHeight, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, IDWriteTextLayout** textLayout)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory1*, ushort*, uint, IDWriteTextFormat*, float, float, float, Matrix*, Bool32, IDWriteTextLayout**, int>)(lpVtbl[19]))((IDWriteFactory1*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutWidth, layoutHeight, pixelsPerDip, transform, useGdiNatural, textLayout);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory1*, ushort*, uint, IDWriteTextFormat*, float, float, float, Matrix3x2*, Bool32, IDWriteTextLayout**, int>)(lpVtbl[19]))((IDWriteFactory1*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutWidth, layoutHeight, pixelsPerDip, transform, useGdiNatural, textLayout);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory.CreateEllipsisTrimmingSign" />
@@ -238,9 +238,9 @@ public unsafe partial struct IDWriteFactory1
 	/// <inheritdoc cref="IDWriteFactory.CreateGlyphRunAnalysis" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(23)]
-	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, float pixelsPerDip, Matrix* transform, RenderingMode renderingMode, MeasuringMode measuringMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
+	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, float pixelsPerDip, Matrix3x2* transform, RenderingMode renderingMode, MeasuringMode measuringMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory1*, GlyphRun*, float, Matrix*, RenderingMode, MeasuringMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[23]))((IDWriteFactory1*)Unsafe.AsPointer(ref this), glyphRun, pixelsPerDip, transform, renderingMode, measuringMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory1*, GlyphRun*, float, Matrix3x2*, RenderingMode, MeasuringMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[23]))((IDWriteFactory1*)Unsafe.AsPointer(ref this), glyphRun, pixelsPerDip, transform, renderingMode, measuringMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
 	}
 
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteFactory1::GetEudcFontCollection"]/*' />
diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory2.cs b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory2.cs
index b3c9ce5..ec1055a 100644
--- a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory2.cs
+++ b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory2.cs
@@ -206,9 +206,9 @@ public unsafe partial struct IDWriteFactory2
 	/// <inheritdoc cref="IDWriteFactory.CreateGdiCompatibleTextLayout" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public HResult CreateGdiCompatibleTextLayout(ushort* @string, uint stringLength, IDWriteTextFormat* textFormat, float layoutWidth, float layoutHeight, float pixelsPerDip, Matrix* transform, Bool32 useGdiNatural, IDWriteTextLayout** textLayout)
+	public HResult CreateGdiCompatibleTextLayout(ushort* @string, uint stringLength, IDWriteTextFormat* textFormat, float layoutWidth, float layoutHeight, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, IDWriteTextLayout** textLayout)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory2*, ushort*, uint, IDWriteTextFormat*, float, float, float, Matrix*, Bool32, IDWriteTextLayout**, int>)(lpVtbl[19]))((IDWriteFactory2*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutWidth, layoutHeight, pixelsPerDip, transform, useGdiNatural, textLayout);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory2*, ushort*, uint, IDWriteTextFormat*, float, float, float, Matrix3x2*, Bool32, IDWriteTextLayout**, int>)(lpVtbl[19]))((IDWriteFactory2*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutWidth, layoutHeight, pixelsPerDip, transform, useGdiNatural, textLayout);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory.CreateEllipsisTrimmingSign" />
@@ -238,9 +238,9 @@ public unsafe partial struct IDWriteFactory2
 	/// <inheritdoc cref="IDWriteFactory.CreateGlyphRunAnalysis" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(23)]
-	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, float pixelsPerDip, Matrix* transform, RenderingMode renderingMode, MeasuringMode measuringMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
+	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, float pixelsPerDip, Matrix3x2* transform, RenderingMode renderingMode, MeasuringMode measuringMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory2*, GlyphRun*, float, Matrix*, RenderingMode, MeasuringMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[23]))((IDWriteFactory2*)Unsafe.AsPointer(ref this), glyphRun, pixelsPerDip, transform, renderingMode, measuringMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory2*, GlyphRun*, float, Matrix3x2*, RenderingMode, MeasuringMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[23]))((IDWriteFactory2*)Unsafe.AsPointer(ref this), glyphRun, pixelsPerDip, transform, renderingMode, measuringMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory1.GetEudcFontCollection" />
@@ -278,9 +278,9 @@ public unsafe partial struct IDWriteFactory2
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteFactory2::TranslateColorGlyphRun"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(28)]
-	public HResult TranslateColorGlyphRun(float baselineOriginX, float baselineOriginY, GlyphRun* glyphRun, GlyphRunDescription* glyphRunDescription, MeasuringMode measuringMode, Matrix* worldToDeviceTransform, uint colorPaletteIndex, IDWriteColorGlyphRunEnumerator** colorLayers)
+	public HResult TranslateColorGlyphRun(float baselineOriginX, float baselineOriginY, GlyphRun* glyphRun, GlyphRunDescription* glyphRunDescription, MeasuringMode measuringMode, Matrix3x2* worldToDeviceTransform, uint colorPaletteIndex, IDWriteColorGlyphRunEnumerator** colorLayers)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory2*, float, float, GlyphRun*, GlyphRunDescription*, MeasuringMode, Matrix*, uint, IDWriteColorGlyphRunEnumerator**, int>)(lpVtbl[28]))((IDWriteFactory2*)Unsafe.AsPointer(ref this), baselineOriginX, baselineOriginY, glyphRun, glyphRunDescription, measuringMode, worldToDeviceTransform, colorPaletteIndex, colorLayers);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory2*, float, float, GlyphRun*, GlyphRunDescription*, MeasuringMode, Matrix3x2*, uint, IDWriteColorGlyphRunEnumerator**, int>)(lpVtbl[28]))((IDWriteFactory2*)Unsafe.AsPointer(ref this), baselineOriginX, baselineOriginY, glyphRun, glyphRunDescription, measuringMode, worldToDeviceTransform, colorPaletteIndex, colorLayers);
 	}
 
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteFactory2::CreateCustomRenderingParams"]/*' />
@@ -294,9 +294,9 @@ public unsafe partial struct IDWriteFactory2
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteFactory2::CreateGlyphRunAnalysis"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(30)]
-	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, Matrix* transform, RenderingMode renderingMode, MeasuringMode measuringMode, GridFitMode gridFitMode, TextAntialiasMode antialiasMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
+	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, Matrix3x2* transform, RenderingMode renderingMode, MeasuringMode measuringMode, GridFitMode gridFitMode, TextAntialiasMode antialiasMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory2*, GlyphRun*, Matrix*, RenderingMode, MeasuringMode, GridFitMode, TextAntialiasMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[30]))((IDWriteFactory2*)Unsafe.AsPointer(ref this), glyphRun, transform, renderingMode, measuringMode, gridFitMode, antialiasMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory2*, GlyphRun*, Matrix3x2*, RenderingMode, MeasuringMode, GridFitMode, TextAntialiasMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[30]))((IDWriteFactory2*)Unsafe.AsPointer(ref this), glyphRun, transform, renderingMode, measuringMode, gridFitMode, antialiasMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
 	}
 }
 
diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory3.cs b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory3.cs
index 8f5a339..2a409bc 100644
--- a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory3.cs
+++ b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory3.cs
@@ -206,9 +206,9 @@ public unsafe partial struct IDWriteFactory3
 	/// <inheritdoc cref="IDWriteFactory.CreateGdiCompatibleTextLayout" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public HResult CreateGdiCompatibleTextLayout(ushort* @string, uint stringLength, IDWriteTextFormat* textFormat, float layoutWidth, float layoutHeight, float pixelsPerDip, Matrix* transform, Bool32 useGdiNatural, IDWriteTextLayout** textLayout)
+	public HResult CreateGdiCompatibleTextLayout(ushort* @string, uint stringLength, IDWriteTextFormat* textFormat, float layoutWidth, float layoutHeight, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, IDWriteTextLayout** textLayout)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory3*, ushort*, uint, IDWriteTextFormat*, float, float, float, Matrix*, Bool32, IDWriteTextLayout**, int>)(lpVtbl[19]))((IDWriteFactory3*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutWidth, layoutHeight, pixelsPerDip, transform, useGdiNatural, textLayout);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory3*, ushort*, uint, IDWriteTextFormat*, float, float, float, Matrix3x2*, Bool32, IDWriteTextLayout**, int>)(lpVtbl[19]))((IDWriteFactory3*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutWidth, layoutHeight, pixelsPerDip, transform, useGdiNatural, textLayout);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory.CreateEllipsisTrimmingSign" />
@@ -238,9 +238,9 @@ public unsafe partial struct IDWriteFactory3
 	/// <inheritdoc cref="IDWriteFactory.CreateGlyphRunAnalysis" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(23)]
-	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, float pixelsPerDip, Matrix* transform, RenderingMode renderingMode, MeasuringMode measuringMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
+	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, float pixelsPerDip, Matrix3x2* transform, RenderingMode renderingMode, MeasuringMode measuringMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory3*, GlyphRun*, float, Matrix*, RenderingMode, MeasuringMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[23]))((IDWriteFactory3*)Unsafe.AsPointer(ref this), glyphRun, pixelsPerDip, transform, renderingMode, measuringMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory3*, GlyphRun*, float, Matrix3x2*, RenderingMode, MeasuringMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[23]))((IDWriteFactory3*)Unsafe.AsPointer(ref this), glyphRun, pixelsPerDip, transform, renderingMode, measuringMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory1.GetEudcFontCollection" />
@@ -278,9 +278,9 @@ public unsafe partial struct IDWriteFactory3
 	/// <inheritdoc cref="IDWriteFactory2.TranslateColorGlyphRun" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(28)]
-	public HResult TranslateColorGlyphRun(float baselineOriginX, float baselineOriginY, GlyphRun* glyphRun, GlyphRunDescription* glyphRunDescription, MeasuringMode measuringMode, Matrix* worldToDeviceTransform, uint colorPaletteIndex, IDWriteColorGlyphRunEnumerator** colorLayers)
+	public HResult TranslateColorGlyphRun(float baselineOriginX, float baselineOriginY, GlyphRun* glyphRun, GlyphRunDescription* glyphRunDescription, MeasuringMode measuringMode, Matrix3x2* worldToDeviceTransform, uint colorPaletteIndex, IDWriteColorGlyphRunEnumerator** colorLayers)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory3*, float, float, GlyphRun*, GlyphRunDescription*, MeasuringMode, Matrix*, uint, IDWriteColorGlyphRunEnumerator**, int>)(lpVtbl[28]))((IDWriteFactory3*)Unsafe.AsPointer(ref this), baselineOriginX, baselineOriginY, glyphRun, glyphRunDescription, measuringMode, worldToDeviceTransform, colorPaletteIndex, colorLayers);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory3*, float, float, GlyphRun*, GlyphRunDescription*, MeasuringMode, Matrix3x2*, uint, IDWriteColorGlyphRunEnumerator**, int>)(lpVtbl[28]))((IDWriteFactory3*)Unsafe.AsPointer(ref this), baselineOriginX, baselineOriginY, glyphRun, glyphRunDescription, measuringMode, worldToDeviceTransform, colorPaletteIndex, colorLayers);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory2.CreateCustomRenderingParams" />
@@ -294,17 +294,17 @@ public unsafe partial struct IDWriteFactory3
 	/// <inheritdoc cref="IDWriteFactory2.CreateGlyphRunAnalysis" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(30)]
-	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, Matrix* transform, RenderingMode renderingMode, MeasuringMode measuringMode, GridFitMode gridFitMode, TextAntialiasMode antialiasMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
+	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, Matrix3x2* transform, RenderingMode renderingMode, MeasuringMode measuringMode, GridFitMode gridFitMode, TextAntialiasMode antialiasMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory3*, GlyphRun*, Matrix*, RenderingMode, MeasuringMode, GridFitMode, TextAntialiasMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[30]))((IDWriteFactory3*)Unsafe.AsPointer(ref this), glyphRun, transform, renderingMode, measuringMode, gridFitMode, antialiasMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory3*, GlyphRun*, Matrix3x2*, RenderingMode, MeasuringMode, GridFitMode, TextAntialiasMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[30]))((IDWriteFactory3*)Unsafe.AsPointer(ref this), glyphRun, transform, renderingMode, measuringMode, gridFitMode, antialiasMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
 	}
 
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteFactory3::CreateGlyphRunAnalysis"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, Matrix* transform, RenderingMode1 renderingMode, MeasuringMode measuringMode, GridFitMode gridFitMode, TextAntialiasMode antialiasMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
+	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, Matrix3x2* transform, RenderingMode1 renderingMode, MeasuringMode measuringMode, GridFitMode gridFitMode, TextAntialiasMode antialiasMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory3*, GlyphRun*, Matrix*, RenderingMode1, MeasuringMode, GridFitMode, TextAntialiasMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[31]))((IDWriteFactory3*)Unsafe.AsPointer(ref this), glyphRun, transform, renderingMode, measuringMode, gridFitMode, antialiasMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory3*, GlyphRun*, Matrix3x2*, RenderingMode1, MeasuringMode, GridFitMode, TextAntialiasMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[31]))((IDWriteFactory3*)Unsafe.AsPointer(ref this), glyphRun, transform, renderingMode, measuringMode, gridFitMode, antialiasMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
 	}
 
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteFactory3::CreateCustomRenderingParams"]/*' />
diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory4.cs b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory4.cs
index 8da5e44..91d9c2d 100644
--- a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory4.cs
+++ b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory4.cs
@@ -206,9 +206,9 @@ public unsafe partial struct IDWriteFactory4
 	/// <inheritdoc cref="IDWriteFactory.CreateGdiCompatibleTextLayout" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public HResult CreateGdiCompatibleTextLayout(ushort* @string, uint stringLength, IDWriteTextFormat* textFormat, float layoutWidth, float layoutHeight, float pixelsPerDip, Matrix* transform, Bool32 useGdiNatural, IDWriteTextLayout** textLayout)
+	public HResult CreateGdiCompatibleTextLayout(ushort* @string, uint stringLength, IDWriteTextFormat* textFormat, float layoutWidth, float layoutHeight, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, IDWriteTextLayout** textLayout)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory4*, ushort*, uint, IDWriteTextFormat*, float, float, float, Matrix*, Bool32, IDWriteTextLayout**, int>)(lpVtbl[19]))((IDWriteFactory4*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutWidth, layoutHeight, pixelsPerDip, transform, useGdiNatural, textLayout);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory4*, ushort*, uint, IDWriteTextFormat*, float, float, float, Matrix3x2*, Bool32, IDWriteTextLayout**, int>)(lpVtbl[19]))((IDWriteFactory4*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutWidth, layoutHeight, pixelsPerDip, transform, useGdiNatural, textLayout);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory.CreateEllipsisTrimmingSign" />
@@ -238,9 +238,9 @@ public unsafe partial struct IDWriteFactory4
 	/// <inheritdoc cref="IDWriteFactory.CreateGlyphRunAnalysis" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(23)]
-	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, float pixelsPerDip, Matrix* transform, RenderingMode renderingMode, MeasuringMode measuringMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
+	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, float pixelsPerDip, Matrix3x2* transform, RenderingMode renderingMode, MeasuringMode measuringMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory4*, GlyphRun*, float, Matrix*, RenderingMode, MeasuringMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[23]))((IDWriteFactory4*)Unsafe.AsPointer(ref this), glyphRun, pixelsPerDip, transform, renderingMode, measuringMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory4*, GlyphRun*, float, Matrix3x2*, RenderingMode, MeasuringMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[23]))((IDWriteFactory4*)Unsafe.AsPointer(ref this), glyphRun, pixelsPerDip, transform, renderingMode, measuringMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory1.GetEudcFontCollection" />
@@ -278,9 +278,9 @@ public unsafe partial struct IDWriteFactory4
 	/// <inheritdoc cref="IDWriteFactory2.TranslateColorGlyphRun" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(28)]
-	public HResult TranslateColorGlyphRun(float baselineOriginX, float baselineOriginY, GlyphRun* glyphRun, GlyphRunDescription* glyphRunDescription, MeasuringMode measuringMode, Matrix* worldToDeviceTransform, uint colorPaletteIndex, IDWriteColorGlyphRunEnumerator** colorLayers)
+	public HResult TranslateColorGlyphRun(float baselineOriginX, float baselineOriginY, GlyphRun* glyphRun, GlyphRunDescription* glyphRunDescription, MeasuringMode measuringMode, Matrix3x2* worldToDeviceTransform, uint colorPaletteIndex, IDWriteColorGlyphRunEnumerator** colorLayers)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory4*, float, float, GlyphRun*, GlyphRunDescription*, MeasuringMode, Matrix*, uint, IDWriteColorGlyphRunEnumerator**, int>)(lpVtbl[28]))((IDWriteFactory4*)Unsafe.AsPointer(ref this), baselineOriginX, baselineOriginY, glyphRun, glyphRunDescription, measuringMode, worldToDeviceTransform, colorPaletteIndex, colorLayers);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory4*, float, float, GlyphRun*, GlyphRunDescription*, MeasuringMode, Matrix3x2*, uint, IDWriteColorGlyphRunEnumerator**, int>)(lpVtbl[28]))((IDWriteFactory4*)Unsafe.AsPointer(ref this), baselineOriginX, baselineOriginY, glyphRun, glyphRunDescription, measuringMode, worldToDeviceTransform, colorPaletteIndex, colorLayers);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory2.CreateCustomRenderingParams" />
@@ -294,17 +294,17 @@ public unsafe partial struct IDWriteFactory4
 	/// <inheritdoc cref="IDWriteFactory2.CreateGlyphRunAnalysis" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(30)]
-	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, Matrix* transform, RenderingMode renderingMode, MeasuringMode measuringMode, GridFitMode gridFitMode, TextAntialiasMode antialiasMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
+	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, Matrix3x2* transform, RenderingMode renderingMode, MeasuringMode measuringMode, GridFitMode gridFitMode, TextAntialiasMode antialiasMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory4*, GlyphRun*, Matrix*, RenderingMode, MeasuringMode, GridFitMode, TextAntialiasMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[30]))((IDWriteFactory4*)Unsafe.AsPointer(ref this), glyphRun, transform, renderingMode, measuringMode, gridFitMode, antialiasMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory4*, GlyphRun*, Matrix3x2*, RenderingMode, MeasuringMode, GridFitMode, TextAntialiasMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[30]))((IDWriteFactory4*)Unsafe.AsPointer(ref this), glyphRun, transform, renderingMode, measuringMode, gridFitMode, antialiasMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory3.CreateGlyphRunAnalysis" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, Matrix* transform, RenderingMode1 renderingMode, MeasuringMode measuringMode, GridFitMode gridFitMode, TextAntialiasMode antialiasMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
+	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, Matrix3x2* transform, RenderingMode1 renderingMode, MeasuringMode measuringMode, GridFitMode gridFitMode, TextAntialiasMode antialiasMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory4*, GlyphRun*, Matrix*, RenderingMode1, MeasuringMode, GridFitMode, TextAntialiasMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[31]))((IDWriteFactory4*)Unsafe.AsPointer(ref this), glyphRun, transform, renderingMode, measuringMode, gridFitMode, antialiasMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory4*, GlyphRun*, Matrix3x2*, RenderingMode1, MeasuringMode, GridFitMode, TextAntialiasMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[31]))((IDWriteFactory4*)Unsafe.AsPointer(ref this), glyphRun, transform, renderingMode, measuringMode, gridFitMode, antialiasMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory3.CreateCustomRenderingParams" />
@@ -374,9 +374,9 @@ public unsafe partial struct IDWriteFactory4
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteFactory4::TranslateColorGlyphRun"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(40)]
-	public HResult TranslateColorGlyphRun(System.Drawing.PointF baselineOrigin, GlyphRun* glyphRun, GlyphRunDescription* glyphRunDescription, GlyphImageFormats desiredGlyphImageFormats, MeasuringMode measuringMode, Matrix* worldAndDpiTransform, uint colorPaletteIndex, IDWriteColorGlyphRunEnumerator1** colorLayers)
+	public HResult TranslateColorGlyphRun(System.Drawing.PointF baselineOrigin, GlyphRun* glyphRun, GlyphRunDescription* glyphRunDescription, GlyphImageFormats desiredGlyphImageFormats, MeasuringMode measuringMode, Matrix3x2* worldAndDpiTransform, uint colorPaletteIndex, IDWriteColorGlyphRunEnumerator1** colorLayers)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory4*, System.Drawing.PointF, GlyphRun*, GlyphRunDescription*, GlyphImageFormats, MeasuringMode, Matrix*, uint, IDWriteColorGlyphRunEnumerator1**, int>)(lpVtbl[40]))((IDWriteFactory4*)Unsafe.AsPointer(ref this), baselineOrigin, glyphRun, glyphRunDescription, desiredGlyphImageFormats, measuringMode, worldAndDpiTransform, colorPaletteIndex, colorLayers);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory4*, System.Drawing.PointF, GlyphRun*, GlyphRunDescription*, GlyphImageFormats, MeasuringMode, Matrix3x2*, uint, IDWriteColorGlyphRunEnumerator1**, int>)(lpVtbl[40]))((IDWriteFactory4*)Unsafe.AsPointer(ref this), baselineOrigin, glyphRun, glyphRunDescription, desiredGlyphImageFormats, measuringMode, worldAndDpiTransform, colorPaletteIndex, colorLayers);
 	}
 
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteFactory4::ComputeGlyphOrigins"]/*' />
@@ -390,9 +390,9 @@ public unsafe partial struct IDWriteFactory4
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteFactory4::ComputeGlyphOrigins"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(42)]
-	public HResult ComputeGlyphOrigins(GlyphRun* glyphRun, MeasuringMode measuringMode, System.Drawing.PointF baselineOrigin, Matrix* worldAndDpiTransform, System.Drawing.PointF* glyphOrigins)
+	public HResult ComputeGlyphOrigins(GlyphRun* glyphRun, MeasuringMode measuringMode, System.Drawing.PointF baselineOrigin, Matrix3x2* worldAndDpiTransform, System.Drawing.PointF* glyphOrigins)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory4*, GlyphRun*, MeasuringMode, System.Drawing.PointF, Matrix*, System.Drawing.PointF*, int>)(lpVtbl[42]))((IDWriteFactory4*)Unsafe.AsPointer(ref this), glyphRun, measuringMode, baselineOrigin, worldAndDpiTransform, glyphOrigins);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory4*, GlyphRun*, MeasuringMode, System.Drawing.PointF, Matrix3x2*, System.Drawing.PointF*, int>)(lpVtbl[42]))((IDWriteFactory4*)Unsafe.AsPointer(ref this), glyphRun, measuringMode, baselineOrigin, worldAndDpiTransform, glyphOrigins);
 	}
 }
 
diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory5.cs b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory5.cs
index 949b9a2..2eb5c9f 100644
--- a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory5.cs
+++ b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory5.cs
@@ -206,9 +206,9 @@ public unsafe partial struct IDWriteFactory5
 	/// <inheritdoc cref="IDWriteFactory.CreateGdiCompatibleTextLayout" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public HResult CreateGdiCompatibleTextLayout(ushort* @string, uint stringLength, IDWriteTextFormat* textFormat, float layoutWidth, float layoutHeight, float pixelsPerDip, Matrix* transform, Bool32 useGdiNatural, IDWriteTextLayout** textLayout)
+	public HResult CreateGdiCompatibleTextLayout(ushort* @string, uint stringLength, IDWriteTextFormat* textFormat, float layoutWidth, float layoutHeight, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, IDWriteTextLayout** textLayout)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory5*, ushort*, uint, IDWriteTextFormat*, float, float, float, Matrix*, Bool32, IDWriteTextLayout**, int>)(lpVtbl[19]))((IDWriteFactory5*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutWidth, layoutHeight, pixelsPerDip, transform, useGdiNatural, textLayout);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory5*, ushort*, uint, IDWriteTextFormat*, float, float, float, Matrix3x2*, Bool32, IDWriteTextLayout**, int>)(lpVtbl[19]))((IDWriteFactory5*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutWidth, layoutHeight, pixelsPerDip, transform, useGdiNatural, textLayout);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory.CreateEllipsisTrimmingSign" />
@@ -238,9 +238,9 @@ public unsafe partial struct IDWriteFactory5
 	/// <inheritdoc cref="IDWriteFactory.CreateGlyphRunAnalysis" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(23)]
-	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, float pixelsPerDip, Matrix* transform, RenderingMode renderingMode, MeasuringMode measuringMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
+	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, float pixelsPerDip, Matrix3x2* transform, RenderingMode renderingMode, MeasuringMode measuringMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory5*, GlyphRun*, float, Matrix*, RenderingMode, MeasuringMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[23]))((IDWriteFactory5*)Unsafe.AsPointer(ref this), glyphRun, pixelsPerDip, transform, renderingMode, measuringMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory5*, GlyphRun*, float, Matrix3x2*, RenderingMode, MeasuringMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[23]))((IDWriteFactory5*)Unsafe.AsPointer(ref this), glyphRun, pixelsPerDip, transform, renderingMode, measuringMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory1.GetEudcFontCollection" />
@@ -278,9 +278,9 @@ public unsafe partial struct IDWriteFactory5
 	/// <inheritdoc cref="IDWriteFactory2.TranslateColorGlyphRun" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(28)]
-	public HResult TranslateColorGlyphRun(float baselineOriginX, float baselineOriginY, GlyphRun* glyphRun, GlyphRunDescription* glyphRunDescription, MeasuringMode measuringMode, Matrix* worldToDeviceTransform, uint colorPaletteIndex, IDWriteColorGlyphRunEnumerator** colorLayers)
+	public HResult TranslateColorGlyphRun(float baselineOriginX, float baselineOriginY, GlyphRun* glyphRun, GlyphRunDescription* glyphRunDescription, MeasuringMode measuringMode, Matrix3x2* worldToDeviceTransform, uint colorPaletteIndex, IDWriteColorGlyphRunEnumerator** colorLayers)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory5*, float, float, GlyphRun*, GlyphRunDescription*, MeasuringMode, Matrix*, uint, IDWriteColorGlyphRunEnumerator**, int>)(lpVtbl[28]))((IDWriteFactory5*)Unsafe.AsPointer(ref this), baselineOriginX, baselineOriginY, glyphRun, glyphRunDescription, measuringMode, worldToDeviceTransform, colorPaletteIndex, colorLayers);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory5*, float, float, GlyphRun*, GlyphRunDescription*, MeasuringMode, Matrix3x2*, uint, IDWriteColorGlyphRunEnumerator**, int>)(lpVtbl[28]))((IDWriteFactory5*)Unsafe.AsPointer(ref this), baselineOriginX, baselineOriginY, glyphRun, glyphRunDescription, measuringMode, worldToDeviceTransform, colorPaletteIndex, colorLayers);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory2.CreateCustomRenderingParams" />
@@ -294,17 +294,17 @@ public unsafe partial struct IDWriteFactory5
 	/// <inheritdoc cref="IDWriteFactory2.CreateGlyphRunAnalysis" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(30)]
-	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, Matrix* transform, RenderingMode renderingMode, MeasuringMode measuringMode, GridFitMode gridFitMode, TextAntialiasMode antialiasMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
+	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, Matrix3x2* transform, RenderingMode renderingMode, MeasuringMode measuringMode, GridFitMode gridFitMode, TextAntialiasMode antialiasMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory5*, GlyphRun*, Matrix*, RenderingMode, MeasuringMode, GridFitMode, TextAntialiasMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[30]))((IDWriteFactory5*)Unsafe.AsPointer(ref this), glyphRun, transform, renderingMode, measuringMode, gridFitMode, antialiasMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory5*, GlyphRun*, Matrix3x2*, RenderingMode, MeasuringMode, GridFitMode, TextAntialiasMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[30]))((IDWriteFactory5*)Unsafe.AsPointer(ref this), glyphRun, transform, renderingMode, measuringMode, gridFitMode, antialiasMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory3.CreateGlyphRunAnalysis" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, Matrix* transform, RenderingMode1 renderingMode, MeasuringMode measuringMode, GridFitMode gridFitMode, TextAntialiasMode antialiasMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
+	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, Matrix3x2* transform, RenderingMode1 renderingMode, MeasuringMode measuringMode, GridFitMode gridFitMode, TextAntialiasMode antialiasMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory5*, GlyphRun*, Matrix*, RenderingMode1, MeasuringMode, GridFitMode, TextAntialiasMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[31]))((IDWriteFactory5*)Unsafe.AsPointer(ref this), glyphRun, transform, renderingMode, measuringMode, gridFitMode, antialiasMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory5*, GlyphRun*, Matrix3x2*, RenderingMode1, MeasuringMode, GridFitMode, TextAntialiasMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[31]))((IDWriteFactory5*)Unsafe.AsPointer(ref this), glyphRun, transform, renderingMode, measuringMode, gridFitMode, antialiasMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory3.CreateCustomRenderingParams" />
@@ -374,9 +374,9 @@ public unsafe partial struct IDWriteFactory5
 	/// <inheritdoc cref="IDWriteFactory4.TranslateColorGlyphRun" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(40)]
-	public HResult TranslateColorGlyphRun(System.Drawing.PointF baselineOrigin, GlyphRun* glyphRun, GlyphRunDescription* glyphRunDescription, GlyphImageFormats desiredGlyphImageFormats, MeasuringMode measuringMode, Matrix* worldAndDpiTransform, uint colorPaletteIndex, IDWriteColorGlyphRunEnumerator1** colorLayers)
+	public HResult TranslateColorGlyphRun(System.Drawing.PointF baselineOrigin, GlyphRun* glyphRun, GlyphRunDescription* glyphRunDescription, GlyphImageFormats desiredGlyphImageFormats, MeasuringMode measuringMode, Matrix3x2* worldAndDpiTransform, uint colorPaletteIndex, IDWriteColorGlyphRunEnumerator1** colorLayers)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory5*, System.Drawing.PointF, GlyphRun*, GlyphRunDescription*, GlyphImageFormats, MeasuringMode, Matrix*, uint, IDWriteColorGlyphRunEnumerator1**, int>)(lpVtbl[40]))((IDWriteFactory5*)Unsafe.AsPointer(ref this), baselineOrigin, glyphRun, glyphRunDescription, desiredGlyphImageFormats, measuringMode, worldAndDpiTransform, colorPaletteIndex, colorLayers);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory5*, System.Drawing.PointF, GlyphRun*, GlyphRunDescription*, GlyphImageFormats, MeasuringMode, Matrix3x2*, uint, IDWriteColorGlyphRunEnumerator1**, int>)(lpVtbl[40]))((IDWriteFactory5*)Unsafe.AsPointer(ref this), baselineOrigin, glyphRun, glyphRunDescription, desiredGlyphImageFormats, measuringMode, worldAndDpiTransform, colorPaletteIndex, colorLayers);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory4.ComputeGlyphOrigins" />
@@ -390,9 +390,9 @@ public unsafe partial struct IDWriteFactory5
 	/// <inheritdoc cref="IDWriteFactory4.ComputeGlyphOrigins" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(42)]
-	public HResult ComputeGlyphOrigins(GlyphRun* glyphRun, MeasuringMode measuringMode, System.Drawing.PointF baselineOrigin, Matrix* worldAndDpiTransform, System.Drawing.PointF* glyphOrigins)
+	public HResult ComputeGlyphOrigins(GlyphRun* glyphRun, MeasuringMode measuringMode, System.Drawing.PointF baselineOrigin, Matrix3x2* worldAndDpiTransform, System.Drawing.PointF* glyphOrigins)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory5*, GlyphRun*, MeasuringMode, System.Drawing.PointF, Matrix*, System.Drawing.PointF*, int>)(lpVtbl[42]))((IDWriteFactory5*)Unsafe.AsPointer(ref this), glyphRun, measuringMode, baselineOrigin, worldAndDpiTransform, glyphOrigins);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory5*, GlyphRun*, MeasuringMode, System.Drawing.PointF, Matrix3x2*, System.Drawing.PointF*, int>)(lpVtbl[42]))((IDWriteFactory5*)Unsafe.AsPointer(ref this), glyphRun, measuringMode, baselineOrigin, worldAndDpiTransform, glyphOrigins);
 	}
 
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteFactory5::CreateFontSetBuilder"]/*' />
diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory6.cs b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory6.cs
index 62d74a8..47e2834 100644
--- a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory6.cs
+++ b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory6.cs
@@ -206,9 +206,9 @@ public unsafe partial struct IDWriteFactory6
 	/// <inheritdoc cref="IDWriteFactory.CreateGdiCompatibleTextLayout" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public HResult CreateGdiCompatibleTextLayout(ushort* @string, uint stringLength, IDWriteTextFormat* textFormat, float layoutWidth, float layoutHeight, float pixelsPerDip, Matrix* transform, Bool32 useGdiNatural, IDWriteTextLayout** textLayout)
+	public HResult CreateGdiCompatibleTextLayout(ushort* @string, uint stringLength, IDWriteTextFormat* textFormat, float layoutWidth, float layoutHeight, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, IDWriteTextLayout** textLayout)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory6*, ushort*, uint, IDWriteTextFormat*, float, float, float, Matrix*, Bool32, IDWriteTextLayout**, int>)(lpVtbl[19]))((IDWriteFactory6*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutWidth, layoutHeight, pixelsPerDip, transform, useGdiNatural, textLayout);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory6*, ushort*, uint, IDWriteTextFormat*, float, float, float, Matrix3x2*, Bool32, IDWriteTextLayout**, int>)(lpVtbl[19]))((IDWriteFactory6*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutWidth, layoutHeight, pixelsPerDip, transform, useGdiNatural, textLayout);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory.CreateEllipsisTrimmingSign" />
@@ -238,9 +238,9 @@ public unsafe partial struct IDWriteFactory6
 	/// <inheritdoc cref="IDWriteFactory.CreateGlyphRunAnalysis" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(23)]
-	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, float pixelsPerDip, Matrix* transform, RenderingMode renderingMode, MeasuringMode measuringMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
+	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, float pixelsPerDip, Matrix3x2* transform, RenderingMode renderingMode, MeasuringMode measuringMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory6*, GlyphRun*, float, Matrix*, RenderingMode, MeasuringMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[23]))((IDWriteFactory6*)Unsafe.AsPointer(ref this), glyphRun, pixelsPerDip, transform, renderingMode, measuringMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory6*, GlyphRun*, float, Matrix3x2*, RenderingMode, MeasuringMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[23]))((IDWriteFactory6*)Unsafe.AsPointer(ref this), glyphRun, pixelsPerDip, transform, renderingMode, measuringMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory1.GetEudcFontCollection" />
@@ -278,9 +278,9 @@ public unsafe partial struct IDWriteFactory6
 	/// <inheritdoc cref="IDWriteFactory2.TranslateColorGlyphRun" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(28)]
-	public HResult TranslateColorGlyphRun(float baselineOriginX, float baselineOriginY, GlyphRun* glyphRun, GlyphRunDescription* glyphRunDescription, MeasuringMode measuringMode, Matrix* worldToDeviceTransform, uint colorPaletteIndex, IDWriteColorGlyphRunEnumerator** colorLayers)
+	public HResult TranslateColorGlyphRun(float baselineOriginX, float baselineOriginY, GlyphRun* glyphRun, GlyphRunDescription* glyphRunDescription, MeasuringMode measuringMode, Matrix3x2* worldToDeviceTransform, uint colorPaletteIndex, IDWriteColorGlyphRunEnumerator** colorLayers)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory6*, float, float, GlyphRun*, GlyphRunDescription*, MeasuringMode, Matrix*, uint, IDWriteColorGlyphRunEnumerator**, int>)(lpVtbl[28]))((IDWriteFactory6*)Unsafe.AsPointer(ref this), baselineOriginX, baselineOriginY, glyphRun, glyphRunDescription, measuringMode, worldToDeviceTransform, colorPaletteIndex, colorLayers);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory6*, float, float, GlyphRun*, GlyphRunDescription*, MeasuringMode, Matrix3x2*, uint, IDWriteColorGlyphRunEnumerator**, int>)(lpVtbl[28]))((IDWriteFactory6*)Unsafe.AsPointer(ref this), baselineOriginX, baselineOriginY, glyphRun, glyphRunDescription, measuringMode, worldToDeviceTransform, colorPaletteIndex, colorLayers);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory2.CreateCustomRenderingParams" />
@@ -294,17 +294,17 @@ public unsafe partial struct IDWriteFactory6
 	/// <inheritdoc cref="IDWriteFactory2.CreateGlyphRunAnalysis" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(30)]
-	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, Matrix* transform, RenderingMode renderingMode, MeasuringMode measuringMode, GridFitMode gridFitMode, TextAntialiasMode antialiasMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
+	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, Matrix3x2* transform, RenderingMode renderingMode, MeasuringMode measuringMode, GridFitMode gridFitMode, TextAntialiasMode antialiasMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory6*, GlyphRun*, Matrix*, RenderingMode, MeasuringMode, GridFitMode, TextAntialiasMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[30]))((IDWriteFactory6*)Unsafe.AsPointer(ref this), glyphRun, transform, renderingMode, measuringMode, gridFitMode, antialiasMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory6*, GlyphRun*, Matrix3x2*, RenderingMode, MeasuringMode, GridFitMode, TextAntialiasMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[30]))((IDWriteFactory6*)Unsafe.AsPointer(ref this), glyphRun, transform, renderingMode, measuringMode, gridFitMode, antialiasMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory3.CreateGlyphRunAnalysis" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, Matrix* transform, RenderingMode1 renderingMode, MeasuringMode measuringMode, GridFitMode gridFitMode, TextAntialiasMode antialiasMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
+	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, Matrix3x2* transform, RenderingMode1 renderingMode, MeasuringMode measuringMode, GridFitMode gridFitMode, TextAntialiasMode antialiasMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory6*, GlyphRun*, Matrix*, RenderingMode1, MeasuringMode, GridFitMode, TextAntialiasMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[31]))((IDWriteFactory6*)Unsafe.AsPointer(ref this), glyphRun, transform, renderingMode, measuringMode, gridFitMode, antialiasMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory6*, GlyphRun*, Matrix3x2*, RenderingMode1, MeasuringMode, GridFitMode, TextAntialiasMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[31]))((IDWriteFactory6*)Unsafe.AsPointer(ref this), glyphRun, transform, renderingMode, measuringMode, gridFitMode, antialiasMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory3.CreateCustomRenderingParams" />
@@ -374,9 +374,9 @@ public unsafe partial struct IDWriteFactory6
 	/// <inheritdoc cref="IDWriteFactory4.TranslateColorGlyphRun" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(40)]
-	public HResult TranslateColorGlyphRun(System.Drawing.PointF baselineOrigin, GlyphRun* glyphRun, GlyphRunDescription* glyphRunDescription, GlyphImageFormats desiredGlyphImageFormats, MeasuringMode measuringMode, Matrix* worldAndDpiTransform, uint colorPaletteIndex, IDWriteColorGlyphRunEnumerator1** colorLayers)
+	public HResult TranslateColorGlyphRun(System.Drawing.PointF baselineOrigin, GlyphRun* glyphRun, GlyphRunDescription* glyphRunDescription, GlyphImageFormats desiredGlyphImageFormats, MeasuringMode measuringMode, Matrix3x2* worldAndDpiTransform, uint colorPaletteIndex, IDWriteColorGlyphRunEnumerator1** colorLayers)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory6*, System.Drawing.PointF, GlyphRun*, GlyphRunDescription*, GlyphImageFormats, MeasuringMode, Matrix*, uint, IDWriteColorGlyphRunEnumerator1**, int>)(lpVtbl[40]))((IDWriteFactory6*)Unsafe.AsPointer(ref this), baselineOrigin, glyphRun, glyphRunDescription, desiredGlyphImageFormats, measuringMode, worldAndDpiTransform, colorPaletteIndex, colorLayers);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory6*, System.Drawing.PointF, GlyphRun*, GlyphRunDescription*, GlyphImageFormats, MeasuringMode, Matrix3x2*, uint, IDWriteColorGlyphRunEnumerator1**, int>)(lpVtbl[40]))((IDWriteFactory6*)Unsafe.AsPointer(ref this), baselineOrigin, glyphRun, glyphRunDescription, desiredGlyphImageFormats, measuringMode, worldAndDpiTransform, colorPaletteIndex, colorLayers);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory4.ComputeGlyphOrigins" />
@@ -390,9 +390,9 @@ public unsafe partial struct IDWriteFactory6
 	/// <inheritdoc cref="IDWriteFactory4.ComputeGlyphOrigins" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(42)]
-	public HResult ComputeGlyphOrigins(GlyphRun* glyphRun, MeasuringMode measuringMode, System.Drawing.PointF baselineOrigin, Matrix* worldAndDpiTransform, System.Drawing.PointF* glyphOrigins)
+	public HResult ComputeGlyphOrigins(GlyphRun* glyphRun, MeasuringMode measuringMode, System.Drawing.PointF baselineOrigin, Matrix3x2* worldAndDpiTransform, System.Drawing.PointF* glyphOrigins)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory6*, GlyphRun*, MeasuringMode, System.Drawing.PointF, Matrix*, System.Drawing.PointF*, int>)(lpVtbl[42]))((IDWriteFactory6*)Unsafe.AsPointer(ref this), glyphRun, measuringMode, baselineOrigin, worldAndDpiTransform, glyphOrigins);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory6*, GlyphRun*, MeasuringMode, System.Drawing.PointF, Matrix3x2*, System.Drawing.PointF*, int>)(lpVtbl[42]))((IDWriteFactory6*)Unsafe.AsPointer(ref this), glyphRun, measuringMode, baselineOrigin, worldAndDpiTransform, glyphOrigins);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory5.CreateFontSetBuilder" />
diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory7.cs b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory7.cs
index dea5db9..b2f8486 100644
--- a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory7.cs
+++ b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFactory7.cs
@@ -206,9 +206,9 @@ public unsafe partial struct IDWriteFactory7
 	/// <inheritdoc cref="IDWriteFactory.CreateGdiCompatibleTextLayout" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public HResult CreateGdiCompatibleTextLayout(ushort* @string, uint stringLength, IDWriteTextFormat* textFormat, float layoutWidth, float layoutHeight, float pixelsPerDip, Matrix* transform, Bool32 useGdiNatural, IDWriteTextLayout** textLayout)
+	public HResult CreateGdiCompatibleTextLayout(ushort* @string, uint stringLength, IDWriteTextFormat* textFormat, float layoutWidth, float layoutHeight, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, IDWriteTextLayout** textLayout)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory7*, ushort*, uint, IDWriteTextFormat*, float, float, float, Matrix*, Bool32, IDWriteTextLayout**, int>)(lpVtbl[19]))((IDWriteFactory7*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutWidth, layoutHeight, pixelsPerDip, transform, useGdiNatural, textLayout);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory7*, ushort*, uint, IDWriteTextFormat*, float, float, float, Matrix3x2*, Bool32, IDWriteTextLayout**, int>)(lpVtbl[19]))((IDWriteFactory7*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutWidth, layoutHeight, pixelsPerDip, transform, useGdiNatural, textLayout);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory.CreateEllipsisTrimmingSign" />
@@ -238,9 +238,9 @@ public unsafe partial struct IDWriteFactory7
 	/// <inheritdoc cref="IDWriteFactory.CreateGlyphRunAnalysis" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(23)]
-	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, float pixelsPerDip, Matrix* transform, RenderingMode renderingMode, MeasuringMode measuringMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
+	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, float pixelsPerDip, Matrix3x2* transform, RenderingMode renderingMode, MeasuringMode measuringMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory7*, GlyphRun*, float, Matrix*, RenderingMode, MeasuringMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[23]))((IDWriteFactory7*)Unsafe.AsPointer(ref this), glyphRun, pixelsPerDip, transform, renderingMode, measuringMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory7*, GlyphRun*, float, Matrix3x2*, RenderingMode, MeasuringMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[23]))((IDWriteFactory7*)Unsafe.AsPointer(ref this), glyphRun, pixelsPerDip, transform, renderingMode, measuringMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory1.GetEudcFontCollection" />
@@ -278,9 +278,9 @@ public unsafe partial struct IDWriteFactory7
 	/// <inheritdoc cref="IDWriteFactory2.TranslateColorGlyphRun" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(28)]
-	public HResult TranslateColorGlyphRun(float baselineOriginX, float baselineOriginY, GlyphRun* glyphRun, GlyphRunDescription* glyphRunDescription, MeasuringMode measuringMode, Matrix* worldToDeviceTransform, uint colorPaletteIndex, IDWriteColorGlyphRunEnumerator** colorLayers)
+	public HResult TranslateColorGlyphRun(float baselineOriginX, float baselineOriginY, GlyphRun* glyphRun, GlyphRunDescription* glyphRunDescription, MeasuringMode measuringMode, Matrix3x2* worldToDeviceTransform, uint colorPaletteIndex, IDWriteColorGlyphRunEnumerator** colorLayers)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory7*, float, float, GlyphRun*, GlyphRunDescription*, MeasuringMode, Matrix*, uint, IDWriteColorGlyphRunEnumerator**, int>)(lpVtbl[28]))((IDWriteFactory7*)Unsafe.AsPointer(ref this), baselineOriginX, baselineOriginY, glyphRun, glyphRunDescription, measuringMode, worldToDeviceTransform, colorPaletteIndex, colorLayers);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory7*, float, float, GlyphRun*, GlyphRunDescription*, MeasuringMode, Matrix3x2*, uint, IDWriteColorGlyphRunEnumerator**, int>)(lpVtbl[28]))((IDWriteFactory7*)Unsafe.AsPointer(ref this), baselineOriginX, baselineOriginY, glyphRun, glyphRunDescription, measuringMode, worldToDeviceTransform, colorPaletteIndex, colorLayers);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory2.CreateCustomRenderingParams" />
@@ -294,17 +294,17 @@ public unsafe partial struct IDWriteFactory7
 	/// <inheritdoc cref="IDWriteFactory2.CreateGlyphRunAnalysis" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(30)]
-	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, Matrix* transform, RenderingMode renderingMode, MeasuringMode measuringMode, GridFitMode gridFitMode, TextAntialiasMode antialiasMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
+	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, Matrix3x2* transform, RenderingMode renderingMode, MeasuringMode measuringMode, GridFitMode gridFitMode, TextAntialiasMode antialiasMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory7*, GlyphRun*, Matrix*, RenderingMode, MeasuringMode, GridFitMode, TextAntialiasMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[30]))((IDWriteFactory7*)Unsafe.AsPointer(ref this), glyphRun, transform, renderingMode, measuringMode, gridFitMode, antialiasMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory7*, GlyphRun*, Matrix3x2*, RenderingMode, MeasuringMode, GridFitMode, TextAntialiasMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[30]))((IDWriteFactory7*)Unsafe.AsPointer(ref this), glyphRun, transform, renderingMode, measuringMode, gridFitMode, antialiasMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory3.CreateGlyphRunAnalysis" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, Matrix* transform, RenderingMode1 renderingMode, MeasuringMode measuringMode, GridFitMode gridFitMode, TextAntialiasMode antialiasMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
+	public HResult CreateGlyphRunAnalysis(GlyphRun* glyphRun, Matrix3x2* transform, RenderingMode1 renderingMode, MeasuringMode measuringMode, GridFitMode gridFitMode, TextAntialiasMode antialiasMode, float baselineOriginX, float baselineOriginY, IDWriteGlyphRunAnalysis** glyphRunAnalysis)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory7*, GlyphRun*, Matrix*, RenderingMode1, MeasuringMode, GridFitMode, TextAntialiasMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[31]))((IDWriteFactory7*)Unsafe.AsPointer(ref this), glyphRun, transform, renderingMode, measuringMode, gridFitMode, antialiasMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory7*, GlyphRun*, Matrix3x2*, RenderingMode1, MeasuringMode, GridFitMode, TextAntialiasMode, float, float, IDWriteGlyphRunAnalysis**, int>)(lpVtbl[31]))((IDWriteFactory7*)Unsafe.AsPointer(ref this), glyphRun, transform, renderingMode, measuringMode, gridFitMode, antialiasMode, baselineOriginX, baselineOriginY, glyphRunAnalysis);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory3.CreateCustomRenderingParams" />
@@ -374,9 +374,9 @@ public unsafe partial struct IDWriteFactory7
 	/// <inheritdoc cref="IDWriteFactory4.TranslateColorGlyphRun" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(40)]
-	public HResult TranslateColorGlyphRun(System.Drawing.PointF baselineOrigin, GlyphRun* glyphRun, GlyphRunDescription* glyphRunDescription, GlyphImageFormats desiredGlyphImageFormats, MeasuringMode measuringMode, Matrix* worldAndDpiTransform, uint colorPaletteIndex, IDWriteColorGlyphRunEnumerator1** colorLayers)
+	public HResult TranslateColorGlyphRun(System.Drawing.PointF baselineOrigin, GlyphRun* glyphRun, GlyphRunDescription* glyphRunDescription, GlyphImageFormats desiredGlyphImageFormats, MeasuringMode measuringMode, Matrix3x2* worldAndDpiTransform, uint colorPaletteIndex, IDWriteColorGlyphRunEnumerator1** colorLayers)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory7*, System.Drawing.PointF, GlyphRun*, GlyphRunDescription*, GlyphImageFormats, MeasuringMode, Matrix*, uint, IDWriteColorGlyphRunEnumerator1**, int>)(lpVtbl[40]))((IDWriteFactory7*)Unsafe.AsPointer(ref this), baselineOrigin, glyphRun, glyphRunDescription, desiredGlyphImageFormats, measuringMode, worldAndDpiTransform, colorPaletteIndex, colorLayers);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory7*, System.Drawing.PointF, GlyphRun*, GlyphRunDescription*, GlyphImageFormats, MeasuringMode, Matrix3x2*, uint, IDWriteColorGlyphRunEnumerator1**, int>)(lpVtbl[40]))((IDWriteFactory7*)Unsafe.AsPointer(ref this), baselineOrigin, glyphRun, glyphRunDescription, desiredGlyphImageFormats, measuringMode, worldAndDpiTransform, colorPaletteIndex, colorLayers);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory4.ComputeGlyphOrigins" />
@@ -390,9 +390,9 @@ public unsafe partial struct IDWriteFactory7
 	/// <inheritdoc cref="IDWriteFactory4.ComputeGlyphOrigins" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(42)]
-	public HResult ComputeGlyphOrigins(GlyphRun* glyphRun, MeasuringMode measuringMode, System.Drawing.PointF baselineOrigin, Matrix* worldAndDpiTransform, System.Drawing.PointF* glyphOrigins)
+	public HResult ComputeGlyphOrigins(GlyphRun* glyphRun, MeasuringMode measuringMode, System.Drawing.PointF baselineOrigin, Matrix3x2* worldAndDpiTransform, System.Drawing.PointF* glyphOrigins)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFactory7*, GlyphRun*, MeasuringMode, System.Drawing.PointF, Matrix*, System.Drawing.PointF*, int>)(lpVtbl[42]))((IDWriteFactory7*)Unsafe.AsPointer(ref this), glyphRun, measuringMode, baselineOrigin, worldAndDpiTransform, glyphOrigins);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFactory7*, GlyphRun*, MeasuringMode, System.Drawing.PointF, Matrix3x2*, System.Drawing.PointF*, int>)(lpVtbl[42]))((IDWriteFactory7*)Unsafe.AsPointer(ref this), glyphRun, measuringMode, baselineOrigin, worldAndDpiTransform, glyphOrigins);
 	}
 
 	/// <inheritdoc cref="IDWriteFactory5.CreateFontSetBuilder" />
diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontCollection3.cs b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontCollection3.cs
index 935857c..9d0b9a7 100644
--- a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontCollection3.cs
+++ b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontCollection3.cs
@@ -158,9 +158,9 @@ public unsafe partial struct IDWriteFontCollection3
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteFontCollection3::GetExpirationEvent"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(13)]
-	public IntPtr GetExpirationEvent()
+	public Handle GetExpirationEvent()
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontCollection3*, IntPtr>)(lpVtbl[13]))((IDWriteFontCollection3*)Unsafe.AsPointer(ref this));
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontCollection3*, Handle>)(lpVtbl[13]))((IDWriteFontCollection3*)Unsafe.AsPointer(ref this));
 	}
 }
 
diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace.cs b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace.cs
index 4fca4a0..d796a14 100644
--- a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace.cs
+++ b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace.cs
@@ -182,17 +182,17 @@ public unsafe partial struct IDWriteFontFace
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteFontFace::GetGdiCompatibleMetrics"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public HResult GetGdiCompatibleMetrics(float emSize, float pixelsPerDip, Matrix* transform, FontMetrics* fontFaceMetrics)
+	public HResult GetGdiCompatibleMetrics(float emSize, float pixelsPerDip, Matrix3x2* transform, FontMetrics* fontFaceMetrics)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace*, float, float, Matrix*, FontMetrics*, int>)(lpVtbl[16]))((IDWriteFontFace*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, fontFaceMetrics);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace*, float, float, Matrix3x2*, FontMetrics*, int>)(lpVtbl[16]))((IDWriteFontFace*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, fontFaceMetrics);
 	}
 
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteFontFace::GetGdiCompatibleGlyphMetrics"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public HResult GetGdiCompatibleGlyphMetrics(float emSize, float pixelsPerDip, Matrix* transform, Bool32 useGdiNatural, ushort* glyphIndices, uint glyphCount, GlyphMetrics* glyphMetrics, Bool32 isSideways)
+	public HResult GetGdiCompatibleGlyphMetrics(float emSize, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, ushort* glyphIndices, uint glyphCount, GlyphMetrics* glyphMetrics, Bool32 isSideways)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace*, float, float, Matrix*, Bool32, ushort*, uint, GlyphMetrics*, Bool32, int>)(lpVtbl[17]))((IDWriteFontFace*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, useGdiNatural, glyphIndices, glyphCount, glyphMetrics, isSideways);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace*, float, float, Matrix3x2*, Bool32, ushort*, uint, GlyphMetrics*, Bool32, int>)(lpVtbl[17]))((IDWriteFontFace*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, useGdiNatural, glyphIndices, glyphCount, glyphMetrics, isSideways);
 	}
 }
 
diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace1.cs b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace1.cs
index 56c6e30..208f1d9 100644
--- a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace1.cs
+++ b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace1.cs
@@ -182,17 +182,17 @@ public unsafe partial struct IDWriteFontFace1
 	/// <inheritdoc cref="IDWriteFontFace.GetGdiCompatibleMetrics" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public HResult GetGdiCompatibleMetrics(float emSize, float pixelsPerDip, Matrix* transform, FontMetrics* fontFaceMetrics)
+	public HResult GetGdiCompatibleMetrics(float emSize, float pixelsPerDip, Matrix3x2* transform, FontMetrics* fontFaceMetrics)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace1*, float, float, Matrix*, FontMetrics*, int>)(lpVtbl[16]))((IDWriteFontFace1*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, fontFaceMetrics);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace1*, float, float, Matrix3x2*, FontMetrics*, int>)(lpVtbl[16]))((IDWriteFontFace1*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, fontFaceMetrics);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace.GetGdiCompatibleGlyphMetrics" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public HResult GetGdiCompatibleGlyphMetrics(float emSize, float pixelsPerDip, Matrix* transform, Bool32 useGdiNatural, ushort* glyphIndices, uint glyphCount, GlyphMetrics* glyphMetrics, Bool32 isSideways)
+	public HResult GetGdiCompatibleGlyphMetrics(float emSize, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, ushort* glyphIndices, uint glyphCount, GlyphMetrics* glyphMetrics, Bool32 isSideways)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace1*, float, float, Matrix*, Bool32, ushort*, uint, GlyphMetrics*, Bool32, int>)(lpVtbl[17]))((IDWriteFontFace1*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, useGdiNatural, glyphIndices, glyphCount, glyphMetrics, isSideways);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace1*, float, float, Matrix3x2*, Bool32, ushort*, uint, GlyphMetrics*, Bool32, int>)(lpVtbl[17]))((IDWriteFontFace1*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, useGdiNatural, glyphIndices, glyphCount, glyphMetrics, isSideways);
 	}
 
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteFontFace1::GetMetrics"]/*' />
@@ -206,9 +206,9 @@ public unsafe partial struct IDWriteFontFace1
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteFontFace1::GetGdiCompatibleMetrics"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public HResult GetGdiCompatibleMetrics(float emSize, float pixelsPerDip, Matrix* transform, FontMetrics1* fontMetrics)
+	public HResult GetGdiCompatibleMetrics(float emSize, float pixelsPerDip, Matrix3x2* transform, FontMetrics1* fontMetrics)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace1*, float, float, Matrix*, FontMetrics1*, int>)(lpVtbl[19]))((IDWriteFontFace1*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, fontMetrics);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace1*, float, float, Matrix3x2*, FontMetrics1*, int>)(lpVtbl[19]))((IDWriteFontFace1*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, fontMetrics);
 	}
 
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteFontFace1::GetCaretMetrics"]/*' />
@@ -246,9 +246,9 @@ public unsafe partial struct IDWriteFontFace1
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteFontFace1::GetGdiCompatibleGlyphAdvances"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(24)]
-	public HResult GetGdiCompatibleGlyphAdvances(float emSize, float pixelsPerDip, Matrix* transform, Bool32 useGdiNatural, Bool32 isSideways, uint glyphCount, ushort* glyphIndices, int* glyphAdvances)
+	public HResult GetGdiCompatibleGlyphAdvances(float emSize, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, Bool32 isSideways, uint glyphCount, ushort* glyphIndices, int* glyphAdvances)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace1*, float, float, Matrix*, Bool32, Bool32, uint, ushort*, int*, int>)(lpVtbl[24]))((IDWriteFontFace1*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, useGdiNatural, isSideways, glyphCount, glyphIndices, glyphAdvances);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace1*, float, float, Matrix3x2*, Bool32, Bool32, uint, ushort*, int*, int>)(lpVtbl[24]))((IDWriteFontFace1*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, useGdiNatural, isSideways, glyphCount, glyphIndices, glyphAdvances);
 	}
 
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteFontFace1::GetKerningPairAdjustments"]/*' />
@@ -270,9 +270,9 @@ public unsafe partial struct IDWriteFontFace1
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteFontFace1::GetRecommendedRenderingMode"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(27)]
-	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, RenderingMode* renderingMode)
+	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix3x2* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, RenderingMode* renderingMode)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace1*, float, float, float, Matrix*, Bool32, OutlineThreshold, MeasuringMode, RenderingMode*, int>)(lpVtbl[27]))((IDWriteFontFace1*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingMode);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace1*, float, float, float, Matrix3x2*, Bool32, OutlineThreshold, MeasuringMode, RenderingMode*, int>)(lpVtbl[27]))((IDWriteFontFace1*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingMode);
 	}
 
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteFontFace1::GetVerticalGlyphVariants"]/*' />
diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace2.cs b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace2.cs
index 63671c9..5d0fb59 100644
--- a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace2.cs
+++ b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace2.cs
@@ -182,17 +182,17 @@ public unsafe partial struct IDWriteFontFace2
 	/// <inheritdoc cref="IDWriteFontFace.GetGdiCompatibleMetrics" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public HResult GetGdiCompatibleMetrics(float emSize, float pixelsPerDip, Matrix* transform, FontMetrics* fontFaceMetrics)
+	public HResult GetGdiCompatibleMetrics(float emSize, float pixelsPerDip, Matrix3x2* transform, FontMetrics* fontFaceMetrics)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace2*, float, float, Matrix*, FontMetrics*, int>)(lpVtbl[16]))((IDWriteFontFace2*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, fontFaceMetrics);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace2*, float, float, Matrix3x2*, FontMetrics*, int>)(lpVtbl[16]))((IDWriteFontFace2*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, fontFaceMetrics);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace.GetGdiCompatibleGlyphMetrics" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public HResult GetGdiCompatibleGlyphMetrics(float emSize, float pixelsPerDip, Matrix* transform, Bool32 useGdiNatural, ushort* glyphIndices, uint glyphCount, GlyphMetrics* glyphMetrics, Bool32 isSideways)
+	public HResult GetGdiCompatibleGlyphMetrics(float emSize, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, ushort* glyphIndices, uint glyphCount, GlyphMetrics* glyphMetrics, Bool32 isSideways)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace2*, float, float, Matrix*, Bool32, ushort*, uint, GlyphMetrics*, Bool32, int>)(lpVtbl[17]))((IDWriteFontFace2*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, useGdiNatural, glyphIndices, glyphCount, glyphMetrics, isSideways);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace2*, float, float, Matrix3x2*, Bool32, ushort*, uint, GlyphMetrics*, Bool32, int>)(lpVtbl[17]))((IDWriteFontFace2*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, useGdiNatural, glyphIndices, glyphCount, glyphMetrics, isSideways);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace1.GetMetrics" />
@@ -206,9 +206,9 @@ public unsafe partial struct IDWriteFontFace2
 	/// <inheritdoc cref="IDWriteFontFace1.GetGdiCompatibleMetrics" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public HResult GetGdiCompatibleMetrics(float emSize, float pixelsPerDip, Matrix* transform, FontMetrics1* fontMetrics)
+	public HResult GetGdiCompatibleMetrics(float emSize, float pixelsPerDip, Matrix3x2* transform, FontMetrics1* fontMetrics)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace2*, float, float, Matrix*, FontMetrics1*, int>)(lpVtbl[19]))((IDWriteFontFace2*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, fontMetrics);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace2*, float, float, Matrix3x2*, FontMetrics1*, int>)(lpVtbl[19]))((IDWriteFontFace2*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, fontMetrics);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace1.GetCaretMetrics" />
@@ -246,9 +246,9 @@ public unsafe partial struct IDWriteFontFace2
 	/// <inheritdoc cref="IDWriteFontFace1.GetGdiCompatibleGlyphAdvances" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(24)]
-	public HResult GetGdiCompatibleGlyphAdvances(float emSize, float pixelsPerDip, Matrix* transform, Bool32 useGdiNatural, Bool32 isSideways, uint glyphCount, ushort* glyphIndices, int* glyphAdvances)
+	public HResult GetGdiCompatibleGlyphAdvances(float emSize, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, Bool32 isSideways, uint glyphCount, ushort* glyphIndices, int* glyphAdvances)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace2*, float, float, Matrix*, Bool32, Bool32, uint, ushort*, int*, int>)(lpVtbl[24]))((IDWriteFontFace2*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, useGdiNatural, isSideways, glyphCount, glyphIndices, glyphAdvances);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace2*, float, float, Matrix3x2*, Bool32, Bool32, uint, ushort*, int*, int>)(lpVtbl[24]))((IDWriteFontFace2*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, useGdiNatural, isSideways, glyphCount, glyphIndices, glyphAdvances);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace1.GetKerningPairAdjustments" />
@@ -270,9 +270,9 @@ public unsafe partial struct IDWriteFontFace2
 	/// <inheritdoc cref="IDWriteFontFace1.GetRecommendedRenderingMode" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(27)]
-	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, RenderingMode* renderingMode)
+	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix3x2* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, RenderingMode* renderingMode)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace2*, float, float, float, Matrix*, Bool32, OutlineThreshold, MeasuringMode, RenderingMode*, int>)(lpVtbl[27]))((IDWriteFontFace2*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingMode);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace2*, float, float, float, Matrix3x2*, Bool32, OutlineThreshold, MeasuringMode, RenderingMode*, int>)(lpVtbl[27]))((IDWriteFontFace2*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingMode);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace1.GetVerticalGlyphVariants" />
@@ -326,9 +326,9 @@ public unsafe partial struct IDWriteFontFace2
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteFontFace2::GetRecommendedRenderingMode"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(34)]
-	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, IDWriteRenderingParams* renderingParams, RenderingMode* renderingMode, GridFitMode* gridFitMode)
+	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix3x2* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, IDWriteRenderingParams* renderingParams, RenderingMode* renderingMode, GridFitMode* gridFitMode)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace2*, float, float, float, Matrix*, Bool32, OutlineThreshold, MeasuringMode, IDWriteRenderingParams*, RenderingMode*, GridFitMode*, int>)(lpVtbl[34]))((IDWriteFontFace2*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingParams, renderingMode, gridFitMode);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace2*, float, float, float, Matrix3x2*, Bool32, OutlineThreshold, MeasuringMode, IDWriteRenderingParams*, RenderingMode*, GridFitMode*, int>)(lpVtbl[34]))((IDWriteFontFace2*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingParams, renderingMode, gridFitMode);
 	}
 }
 
diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace3.cs b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace3.cs
index 755eb92..81b49fa 100644
--- a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace3.cs
+++ b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace3.cs
@@ -182,17 +182,17 @@ public unsafe partial struct IDWriteFontFace3
 	/// <inheritdoc cref="IDWriteFontFace.GetGdiCompatibleMetrics" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public HResult GetGdiCompatibleMetrics(float emSize, float pixelsPerDip, Matrix* transform, FontMetrics* fontFaceMetrics)
+	public HResult GetGdiCompatibleMetrics(float emSize, float pixelsPerDip, Matrix3x2* transform, FontMetrics* fontFaceMetrics)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace3*, float, float, Matrix*, FontMetrics*, int>)(lpVtbl[16]))((IDWriteFontFace3*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, fontFaceMetrics);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace3*, float, float, Matrix3x2*, FontMetrics*, int>)(lpVtbl[16]))((IDWriteFontFace3*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, fontFaceMetrics);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace.GetGdiCompatibleGlyphMetrics" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public HResult GetGdiCompatibleGlyphMetrics(float emSize, float pixelsPerDip, Matrix* transform, Bool32 useGdiNatural, ushort* glyphIndices, uint glyphCount, GlyphMetrics* glyphMetrics, Bool32 isSideways)
+	public HResult GetGdiCompatibleGlyphMetrics(float emSize, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, ushort* glyphIndices, uint glyphCount, GlyphMetrics* glyphMetrics, Bool32 isSideways)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace3*, float, float, Matrix*, Bool32, ushort*, uint, GlyphMetrics*, Bool32, int>)(lpVtbl[17]))((IDWriteFontFace3*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, useGdiNatural, glyphIndices, glyphCount, glyphMetrics, isSideways);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace3*, float, float, Matrix3x2*, Bool32, ushort*, uint, GlyphMetrics*, Bool32, int>)(lpVtbl[17]))((IDWriteFontFace3*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, useGdiNatural, glyphIndices, glyphCount, glyphMetrics, isSideways);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace1.GetMetrics" />
@@ -206,9 +206,9 @@ public unsafe partial struct IDWriteFontFace3
 	/// <inheritdoc cref="IDWriteFontFace1.GetGdiCompatibleMetrics" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public HResult GetGdiCompatibleMetrics(float emSize, float pixelsPerDip, Matrix* transform, FontMetrics1* fontMetrics)
+	public HResult GetGdiCompatibleMetrics(float emSize, float pixelsPerDip, Matrix3x2* transform, FontMetrics1* fontMetrics)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace3*, float, float, Matrix*, FontMetrics1*, int>)(lpVtbl[19]))((IDWriteFontFace3*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, fontMetrics);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace3*, float, float, Matrix3x2*, FontMetrics1*, int>)(lpVtbl[19]))((IDWriteFontFace3*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, fontMetrics);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace1.GetCaretMetrics" />
@@ -246,9 +246,9 @@ public unsafe partial struct IDWriteFontFace3
 	/// <inheritdoc cref="IDWriteFontFace1.GetGdiCompatibleGlyphAdvances" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(24)]
-	public HResult GetGdiCompatibleGlyphAdvances(float emSize, float pixelsPerDip, Matrix* transform, Bool32 useGdiNatural, Bool32 isSideways, uint glyphCount, ushort* glyphIndices, int* glyphAdvances)
+	public HResult GetGdiCompatibleGlyphAdvances(float emSize, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, Bool32 isSideways, uint glyphCount, ushort* glyphIndices, int* glyphAdvances)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace3*, float, float, Matrix*, Bool32, Bool32, uint, ushort*, int*, int>)(lpVtbl[24]))((IDWriteFontFace3*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, useGdiNatural, isSideways, glyphCount, glyphIndices, glyphAdvances);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace3*, float, float, Matrix3x2*, Bool32, Bool32, uint, ushort*, int*, int>)(lpVtbl[24]))((IDWriteFontFace3*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, useGdiNatural, isSideways, glyphCount, glyphIndices, glyphAdvances);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace1.GetKerningPairAdjustments" />
@@ -270,9 +270,9 @@ public unsafe partial struct IDWriteFontFace3
 	/// <inheritdoc cref="IDWriteFontFace1.GetRecommendedRenderingMode" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(27)]
-	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, RenderingMode* renderingMode)
+	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix3x2* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, RenderingMode* renderingMode)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace3*, float, float, float, Matrix*, Bool32, OutlineThreshold, MeasuringMode, RenderingMode*, int>)(lpVtbl[27]))((IDWriteFontFace3*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingMode);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace3*, float, float, float, Matrix3x2*, Bool32, OutlineThreshold, MeasuringMode, RenderingMode*, int>)(lpVtbl[27]))((IDWriteFontFace3*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingMode);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace1.GetVerticalGlyphVariants" />
@@ -326,9 +326,9 @@ public unsafe partial struct IDWriteFontFace3
 	/// <inheritdoc cref="IDWriteFontFace2.GetRecommendedRenderingMode" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(34)]
-	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, IDWriteRenderingParams* renderingParams, RenderingMode* renderingMode, GridFitMode* gridFitMode)
+	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix3x2* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, IDWriteRenderingParams* renderingParams, RenderingMode* renderingMode, GridFitMode* gridFitMode)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace3*, float, float, float, Matrix*, Bool32, OutlineThreshold, MeasuringMode, IDWriteRenderingParams*, RenderingMode*, GridFitMode*, int>)(lpVtbl[34]))((IDWriteFontFace3*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingParams, renderingMode, gridFitMode);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace3*, float, float, float, Matrix3x2*, Bool32, OutlineThreshold, MeasuringMode, IDWriteRenderingParams*, RenderingMode*, GridFitMode*, int>)(lpVtbl[34]))((IDWriteFontFace3*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingParams, renderingMode, gridFitMode);
 	}
 
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteFontFace3::GetFontFaceReference"]/*' />
@@ -406,9 +406,9 @@ public unsafe partial struct IDWriteFontFace3
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteFontFace3::GetRecommendedRenderingMode"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(44)]
-	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, IDWriteRenderingParams* renderingParams, RenderingMode1* renderingMode, GridFitMode* gridFitMode)
+	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix3x2* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, IDWriteRenderingParams* renderingParams, RenderingMode1* renderingMode, GridFitMode* gridFitMode)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace3*, float, float, float, Matrix*, Bool32, OutlineThreshold, MeasuringMode, IDWriteRenderingParams*, RenderingMode1*, GridFitMode*, int>)(lpVtbl[44]))((IDWriteFontFace3*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingParams, renderingMode, gridFitMode);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace3*, float, float, float, Matrix3x2*, Bool32, OutlineThreshold, MeasuringMode, IDWriteRenderingParams*, RenderingMode1*, GridFitMode*, int>)(lpVtbl[44]))((IDWriteFontFace3*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingParams, renderingMode, gridFitMode);
 	}
 
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteFontFace3::IsCharacterLocal"]/*' />
diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace4.cs b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace4.cs
index d56a144..4f1c151 100644
--- a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace4.cs
+++ b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace4.cs
@@ -182,17 +182,17 @@ public unsafe partial struct IDWriteFontFace4
 	/// <inheritdoc cref="IDWriteFontFace.GetGdiCompatibleMetrics" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public HResult GetGdiCompatibleMetrics(float emSize, float pixelsPerDip, Matrix* transform, FontMetrics* fontFaceMetrics)
+	public HResult GetGdiCompatibleMetrics(float emSize, float pixelsPerDip, Matrix3x2* transform, FontMetrics* fontFaceMetrics)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace4*, float, float, Matrix*, FontMetrics*, int>)(lpVtbl[16]))((IDWriteFontFace4*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, fontFaceMetrics);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace4*, float, float, Matrix3x2*, FontMetrics*, int>)(lpVtbl[16]))((IDWriteFontFace4*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, fontFaceMetrics);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace.GetGdiCompatibleGlyphMetrics" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public HResult GetGdiCompatibleGlyphMetrics(float emSize, float pixelsPerDip, Matrix* transform, Bool32 useGdiNatural, ushort* glyphIndices, uint glyphCount, GlyphMetrics* glyphMetrics, Bool32 isSideways)
+	public HResult GetGdiCompatibleGlyphMetrics(float emSize, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, ushort* glyphIndices, uint glyphCount, GlyphMetrics* glyphMetrics, Bool32 isSideways)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace4*, float, float, Matrix*, Bool32, ushort*, uint, GlyphMetrics*, Bool32, int>)(lpVtbl[17]))((IDWriteFontFace4*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, useGdiNatural, glyphIndices, glyphCount, glyphMetrics, isSideways);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace4*, float, float, Matrix3x2*, Bool32, ushort*, uint, GlyphMetrics*, Bool32, int>)(lpVtbl[17]))((IDWriteFontFace4*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, useGdiNatural, glyphIndices, glyphCount, glyphMetrics, isSideways);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace1.GetMetrics" />
@@ -206,9 +206,9 @@ public unsafe partial struct IDWriteFontFace4
 	/// <inheritdoc cref="IDWriteFontFace1.GetGdiCompatibleMetrics" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public HResult GetGdiCompatibleMetrics(float emSize, float pixelsPerDip, Matrix* transform, FontMetrics1* fontMetrics)
+	public HResult GetGdiCompatibleMetrics(float emSize, float pixelsPerDip, Matrix3x2* transform, FontMetrics1* fontMetrics)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace4*, float, float, Matrix*, FontMetrics1*, int>)(lpVtbl[19]))((IDWriteFontFace4*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, fontMetrics);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace4*, float, float, Matrix3x2*, FontMetrics1*, int>)(lpVtbl[19]))((IDWriteFontFace4*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, fontMetrics);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace1.GetCaretMetrics" />
@@ -246,9 +246,9 @@ public unsafe partial struct IDWriteFontFace4
 	/// <inheritdoc cref="IDWriteFontFace1.GetGdiCompatibleGlyphAdvances" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(24)]
-	public HResult GetGdiCompatibleGlyphAdvances(float emSize, float pixelsPerDip, Matrix* transform, Bool32 useGdiNatural, Bool32 isSideways, uint glyphCount, ushort* glyphIndices, int* glyphAdvances)
+	public HResult GetGdiCompatibleGlyphAdvances(float emSize, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, Bool32 isSideways, uint glyphCount, ushort* glyphIndices, int* glyphAdvances)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace4*, float, float, Matrix*, Bool32, Bool32, uint, ushort*, int*, int>)(lpVtbl[24]))((IDWriteFontFace4*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, useGdiNatural, isSideways, glyphCount, glyphIndices, glyphAdvances);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace4*, float, float, Matrix3x2*, Bool32, Bool32, uint, ushort*, int*, int>)(lpVtbl[24]))((IDWriteFontFace4*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, useGdiNatural, isSideways, glyphCount, glyphIndices, glyphAdvances);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace1.GetKerningPairAdjustments" />
@@ -270,9 +270,9 @@ public unsafe partial struct IDWriteFontFace4
 	/// <inheritdoc cref="IDWriteFontFace1.GetRecommendedRenderingMode" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(27)]
-	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, RenderingMode* renderingMode)
+	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix3x2* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, RenderingMode* renderingMode)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace4*, float, float, float, Matrix*, Bool32, OutlineThreshold, MeasuringMode, RenderingMode*, int>)(lpVtbl[27]))((IDWriteFontFace4*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingMode);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace4*, float, float, float, Matrix3x2*, Bool32, OutlineThreshold, MeasuringMode, RenderingMode*, int>)(lpVtbl[27]))((IDWriteFontFace4*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingMode);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace1.GetVerticalGlyphVariants" />
@@ -326,9 +326,9 @@ public unsafe partial struct IDWriteFontFace4
 	/// <inheritdoc cref="IDWriteFontFace2.GetRecommendedRenderingMode" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(34)]
-	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, IDWriteRenderingParams* renderingParams, RenderingMode* renderingMode, GridFitMode* gridFitMode)
+	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix3x2* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, IDWriteRenderingParams* renderingParams, RenderingMode* renderingMode, GridFitMode* gridFitMode)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace4*, float, float, float, Matrix*, Bool32, OutlineThreshold, MeasuringMode, IDWriteRenderingParams*, RenderingMode*, GridFitMode*, int>)(lpVtbl[34]))((IDWriteFontFace4*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingParams, renderingMode, gridFitMode);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace4*, float, float, float, Matrix3x2*, Bool32, OutlineThreshold, MeasuringMode, IDWriteRenderingParams*, RenderingMode*, GridFitMode*, int>)(lpVtbl[34]))((IDWriteFontFace4*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingParams, renderingMode, gridFitMode);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace3.GetFontFaceReference" />
@@ -406,9 +406,9 @@ public unsafe partial struct IDWriteFontFace4
 	/// <inheritdoc cref="IDWriteFontFace3.GetRecommendedRenderingMode" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(44)]
-	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, IDWriteRenderingParams* renderingParams, RenderingMode1* renderingMode, GridFitMode* gridFitMode)
+	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix3x2* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, IDWriteRenderingParams* renderingParams, RenderingMode1* renderingMode, GridFitMode* gridFitMode)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace4*, float, float, float, Matrix*, Bool32, OutlineThreshold, MeasuringMode, IDWriteRenderingParams*, RenderingMode1*, GridFitMode*, int>)(lpVtbl[44]))((IDWriteFontFace4*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingParams, renderingMode, gridFitMode);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace4*, float, float, float, Matrix3x2*, Bool32, OutlineThreshold, MeasuringMode, IDWriteRenderingParams*, RenderingMode1*, GridFitMode*, int>)(lpVtbl[44]))((IDWriteFontFace4*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingParams, renderingMode, gridFitMode);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace3.IsCharacterLocal" />
diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace5.cs b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace5.cs
index fe45729..1a72b18 100644
--- a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace5.cs
+++ b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace5.cs
@@ -182,17 +182,17 @@ public unsafe partial struct IDWriteFontFace5
 	/// <inheritdoc cref="IDWriteFontFace.GetGdiCompatibleMetrics" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public HResult GetGdiCompatibleMetrics(float emSize, float pixelsPerDip, Matrix* transform, FontMetrics* fontFaceMetrics)
+	public HResult GetGdiCompatibleMetrics(float emSize, float pixelsPerDip, Matrix3x2* transform, FontMetrics* fontFaceMetrics)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace5*, float, float, Matrix*, FontMetrics*, int>)(lpVtbl[16]))((IDWriteFontFace5*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, fontFaceMetrics);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace5*, float, float, Matrix3x2*, FontMetrics*, int>)(lpVtbl[16]))((IDWriteFontFace5*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, fontFaceMetrics);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace.GetGdiCompatibleGlyphMetrics" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public HResult GetGdiCompatibleGlyphMetrics(float emSize, float pixelsPerDip, Matrix* transform, Bool32 useGdiNatural, ushort* glyphIndices, uint glyphCount, GlyphMetrics* glyphMetrics, Bool32 isSideways)
+	public HResult GetGdiCompatibleGlyphMetrics(float emSize, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, ushort* glyphIndices, uint glyphCount, GlyphMetrics* glyphMetrics, Bool32 isSideways)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace5*, float, float, Matrix*, Bool32, ushort*, uint, GlyphMetrics*, Bool32, int>)(lpVtbl[17]))((IDWriteFontFace5*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, useGdiNatural, glyphIndices, glyphCount, glyphMetrics, isSideways);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace5*, float, float, Matrix3x2*, Bool32, ushort*, uint, GlyphMetrics*, Bool32, int>)(lpVtbl[17]))((IDWriteFontFace5*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, useGdiNatural, glyphIndices, glyphCount, glyphMetrics, isSideways);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace1.GetMetrics" />
@@ -206,9 +206,9 @@ public unsafe partial struct IDWriteFontFace5
 	/// <inheritdoc cref="IDWriteFontFace1.GetGdiCompatibleMetrics" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public HResult GetGdiCompatibleMetrics(float emSize, float pixelsPerDip, Matrix* transform, FontMetrics1* fontMetrics)
+	public HResult GetGdiCompatibleMetrics(float emSize, float pixelsPerDip, Matrix3x2* transform, FontMetrics1* fontMetrics)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace5*, float, float, Matrix*, FontMetrics1*, int>)(lpVtbl[19]))((IDWriteFontFace5*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, fontMetrics);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace5*, float, float, Matrix3x2*, FontMetrics1*, int>)(lpVtbl[19]))((IDWriteFontFace5*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, fontMetrics);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace1.GetCaretMetrics" />
@@ -246,9 +246,9 @@ public unsafe partial struct IDWriteFontFace5
 	/// <inheritdoc cref="IDWriteFontFace1.GetGdiCompatibleGlyphAdvances" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(24)]
-	public HResult GetGdiCompatibleGlyphAdvances(float emSize, float pixelsPerDip, Matrix* transform, Bool32 useGdiNatural, Bool32 isSideways, uint glyphCount, ushort* glyphIndices, int* glyphAdvances)
+	public HResult GetGdiCompatibleGlyphAdvances(float emSize, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, Bool32 isSideways, uint glyphCount, ushort* glyphIndices, int* glyphAdvances)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace5*, float, float, Matrix*, Bool32, Bool32, uint, ushort*, int*, int>)(lpVtbl[24]))((IDWriteFontFace5*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, useGdiNatural, isSideways, glyphCount, glyphIndices, glyphAdvances);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace5*, float, float, Matrix3x2*, Bool32, Bool32, uint, ushort*, int*, int>)(lpVtbl[24]))((IDWriteFontFace5*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, useGdiNatural, isSideways, glyphCount, glyphIndices, glyphAdvances);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace1.GetKerningPairAdjustments" />
@@ -270,9 +270,9 @@ public unsafe partial struct IDWriteFontFace5
 	/// <inheritdoc cref="IDWriteFontFace1.GetRecommendedRenderingMode" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(27)]
-	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, RenderingMode* renderingMode)
+	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix3x2* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, RenderingMode* renderingMode)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace5*, float, float, float, Matrix*, Bool32, OutlineThreshold, MeasuringMode, RenderingMode*, int>)(lpVtbl[27]))((IDWriteFontFace5*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingMode);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace5*, float, float, float, Matrix3x2*, Bool32, OutlineThreshold, MeasuringMode, RenderingMode*, int>)(lpVtbl[27]))((IDWriteFontFace5*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingMode);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace1.GetVerticalGlyphVariants" />
@@ -326,9 +326,9 @@ public unsafe partial struct IDWriteFontFace5
 	/// <inheritdoc cref="IDWriteFontFace2.GetRecommendedRenderingMode" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(34)]
-	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, IDWriteRenderingParams* renderingParams, RenderingMode* renderingMode, GridFitMode* gridFitMode)
+	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix3x2* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, IDWriteRenderingParams* renderingParams, RenderingMode* renderingMode, GridFitMode* gridFitMode)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace5*, float, float, float, Matrix*, Bool32, OutlineThreshold, MeasuringMode, IDWriteRenderingParams*, RenderingMode*, GridFitMode*, int>)(lpVtbl[34]))((IDWriteFontFace5*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingParams, renderingMode, gridFitMode);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace5*, float, float, float, Matrix3x2*, Bool32, OutlineThreshold, MeasuringMode, IDWriteRenderingParams*, RenderingMode*, GridFitMode*, int>)(lpVtbl[34]))((IDWriteFontFace5*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingParams, renderingMode, gridFitMode);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace3.GetFontFaceReference" />
@@ -406,9 +406,9 @@ public unsafe partial struct IDWriteFontFace5
 	/// <inheritdoc cref="IDWriteFontFace3.GetRecommendedRenderingMode" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(44)]
-	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, IDWriteRenderingParams* renderingParams, RenderingMode1* renderingMode, GridFitMode* gridFitMode)
+	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix3x2* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, IDWriteRenderingParams* renderingParams, RenderingMode1* renderingMode, GridFitMode* gridFitMode)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace5*, float, float, float, Matrix*, Bool32, OutlineThreshold, MeasuringMode, IDWriteRenderingParams*, RenderingMode1*, GridFitMode*, int>)(lpVtbl[44]))((IDWriteFontFace5*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingParams, renderingMode, gridFitMode);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace5*, float, float, float, Matrix3x2*, Bool32, OutlineThreshold, MeasuringMode, IDWriteRenderingParams*, RenderingMode1*, GridFitMode*, int>)(lpVtbl[44]))((IDWriteFontFace5*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingParams, renderingMode, gridFitMode);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace3.IsCharacterLocal" />
diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace6.cs b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace6.cs
index d154524..000d11e 100644
--- a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace6.cs
+++ b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontFace6.cs
@@ -182,17 +182,17 @@ public unsafe partial struct IDWriteFontFace6
 	/// <inheritdoc cref="IDWriteFontFace.GetGdiCompatibleMetrics" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public HResult GetGdiCompatibleMetrics(float emSize, float pixelsPerDip, Matrix* transform, FontMetrics* fontFaceMetrics)
+	public HResult GetGdiCompatibleMetrics(float emSize, float pixelsPerDip, Matrix3x2* transform, FontMetrics* fontFaceMetrics)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace6*, float, float, Matrix*, FontMetrics*, int>)(lpVtbl[16]))((IDWriteFontFace6*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, fontFaceMetrics);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace6*, float, float, Matrix3x2*, FontMetrics*, int>)(lpVtbl[16]))((IDWriteFontFace6*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, fontFaceMetrics);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace.GetGdiCompatibleGlyphMetrics" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public HResult GetGdiCompatibleGlyphMetrics(float emSize, float pixelsPerDip, Matrix* transform, Bool32 useGdiNatural, ushort* glyphIndices, uint glyphCount, GlyphMetrics* glyphMetrics, Bool32 isSideways)
+	public HResult GetGdiCompatibleGlyphMetrics(float emSize, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, ushort* glyphIndices, uint glyphCount, GlyphMetrics* glyphMetrics, Bool32 isSideways)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace6*, float, float, Matrix*, Bool32, ushort*, uint, GlyphMetrics*, Bool32, int>)(lpVtbl[17]))((IDWriteFontFace6*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, useGdiNatural, glyphIndices, glyphCount, glyphMetrics, isSideways);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace6*, float, float, Matrix3x2*, Bool32, ushort*, uint, GlyphMetrics*, Bool32, int>)(lpVtbl[17]))((IDWriteFontFace6*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, useGdiNatural, glyphIndices, glyphCount, glyphMetrics, isSideways);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace1.GetMetrics" />
@@ -206,9 +206,9 @@ public unsafe partial struct IDWriteFontFace6
 	/// <inheritdoc cref="IDWriteFontFace1.GetGdiCompatibleMetrics" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public HResult GetGdiCompatibleMetrics(float emSize, float pixelsPerDip, Matrix* transform, FontMetrics1* fontMetrics)
+	public HResult GetGdiCompatibleMetrics(float emSize, float pixelsPerDip, Matrix3x2* transform, FontMetrics1* fontMetrics)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace6*, float, float, Matrix*, FontMetrics1*, int>)(lpVtbl[19]))((IDWriteFontFace6*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, fontMetrics);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace6*, float, float, Matrix3x2*, FontMetrics1*, int>)(lpVtbl[19]))((IDWriteFontFace6*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, fontMetrics);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace1.GetCaretMetrics" />
@@ -246,9 +246,9 @@ public unsafe partial struct IDWriteFontFace6
 	/// <inheritdoc cref="IDWriteFontFace1.GetGdiCompatibleGlyphAdvances" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(24)]
-	public HResult GetGdiCompatibleGlyphAdvances(float emSize, float pixelsPerDip, Matrix* transform, Bool32 useGdiNatural, Bool32 isSideways, uint glyphCount, ushort* glyphIndices, int* glyphAdvances)
+	public HResult GetGdiCompatibleGlyphAdvances(float emSize, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, Bool32 isSideways, uint glyphCount, ushort* glyphIndices, int* glyphAdvances)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace6*, float, float, Matrix*, Bool32, Bool32, uint, ushort*, int*, int>)(lpVtbl[24]))((IDWriteFontFace6*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, useGdiNatural, isSideways, glyphCount, glyphIndices, glyphAdvances);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace6*, float, float, Matrix3x2*, Bool32, Bool32, uint, ushort*, int*, int>)(lpVtbl[24]))((IDWriteFontFace6*)Unsafe.AsPointer(ref this), emSize, pixelsPerDip, transform, useGdiNatural, isSideways, glyphCount, glyphIndices, glyphAdvances);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace1.GetKerningPairAdjustments" />
@@ -270,9 +270,9 @@ public unsafe partial struct IDWriteFontFace6
 	/// <inheritdoc cref="IDWriteFontFace1.GetRecommendedRenderingMode" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(27)]
-	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, RenderingMode* renderingMode)
+	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix3x2* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, RenderingMode* renderingMode)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace6*, float, float, float, Matrix*, Bool32, OutlineThreshold, MeasuringMode, RenderingMode*, int>)(lpVtbl[27]))((IDWriteFontFace6*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingMode);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace6*, float, float, float, Matrix3x2*, Bool32, OutlineThreshold, MeasuringMode, RenderingMode*, int>)(lpVtbl[27]))((IDWriteFontFace6*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingMode);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace1.GetVerticalGlyphVariants" />
@@ -326,9 +326,9 @@ public unsafe partial struct IDWriteFontFace6
 	/// <inheritdoc cref="IDWriteFontFace2.GetRecommendedRenderingMode" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(34)]
-	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, IDWriteRenderingParams* renderingParams, RenderingMode* renderingMode, GridFitMode* gridFitMode)
+	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix3x2* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, IDWriteRenderingParams* renderingParams, RenderingMode* renderingMode, GridFitMode* gridFitMode)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace6*, float, float, float, Matrix*, Bool32, OutlineThreshold, MeasuringMode, IDWriteRenderingParams*, RenderingMode*, GridFitMode*, int>)(lpVtbl[34]))((IDWriteFontFace6*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingParams, renderingMode, gridFitMode);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace6*, float, float, float, Matrix3x2*, Bool32, OutlineThreshold, MeasuringMode, IDWriteRenderingParams*, RenderingMode*, GridFitMode*, int>)(lpVtbl[34]))((IDWriteFontFace6*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingParams, renderingMode, gridFitMode);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace3.GetFontFaceReference" />
@@ -406,9 +406,9 @@ public unsafe partial struct IDWriteFontFace6
 	/// <inheritdoc cref="IDWriteFontFace3.GetRecommendedRenderingMode" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(44)]
-	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, IDWriteRenderingParams* renderingParams, RenderingMode1* renderingMode, GridFitMode* gridFitMode)
+	public HResult GetRecommendedRenderingMode(float fontEmSize, float dpiX, float dpiY, Matrix3x2* transform, Bool32 isSideways, OutlineThreshold outlineThreshold, MeasuringMode measuringMode, IDWriteRenderingParams* renderingParams, RenderingMode1* renderingMode, GridFitMode* gridFitMode)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace6*, float, float, float, Matrix*, Bool32, OutlineThreshold, MeasuringMode, IDWriteRenderingParams*, RenderingMode1*, GridFitMode*, int>)(lpVtbl[44]))((IDWriteFontFace6*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingParams, renderingMode, gridFitMode);
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontFace6*, float, float, float, Matrix3x2*, Bool32, OutlineThreshold, MeasuringMode, IDWriteRenderingParams*, RenderingMode1*, GridFitMode*, int>)(lpVtbl[44]))((IDWriteFontFace6*)Unsafe.AsPointer(ref this), fontEmSize, dpiX, dpiY, transform, isSideways, outlineThreshold, measuringMode, renderingParams, renderingMode, gridFitMode);
 	}
 
 	/// <inheritdoc cref="IDWriteFontFace3.IsCharacterLocal" />
diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontSet2.cs b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontSet2.cs
index 23105f9..e1b849d 100644
--- a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontSet2.cs
+++ b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontSet2.cs
@@ -262,9 +262,9 @@ public unsafe partial struct IDWriteFontSet2
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteFontSet2::GetExpirationEvent"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(26)]
-	public IntPtr GetExpirationEvent()
+	public Handle GetExpirationEvent()
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontSet2*, IntPtr>)(lpVtbl[26]))((IDWriteFontSet2*)Unsafe.AsPointer(ref this));
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontSet2*, Handle>)(lpVtbl[26]))((IDWriteFontSet2*)Unsafe.AsPointer(ref this));
 	}
 }
 
diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontSet3.cs b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontSet3.cs
index 320ae01..00c4c03 100644
--- a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontSet3.cs
+++ b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteFontSet3.cs
@@ -262,9 +262,9 @@ public unsafe partial struct IDWriteFontSet3
 	/// <inheritdoc cref="IDWriteFontSet2.GetExpirationEvent" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(26)]
-	public IntPtr GetExpirationEvent()
+	public Handle GetExpirationEvent()
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteFontSet3*, IntPtr>)(lpVtbl[26]))((IDWriteFontSet3*)Unsafe.AsPointer(ref this));
+		return ((delegate* unmanaged[Stdcall]<IDWriteFontSet3*, Handle>)(lpVtbl[26]))((IDWriteFontSet3*)Unsafe.AsPointer(ref this));
 	}
 
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteFontSet3::GetFontSourceType"]/*' />
diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWritePixelSnapping.cs b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWritePixelSnapping.cs
index ea21978..d4509e9 100644
--- a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWritePixelSnapping.cs
+++ b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWritePixelSnapping.cs
@@ -86,9 +86,9 @@ public unsafe partial struct IDWritePixelSnapping
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWritePixelSnapping::GetCurrentTransform"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(4)]
-	public HResult GetCurrentTransform(void* clientDrawingContext, Matrix* transform)
+	public HResult GetCurrentTransform(void* clientDrawingContext, Matrix3x2* transform)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWritePixelSnapping*, void*, Matrix*, int>)(lpVtbl[4]))((IDWritePixelSnapping*)Unsafe.AsPointer(ref this), clientDrawingContext, transform);
+		return ((delegate* unmanaged[Stdcall]<IDWritePixelSnapping*, void*, Matrix3x2*, int>)(lpVtbl[4]))((IDWritePixelSnapping*)Unsafe.AsPointer(ref this), clientDrawingContext, transform);
 	}
 
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWritePixelSnapping::GetPixelsPerDip"]/*' />
diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextAnalyzer.cs b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextAnalyzer.cs
index a09fabc..707fa15 100644
--- a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextAnalyzer.cs
+++ b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextAnalyzer.cs
@@ -126,9 +126,9 @@ public unsafe partial struct IDWriteTextAnalyzer
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteTextAnalyzer::GetGdiCompatibleGlyphPlacements"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(9)]
-	public HResult GetGdiCompatibleGlyphPlacements(ushort* textString, ushort* clusterMap, ShapingTextProperties* textProps, uint textLength, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint glyphCount, IDWriteFontFace* fontFace, float fontEmSize, float pixelsPerDip, Matrix* transform, Bool32 useGdiNatural, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, ushort* localeName, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, float* glyphAdvances, GlyphOffset* glyphOffsets)
+	public HResult GetGdiCompatibleGlyphPlacements(ushort* textString, ushort* clusterMap, ShapingTextProperties* textProps, uint textLength, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint glyphCount, IDWriteFontFace* fontFace, float fontEmSize, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, ushort* localeName, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, float* glyphAdvances, GlyphOffset* glyphOffsets)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer*, ushort*, ushort*, ShapingTextProperties*, uint, ushort*, ShapingGlyphProperties*, uint, IDWriteFontFace*, float, float, Matrix*, Bool32, Bool32, Bool32, ScriptAnalysis*, ushort*, TypographicFeatures**, uint*, uint, float*, GlyphOffset*, int>)(lpVtbl[9]))((IDWriteTextAnalyzer*)Unsafe.AsPointer(ref this), textString, clusterMap, textProps, textLength, glyphIndices, glyphProps, glyphCount, fontFace, fontEmSize, pixelsPerDip, transform, useGdiNatural, isSideways, isRightToLeft, scriptAnalysis, localeName, features, featureRangeLengths, featureRanges, glyphAdvances, glyphOffsets);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer*, ushort*, ushort*, ShapingTextProperties*, uint, ushort*, ShapingGlyphProperties*, uint, IDWriteFontFace*, float, float, Matrix3x2*, Bool32, Bool32, Bool32, ScriptAnalysis*, ushort*, TypographicFeatures**, uint*, uint, float*, GlyphOffset*, int>)(lpVtbl[9]))((IDWriteTextAnalyzer*)Unsafe.AsPointer(ref this), textString, clusterMap, textProps, textLength, glyphIndices, glyphProps, glyphCount, fontFace, fontEmSize, pixelsPerDip, transform, useGdiNatural, isSideways, isRightToLeft, scriptAnalysis, localeName, features, featureRangeLengths, featureRanges, glyphAdvances, glyphOffsets);
 	}
 }
 
diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextAnalyzer1.cs b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextAnalyzer1.cs
index 2fa5ea1..87e2e96 100644
--- a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextAnalyzer1.cs
+++ b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextAnalyzer1.cs
@@ -126,9 +126,9 @@ public unsafe partial struct IDWriteTextAnalyzer1
 	/// <inheritdoc cref="IDWriteTextAnalyzer.GetGdiCompatibleGlyphPlacements" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(9)]
-	public HResult GetGdiCompatibleGlyphPlacements(ushort* textString, ushort* clusterMap, ShapingTextProperties* textProps, uint textLength, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint glyphCount, IDWriteFontFace* fontFace, float fontEmSize, float pixelsPerDip, Matrix* transform, Bool32 useGdiNatural, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, ushort* localeName, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, float* glyphAdvances, GlyphOffset* glyphOffsets)
+	public HResult GetGdiCompatibleGlyphPlacements(ushort* textString, ushort* clusterMap, ShapingTextProperties* textProps, uint textLength, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint glyphCount, IDWriteFontFace* fontFace, float fontEmSize, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, ushort* localeName, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, float* glyphAdvances, GlyphOffset* glyphOffsets)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer1*, ushort*, ushort*, ShapingTextProperties*, uint, ushort*, ShapingGlyphProperties*, uint, IDWriteFontFace*, float, float, Matrix*, Bool32, Bool32, Bool32, ScriptAnalysis*, ushort*, TypographicFeatures**, uint*, uint, float*, GlyphOffset*, int>)(lpVtbl[9]))((IDWriteTextAnalyzer1*)Unsafe.AsPointer(ref this), textString, clusterMap, textProps, textLength, glyphIndices, glyphProps, glyphCount, fontFace, fontEmSize, pixelsPerDip, transform, useGdiNatural, isSideways, isRightToLeft, scriptAnalysis, localeName, features, featureRangeLengths, featureRanges, glyphAdvances, glyphOffsets);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer1*, ushort*, ushort*, ShapingTextProperties*, uint, ushort*, ShapingGlyphProperties*, uint, IDWriteFontFace*, float, float, Matrix3x2*, Bool32, Bool32, Bool32, ScriptAnalysis*, ushort*, TypographicFeatures**, uint*, uint, float*, GlyphOffset*, int>)(lpVtbl[9]))((IDWriteTextAnalyzer1*)Unsafe.AsPointer(ref this), textString, clusterMap, textProps, textLength, glyphIndices, glyphProps, glyphCount, fontFace, fontEmSize, pixelsPerDip, transform, useGdiNatural, isSideways, isRightToLeft, scriptAnalysis, localeName, features, featureRangeLengths, featureRanges, glyphAdvances, glyphOffsets);
 	}
 
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteTextAnalyzer1::ApplyCharacterSpacing"]/*' />
@@ -158,9 +158,9 @@ public unsafe partial struct IDWriteTextAnalyzer1
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteTextAnalyzer1::GetGlyphOrientationTransform"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(13)]
-	public HResult GetGlyphOrientationTransform(GlyphOrientationAngle glyphOrientationAngle, Bool32 isSideways, Matrix* transform)
+	public HResult GetGlyphOrientationTransform(GlyphOrientationAngle glyphOrientationAngle, Bool32 isSideways, Matrix3x2* transform)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer1*, GlyphOrientationAngle, Bool32, Matrix*, int>)(lpVtbl[13]))((IDWriteTextAnalyzer1*)Unsafe.AsPointer(ref this), glyphOrientationAngle, isSideways, transform);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer1*, GlyphOrientationAngle, Bool32, Matrix3x2*, int>)(lpVtbl[13]))((IDWriteTextAnalyzer1*)Unsafe.AsPointer(ref this), glyphOrientationAngle, isSideways, transform);
 	}
 
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteTextAnalyzer1::GetScriptProperties"]/*' />
diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextAnalyzer2.cs b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextAnalyzer2.cs
index 47cd3ef..c636122 100644
--- a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextAnalyzer2.cs
+++ b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextAnalyzer2.cs
@@ -126,9 +126,9 @@ public unsafe partial struct IDWriteTextAnalyzer2
 	/// <inheritdoc cref="IDWriteTextAnalyzer.GetGdiCompatibleGlyphPlacements" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(9)]
-	public HResult GetGdiCompatibleGlyphPlacements(ushort* textString, ushort* clusterMap, ShapingTextProperties* textProps, uint textLength, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint glyphCount, IDWriteFontFace* fontFace, float fontEmSize, float pixelsPerDip, Matrix* transform, Bool32 useGdiNatural, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, ushort* localeName, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, float* glyphAdvances, GlyphOffset* glyphOffsets)
+	public HResult GetGdiCompatibleGlyphPlacements(ushort* textString, ushort* clusterMap, ShapingTextProperties* textProps, uint textLength, ushort* glyphIndices, ShapingGlyphProperties* glyphProps, uint glyphCount, IDWriteFontFace* fontFace, float fontEmSize, float pixelsPerDip, Matrix3x2* transform, Bool32 useGdiNatural, Bool32 isSideways, Bool32 isRightToLeft, ScriptAnalysis* scriptAnalysis, ushort* localeName, TypographicFeatures** features, uint* featureRangeLengths, uint featureRanges, float* glyphAdvances, GlyphOffset* glyphOffsets)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer2*, ushort*, ushort*, ShapingTextProperties*, uint, ushort*, ShapingGlyphProperties*, uint, IDWriteFontFace*, float, float, Matrix*, Bool32, Bool32, Bool32, ScriptAnalysis*, ushort*, TypographicFeatures**, uint*, uint, float*, GlyphOffset*, int>)(lpVtbl[9]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), textString, clusterMap, textProps, textLength, glyphIndices, glyphProps, glyphCount, fontFace, fontEmSize, pixelsPerDip, transform, useGdiNatural, isSideways, isRightToLeft, scriptAnalysis, localeName, features, featureRangeLengths, featureRanges, glyphAdvances, glyphOffsets);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer2*, ushort*, ushort*, ShapingTextProperties*, uint, ushort*, ShapingGlyphProperties*, uint, IDWriteFontFace*, float, float, Matrix3x2*, Bool32, Bool32, Bool32, ScriptAnalysis*, ushort*, TypographicFeatures**, uint*, uint, float*, GlyphOffset*, int>)(lpVtbl[9]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), textString, clusterMap, textProps, textLength, glyphIndices, glyphProps, glyphCount, fontFace, fontEmSize, pixelsPerDip, transform, useGdiNatural, isSideways, isRightToLeft, scriptAnalysis, localeName, features, featureRangeLengths, featureRanges, glyphAdvances, glyphOffsets);
 	}
 
 	/// <inheritdoc cref="IDWriteTextAnalyzer1.ApplyCharacterSpacing" />
@@ -158,9 +158,9 @@ public unsafe partial struct IDWriteTextAnalyzer2
 	/// <inheritdoc cref="IDWriteTextAnalyzer1.GetGlyphOrientationTransform" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(13)]
-	public HResult GetGlyphOrientationTransform(GlyphOrientationAngle glyphOrientationAngle, Bool32 isSideways, Matrix* transform)
+	public HResult GetGlyphOrientationTransform(GlyphOrientationAngle glyphOrientationAngle, Bool32 isSideways, Matrix3x2* transform)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer2*, GlyphOrientationAngle, Bool32, Matrix*, int>)(lpVtbl[13]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), glyphOrientationAngle, isSideways, transform);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer2*, GlyphOrientationAngle, Bool32, Matrix3x2*, int>)(lpVtbl[13]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), glyphOrientationAngle, isSideways, transform);
 	}
 
 	/// <inheritdoc cref="IDWriteTextAnalyzer1.GetScriptProperties" />
@@ -206,9 +206,9 @@ public unsafe partial struct IDWriteTextAnalyzer2
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteTextAnalyzer2::GetGlyphOrientationTransform"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public HResult GetGlyphOrientationTransform(GlyphOrientationAngle glyphOrientationAngle, Bool32 isSideways, float originX, float originY, Matrix* transform)
+	public HResult GetGlyphOrientationTransform(GlyphOrientationAngle glyphOrientationAngle, Bool32 isSideways, float originX, float originY, Matrix3x2* transform)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer2*, GlyphOrientationAngle, Bool32, float, float, Matrix*, int>)(lpVtbl[19]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), glyphOrientationAngle, isSideways, originX, originY, transform);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer2*, GlyphOrientationAngle, Bool32, float, float, Matrix3x2*, int>)(lpVtbl[19]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), glyphOrientationAngle, isSideways, originX, originY, transform);
 	}
 
 	/// <include file='../../DirectWrite.xml' path='doc/member[@name="IDWriteTextAnalyzer2::GetTypographicFeatures"]/*' />
diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextRenderer.cs b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextRenderer.cs
index 0770258..c71f792 100644
--- a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextRenderer.cs
+++ b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextRenderer.cs
@@ -86,9 +86,9 @@ public unsafe partial struct IDWriteTextRenderer
 	/// <inheritdoc cref="IDWritePixelSnapping.GetCurrentTransform" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(4)]
-	public HResult GetCurrentTransform(void* clientDrawingContext, Matrix* transform)
+	public HResult GetCurrentTransform(void* clientDrawingContext, Matrix3x2* transform)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextRenderer*, void*, Matrix*, int>)(lpVtbl[4]))((IDWriteTextRenderer*)Unsafe.AsPointer(ref this), clientDrawingContext, transform);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextRenderer*, void*, Matrix3x2*, int>)(lpVtbl[4]))((IDWriteTextRenderer*)Unsafe.AsPointer(ref this), clientDrawingContext, transform);
 	}
 
 	/// <inheritdoc cref="IDWritePixelSnapping.GetPixelsPerDip" />
diff --git a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextRenderer1.cs b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextRenderer1.cs
index 3cc2098..5a37d1e 100644
--- a/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextRenderer1.cs
+++ b/src/Vortice.Win32/Generated/Graphics/DirectWrite/IDWriteTextRenderer1.cs
@@ -86,9 +86,9 @@ public unsafe partial struct IDWriteTextRenderer1
 	/// <inheritdoc cref="IDWritePixelSnapping.GetCurrentTransform" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(4)]
-	public HResult GetCurrentTransform(void* clientDrawingContext, Matrix* transform)
+	public HResult GetCurrentTransform(void* clientDrawingContext, Matrix3x2* transform)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextRenderer1*, void*, Matrix*, int>)(lpVtbl[4]))((IDWriteTextRenderer1*)Unsafe.AsPointer(ref this), clientDrawingContext, transform);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextRenderer1*, void*, Matrix3x2*, int>)(lpVtbl[4]))((IDWriteTextRenderer1*)Unsafe.AsPointer(ref this), clientDrawingContext, transform);
 	}
 
 	/// <inheritdoc cref="IDWritePixelSnapping.GetPixelsPerDip" />
diff --git a/src/Vortice.Win32/Generated/Graphics/Dxgi.cs b/src/Vortice.Win32/Generated/Graphics/Dxgi.cs
index 2d83765..e76bd02 100644
--- a/src/Vortice.Win32/Generated/Graphics/Dxgi.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Dxgi.cs
@@ -508,7 +508,7 @@ public enum Feature : int
 /// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_ADAPTER_FLAG3"]/*' />
 /// <unmanaged>DXGI_ADAPTER_FLAG3</unmanaged>
 [Flags]
-public enum AdapterFlag3 : uint
+public enum AdapterFlags3 : uint
 {
 	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_ADAPTER_FLAG3::DXGI_ADAPTER_FLAG3_NONE"]/*' />
 	/// <unmanaged>DXGI_ADAPTER_FLAG3_NONE</unmanaged>
@@ -568,7 +568,7 @@ public enum GpuPreference : int
 /// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_DEBUG_RLO_FLAGS"]/*' />
 /// <unmanaged>DXGI_DEBUG_RLO_FLAGS</unmanaged>
 [Flags]
-public enum DebugRloFlags : uint
+public enum ReportLiveObjectFlags : uint
 {
 	None = 0,
 	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_DEBUG_RLO_FLAGS::DXGI_DEBUG_RLO_SUMMARY"]/*' />
@@ -1827,7 +1827,7 @@ public partial struct OutputDescription
 public partial struct SharedResource
 {
 	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_SHARED_RESOURCE::Handle"]/*' />
-	public IntPtr Handle;
+	public Handle Handle;
 }
 
 /// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_SURFACE_DESC"]/*' />
@@ -2146,35 +2146,12 @@ public partial struct AdapterDescription2
 	public ComputePreemptionGranularity ComputePreemptionGranularity;
 }
 
-/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_MATRIX_3X2_F"]/*' />
-/// <unmanaged>DXGI_MATRIX_3X2_F</unmanaged>
-public partial struct Matrix3x2F
-{
-	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_MATRIX_3X2_F::_11"]/*' />
-	public float _11;
-
-	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_MATRIX_3X2_F::_12"]/*' />
-	public float _12;
-
-	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_MATRIX_3X2_F::_21"]/*' />
-	public float _21;
-
-	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_MATRIX_3X2_F::_22"]/*' />
-	public float _22;
-
-	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_MATRIX_3X2_F::_31"]/*' />
-	public float _31;
-
-	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_MATRIX_3X2_F::_32"]/*' />
-	public float _32;
-}
-
 /// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_DECODE_SWAP_CHAIN_DESC"]/*' />
 /// <unmanaged>DXGI_DECODE_SWAP_CHAIN_DESC</unmanaged>
 public partial struct DecodeSwapChainDescription
 {
 	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_DECODE_SWAP_CHAIN_DESC::Flags"]/*' />
-	public uint Flags;
+	public SwapChainFlags Flags;
 }
 
 /// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_FRAME_STATISTICS_MEDIA"]/*' />
@@ -2289,7 +2266,7 @@ public partial struct AdapterDescription3
 	public Luid AdapterLuid;
 
 	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_ADAPTER_DESC3::Flags"]/*' />
-	public AdapterFlag3 Flags;
+	public AdapterFlags3 Flags;
 
 	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_ADAPTER_DESC3::GraphicsPreemptionGranularity"]/*' />
 	public GraphicsPreemptionGranularity GraphicsPreemptionGranularity;
diff --git a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIAdapter3.cs b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIAdapter3.cs
index c9337e4..85ee073 100644
--- a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIAdapter3.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIAdapter3.cs
@@ -150,9 +150,9 @@ public unsafe partial struct IDXGIAdapter3
 	/// <include file='../../Dxgi.xml' path='doc/member[@name="IDXGIAdapter3::RegisterHardwareContentProtectionTeardownStatusEvent"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(12)]
-	public HResult RegisterHardwareContentProtectionTeardownStatusEvent(IntPtr hEvent, uint* pdwCookie)
+	public HResult RegisterHardwareContentProtectionTeardownStatusEvent(Handle hEvent, uint* pdwCookie)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIAdapter3*, IntPtr, uint*, int>)(lpVtbl[12]))((IDXGIAdapter3*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
+		return ((delegate* unmanaged[Stdcall]<IDXGIAdapter3*, Handle, uint*, int>)(lpVtbl[12]))((IDXGIAdapter3*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
 	}
 
 	/// <include file='../../Dxgi.xml' path='doc/member[@name="IDXGIAdapter3::UnregisterHardwareContentProtectionTeardownStatus"]/*' />
@@ -182,9 +182,9 @@ public unsafe partial struct IDXGIAdapter3
 	/// <include file='../../Dxgi.xml' path='doc/member[@name="IDXGIAdapter3::RegisterVideoMemoryBudgetChangeNotificationEvent"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public HResult RegisterVideoMemoryBudgetChangeNotificationEvent(IntPtr hEvent, uint* pdwCookie)
+	public HResult RegisterVideoMemoryBudgetChangeNotificationEvent(Handle hEvent, uint* pdwCookie)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIAdapter3*, IntPtr, uint*, int>)(lpVtbl[16]))((IDXGIAdapter3*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
+		return ((delegate* unmanaged[Stdcall]<IDXGIAdapter3*, Handle, uint*, int>)(lpVtbl[16]))((IDXGIAdapter3*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
 	}
 
 	/// <include file='../../Dxgi.xml' path='doc/member[@name="IDXGIAdapter3::UnregisterVideoMemoryBudgetChangeNotification"]/*' />
diff --git a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIAdapter4.cs b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIAdapter4.cs
index 55b6d06..d7a47cc 100644
--- a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIAdapter4.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIAdapter4.cs
@@ -150,9 +150,9 @@ public unsafe partial struct IDXGIAdapter4
 	/// <inheritdoc cref="IDXGIAdapter3.RegisterHardwareContentProtectionTeardownStatusEvent" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(12)]
-	public HResult RegisterHardwareContentProtectionTeardownStatusEvent(IntPtr hEvent, uint* pdwCookie)
+	public HResult RegisterHardwareContentProtectionTeardownStatusEvent(Handle hEvent, uint* pdwCookie)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIAdapter4*, IntPtr, uint*, int>)(lpVtbl[12]))((IDXGIAdapter4*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
+		return ((delegate* unmanaged[Stdcall]<IDXGIAdapter4*, Handle, uint*, int>)(lpVtbl[12]))((IDXGIAdapter4*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
 	}
 
 	/// <inheritdoc cref="IDXGIAdapter3.UnregisterHardwareContentProtectionTeardownStatus" />
@@ -182,9 +182,9 @@ public unsafe partial struct IDXGIAdapter4
 	/// <inheritdoc cref="IDXGIAdapter3.RegisterVideoMemoryBudgetChangeNotificationEvent" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public HResult RegisterVideoMemoryBudgetChangeNotificationEvent(IntPtr hEvent, uint* pdwCookie)
+	public HResult RegisterVideoMemoryBudgetChangeNotificationEvent(Handle hEvent, uint* pdwCookie)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIAdapter4*, IntPtr, uint*, int>)(lpVtbl[16]))((IDXGIAdapter4*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
+		return ((delegate* unmanaged[Stdcall]<IDXGIAdapter4*, Handle, uint*, int>)(lpVtbl[16]))((IDXGIAdapter4*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
 	}
 
 	/// <inheritdoc cref="IDXGIAdapter3.UnregisterVideoMemoryBudgetChangeNotification" />
diff --git a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIDebug.cs b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIDebug.cs
index c802b3d..439be7c 100644
--- a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIDebug.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIDebug.cs
@@ -78,9 +78,9 @@ public unsafe partial struct IDXGIDebug
 	/// <include file='../../Dxgi.xml' path='doc/member[@name="IDXGIDebug::ReportLiveObjects"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(3)]
-	public HResult ReportLiveObjects(Guid apiid, DebugRloFlags flags)
+	public HResult ReportLiveObjects(Guid apiid, ReportLiveObjectFlags flags)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIDebug*, Guid, DebugRloFlags, int>)(lpVtbl[3]))((IDXGIDebug*)Unsafe.AsPointer(ref this), apiid, flags);
+		return ((delegate* unmanaged[Stdcall]<IDXGIDebug*, Guid, ReportLiveObjectFlags, int>)(lpVtbl[3]))((IDXGIDebug*)Unsafe.AsPointer(ref this), apiid, flags);
 	}
 }
 
diff --git a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIDebug1.cs b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIDebug1.cs
index 11f0caf..d176d3e 100644
--- a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIDebug1.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIDebug1.cs
@@ -78,9 +78,9 @@ public unsafe partial struct IDXGIDebug1
 	/// <inheritdoc cref="IDXGIDebug.ReportLiveObjects" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(3)]
-	public HResult ReportLiveObjects(Guid apiid, DebugRloFlags flags)
+	public HResult ReportLiveObjects(Guid apiid, ReportLiveObjectFlags flags)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIDebug1*, Guid, DebugRloFlags, int>)(lpVtbl[3]))((IDXGIDebug1*)Unsafe.AsPointer(ref this), apiid, flags);
+		return ((delegate* unmanaged[Stdcall]<IDXGIDebug1*, Guid, ReportLiveObjectFlags, int>)(lpVtbl[3]))((IDXGIDebug1*)Unsafe.AsPointer(ref this), apiid, flags);
 	}
 
 	/// <include file='../../Dxgi.xml' path='doc/member[@name="IDXGIDebug1::EnableLeakTrackingForThread"]/*' />
diff --git a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIDevice2.cs b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIDevice2.cs
index 0ba702a..93a9ea2 100644
--- a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIDevice2.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIDevice2.cs
@@ -182,9 +182,9 @@ public unsafe partial struct IDXGIDevice2
 	/// <include file='../../Dxgi.xml' path='doc/member[@name="IDXGIDevice2::EnqueueSetEvent"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public HResult EnqueueSetEvent(IntPtr hEvent)
+	public HResult EnqueueSetEvent(Handle hEvent)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIDevice2*, IntPtr, int>)(lpVtbl[16]))((IDXGIDevice2*)Unsafe.AsPointer(ref this), hEvent);
+		return ((delegate* unmanaged[Stdcall]<IDXGIDevice2*, Handle, int>)(lpVtbl[16]))((IDXGIDevice2*)Unsafe.AsPointer(ref this), hEvent);
 	}
 }
 
diff --git a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIDevice3.cs b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIDevice3.cs
index af6db98..cdadc21 100644
--- a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIDevice3.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIDevice3.cs
@@ -182,9 +182,9 @@ public unsafe partial struct IDXGIDevice3
 	/// <inheritdoc cref="IDXGIDevice2.EnqueueSetEvent" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public HResult EnqueueSetEvent(IntPtr hEvent)
+	public HResult EnqueueSetEvent(Handle hEvent)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIDevice3*, IntPtr, int>)(lpVtbl[16]))((IDXGIDevice3*)Unsafe.AsPointer(ref this), hEvent);
+		return ((delegate* unmanaged[Stdcall]<IDXGIDevice3*, Handle, int>)(lpVtbl[16]))((IDXGIDevice3*)Unsafe.AsPointer(ref this), hEvent);
 	}
 
 	/// <include file='../../Dxgi.xml' path='doc/member[@name="IDXGIDevice3::Trim"]/*' />
diff --git a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIDevice4.cs b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIDevice4.cs
index 8da5a8c..57c18e5 100644
--- a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIDevice4.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIDevice4.cs
@@ -182,9 +182,9 @@ public unsafe partial struct IDXGIDevice4
 	/// <inheritdoc cref="IDXGIDevice2.EnqueueSetEvent" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public HResult EnqueueSetEvent(IntPtr hEvent)
+	public HResult EnqueueSetEvent(Handle hEvent)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIDevice4*, IntPtr, int>)(lpVtbl[16]))((IDXGIDevice4*)Unsafe.AsPointer(ref this), hEvent);
+		return ((delegate* unmanaged[Stdcall]<IDXGIDevice4*, Handle, int>)(lpVtbl[16]))((IDXGIDevice4*)Unsafe.AsPointer(ref this), hEvent);
 	}
 
 	/// <inheritdoc cref="IDXGIDevice3.Trim" />
diff --git a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIFactory2.cs b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIFactory2.cs
index 825734e..08a5062 100644
--- a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIFactory2.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIFactory2.cs
@@ -190,9 +190,9 @@ public unsafe partial struct IDXGIFactory2
 	/// <include file='../../Dxgi.xml' path='doc/member[@name="IDXGIFactory2::GetSharedResourceAdapterLuid"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public HResult GetSharedResourceAdapterLuid(IntPtr hResource, Luid* pLuid)
+	public HResult GetSharedResourceAdapterLuid(Handle hResource, Luid* pLuid)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIFactory2*, IntPtr, Luid*, int>)(lpVtbl[17]))((IDXGIFactory2*)Unsafe.AsPointer(ref this), hResource, pLuid);
+		return ((delegate* unmanaged[Stdcall]<IDXGIFactory2*, Handle, Luid*, int>)(lpVtbl[17]))((IDXGIFactory2*)Unsafe.AsPointer(ref this), hResource, pLuid);
 	}
 
 	/// <include file='../../Dxgi.xml' path='doc/member[@name="IDXGIFactory2::RegisterStereoStatusWindow"]/*' />
@@ -206,9 +206,9 @@ public unsafe partial struct IDXGIFactory2
 	/// <include file='../../Dxgi.xml' path='doc/member[@name="IDXGIFactory2::RegisterStereoStatusEvent"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public HResult RegisterStereoStatusEvent(IntPtr hEvent, uint* pdwCookie)
+	public HResult RegisterStereoStatusEvent(Handle hEvent, uint* pdwCookie)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIFactory2*, IntPtr, uint*, int>)(lpVtbl[19]))((IDXGIFactory2*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
+		return ((delegate* unmanaged[Stdcall]<IDXGIFactory2*, Handle, uint*, int>)(lpVtbl[19]))((IDXGIFactory2*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
 	}
 
 	/// <include file='../../Dxgi.xml' path='doc/member[@name="IDXGIFactory2::UnregisterStereoStatus"]/*' />
@@ -230,9 +230,9 @@ public unsafe partial struct IDXGIFactory2
 	/// <include file='../../Dxgi.xml' path='doc/member[@name="IDXGIFactory2::RegisterOcclusionStatusEvent"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(22)]
-	public HResult RegisterOcclusionStatusEvent(IntPtr hEvent, uint* pdwCookie)
+	public HResult RegisterOcclusionStatusEvent(Handle hEvent, uint* pdwCookie)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIFactory2*, IntPtr, uint*, int>)(lpVtbl[22]))((IDXGIFactory2*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
+		return ((delegate* unmanaged[Stdcall]<IDXGIFactory2*, Handle, uint*, int>)(lpVtbl[22]))((IDXGIFactory2*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
 	}
 
 	/// <include file='../../Dxgi.xml' path='doc/member[@name="IDXGIFactory2::UnregisterOcclusionStatus"]/*' />
diff --git a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIFactory3.cs b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIFactory3.cs
index 16048e1..91c2ce9 100644
--- a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIFactory3.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIFactory3.cs
@@ -190,9 +190,9 @@ public unsafe partial struct IDXGIFactory3
 	/// <inheritdoc cref="IDXGIFactory2.GetSharedResourceAdapterLuid" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public HResult GetSharedResourceAdapterLuid(IntPtr hResource, Luid* pLuid)
+	public HResult GetSharedResourceAdapterLuid(Handle hResource, Luid* pLuid)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIFactory3*, IntPtr, Luid*, int>)(lpVtbl[17]))((IDXGIFactory3*)Unsafe.AsPointer(ref this), hResource, pLuid);
+		return ((delegate* unmanaged[Stdcall]<IDXGIFactory3*, Handle, Luid*, int>)(lpVtbl[17]))((IDXGIFactory3*)Unsafe.AsPointer(ref this), hResource, pLuid);
 	}
 
 	/// <inheritdoc cref="IDXGIFactory2.RegisterStereoStatusWindow" />
@@ -206,9 +206,9 @@ public unsafe partial struct IDXGIFactory3
 	/// <inheritdoc cref="IDXGIFactory2.RegisterStereoStatusEvent" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public HResult RegisterStereoStatusEvent(IntPtr hEvent, uint* pdwCookie)
+	public HResult RegisterStereoStatusEvent(Handle hEvent, uint* pdwCookie)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIFactory3*, IntPtr, uint*, int>)(lpVtbl[19]))((IDXGIFactory3*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
+		return ((delegate* unmanaged[Stdcall]<IDXGIFactory3*, Handle, uint*, int>)(lpVtbl[19]))((IDXGIFactory3*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
 	}
 
 	/// <inheritdoc cref="IDXGIFactory2.UnregisterStereoStatus" />
@@ -230,9 +230,9 @@ public unsafe partial struct IDXGIFactory3
 	/// <inheritdoc cref="IDXGIFactory2.RegisterOcclusionStatusEvent" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(22)]
-	public HResult RegisterOcclusionStatusEvent(IntPtr hEvent, uint* pdwCookie)
+	public HResult RegisterOcclusionStatusEvent(Handle hEvent, uint* pdwCookie)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIFactory3*, IntPtr, uint*, int>)(lpVtbl[22]))((IDXGIFactory3*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
+		return ((delegate* unmanaged[Stdcall]<IDXGIFactory3*, Handle, uint*, int>)(lpVtbl[22]))((IDXGIFactory3*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
 	}
 
 	/// <inheritdoc cref="IDXGIFactory2.UnregisterOcclusionStatus" />
diff --git a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIFactory4.cs b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIFactory4.cs
index 77ac167..75eec86 100644
--- a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIFactory4.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIFactory4.cs
@@ -190,9 +190,9 @@ public unsafe partial struct IDXGIFactory4
 	/// <inheritdoc cref="IDXGIFactory2.GetSharedResourceAdapterLuid" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public HResult GetSharedResourceAdapterLuid(IntPtr hResource, Luid* pLuid)
+	public HResult GetSharedResourceAdapterLuid(Handle hResource, Luid* pLuid)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIFactory4*, IntPtr, Luid*, int>)(lpVtbl[17]))((IDXGIFactory4*)Unsafe.AsPointer(ref this), hResource, pLuid);
+		return ((delegate* unmanaged[Stdcall]<IDXGIFactory4*, Handle, Luid*, int>)(lpVtbl[17]))((IDXGIFactory4*)Unsafe.AsPointer(ref this), hResource, pLuid);
 	}
 
 	/// <inheritdoc cref="IDXGIFactory2.RegisterStereoStatusWindow" />
@@ -206,9 +206,9 @@ public unsafe partial struct IDXGIFactory4
 	/// <inheritdoc cref="IDXGIFactory2.RegisterStereoStatusEvent" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public HResult RegisterStereoStatusEvent(IntPtr hEvent, uint* pdwCookie)
+	public HResult RegisterStereoStatusEvent(Handle hEvent, uint* pdwCookie)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIFactory4*, IntPtr, uint*, int>)(lpVtbl[19]))((IDXGIFactory4*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
+		return ((delegate* unmanaged[Stdcall]<IDXGIFactory4*, Handle, uint*, int>)(lpVtbl[19]))((IDXGIFactory4*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
 	}
 
 	/// <inheritdoc cref="IDXGIFactory2.UnregisterStereoStatus" />
@@ -230,9 +230,9 @@ public unsafe partial struct IDXGIFactory4
 	/// <inheritdoc cref="IDXGIFactory2.RegisterOcclusionStatusEvent" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(22)]
-	public HResult RegisterOcclusionStatusEvent(IntPtr hEvent, uint* pdwCookie)
+	public HResult RegisterOcclusionStatusEvent(Handle hEvent, uint* pdwCookie)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIFactory4*, IntPtr, uint*, int>)(lpVtbl[22]))((IDXGIFactory4*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
+		return ((delegate* unmanaged[Stdcall]<IDXGIFactory4*, Handle, uint*, int>)(lpVtbl[22]))((IDXGIFactory4*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
 	}
 
 	/// <inheritdoc cref="IDXGIFactory2.UnregisterOcclusionStatus" />
diff --git a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIFactory5.cs b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIFactory5.cs
index 3415723..0b24383 100644
--- a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIFactory5.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIFactory5.cs
@@ -190,9 +190,9 @@ public unsafe partial struct IDXGIFactory5
 	/// <inheritdoc cref="IDXGIFactory2.GetSharedResourceAdapterLuid" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public HResult GetSharedResourceAdapterLuid(IntPtr hResource, Luid* pLuid)
+	public HResult GetSharedResourceAdapterLuid(Handle hResource, Luid* pLuid)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIFactory5*, IntPtr, Luid*, int>)(lpVtbl[17]))((IDXGIFactory5*)Unsafe.AsPointer(ref this), hResource, pLuid);
+		return ((delegate* unmanaged[Stdcall]<IDXGIFactory5*, Handle, Luid*, int>)(lpVtbl[17]))((IDXGIFactory5*)Unsafe.AsPointer(ref this), hResource, pLuid);
 	}
 
 	/// <inheritdoc cref="IDXGIFactory2.RegisterStereoStatusWindow" />
@@ -206,9 +206,9 @@ public unsafe partial struct IDXGIFactory5
 	/// <inheritdoc cref="IDXGIFactory2.RegisterStereoStatusEvent" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public HResult RegisterStereoStatusEvent(IntPtr hEvent, uint* pdwCookie)
+	public HResult RegisterStereoStatusEvent(Handle hEvent, uint* pdwCookie)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIFactory5*, IntPtr, uint*, int>)(lpVtbl[19]))((IDXGIFactory5*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
+		return ((delegate* unmanaged[Stdcall]<IDXGIFactory5*, Handle, uint*, int>)(lpVtbl[19]))((IDXGIFactory5*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
 	}
 
 	/// <inheritdoc cref="IDXGIFactory2.UnregisterStereoStatus" />
@@ -230,9 +230,9 @@ public unsafe partial struct IDXGIFactory5
 	/// <inheritdoc cref="IDXGIFactory2.RegisterOcclusionStatusEvent" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(22)]
-	public HResult RegisterOcclusionStatusEvent(IntPtr hEvent, uint* pdwCookie)
+	public HResult RegisterOcclusionStatusEvent(Handle hEvent, uint* pdwCookie)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIFactory5*, IntPtr, uint*, int>)(lpVtbl[22]))((IDXGIFactory5*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
+		return ((delegate* unmanaged[Stdcall]<IDXGIFactory5*, Handle, uint*, int>)(lpVtbl[22]))((IDXGIFactory5*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
 	}
 
 	/// <inheritdoc cref="IDXGIFactory2.UnregisterOcclusionStatus" />
diff --git a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIFactory6.cs b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIFactory6.cs
index 72d4ff7..8c4f63d 100644
--- a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIFactory6.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIFactory6.cs
@@ -190,9 +190,9 @@ public unsafe partial struct IDXGIFactory6
 	/// <inheritdoc cref="IDXGIFactory2.GetSharedResourceAdapterLuid" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public HResult GetSharedResourceAdapterLuid(IntPtr hResource, Luid* pLuid)
+	public HResult GetSharedResourceAdapterLuid(Handle hResource, Luid* pLuid)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIFactory6*, IntPtr, Luid*, int>)(lpVtbl[17]))((IDXGIFactory6*)Unsafe.AsPointer(ref this), hResource, pLuid);
+		return ((delegate* unmanaged[Stdcall]<IDXGIFactory6*, Handle, Luid*, int>)(lpVtbl[17]))((IDXGIFactory6*)Unsafe.AsPointer(ref this), hResource, pLuid);
 	}
 
 	/// <inheritdoc cref="IDXGIFactory2.RegisterStereoStatusWindow" />
@@ -206,9 +206,9 @@ public unsafe partial struct IDXGIFactory6
 	/// <inheritdoc cref="IDXGIFactory2.RegisterStereoStatusEvent" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public HResult RegisterStereoStatusEvent(IntPtr hEvent, uint* pdwCookie)
+	public HResult RegisterStereoStatusEvent(Handle hEvent, uint* pdwCookie)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIFactory6*, IntPtr, uint*, int>)(lpVtbl[19]))((IDXGIFactory6*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
+		return ((delegate* unmanaged[Stdcall]<IDXGIFactory6*, Handle, uint*, int>)(lpVtbl[19]))((IDXGIFactory6*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
 	}
 
 	/// <inheritdoc cref="IDXGIFactory2.UnregisterStereoStatus" />
@@ -230,9 +230,9 @@ public unsafe partial struct IDXGIFactory6
 	/// <inheritdoc cref="IDXGIFactory2.RegisterOcclusionStatusEvent" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(22)]
-	public HResult RegisterOcclusionStatusEvent(IntPtr hEvent, uint* pdwCookie)
+	public HResult RegisterOcclusionStatusEvent(Handle hEvent, uint* pdwCookie)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIFactory6*, IntPtr, uint*, int>)(lpVtbl[22]))((IDXGIFactory6*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
+		return ((delegate* unmanaged[Stdcall]<IDXGIFactory6*, Handle, uint*, int>)(lpVtbl[22]))((IDXGIFactory6*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
 	}
 
 	/// <inheritdoc cref="IDXGIFactory2.UnregisterOcclusionStatus" />
diff --git a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIFactory7.cs b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIFactory7.cs
index 5394996..77cb186 100644
--- a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIFactory7.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIFactory7.cs
@@ -190,9 +190,9 @@ public unsafe partial struct IDXGIFactory7
 	/// <inheritdoc cref="IDXGIFactory2.GetSharedResourceAdapterLuid" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public HResult GetSharedResourceAdapterLuid(IntPtr hResource, Luid* pLuid)
+	public HResult GetSharedResourceAdapterLuid(Handle hResource, Luid* pLuid)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIFactory7*, IntPtr, Luid*, int>)(lpVtbl[17]))((IDXGIFactory7*)Unsafe.AsPointer(ref this), hResource, pLuid);
+		return ((delegate* unmanaged[Stdcall]<IDXGIFactory7*, Handle, Luid*, int>)(lpVtbl[17]))((IDXGIFactory7*)Unsafe.AsPointer(ref this), hResource, pLuid);
 	}
 
 	/// <inheritdoc cref="IDXGIFactory2.RegisterStereoStatusWindow" />
@@ -206,9 +206,9 @@ public unsafe partial struct IDXGIFactory7
 	/// <inheritdoc cref="IDXGIFactory2.RegisterStereoStatusEvent" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public HResult RegisterStereoStatusEvent(IntPtr hEvent, uint* pdwCookie)
+	public HResult RegisterStereoStatusEvent(Handle hEvent, uint* pdwCookie)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIFactory7*, IntPtr, uint*, int>)(lpVtbl[19]))((IDXGIFactory7*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
+		return ((delegate* unmanaged[Stdcall]<IDXGIFactory7*, Handle, uint*, int>)(lpVtbl[19]))((IDXGIFactory7*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
 	}
 
 	/// <inheritdoc cref="IDXGIFactory2.UnregisterStereoStatus" />
@@ -230,9 +230,9 @@ public unsafe partial struct IDXGIFactory7
 	/// <inheritdoc cref="IDXGIFactory2.RegisterOcclusionStatusEvent" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(22)]
-	public HResult RegisterOcclusionStatusEvent(IntPtr hEvent, uint* pdwCookie)
+	public HResult RegisterOcclusionStatusEvent(Handle hEvent, uint* pdwCookie)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIFactory7*, IntPtr, uint*, int>)(lpVtbl[22]))((IDXGIFactory7*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
+		return ((delegate* unmanaged[Stdcall]<IDXGIFactory7*, Handle, uint*, int>)(lpVtbl[22]))((IDXGIFactory7*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
 	}
 
 	/// <inheritdoc cref="IDXGIFactory2.UnregisterOcclusionStatus" />
@@ -294,9 +294,9 @@ public unsafe partial struct IDXGIFactory7
 	/// <include file='../../Dxgi.xml' path='doc/member[@name="IDXGIFactory7::RegisterAdaptersChangedEvent"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(30)]
-	public HResult RegisterAdaptersChangedEvent(IntPtr hEvent, uint* pdwCookie)
+	public HResult RegisterAdaptersChangedEvent(Handle hEvent, uint* pdwCookie)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIFactory7*, IntPtr, uint*, int>)(lpVtbl[30]))((IDXGIFactory7*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
+		return ((delegate* unmanaged[Stdcall]<IDXGIFactory7*, Handle, uint*, int>)(lpVtbl[30]))((IDXGIFactory7*)Unsafe.AsPointer(ref this), hEvent, pdwCookie);
 	}
 
 	/// <include file='../../Dxgi.xml' path='doc/member[@name="IDXGIFactory7::UnregisterAdaptersChangedEvent"]/*' />
diff --git a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIFactoryMedia.cs b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIFactoryMedia.cs
index f9774c2..94b46f9 100644
--- a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIFactoryMedia.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIFactoryMedia.cs
@@ -78,17 +78,17 @@ public unsafe partial struct IDXGIFactoryMedia
 	/// <include file='../../Dxgi.xml' path='doc/member[@name="IDXGIFactoryMedia::CreateSwapChainForCompositionSurfaceHandle"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(3)]
-	public HResult CreateSwapChainForCompositionSurfaceHandle(IUnknown* pDevice, IntPtr hSurface, SwapChainDescription1* pDesc, IDXGIOutput* pRestrictToOutput, IDXGISwapChain1** ppSwapChain)
+	public HResult CreateSwapChainForCompositionSurfaceHandle(IUnknown* pDevice, Handle hSurface, SwapChainDescription1* pDesc, IDXGIOutput* pRestrictToOutput, IDXGISwapChain1** ppSwapChain)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIFactoryMedia*, IUnknown*, IntPtr, SwapChainDescription1*, IDXGIOutput*, IDXGISwapChain1**, int>)(lpVtbl[3]))((IDXGIFactoryMedia*)Unsafe.AsPointer(ref this), pDevice, hSurface, pDesc, pRestrictToOutput, ppSwapChain);
+		return ((delegate* unmanaged[Stdcall]<IDXGIFactoryMedia*, IUnknown*, Handle, SwapChainDescription1*, IDXGIOutput*, IDXGISwapChain1**, int>)(lpVtbl[3]))((IDXGIFactoryMedia*)Unsafe.AsPointer(ref this), pDevice, hSurface, pDesc, pRestrictToOutput, ppSwapChain);
 	}
 
 	/// <include file='../../Dxgi.xml' path='doc/member[@name="IDXGIFactoryMedia::CreateDecodeSwapChainForCompositionSurfaceHandle"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(4)]
-	public HResult CreateDecodeSwapChainForCompositionSurfaceHandle(IUnknown* pDevice, IntPtr hSurface, DecodeSwapChainDescription* pDesc, IDXGIResource* pYuvDecodeBuffers, IDXGIOutput* pRestrictToOutput, IDXGIDecodeSwapChain** ppSwapChain)
+	public HResult CreateDecodeSwapChainForCompositionSurfaceHandle(IUnknown* pDevice, Handle hSurface, DecodeSwapChainDescription* pDesc, IDXGIResource* pYuvDecodeBuffers, IDXGIOutput* pRestrictToOutput, IDXGIDecodeSwapChain** ppSwapChain)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIFactoryMedia*, IUnknown*, IntPtr, DecodeSwapChainDescription*, IDXGIResource*, IDXGIOutput*, IDXGIDecodeSwapChain**, int>)(lpVtbl[4]))((IDXGIFactoryMedia*)Unsafe.AsPointer(ref this), pDevice, hSurface, pDesc, pYuvDecodeBuffers, pRestrictToOutput, ppSwapChain);
+		return ((delegate* unmanaged[Stdcall]<IDXGIFactoryMedia*, IUnknown*, Handle, DecodeSwapChainDescription*, IDXGIResource*, IDXGIOutput*, IDXGIDecodeSwapChain**, int>)(lpVtbl[4]))((IDXGIFactoryMedia*)Unsafe.AsPointer(ref this), pDevice, hSurface, pDesc, pYuvDecodeBuffers, pRestrictToOutput, ppSwapChain);
 	}
 }
 
diff --git a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIResource.cs b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIResource.cs
index 080240b..a9205f8 100644
--- a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIResource.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIResource.cs
@@ -118,9 +118,9 @@ public unsafe partial struct IDXGIResource
 	/// <include file='../../Dxgi.xml' path='doc/member[@name="IDXGIResource::GetSharedHandle"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(8)]
-	public HResult GetSharedHandle(IntPtr* pSharedHandle)
+	public HResult GetSharedHandle(Handle* pSharedHandle)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIResource*, IntPtr*, int>)(lpVtbl[8]))((IDXGIResource*)Unsafe.AsPointer(ref this), pSharedHandle);
+		return ((delegate* unmanaged[Stdcall]<IDXGIResource*, Handle*, int>)(lpVtbl[8]))((IDXGIResource*)Unsafe.AsPointer(ref this), pSharedHandle);
 	}
 
 	/// <include file='../../Dxgi.xml' path='doc/member[@name="IDXGIResource::GetUsage"]/*' />
diff --git a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIResource1.cs b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIResource1.cs
index 63df805..ae23c3f 100644
--- a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIResource1.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGIResource1.cs
@@ -118,9 +118,9 @@ public unsafe partial struct IDXGIResource1
 	/// <inheritdoc cref="IDXGIResource.GetSharedHandle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(8)]
-	public HResult GetSharedHandle(IntPtr* pSharedHandle)
+	public HResult GetSharedHandle(Handle* pSharedHandle)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIResource1*, IntPtr*, int>)(lpVtbl[8]))((IDXGIResource1*)Unsafe.AsPointer(ref this), pSharedHandle);
+		return ((delegate* unmanaged[Stdcall]<IDXGIResource1*, Handle*, int>)(lpVtbl[8]))((IDXGIResource1*)Unsafe.AsPointer(ref this), pSharedHandle);
 	}
 
 	/// <inheritdoc cref="IDXGIResource.GetUsage" />
@@ -158,9 +158,9 @@ public unsafe partial struct IDXGIResource1
 	/// <include file='../../Dxgi.xml' path='doc/member[@name="IDXGIResource1::CreateSharedHandle"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(13)]
-	public HResult CreateSharedHandle(Security.SECURITY_ATTRIBUTES* pAttributes, uint dwAccess, ushort* lpName, IntPtr* pHandle)
+	public HResult CreateSharedHandle(Security.SECURITY_ATTRIBUTES* pAttributes, uint dwAccess, ushort* lpName, Handle* pHandle)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIResource1*, Security.SECURITY_ATTRIBUTES*, uint, ushort*, IntPtr*, int>)(lpVtbl[13]))((IDXGIResource1*)Unsafe.AsPointer(ref this), pAttributes, dwAccess, lpName, pHandle);
+		return ((delegate* unmanaged[Stdcall]<IDXGIResource1*, Security.SECURITY_ATTRIBUTES*, uint, ushort*, Handle*, int>)(lpVtbl[13]))((IDXGIResource1*)Unsafe.AsPointer(ref this), pAttributes, dwAccess, lpName, pHandle);
 	}
 }
 
diff --git a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGISwapChain2.cs b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGISwapChain2.cs
index 30035fa..129f41b 100644
--- a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGISwapChain2.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGISwapChain2.cs
@@ -318,25 +318,25 @@ public unsafe partial struct IDXGISwapChain2
 	/// <include file='../../Dxgi.xml' path='doc/member[@name="IDXGISwapChain2::GetFrameLatencyWaitableObject"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(33)]
-	public IntPtr GetFrameLatencyWaitableObject()
+	public Handle GetFrameLatencyWaitableObject()
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGISwapChain2*, IntPtr>)(lpVtbl[33]))((IDXGISwapChain2*)Unsafe.AsPointer(ref this));
+		return ((delegate* unmanaged[Stdcall]<IDXGISwapChain2*, Handle>)(lpVtbl[33]))((IDXGISwapChain2*)Unsafe.AsPointer(ref this));
 	}
 
 	/// <include file='../../Dxgi.xml' path='doc/member[@name="IDXGISwapChain2::SetMatrixTransform"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(34)]
-	public HResult SetMatrixTransform(Matrix3x2F* pMatrix)
+	public HResult SetMatrixTransform(Matrix3x2* pMatrix)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGISwapChain2*, Matrix3x2F*, int>)(lpVtbl[34]))((IDXGISwapChain2*)Unsafe.AsPointer(ref this), pMatrix);
+		return ((delegate* unmanaged[Stdcall]<IDXGISwapChain2*, Matrix3x2*, int>)(lpVtbl[34]))((IDXGISwapChain2*)Unsafe.AsPointer(ref this), pMatrix);
 	}
 
 	/// <include file='../../Dxgi.xml' path='doc/member[@name="IDXGISwapChain2::GetMatrixTransform"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(35)]
-	public HResult GetMatrixTransform(Matrix3x2F* pMatrix)
+	public HResult GetMatrixTransform(Matrix3x2* pMatrix)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGISwapChain2*, Matrix3x2F*, int>)(lpVtbl[35]))((IDXGISwapChain2*)Unsafe.AsPointer(ref this), pMatrix);
+		return ((delegate* unmanaged[Stdcall]<IDXGISwapChain2*, Matrix3x2*, int>)(lpVtbl[35]))((IDXGISwapChain2*)Unsafe.AsPointer(ref this), pMatrix);
 	}
 }
 
diff --git a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGISwapChain3.cs b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGISwapChain3.cs
index c01a340..b76d458 100644
--- a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGISwapChain3.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGISwapChain3.cs
@@ -318,25 +318,25 @@ public unsafe partial struct IDXGISwapChain3
 	/// <inheritdoc cref="IDXGISwapChain2.GetFrameLatencyWaitableObject" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(33)]
-	public IntPtr GetFrameLatencyWaitableObject()
+	public Handle GetFrameLatencyWaitableObject()
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGISwapChain3*, IntPtr>)(lpVtbl[33]))((IDXGISwapChain3*)Unsafe.AsPointer(ref this));
+		return ((delegate* unmanaged[Stdcall]<IDXGISwapChain3*, Handle>)(lpVtbl[33]))((IDXGISwapChain3*)Unsafe.AsPointer(ref this));
 	}
 
 	/// <inheritdoc cref="IDXGISwapChain2.SetMatrixTransform" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(34)]
-	public HResult SetMatrixTransform(Matrix3x2F* pMatrix)
+	public HResult SetMatrixTransform(Matrix3x2* pMatrix)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGISwapChain3*, Matrix3x2F*, int>)(lpVtbl[34]))((IDXGISwapChain3*)Unsafe.AsPointer(ref this), pMatrix);
+		return ((delegate* unmanaged[Stdcall]<IDXGISwapChain3*, Matrix3x2*, int>)(lpVtbl[34]))((IDXGISwapChain3*)Unsafe.AsPointer(ref this), pMatrix);
 	}
 
 	/// <inheritdoc cref="IDXGISwapChain2.GetMatrixTransform" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(35)]
-	public HResult GetMatrixTransform(Matrix3x2F* pMatrix)
+	public HResult GetMatrixTransform(Matrix3x2* pMatrix)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGISwapChain3*, Matrix3x2F*, int>)(lpVtbl[35]))((IDXGISwapChain3*)Unsafe.AsPointer(ref this), pMatrix);
+		return ((delegate* unmanaged[Stdcall]<IDXGISwapChain3*, Matrix3x2*, int>)(lpVtbl[35]))((IDXGISwapChain3*)Unsafe.AsPointer(ref this), pMatrix);
 	}
 
 	/// <include file='../../Dxgi.xml' path='doc/member[@name="IDXGISwapChain3::GetCurrentBackBufferIndex"]/*' />
diff --git a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGISwapChain4.cs b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGISwapChain4.cs
index f3e2e87..9a32aba 100644
--- a/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGISwapChain4.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Dxgi/IDXGISwapChain4.cs
@@ -318,25 +318,25 @@ public unsafe partial struct IDXGISwapChain4
 	/// <inheritdoc cref="IDXGISwapChain2.GetFrameLatencyWaitableObject" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(33)]
-	public IntPtr GetFrameLatencyWaitableObject()
+	public Handle GetFrameLatencyWaitableObject()
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGISwapChain4*, IntPtr>)(lpVtbl[33]))((IDXGISwapChain4*)Unsafe.AsPointer(ref this));
+		return ((delegate* unmanaged[Stdcall]<IDXGISwapChain4*, Handle>)(lpVtbl[33]))((IDXGISwapChain4*)Unsafe.AsPointer(ref this));
 	}
 
 	/// <inheritdoc cref="IDXGISwapChain2.SetMatrixTransform" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(34)]
-	public HResult SetMatrixTransform(Matrix3x2F* pMatrix)
+	public HResult SetMatrixTransform(Matrix3x2* pMatrix)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGISwapChain4*, Matrix3x2F*, int>)(lpVtbl[34]))((IDXGISwapChain4*)Unsafe.AsPointer(ref this), pMatrix);
+		return ((delegate* unmanaged[Stdcall]<IDXGISwapChain4*, Matrix3x2*, int>)(lpVtbl[34]))((IDXGISwapChain4*)Unsafe.AsPointer(ref this), pMatrix);
 	}
 
 	/// <inheritdoc cref="IDXGISwapChain2.GetMatrixTransform" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(35)]
-	public HResult GetMatrixTransform(Matrix3x2F* pMatrix)
+	public HResult GetMatrixTransform(Matrix3x2* pMatrix)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGISwapChain4*, Matrix3x2F*, int>)(lpVtbl[35]))((IDXGISwapChain4*)Unsafe.AsPointer(ref this), pMatrix);
+		return ((delegate* unmanaged[Stdcall]<IDXGISwapChain4*, Matrix3x2*, int>)(lpVtbl[35]))((IDXGISwapChain4*)Unsafe.AsPointer(ref this), pMatrix);
 	}
 
 	/// <inheritdoc cref="IDXGISwapChain3.GetCurrentBackBufferIndex" />
diff --git a/src/Vortice.Win32/Generated/Graphics/Imaging.cs b/src/Vortice.Win32/Generated/Graphics/Imaging.cs
index a807ca0..0f6b01b 100644
--- a/src/Vortice.Win32/Generated/Graphics/Imaging.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Imaging.cs
@@ -7791,10 +7791,10 @@ public static unsafe partial class Apis
 	public static extern HResult WICConvertBitmapSource(Guid* dstFormat, IWICBitmapSource* pISrc, IWICBitmapSource* ppIDst);
 
 	[DllImport("WindowsCodecs", ExactSpelling = true)]
-	public static extern HResult WICCreateBitmapFromSection(uint width, uint height, Guid* pixelFormat, IntPtr hSection, uint stride, uint offset, IWICBitmap* ppIBitmap);
+	public static extern HResult WICCreateBitmapFromSection(uint width, uint height, Guid* pixelFormat, Handle hSection, uint stride, uint offset, IWICBitmap* ppIBitmap);
 
 	[DllImport("WindowsCodecs", ExactSpelling = true)]
-	public static extern HResult WICCreateBitmapFromSectionEx(uint width, uint height, Guid* pixelFormat, IntPtr hSection, uint stride, uint offset, WICSectionAccessLevel desiredAccessLevel, IWICBitmap* ppIBitmap);
+	public static extern HResult WICCreateBitmapFromSectionEx(uint width, uint height, Guid* pixelFormat, Handle hSection, uint stride, uint offset, WICSectionAccessLevel desiredAccessLevel, IWICBitmap* ppIBitmap);
 
 	[DllImport("WindowsCodecs", ExactSpelling = true)]
 	public static extern HResult WICMapGuidToShortName(Guid* guid, uint cchName, ushort* wzName, uint* pcchActual);
diff --git a/src/Vortice.Win32/Graphics/Direct3D12/Apis.cs b/src/Vortice.Win32/Graphics/Direct3D12/Apis.cs
index df9a9bd..0194c1c 100644
--- a/src/Vortice.Win32/Graphics/Direct3D12/Apis.cs
+++ b/src/Vortice.Win32/Graphics/Direct3D12/Apis.cs
@@ -246,73 +246,88 @@ public static unsafe partial class Apis
         return RequiredSize;
     }
 
-    //public static ulong UpdateSubresources(ID3D12GraphicsCommandList* pCmdList, ID3D12Resource* pDestinationResource, ID3D12Resource* pIntermediate, [NativeTypeName("UINT64")] ulong IntermediateOffset, uint FirstSubresource, uint NumSubresources, D3D12_SUBRESOURCE_DATA* pSrcData)
-    //{
-    //    ulong RequiredSize = 0;
-    //    ulong MemToAlloc = (ulong)(sizeof(D3D12_PLACED_SUBRESOURCE_FOOTPRINT) + sizeof(uint) + sizeof(ulong)) * NumSubresources;
+    public static ulong UpdateSubresources(
+        ID3D12GraphicsCommandList* pCmdList,
+        ID3D12Resource* pDestinationResource,
+        ID3D12Resource* pIntermediate,
+        ulong IntermediateOffset,
+        uint FirstSubresource,
+        uint NumSubresources,
+        SubresourceData* pSrcData)
+    {
+        ulong RequiredSize = 0;
+        ulong MemToAlloc = (ulong)(sizeof(PlacedSubresourceFootprint) + sizeof(uint) + sizeof(ulong)) * NumSubresources;
 
-    //    if (MemToAlloc > unchecked((nuint)(-1)))
-    //    {
-    //        return 0;
-    //    }
+        if (MemToAlloc > unchecked((nuint)(-1)))
+        {
+            return 0;
+        }
 
-    //    var pMem = HeapAlloc(GetProcessHeap(), 0, (nuint)MemToAlloc);
+        var pMem = HeapAlloc(GetProcessHeap(), 0, (nuint)MemToAlloc);
 
-    //    if (pMem == null)
-    //    {
-    //        return 0;
-    //    }
+        if (pMem == null)
+        {
+            return 0;
+        }
 
-    //    var pLayouts = (D3D12_PLACED_SUBRESOURCE_FOOTPRINT*)pMem;
-    //    ulong* pRowSizesInBytes = (ulong*)(pLayouts + NumSubresources);
-    //    uint* pNumRows = (uint*)(pRowSizesInBytes + NumSubresources);
+        var pLayouts = (PlacedSubresourceFootprint*)pMem;
+        ulong* pRowSizesInBytes = (ulong*)(pLayouts + NumSubresources);
+        uint* pNumRows = (uint*)(pRowSizesInBytes + NumSubresources);
 
-    //    var Desc = pDestinationResource->GetDesc();
+        var Desc = pDestinationResource->GetDesc();
 
-    //    ID3D12Device* pDevice = null;
-    //    _ = pDestinationResource->GetDevice(__uuidof<ID3D12Device>(), (void**)&pDevice);
+        ID3D12Device* pDevice = null;
+        _ = pDestinationResource->GetDevice(__uuidof<ID3D12Device>(), (void**)&pDevice);
 
-    //    pDevice->GetCopyableFootprints(&Desc, FirstSubresource, NumSubresources, IntermediateOffset, pLayouts, pNumRows, pRowSizesInBytes, &RequiredSize);
-    //    _ = pDevice->Release();
+        pDevice->GetCopyableFootprints(&Desc, FirstSubresource, NumSubresources, IntermediateOffset, pLayouts, pNumRows, pRowSizesInBytes, &RequiredSize);
+        _ = pDevice->Release();
 
-    //    ulong Result = UpdateSubresources(pCmdList, pDestinationResource, pIntermediate, FirstSubresource, NumSubresources, RequiredSize, pLayouts, pNumRows, pRowSizesInBytes, pSrcData);
-    //    _ = HeapFree(GetProcessHeap(), 0, pMem);
-    //    return Result;
-    //}
+        ulong Result = UpdateSubresources(pCmdList, pDestinationResource, pIntermediate, FirstSubresource, NumSubresources, RequiredSize, pLayouts, pNumRows, pRowSizesInBytes, pSrcData);
+        _ = HeapFree(GetProcessHeap(), 0, pMem);
+        return Result;
+    }
 
-    //public static ulong UpdateSubresources(ID3D12GraphicsCommandList* pCmdList, ID3D12Resource* pDestinationResource, ID3D12Resource* pIntermediate, [NativeTypeName("UINT64")] ulong IntermediateOffset, uint FirstSubresource, uint NumSubresources, [NativeTypeName("const void *")] void* pResourceData, [NativeTypeName("D3D12_SUBRESOURCE_INFO *")] D3D12_SUBRESOURCE_INFO* pSrcData)
-    //{
-    //    ulong RequiredSize = 0;
-    //    ulong MemToAlloc = (ulong)(sizeof(D3D12_PLACED_SUBRESOURCE_FOOTPRINT) + sizeof(uint) + sizeof(ulong)) * NumSubresources;
+    public static ulong UpdateSubresources(
+        ID3D12GraphicsCommandList* pCmdList,
+        ID3D12Resource* pDestinationResource,
+        ID3D12Resource* pIntermediate,
+        ulong IntermediateOffset,
+        uint FirstSubresource,
+        uint NumSubresources,
+        void* pResourceData,
+        SubresourceInfo* pSrcData)
+    {
+        ulong RequiredSize = 0;
+        ulong MemToAlloc = (ulong)(sizeof(PlacedSubresourceFootprint) + sizeof(uint) + sizeof(ulong)) * NumSubresources;
 
-    //    if (MemToAlloc > unchecked((nuint)(-1)))
-    //    {
-    //        return 0;
-    //    }
+        if (MemToAlloc > unchecked((nuint)(-1)))
+        {
+            return 0;
+        }
 
-    //    var pMem = HeapAlloc(GetProcessHeap(), 0, (nuint)MemToAlloc);
+        var pMem = HeapAlloc(GetProcessHeap(), 0, (nuint)MemToAlloc);
 
-    //    if (pMem == null)
-    //    {
-    //        return 0;
-    //    }
+        if (pMem == null)
+        {
+            return 0;
+        }
 
-    //    var pLayouts = (D3D12_PLACED_SUBRESOURCE_FOOTPRINT*)pMem;
-    //    ulong* pRowSizesInBytes = (ulong*)(pLayouts + NumSubresources);
-    //    uint* pNumRows = (uint*)(pRowSizesInBytes + NumSubresources);
+        var pLayouts = (PlacedSubresourceFootprint*)pMem;
+        ulong* pRowSizesInBytes = (ulong*)(pLayouts + NumSubresources);
+        uint* pNumRows = (uint*)(pRowSizesInBytes + NumSubresources);
 
-    //    var Desc = pDestinationResource->GetDesc();
+        var Desc = pDestinationResource->GetDesc();
 
-    //    ID3D12Device* pDevice = null;
-    //    _ = pDestinationResource->GetDevice(__uuidof<ID3D12Device>(), (void**)&pDevice);
+        ID3D12Device* pDevice = null;
+        _ = pDestinationResource->GetDevice(__uuidof<ID3D12Device>(), (void**)&pDevice);
 
-    //    pDevice->GetCopyableFootprints(&Desc, FirstSubresource, NumSubresources, IntermediateOffset, pLayouts, pNumRows, pRowSizesInBytes, &RequiredSize);
-    //    _ = pDevice->Release();
+        pDevice->GetCopyableFootprints(&Desc, FirstSubresource, NumSubresources, IntermediateOffset, pLayouts, pNumRows, pRowSizesInBytes, &RequiredSize);
+        _ = pDevice->Release();
 
-    //    ulong Result = UpdateSubresources(pCmdList, pDestinationResource, pIntermediate, FirstSubresource, NumSubresources, RequiredSize, pLayouts, pNumRows, pRowSizesInBytes, pResourceData, pSrcData);
-    //    _ = HeapFree(GetProcessHeap(), 0, pMem);
-    //    return Result;
-    //}
+        ulong Result = UpdateSubresources(pCmdList, pDestinationResource, pIntermediate, FirstSubresource, NumSubresources, RequiredSize, pLayouts, pNumRows, pRowSizesInBytes, pResourceData, pSrcData);
+        _ = HeapFree(GetProcessHeap(), 0, pMem);
+        return Result;
+    }
 
     public static ulong UpdateSubresources(
         uint MaxSubresources,
diff --git a/src/Vortice.Win32/Handle.cs b/src/Vortice.Win32/Handle.cs
new file mode 100644
index 0000000..e53fad8
--- /dev/null
+++ b/src/Vortice.Win32/Handle.cs
@@ -0,0 +1,102 @@
+// Copyright © Tanner Gooding and Contributors. Licensed under the MIT License (MIT). See License.md in the repository root for more information.
+// Copyright © Amer Koleci and Contributors.
+// Licensed under the MIT License (MIT). See LICENSE in the repository root for more information.
+
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
+
+namespace Win32;
+
+/// <unmanaged>HANDLE</unmanaged>
+[NativeTypeName("LARGE_INTEGER")]
+public readonly unsafe partial struct Handle : IComparable, IComparable<Handle>, IEquatable<Handle>, IFormattable
+{
+    public readonly void* Value;
+
+    public Handle(void* value)
+    {
+        Value = value;
+    }
+
+    public static Handle InvalidValue => new Handle((void*)(-1));
+
+    public static Handle Null => new Handle(null);
+
+    public static bool operator ==(Handle left, Handle right) => left.Value == right.Value;
+
+    public static bool operator !=(Handle left, Handle right) => left.Value != right.Value;
+
+    public static bool operator <(Handle left, Handle right) => left.Value < right.Value;
+
+    public static bool operator <=(Handle left, Handle right) => left.Value <= right.Value;
+
+    public static bool operator >(Handle left, Handle right) => left.Value > right.Value;
+
+    public static bool operator >=(Handle left, Handle right) => left.Value >= right.Value;
+
+    public static explicit operator Handle(void* value) => new Handle(value);
+
+    public static implicit operator void*(Handle value) => value.Value;
+
+    public static explicit operator Handle(byte value) => new Handle(unchecked((void*)(value)));
+
+    public static explicit operator byte(Handle value) => (byte)(value.Value);
+
+    public static explicit operator Handle(short value) => new Handle(unchecked((void*)(value)));
+
+    public static explicit operator short(Handle value) => (short)(value.Value);
+
+    public static explicit operator Handle(int value) => new Handle(unchecked((void*)(value)));
+
+    public static explicit operator int(Handle value) => (int)(value.Value);
+
+    public static explicit operator Handle(long value) => new Handle(unchecked((void*)(value)));
+
+    public static explicit operator long(Handle value) => (long)(value.Value);
+
+    public static explicit operator Handle(nint value) => new Handle(unchecked((void*)(value)));
+
+    public static implicit operator nint(Handle value) => (nint)(value.Value);
+
+    public static explicit operator Handle(sbyte value) => new Handle(unchecked((void*)(value)));
+
+    public static explicit operator sbyte(Handle value) => (sbyte)(value.Value);
+
+    public static explicit operator Handle(ushort value) => new Handle(unchecked((void*)(value)));
+
+    public static explicit operator ushort(Handle value) => (ushort)(value.Value);
+
+    public static explicit operator Handle(uint value) => new Handle(unchecked((void*)(value)));
+
+    public static explicit operator uint(Handle value) => (uint)(value.Value);
+
+    public static explicit operator Handle(ulong value) => new Handle(unchecked((void*)(value)));
+
+    public static explicit operator ulong(Handle value) => (ulong)(value.Value);
+
+    public static explicit operator Handle(nuint value) => new Handle(unchecked((void*)(value)));
+
+    public static implicit operator nuint(Handle value) => (nuint)(value.Value);
+
+    public int CompareTo(object? obj)
+    {
+        if (obj is Handle other)
+        {
+            return CompareTo(other);
+        }
+
+        return (obj is null) ? 1 : throw new ArgumentException("obj is not an instance of HANDLE.");
+    }
+
+    public int CompareTo(Handle other) => ((nuint)(Value)).CompareTo((nuint)(other.Value));
+
+    public override bool Equals(object? obj) => (obj is Handle other) && Equals(other);
+
+    public bool Equals(Handle other) => ((nuint)(Value)).Equals((nuint)(other.Value));
+
+    public override int GetHashCode() => ((nuint)(Value)).GetHashCode();
+
+    public override string ToString() => ((nuint)(Value)).ToString((sizeof(nint) == 4) ? "X8" : "X16");
+
+    public string ToString(string? format, IFormatProvider? formatProvider) => ((nuint)(Value)).ToString(format, formatProvider);
+}
diff --git a/src/Vortice.Win32/NetStandard.cs b/src/Vortice.Win32/NetStandard.cs
index 2ab94f8..0f857c0 100644
--- a/src/Vortice.Win32/NetStandard.cs
+++ b/src/Vortice.Win32/NetStandard.cs
@@ -3,10 +3,60 @@
 
 #if !NET6_0_OR_GREATER
 
-using System.Runtime.CompilerServices;
-
 namespace Win32;
 
+internal static unsafe class Extensions
+{
+    /// <inheritdoc cref="IComparable{T}.CompareTo(T)"/>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static int CompareTo(this nint left, nint right)
+    {
+        if (sizeof(nint) == sizeof(int))
+        {
+            return ((int)left).CompareTo((int)right);
+        }
+
+        return ((long)left).CompareTo(right);
+    }
+
+    /// <inheritdoc cref="IComparable{T}.CompareTo(T)"/>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static int CompareTo(this nuint left, nuint right)
+    {
+        if (sizeof(nuint) == sizeof(uint))
+        {
+            return ((uint)left).CompareTo((uint)right);
+        }
+
+        return ((ulong)left).CompareTo(right);
+    }
+
+    // <inheritdoc cref="IFormattable.ToString(string?, IFormatProvider?)"/>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static string ToString(this nuint value, string? format)
+    {
+        if (sizeof(nuint) == sizeof(uint))
+        {
+            return ((uint)value).ToString(format);
+        }
+
+        return ((ulong)value).ToString(format);
+    }
+
+    /// <inheritdoc cref="IFormattable.ToString(string?, IFormatProvider?)"/>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static string ToString(this nuint value, string? format, IFormatProvider? formatProvider)
+    {
+        if (sizeof(nuint) == sizeof(uint))
+        {
+            return ((uint)value).ToString(format, formatProvider);
+        }
+
+        return ((ulong)value).ToString(format, formatProvider);
+    }
+}
+
+
 internal static class MemoryMarshal
 {
     /// <inheritdoc cref="global::System.Runtime.InteropServices.MemoryMarshal.GetReference{T}(Span{T})"/>
diff --git a/src/Vortice.Win32/Numerics/Viewport.cs b/src/Vortice.Win32/Numerics/Viewport.cs
new file mode 100644
index 0000000..85397b4
--- /dev/null
+++ b/src/Vortice.Win32/Numerics/Viewport.cs
@@ -0,0 +1,271 @@
+// Copyright © Amer Koleci and Contributors.
+// Licensed under the MIT License (MIT). See LICENSE in the repository root for more information.
+
+using System.Diagnostics;
+using System.Drawing;
+using System.Globalization;
+using System.Numerics;
+using System.Runtime.CompilerServices;
+using System.Text;
+
+#if NET6_0_OR_GREATER
+using System.Runtime.Intrinsics;
+using static Win32.Numerics.VectorUtilities;
+#endif
+
+namespace Win32.Numerics;
+
+[Serializable]
+[StructLayout(LayoutKind.Sequential, Pack = 4)]
+public readonly struct Viewport : IEquatable<Viewport>
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Viewport"/> struct.
+    /// </summary>
+    /// <param name="width">The width of the viewport in pixels.</param>
+    /// <param name="height">The height of the viewport in pixels.</param>
+    public Viewport(float width, float height)
+    {
+        X = 0.0f;
+        Y = 0.0f;
+        Width = width;
+        Height = height;
+        MinDepth = 0.0f;
+        MaxDepth = 1.0f;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Viewport"/> struct.
+    /// </summary>
+    /// <param name="x">The x coordinate of the upper-left corner of the viewport in pixels.</param>
+    /// <param name="y">The y coordinate of the upper-left corner of the viewport in pixels.</param>
+    /// <param name="width">The width of the viewport in pixels.</param>
+    /// <param name="height">The height of the viewport in pixels.</param>
+    public Viewport(float x, float y, float width, float height)
+    {
+        X = x;
+        Y = y;
+        Width = width;
+        Height = height;
+        MinDepth = 0.0f;
+        MaxDepth = 1.0f;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Viewport"/> struct.
+    /// </summary>
+    /// <param name="x">The x coordinate of the upper-left corner of the viewport in pixels.</param>
+    /// <param name="y">The y coordinate of the upper-left corner of the viewport in pixels.</param>
+    /// <param name="width">The width of the viewport in pixels.</param>
+    /// <param name="height">The height of the viewport in pixels.</param>
+    /// <param name="minDepth">The minimum depth of the clip volume.</param>
+    /// <param name="maxDepth">The maximum depth of the clip volume.</param>
+    public Viewport(float x, float y, float width, float height, float minDepth, float maxDepth)
+    {
+        X = x;
+        Y = y;
+        Width = width;
+        Height = height;
+        MinDepth = minDepth;
+        MaxDepth = maxDepth;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Viewport"/> struct.
+    /// </summary>
+    /// <param name="bounds">A <see cref="RectangleF"/> that defines the location and size of the viewport in a render target.</param>
+    public Viewport(in RectangleF bounds)
+    {
+        X = bounds.X;
+        Y = bounds.Y;
+        Width = bounds.Width;
+        Height = bounds.Height;
+        MinDepth = 0.0f;
+        MaxDepth = 1.0f;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Viewport"/> struct.
+    /// </summary>
+    /// <param name="bounds">A <see cref="Rectangle"/> that defines the location and size of the viewport in a render target.</param>
+    public Viewport(in Rectangle bounds)
+    {
+        X = bounds.X;
+        Y = bounds.Y;
+        Width = bounds.Width;
+        Height = bounds.Height;
+        MinDepth = 0.0f;
+        MaxDepth = 1.0f;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Viewport"/> struct.
+    /// </summary>
+    /// <param name="bounds">A <see cref="Vector4"/> that defines the location and size of the viewport in a render target.</param>
+    public Viewport(in Vector4 bounds)
+    {
+        X = bounds.X;
+        Y = bounds.Y;
+        Width = bounds.Z;
+        Height = bounds.W;
+        MinDepth = 0.0f;
+        MaxDepth = 1.0f;
+    }
+
+    /// <summary>
+    /// Position of the pixel coordinate of the upper-left corner of the viewport.
+    /// </summary>
+    public float X { get; }
+
+    /// <summary>
+    /// Position of the pixel coordinate of the upper-left corner of the viewport.
+    /// </summary>
+    public float Y { get; }
+
+    /// <summary>
+    /// Width dimension of the viewport.
+    /// </summary>
+    public float Width { get; }
+
+    /// <summary>
+    /// Height dimension of the viewport.
+    /// </summary>
+    public float Height { get; }
+
+    /// <summary>
+    /// Gets or sets the minimum depth of the clip volume.
+    /// </summary>
+    public float MinDepth { get; }
+
+    /// <summary>
+    /// Gets or sets the maximum depth of the clip volume.
+    /// </summary>
+    public float MaxDepth { get; }
+
+    /// <summary>
+    /// Gets or sets the bounds of the viewport.
+    /// </summary>
+    /// <value>The bounds.</value>
+    public RectangleF Bounds => new(X, Y, Width, Height);
+
+    /// <summary>
+    /// Gets the aspect ratio used by the viewport.
+    /// </summary>
+    /// <value>The aspect ratio.</value>
+    public readonly float AspectRatio
+    {
+        get
+        {
+            if (Width == 0.0f || Height == 0.0f)
+                return 0.0f;
+
+            return Width / Height;
+        }
+    }
+    /// <summary>
+    /// Compares two <see cref="Viewport"/> objects for equality.
+    /// </summary>
+    /// <param name="left">The <see cref="Viewport"/> on the left hand of the operand.</param>
+    /// <param name="right">The <see cref="Viewport"/> on the right hand of the operand.</param>
+    /// <returns>
+    /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
+    /// </returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static bool operator ==(Viewport left, Viewport right) => left.Equals(right);
+
+    /// <summary>
+    /// Compares two <see cref="Viewport"/> objects for inequality.
+    /// </summary>
+    /// <param name="left">The <see cref="Viewport"/> on the left hand of the operand.</param>
+    /// <param name="right">The <see cref="Viewport"/> on the right hand of the operand.</param>
+    /// <returns>
+    /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
+    /// </returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static bool operator !=(Viewport left, Viewport right) => !left.Equals(right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is Viewport other && Equals(other);
+
+    /// <summary>
+    /// Determines whether the specified <see cref="Viewport"/> is equal to this instance.
+    /// </summary>
+    /// <param name="other">The <see cref="Viewport"/> to compare with this instance.</param>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public bool Equals(Viewport other)
+    {
+        return
+            X == other.X &&
+            Y == other.Y &&
+            Width == other.Width &&
+            Height == other.Height &&
+            MinDepth == other.MinDepth &&
+            MaxDepth == other.MaxDepth;
+    }
+
+    /// <inheritdoc/>
+    public override int GetHashCode()
+    {
+        var hashCode = new HashCode();
+        {
+            hashCode.Add(X);
+            hashCode.Add(Y);
+            hashCode.Add(Width);
+            hashCode.Add(Height);
+            hashCode.Add(MinDepth);
+            hashCode.Add(MaxDepth);
+        }
+        return hashCode.ToHashCode();
+    }
+
+    /// <inheritdoc />
+    public override string ToString() => ToString(format: null, formatProvider: null);
+
+    /// <inheritdoc />
+    public string ToString(string? format, IFormatProvider? formatProvider)
+    {
+        var separator = NumberFormatInfo.GetInstance(formatProvider).NumberGroupSeparator;
+
+        return new StringBuilder(9 + (separator.Length * 3))
+            .Append('<')
+            .Append(X.ToString(format, formatProvider))
+            .Append(separator)
+            .Append(' ')
+            .Append(Y.ToString(format, formatProvider))
+            .Append(separator)
+            .Append(' ')
+            .Append(Width.ToString(format, formatProvider))
+            .Append(separator)
+            .Append(' ')
+            .Append(Height.ToString(format, formatProvider))
+            .Append(separator)
+            .Append(' ')
+            .Append(MinDepth.ToString(format, formatProvider))
+            .Append(separator)
+            .Append(' ')
+            .Append(MaxDepth.ToString(format, formatProvider))
+            .Append(' ')
+            .Append('>')
+            .ToString();
+    }
+
+    internal const int Count = 4;
+
+    internal static float GetElement(Color4 vector, int index)
+    {
+        if (index >= Count)
+        {
+            throw new ArgumentOutOfRangeException(nameof(index));
+        }
+
+        return GetElementUnsafe(ref vector, index);
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static float GetElementUnsafe(ref Color4 vector, int index)
+    {
+        Debug.Assert(index is >= 0 and < Count);
+
+        return Unsafe.Add(ref Unsafe.As<Color4, float>(ref vector), index);
+    }
+}
diff --git a/src/Vortice.Win32/Win32.cs b/src/Vortice.Win32/Win32.cs
index 4c96e2e..27733da 100644
--- a/src/Vortice.Win32/Win32.cs
+++ b/src/Vortice.Win32/Win32.cs
@@ -93,4 +93,26 @@ public static unsafe partial class Apis
 
     [DllImport("ole32", ExactSpelling = true)]
     public static extern HResult CoCreateInstance(Guid* rclsid, IUnknown* pUnkOuter, uint dwClsContext, Guid* riid, void** ppv);
+
+    [DllImport("kernel32", ExactSpelling = true)]
+    public static extern Handle HeapCreate(uint flOptions, nuint dwInitialSize, nuint dwMaximumSize);
+
+    [DllImport("kernel32", ExactSpelling = true)]
+    public static extern Bool32 HeapDestroy(void* hHeap);
+
+    [DllImport("kernel32", ExactSpelling = true)]
+    public static extern void* HeapAlloc(Handle hHeap, uint dwFlags, nuint dwBytes);
+
+    [DllImport("kernel32", ExactSpelling = true)]
+    [return: NativeTypeName("LPVOID")]
+    public static extern void* HeapReAlloc(Handle hHeap, uint dwFlags, void* lpMem, nuint dwBytes);
+
+    [DllImport("kernel32", ExactSpelling = true)]
+    public static extern Bool32 HeapFree(Handle hHeap, uint dwFlags, void* lpMem);
+
+    [DllImport("kernel32", ExactSpelling = true)]
+    public static extern nuint HeapSize(Handle hHeap, uint dwFlags, void* lpMem);
+
+    [DllImport("kernel32", ExactSpelling = true)]
+    public static extern Handle GetProcessHeap();
 }