diff --git a/Directory.Build.props b/Directory.Build.props
index 9b3feac..d07a72b 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -15,7 +15,7 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <RestoreConfigFile>$(MSBuildThisFileDirectory)NuGet.config</RestoreConfigFile>
 
-    <VersionPrefix>1.8.6</VersionPrefix>
+    <VersionPrefix>1.8.7</VersionPrefix>
     <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
     
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/Generator/Program.cs b/src/Generator/Program.cs
index 1070400..d43200e 100644
--- a/src/Generator/Program.cs
+++ b/src/Generator/Program.cs
@@ -2375,6 +2375,11 @@ public static class Program
 
                     foreach (ApiParameter parameter in method.Params)
                     {
+                        if(method.Name == "CreateRenderTargetView" && comType.Name == "ID3D12Device")
+                        {
+
+                        }
+
                         GetParameterSignature(api, writer, parameter,
                             $"{comType.Name}::{method.Name}",
                             out string parameterType,
@@ -2510,7 +2515,7 @@ public static class Program
             else
             {
                 string fullTypeName = $"{parameter.Type.Api}.{parameter.Type.Name}";
-                if (!IsPrimitive(parameter.Type) && !IsEnum(fullTypeName))
+                if (!IsPrimitive(parameter.Type) && !IsStruct(fullTypeName) && !IsEnum(fullTypeName))
                 {
                     asPointer = true;
                 }
diff --git a/src/Generator/win32json/api/Graphics.Direct2D.json b/src/Generator/win32json/api/Graphics.Direct2D.json
index 2cc7bd9..1ae5d86 100644
--- a/src/Generator/win32json/api/Graphics.Direct2D.json
+++ b/src/Generator/win32json/api/Graphics.Direct2D.json
@@ -6850,45 +6850,6 @@
 			}
 		]
 	}
-	,{
-		"Name":"Matrix4x3F"
-		,"Architectures":[]
-		,"Platform":null
-		,"Kind":"Struct"
-		,"Size":0
-		,"PackingSize":0
-		,"Fields":[
-			{"Name":"Base","Type":{"Kind":"ApiRef","Name":"D2D_MATRIX_4X3_F","TargetKind":"Default","Api":"Graphics.Direct2D.Common","Parents":[]},"Attrs":[]}
-		]
-		,"NestedTypes":[
-		]
-	}
-	,{
-		"Name":"Matrix4x4F"
-		,"Architectures":[]
-		,"Platform":null
-		,"Kind":"Struct"
-		,"Size":0
-		,"PackingSize":0
-		,"Fields":[
-			{"Name":"Base","Type":{"Kind":"ApiRef","Name":"D2D_MATRIX_4X4_F","TargetKind":"Default","Api":"Graphics.Direct2D.Common","Parents":[]},"Attrs":[]}
-		]
-		,"NestedTypes":[
-		]
-	}
-	,{
-		"Name":"Matrix5x4F"
-		,"Architectures":[]
-		,"Platform":null
-		,"Kind":"Struct"
-		,"Size":0
-		,"PackingSize":0
-		,"Fields":[
-			{"Name":"Base","Type":{"Kind":"ApiRef","Name":"D2D_MATRIX_5X4_F","TargetKind":"Default","Api":"Graphics.Direct2D.Common","Parents":[]},"Attrs":[]}
-		]
-		,"NestedTypes":[
-		]
-	}
 	,{
 		"Name":"PD2D1_PROPERTY_SET_FUNCTION"
 		,"Architectures":[]
diff --git a/src/Generator/win32json/api/Graphics.Direct3D11.json b/src/Generator/win32json/api/Graphics.Direct3D11.json
index 0b50790..f0bf468 100644
--- a/src/Generator/win32json/api/Graphics.Direct3D11.json
+++ b/src/Generator/win32json/api/Graphics.Direct3D11.json
@@ -3856,13 +3856,13 @@
 		,"Architectures":[]
 		,"Platform":null
 		,"Kind":"Enum"
-		,"Flags":false
+		,"Flags":true
 		,"Scoped":false
 		,"Values":[
 			{"Name":"D3D11_CLEAR_DEPTH","Value":1}
 			,{"Name":"D3D11_CLEAR_STENCIL","Value":2}
 		]
-		,"IntegerBase":"Int32"
+		,"IntegerBase":"UInt32"
 	}
 	,{
 		"Name":"D3D11_BOX"
diff --git a/src/Generator/win32json/api/Graphics.DirectComposition.json b/src/Generator/win32json/api/Graphics.DirectComposition.json
index 6ffbfd5..0b93948 100644
--- a/src/Generator/win32json/api/Graphics.DirectComposition.json
+++ b/src/Generator/win32json/api/Graphics.DirectComposition.json
@@ -2123,7 +2123,7 @@
 				,"Params":[
 					{"Name":"updateRect","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"RECT","TargetKind":"Default","Api":"Foundation","Parents":[]}},"Attrs":["In","Optional","Const"]}
 					,{"Name":"iid","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Guid"}},"Attrs":["In","Const"]}
-					,{"Name":"updateObject","Type":{"Kind":"PointerTo","Child":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Void"}}},"Attrs":["Out"]}
+					,{"Name":"updateObject","Type":{"Kind":"PointerTo","Child":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Void"}}},"Attrs":["Out","ComOutPtr"]}
 					,{"Name":"updateOffset","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"POINT","TargetKind":"Default","Api":"Foundation","Parents":[]}},"Attrs":["Out"]}
 				]
 			}
@@ -4438,7 +4438,7 @@
 		,"Params":[
 			{"Name":"dxgiDevice","Type":{"Kind":"ApiRef","Name":"IDXGIDevice","TargetKind":"Com","Api":"Graphics.Dxgi","Parents":[]},"Attrs":["In","Optional"]}
 			,{"Name":"iid","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Guid"}},"Attrs":["In","Const"]}
-			,{"Name":"dcompositionDevice","Type":{"Kind":"PointerTo","Child":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Void"}}},"Attrs":["Out"]}
+			,{"Name":"dcompositionDevice","Type":{"Kind":"PointerTo","Child":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Void"}}},"Attrs":["Out","ComOutPtr"]}
 		]
 	}
 	,{
@@ -4453,7 +4453,7 @@
 		,"Params":[
 			{"Name":"renderingDevice","Type":{"Kind":"ApiRef","Name":"IUnknown","TargetKind":"Com","Api":"System.Com","Parents":[]},"Attrs":["In","Optional"]}
 			,{"Name":"iid","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Guid"}},"Attrs":["In","Const"]}
-			,{"Name":"dcompositionDevice","Type":{"Kind":"PointerTo","Child":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Void"}}},"Attrs":["Out"]}
+			,{"Name":"dcompositionDevice","Type":{"Kind":"PointerTo","Child":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Void"}}},"Attrs":["Out","ComOutPtr"]}
 		]
 	}
 	,{
@@ -4468,7 +4468,7 @@
 		,"Params":[
 			{"Name":"renderingDevice","Type":{"Kind":"ApiRef","Name":"IUnknown","TargetKind":"Com","Api":"System.Com","Parents":[]},"Attrs":["In","Optional"]}
 			,{"Name":"iid","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Guid"}},"Attrs":["In","Const"]}
-			,{"Name":"dcompositionDevice","Type":{"Kind":"PointerTo","Child":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Void"}}},"Attrs":["Out"]}
+			,{"Name":"dcompositionDevice","Type":{"Kind":"PointerTo","Child":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Void"}}},"Attrs":["Out","ComOutPtr"]}
 		]
 	}
 	,{
diff --git a/src/Generator/win32json/api/Graphics.DirectWrite.json b/src/Generator/win32json/api/Graphics.DirectWrite.json
index fb11d51..362872e 100644
--- a/src/Generator/win32json/api/Graphics.DirectWrite.json
+++ b/src/Generator/win32json/api/Graphics.DirectWrite.json
@@ -9089,7 +9089,7 @@
 		,"Params":[
 			{"Name":"factoryType","Type":{"Kind":"ApiRef","Name":"DWRITE_FACTORY_TYPE","TargetKind":"Default","Api":"Graphics.DirectWrite","Parents":[]},"Attrs":["In"]}
 			,{"Name":"iid","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Guid"}},"Attrs":["In","Const"]}
-			,{"Name":"factory","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IUnknown","TargetKind":"Com","Api":"System.Com","Parents":[]}},"Attrs":["Out","ComOutPtr"]}
+			,{"Name":"factory","Type":{"Kind":"PointerTo","Child":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Void"}}},"Attrs":["Out","ComOutPtr"]}
 		]
 	}
 ]
diff --git a/src/Generator/win32json/api/Graphics.Dxgi.json b/src/Generator/win32json/api/Graphics.Dxgi.json
index f412130..a56d2e9 100644
--- a/src/Generator/win32json/api/Graphics.Dxgi.json
+++ b/src/Generator/win32json/api/Graphics.Dxgi.json
@@ -2,55 +2,6 @@
 
 "Constants":[
 	{
-		"Name":"DXGI_USAGE_SHADER_INPUT"
-		,"Type":{"Kind":"Native","Name":"UInt32"}
-		,"ValueType":"UInt32"
-		,"Value":16
-		,"Attrs":[]
-	}
-	,{
-		"Name":"DXGI_USAGE_RENDER_TARGET_OUTPUT"
-		,"Type":{"Kind":"Native","Name":"UInt32"}
-		,"ValueType":"UInt32"
-		,"Value":32
-		,"Attrs":[]
-	}
-	,{
-		"Name":"DXGI_USAGE_BACK_BUFFER"
-		,"Type":{"Kind":"Native","Name":"UInt32"}
-		,"ValueType":"UInt32"
-		,"Value":64
-		,"Attrs":[]
-	}
-	,{
-		"Name":"DXGI_USAGE_SHARED"
-		,"Type":{"Kind":"Native","Name":"UInt32"}
-		,"ValueType":"UInt32"
-		,"Value":128
-		,"Attrs":[]
-	}
-	,{
-		"Name":"DXGI_USAGE_READ_ONLY"
-		,"Type":{"Kind":"Native","Name":"UInt32"}
-		,"ValueType":"UInt32"
-		,"Value":256
-		,"Attrs":[]
-	}
-	,{
-		"Name":"DXGI_USAGE_DISCARD_ON_PRESENT"
-		,"Type":{"Kind":"Native","Name":"UInt32"}
-		,"ValueType":"UInt32"
-		,"Value":512
-		,"Attrs":[]
-	}
-	,{
-		"Name":"DXGI_USAGE_UNORDERED_ACCESS"
-		,"Type":{"Kind":"Native","Name":"UInt32"}
-		,"ValueType":"UInt32"
-		,"Value":1024
-		,"Attrs":[]
-	}
-	,{
 		"Name":"DXGI_MAP_READ"
 		,"Type":{"Kind":"Native","Name":"UInt32"}
 		,"ValueType":"UInt32"
@@ -526,6 +477,24 @@
 		]
 		,"IntegerBase":"UInt32"
 	}
+	,{
+		"Name":"DXGI_USAGE"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Enum"
+		,"Flags":true
+		,"Scoped":false
+		,"Values":[
+			{"Name":"DXGI_USAGE_SHADER_INPUT","Value":16}
+			,{"Name":"DXGI_USAGE_RENDER_TARGET_OUTPUT","Value":32}
+			,{"Name":"DXGI_USAGE_BACK_BUFFER","Value":64}
+			,{"Name":"DXGI_USAGE_SHARED","Value":128}
+			,{"Name":"DXGI_USAGE_READ_ONLY","Value":256}
+			,{"Name":"DXGI_USAGE_DISCARD_ON_PRESENT","Value":512}
+			,{"Name":"DXGI_USAGE_UNORDERED_ACCESS","Value":1024}
+		]
+		,"IntegerBase":"UInt32"
+	}
 	,{
 		"Name":"DXGI_FRAME_STATISTICS"
 		,"Architectures":[]
@@ -687,7 +656,7 @@
 		,"Fields":[
 			{"Name":"BufferDesc","Type":{"Kind":"ApiRef","Name":"DXGI_MODE_DESC","TargetKind":"Default","Api":"Graphics.Dxgi.Common","Parents":[]},"Attrs":[]}
 			,{"Name":"SampleDesc","Type":{"Kind":"ApiRef","Name":"DXGI_SAMPLE_DESC","TargetKind":"Default","Api":"Graphics.Dxgi.Common","Parents":[]},"Attrs":[]}
-			,{"Name":"BufferUsage","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":[]}
+			,{"Name":"BufferUsage","Type":{"Kind":"ApiRef","Name":"DXGI_USAGE","TargetKind":"Default","Api":"Graphics.Dxgi","Parents":[]},"Attrs":[]}
 			,{"Name":"BufferCount","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":[]}
 			,{"Name":"OutputWindow","Type":{"Kind":"ApiRef","Name":"HWND","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":[]}
 			,{"Name":"Windowed","Type":{"Kind":"ApiRef","Name":"BOOL","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":[]}
@@ -813,7 +782,7 @@
 				,"Platform":null
 				,"Attrs":[]
 				,"Params":[
-					{"Name":"pUsage","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"UInt32"}},"Attrs":["Out"]}
+					{"Name":"pUsage","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"DXGI_USAGE","TargetKind":"Default","Api":"Graphics.Dxgi","Parents":[]}},"Attrs":["Out"]}
 				]
 			}
 			,{
@@ -1409,7 +1378,7 @@
 				,"Params":[
 					{"Name":"pDesc","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"DXGI_SURFACE_DESC","TargetKind":"Default","Api":"Graphics.Dxgi","Parents":[]}},"Attrs":["In","Const"]}
 					,{"Name":"NumSurfaces","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":["In"]}
-					,{"Name":"Usage","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":["In"]}
+					,{"Name":"Usage","Type":{"Kind":"ApiRef","Name":"DXGI_USAGE","TargetKind":"Default","Api":"Graphics.Dxgi","Parents":[]},"Attrs":["In"]}
 					,{"Name":"pSharedResource","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"DXGI_SHARED_RESOURCE","TargetKind":"Default","Api":"Graphics.Dxgi","Parents":[]}},"Attrs":["In","Optional","Const"]}
 					,{"Name":"ppSurface","Type":{"Kind":"LPArray","NullNullTerm":false,"CountConst":-1,"CountParamIndex":1,"Child":{"Kind":"ApiRef","Name":"IDXGISurface","TargetKind":"Com","Api":"Graphics.Dxgi","Parents":[]}},"Attrs":["Out"]}
 				]
@@ -2006,7 +1975,7 @@
 			,{"Name":"Format","Type":{"Kind":"ApiRef","Name":"DXGI_FORMAT","TargetKind":"Default","Api":"Graphics.Dxgi.Common","Parents":[]},"Attrs":[]}
 			,{"Name":"Stereo","Type":{"Kind":"ApiRef","Name":"BOOL","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":[]}
 			,{"Name":"SampleDesc","Type":{"Kind":"ApiRef","Name":"DXGI_SAMPLE_DESC","TargetKind":"Default","Api":"Graphics.Dxgi.Common","Parents":[]},"Attrs":[]}
-			,{"Name":"BufferUsage","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":[]}
+			,{"Name":"BufferUsage","Type":{"Kind":"ApiRef","Name":"DXGI_USAGE","TargetKind":"Default","Api":"Graphics.Dxgi","Parents":[]},"Attrs":[]}
 			,{"Name":"BufferCount","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":[]}
 			,{"Name":"Scaling","Type":{"Kind":"ApiRef","Name":"DXGI_SCALING","TargetKind":"Default","Api":"Graphics.Dxgi","Parents":[]},"Attrs":[]}
 			,{"Name":"SwapEffect","Type":{"Kind":"ApiRef","Name":"DXGI_SWAP_EFFECT","TargetKind":"Default","Api":"Graphics.Dxgi","Parents":[]},"Attrs":[]}
diff --git a/src/Generator/win32json/api/Graphics.Imaging.json b/src/Generator/win32json/api/Graphics.Imaging.json
index 58f8ecf..d9cc104 100644
--- a/src/Generator/win32json/api/Graphics.Imaging.json
+++ b/src/Generator/win32json/api/Graphics.Imaging.json
@@ -5029,7 +5029,7 @@
 				,"Attrs":[]
 				,"Params":[
 					{"Name":"wzFilename","Type":{"Kind":"ApiRef","Name":"PWSTR","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In","Const"]}
-					,{"Name":"pguidVendor","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Guid"}},"Attrs":["In","Const"]}
+					,{"Name":"pguidVendor","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Guid"}},"Attrs":["In","Optional","Const"]}
 					,{"Name":"dwDesiredAccess","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":["In"]}
 					,{"Name":"metadataOptions","Type":{"Kind":"ApiRef","Name":"WICDecodeOptions","TargetKind":"Default","Api":"Graphics.Imaging","Parents":[]},"Attrs":["In"]}
 					,{"Name":"ppIDecoder","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IWICBitmapDecoder","TargetKind":"Com","Api":"Graphics.Imaging","Parents":[]}},"Attrs":["Out","RetVal"]}
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ComputeInfo.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ComputeInfo.cs
index 2fb9ecd..0cd2046 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ComputeInfo.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ComputeInfo.cs
@@ -77,9 +77,9 @@ public unsafe partial struct ID2D1ComputeInfo : INativeGuid
 	/// <inheritdoc cref="ID2D1RenderInfo.SetInputDescription" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(3)]
-	public HResult SetInputDescription(uint inputIndex, InputDescription* inputDescription)
+	public HResult SetInputDescription(uint inputIndex, InputDescription inputDescription)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1ComputeInfo*, uint, InputDescription*, int>)(lpVtbl[3]))((ID2D1ComputeInfo*)Unsafe.AsPointer(ref this), inputIndex, inputDescription);
+		return ((delegate* unmanaged[Stdcall]<ID2D1ComputeInfo*, uint, InputDescription, int>)(lpVtbl[3]))((ID2D1ComputeInfo*)Unsafe.AsPointer(ref this), inputIndex, inputDescription);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderInfo.SetOutputBuffer" />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ComputeTransform.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ComputeTransform.cs
index 94c8dca..838a1c3 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ComputeTransform.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ComputeTransform.cs
@@ -101,9 +101,9 @@ public unsafe partial struct ID2D1ComputeTransform : INativeGuid
 	/// <inheritdoc cref="ID2D1Transform.MapInvalidRect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(6)]
-	public HResult MapInvalidRect(uint inputIndex, RawRect* invalidInputRect, RawRect* invalidOutputRect)
+	public HResult MapInvalidRect(uint inputIndex, RawRect invalidInputRect, RawRect* invalidOutputRect)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1ComputeTransform*, uint, RawRect*, RawRect*, int>)(lpVtbl[6]))((ID2D1ComputeTransform*)Unsafe.AsPointer(ref this), inputIndex, invalidInputRect, invalidOutputRect);
+		return ((delegate* unmanaged[Stdcall]<ID2D1ComputeTransform*, uint, RawRect, RawRect*, int>)(lpVtbl[6]))((ID2D1ComputeTransform*)Unsafe.AsPointer(ref this), inputIndex, invalidInputRect, invalidOutputRect);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1ComputeTransform::SetComputeInfo"]/*' />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DrawInfo.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DrawInfo.cs
index 3ca93e1..5ebca61 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DrawInfo.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DrawInfo.cs
@@ -77,9 +77,9 @@ public unsafe partial struct ID2D1DrawInfo : INativeGuid
 	/// <inheritdoc cref="ID2D1RenderInfo.SetInputDescription" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(3)]
-	public HResult SetInputDescription(uint inputIndex, InputDescription* inputDescription)
+	public HResult SetInputDescription(uint inputIndex, InputDescription inputDescription)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DrawInfo*, uint, InputDescription*, int>)(lpVtbl[3]))((ID2D1DrawInfo*)Unsafe.AsPointer(ref this), inputIndex, inputDescription);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DrawInfo*, uint, InputDescription, int>)(lpVtbl[3]))((ID2D1DrawInfo*)Unsafe.AsPointer(ref this), inputIndex, inputDescription);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderInfo.SetOutputBuffer" />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DrawTransform.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DrawTransform.cs
index cd56bb5..7d5756c 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DrawTransform.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DrawTransform.cs
@@ -101,9 +101,9 @@ public unsafe partial struct ID2D1DrawTransform : INativeGuid
 	/// <inheritdoc cref="ID2D1Transform.MapInvalidRect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(6)]
-	public HResult MapInvalidRect(uint inputIndex, RawRect* invalidInputRect, RawRect* invalidOutputRect)
+	public HResult MapInvalidRect(uint inputIndex, RawRect invalidInputRect, RawRect* invalidOutputRect)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DrawTransform*, uint, RawRect*, RawRect*, int>)(lpVtbl[6]))((ID2D1DrawTransform*)Unsafe.AsPointer(ref this), inputIndex, invalidInputRect, invalidOutputRect);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DrawTransform*, uint, RawRect, RawRect*, int>)(lpVtbl[6]))((ID2D1DrawTransform*)Unsafe.AsPointer(ref this), inputIndex, invalidInputRect, invalidOutputRect);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1DrawTransform::SetDrawInfo"]/*' />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RenderInfo.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RenderInfo.cs
index 09674ea..ee65e76 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RenderInfo.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RenderInfo.cs
@@ -77,9 +77,9 @@ public unsafe partial struct ID2D1RenderInfo : INativeGuid
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1RenderInfo::SetInputDescription"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(3)]
-	public HResult SetInputDescription(uint inputIndex, InputDescription* inputDescription)
+	public HResult SetInputDescription(uint inputIndex, InputDescription inputDescription)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1RenderInfo*, uint, InputDescription*, int>)(lpVtbl[3]))((ID2D1RenderInfo*)Unsafe.AsPointer(ref this), inputIndex, inputDescription);
+		return ((delegate* unmanaged[Stdcall]<ID2D1RenderInfo*, uint, InputDescription, int>)(lpVtbl[3]))((ID2D1RenderInfo*)Unsafe.AsPointer(ref this), inputIndex, inputDescription);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1RenderInfo::SetOutputBuffer"]/*' />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SourceTransform.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SourceTransform.cs
index f76fcd9..89c368a 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SourceTransform.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SourceTransform.cs
@@ -101,9 +101,9 @@ public unsafe partial struct ID2D1SourceTransform : INativeGuid
 	/// <inheritdoc cref="ID2D1Transform.MapInvalidRect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(6)]
-	public HResult MapInvalidRect(uint inputIndex, RawRect* invalidInputRect, RawRect* invalidOutputRect)
+	public HResult MapInvalidRect(uint inputIndex, RawRect invalidInputRect, RawRect* invalidOutputRect)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1SourceTransform*, uint, RawRect*, RawRect*, int>)(lpVtbl[6]))((ID2D1SourceTransform*)Unsafe.AsPointer(ref this), inputIndex, invalidInputRect, invalidOutputRect);
+		return ((delegate* unmanaged[Stdcall]<ID2D1SourceTransform*, uint, RawRect, RawRect*, int>)(lpVtbl[6]))((ID2D1SourceTransform*)Unsafe.AsPointer(ref this), inputIndex, invalidInputRect, invalidOutputRect);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1SourceTransform::SetRenderInfo"]/*' />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Transform.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Transform.cs
index f04f749..89720c8 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Transform.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Transform.cs
@@ -101,9 +101,9 @@ public unsafe partial struct ID2D1Transform : INativeGuid
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1Transform::MapInvalidRect"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(6)]
-	public HResult MapInvalidRect(uint inputIndex, RawRect* invalidInputRect, RawRect* invalidOutputRect)
+	public HResult MapInvalidRect(uint inputIndex, RawRect invalidInputRect, RawRect* invalidOutputRect)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1Transform*, uint, RawRect*, RawRect*, int>)(lpVtbl[6]))((ID2D1Transform*)Unsafe.AsPointer(ref this), inputIndex, invalidInputRect, invalidOutputRect);
+		return ((delegate* unmanaged[Stdcall]<ID2D1Transform*, uint, RawRect, RawRect*, int>)(lpVtbl[6]))((ID2D1Transform*)Unsafe.AsPointer(ref this), inputIndex, invalidInputRect, invalidOutputRect);
 	}
 }
 
diff --git a/src/Vortice.Win32.Graphics.Direct3D11/Generated/Graphics.Direct3D11.Enums.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Graphics.Direct3D11.Enums.cs
index e9c513d..17a5b14 100644
--- a/src/Vortice.Win32.Graphics.Direct3D11/Generated/Graphics.Direct3D11.Enums.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D11/Generated/Graphics.Direct3D11.Enums.cs
@@ -337,7 +337,7 @@ public enum RaiseFlags : int
 /// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_CLEAR_FLAG"]/*' />
 /// <unmanaged>D3D11_CLEAR_FLAG</unmanaged>
 [Flags]
-public enum ClearFlags : int
+public enum ClearFlags : uint
 {
 	None = 0,
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="D3D11_CLEAR_FLAG::D3D11_CLEAR_DEPTH"]/*' />
diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device.cs
index a862ea1..730d866 100644
--- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device.cs
@@ -189,49 +189,49 @@ public unsafe partial struct ID3D12Device : INativeGuid
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="ID3D12Device::CreateConstantBufferView"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public void CreateConstantBufferView(ConstantBufferViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateConstantBufferView(ConstantBufferViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device*, ConstantBufferViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[17]))((ID3D12Device*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device*, ConstantBufferViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[17]))((ID3D12Device*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
 	}
 
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="ID3D12Device::CreateShaderResourceView"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(18)]
-	public void CreateShaderResourceView(ID3D12Resource* pResource, ShaderResourceViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateShaderResourceView(ID3D12Resource* pResource, ShaderResourceViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device*, ID3D12Resource*, ShaderResourceViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[18]))((ID3D12Device*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device*, ID3D12Resource*, ShaderResourceViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[18]))((ID3D12Device*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="ID3D12Device::CreateUnorderedAccessView"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public void CreateUnorderedAccessView(ID3D12Resource* pResource, ID3D12Resource* pCounterResource, UnorderedAccessViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateUnorderedAccessView(ID3D12Resource* pResource, ID3D12Resource* pCounterResource, UnorderedAccessViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device*, ID3D12Resource*, ID3D12Resource*, UnorderedAccessViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[19]))((ID3D12Device*)Unsafe.AsPointer(ref this), pResource, pCounterResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device*, ID3D12Resource*, ID3D12Resource*, UnorderedAccessViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[19]))((ID3D12Device*)Unsafe.AsPointer(ref this), pResource, pCounterResource, pDesc, DestDescriptor);
 	}
 
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="ID3D12Device::CreateRenderTargetView"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(20)]
-	public void CreateRenderTargetView(ID3D12Resource* pResource, RenderTargetViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateRenderTargetView(ID3D12Resource* pResource, RenderTargetViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device*, ID3D12Resource*, RenderTargetViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[20]))((ID3D12Device*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device*, ID3D12Resource*, RenderTargetViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[20]))((ID3D12Device*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="ID3D12Device::CreateDepthStencilView"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(21)]
-	public void CreateDepthStencilView(ID3D12Resource* pResource, DepthStencilViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateDepthStencilView(ID3D12Resource* pResource, DepthStencilViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device*, ID3D12Resource*, DepthStencilViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[21]))((ID3D12Device*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device*, ID3D12Resource*, DepthStencilViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[21]))((ID3D12Device*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="ID3D12Device::CreateSampler"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(22)]
-	public void CreateSampler(SamplerDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateSampler(SamplerDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device*, SamplerDescription*, CpuDescriptorHandle*, void>)(lpVtbl[22]))((ID3D12Device*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device*, SamplerDescription*, CpuDescriptorHandle, void>)(lpVtbl[22]))((ID3D12Device*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
 	}
 
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="ID3D12Device::CopyDescriptors"]/*' />
@@ -245,9 +245,9 @@ public unsafe partial struct ID3D12Device : INativeGuid
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="ID3D12Device::CopyDescriptorsSimple"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(24)]
-	public void CopyDescriptorsSimple(uint NumDescriptors, CpuDescriptorHandle* DestDescriptorRangeStart, CpuDescriptorHandle* SrcDescriptorRangeStart, DescriptorHeapType DescriptorHeapsType)
+	public void CopyDescriptorsSimple(uint NumDescriptors, CpuDescriptorHandle DestDescriptorRangeStart, CpuDescriptorHandle SrcDescriptorRangeStart, DescriptorHeapType DescriptorHeapsType)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device*, uint, CpuDescriptorHandle*, CpuDescriptorHandle*, DescriptorHeapType, void>)(lpVtbl[24]))((ID3D12Device*)Unsafe.AsPointer(ref this), NumDescriptors, DestDescriptorRangeStart, SrcDescriptorRangeStart, DescriptorHeapsType);
+		((delegate* unmanaged[Stdcall]<ID3D12Device*, uint, CpuDescriptorHandle, CpuDescriptorHandle, DescriptorHeapType, void>)(lpVtbl[24]))((ID3D12Device*)Unsafe.AsPointer(ref this), NumDescriptors, DestDescriptorRangeStart, SrcDescriptorRangeStart, DescriptorHeapsType);
 	}
 
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="ID3D12Device::GetResourceAllocationInfo"]/*' />
diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device1.cs
index b750656..4c6779b 100644
--- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device1.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device1.cs
@@ -189,49 +189,49 @@ public unsafe partial struct ID3D12Device1 : INativeGuid
 	/// <inheritdoc cref="ID3D12Device.CreateConstantBufferView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public void CreateConstantBufferView(ConstantBufferViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateConstantBufferView(ConstantBufferViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device1*, ConstantBufferViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[17]))((ID3D12Device1*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device1*, ConstantBufferViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[17]))((ID3D12Device1*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateShaderResourceView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(18)]
-	public void CreateShaderResourceView(ID3D12Resource* pResource, ShaderResourceViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateShaderResourceView(ID3D12Resource* pResource, ShaderResourceViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device1*, ID3D12Resource*, ShaderResourceViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[18]))((ID3D12Device1*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device1*, ID3D12Resource*, ShaderResourceViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[18]))((ID3D12Device1*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateUnorderedAccessView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public void CreateUnorderedAccessView(ID3D12Resource* pResource, ID3D12Resource* pCounterResource, UnorderedAccessViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateUnorderedAccessView(ID3D12Resource* pResource, ID3D12Resource* pCounterResource, UnorderedAccessViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device1*, ID3D12Resource*, ID3D12Resource*, UnorderedAccessViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[19]))((ID3D12Device1*)Unsafe.AsPointer(ref this), pResource, pCounterResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device1*, ID3D12Resource*, ID3D12Resource*, UnorderedAccessViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[19]))((ID3D12Device1*)Unsafe.AsPointer(ref this), pResource, pCounterResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateRenderTargetView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(20)]
-	public void CreateRenderTargetView(ID3D12Resource* pResource, RenderTargetViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateRenderTargetView(ID3D12Resource* pResource, RenderTargetViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device1*, ID3D12Resource*, RenderTargetViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[20]))((ID3D12Device1*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device1*, ID3D12Resource*, RenderTargetViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[20]))((ID3D12Device1*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateDepthStencilView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(21)]
-	public void CreateDepthStencilView(ID3D12Resource* pResource, DepthStencilViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateDepthStencilView(ID3D12Resource* pResource, DepthStencilViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device1*, ID3D12Resource*, DepthStencilViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[21]))((ID3D12Device1*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device1*, ID3D12Resource*, DepthStencilViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[21]))((ID3D12Device1*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateSampler" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(22)]
-	public void CreateSampler(SamplerDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateSampler(SamplerDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device1*, SamplerDescription*, CpuDescriptorHandle*, void>)(lpVtbl[22]))((ID3D12Device1*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device1*, SamplerDescription*, CpuDescriptorHandle, void>)(lpVtbl[22]))((ID3D12Device1*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CopyDescriptors" />
@@ -245,9 +245,9 @@ public unsafe partial struct ID3D12Device1 : INativeGuid
 	/// <inheritdoc cref="ID3D12Device.CopyDescriptorsSimple" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(24)]
-	public void CopyDescriptorsSimple(uint NumDescriptors, CpuDescriptorHandle* DestDescriptorRangeStart, CpuDescriptorHandle* SrcDescriptorRangeStart, DescriptorHeapType DescriptorHeapsType)
+	public void CopyDescriptorsSimple(uint NumDescriptors, CpuDescriptorHandle DestDescriptorRangeStart, CpuDescriptorHandle SrcDescriptorRangeStart, DescriptorHeapType DescriptorHeapsType)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device1*, uint, CpuDescriptorHandle*, CpuDescriptorHandle*, DescriptorHeapType, void>)(lpVtbl[24]))((ID3D12Device1*)Unsafe.AsPointer(ref this), NumDescriptors, DestDescriptorRangeStart, SrcDescriptorRangeStart, DescriptorHeapsType);
+		((delegate* unmanaged[Stdcall]<ID3D12Device1*, uint, CpuDescriptorHandle, CpuDescriptorHandle, DescriptorHeapType, void>)(lpVtbl[24]))((ID3D12Device1*)Unsafe.AsPointer(ref this), NumDescriptors, DestDescriptorRangeStart, SrcDescriptorRangeStart, DescriptorHeapsType);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.GetResourceAllocationInfo" />
diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device2.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device2.cs
index 44b6e65..0fbb9db 100644
--- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device2.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device2.cs
@@ -189,49 +189,49 @@ public unsafe partial struct ID3D12Device2 : INativeGuid
 	/// <inheritdoc cref="ID3D12Device.CreateConstantBufferView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public void CreateConstantBufferView(ConstantBufferViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateConstantBufferView(ConstantBufferViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device2*, ConstantBufferViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[17]))((ID3D12Device2*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device2*, ConstantBufferViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[17]))((ID3D12Device2*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateShaderResourceView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(18)]
-	public void CreateShaderResourceView(ID3D12Resource* pResource, ShaderResourceViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateShaderResourceView(ID3D12Resource* pResource, ShaderResourceViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device2*, ID3D12Resource*, ShaderResourceViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[18]))((ID3D12Device2*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device2*, ID3D12Resource*, ShaderResourceViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[18]))((ID3D12Device2*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateUnorderedAccessView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public void CreateUnorderedAccessView(ID3D12Resource* pResource, ID3D12Resource* pCounterResource, UnorderedAccessViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateUnorderedAccessView(ID3D12Resource* pResource, ID3D12Resource* pCounterResource, UnorderedAccessViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device2*, ID3D12Resource*, ID3D12Resource*, UnorderedAccessViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[19]))((ID3D12Device2*)Unsafe.AsPointer(ref this), pResource, pCounterResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device2*, ID3D12Resource*, ID3D12Resource*, UnorderedAccessViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[19]))((ID3D12Device2*)Unsafe.AsPointer(ref this), pResource, pCounterResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateRenderTargetView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(20)]
-	public void CreateRenderTargetView(ID3D12Resource* pResource, RenderTargetViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateRenderTargetView(ID3D12Resource* pResource, RenderTargetViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device2*, ID3D12Resource*, RenderTargetViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[20]))((ID3D12Device2*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device2*, ID3D12Resource*, RenderTargetViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[20]))((ID3D12Device2*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateDepthStencilView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(21)]
-	public void CreateDepthStencilView(ID3D12Resource* pResource, DepthStencilViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateDepthStencilView(ID3D12Resource* pResource, DepthStencilViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device2*, ID3D12Resource*, DepthStencilViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[21]))((ID3D12Device2*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device2*, ID3D12Resource*, DepthStencilViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[21]))((ID3D12Device2*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateSampler" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(22)]
-	public void CreateSampler(SamplerDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateSampler(SamplerDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device2*, SamplerDescription*, CpuDescriptorHandle*, void>)(lpVtbl[22]))((ID3D12Device2*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device2*, SamplerDescription*, CpuDescriptorHandle, void>)(lpVtbl[22]))((ID3D12Device2*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CopyDescriptors" />
@@ -245,9 +245,9 @@ public unsafe partial struct ID3D12Device2 : INativeGuid
 	/// <inheritdoc cref="ID3D12Device.CopyDescriptorsSimple" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(24)]
-	public void CopyDescriptorsSimple(uint NumDescriptors, CpuDescriptorHandle* DestDescriptorRangeStart, CpuDescriptorHandle* SrcDescriptorRangeStart, DescriptorHeapType DescriptorHeapsType)
+	public void CopyDescriptorsSimple(uint NumDescriptors, CpuDescriptorHandle DestDescriptorRangeStart, CpuDescriptorHandle SrcDescriptorRangeStart, DescriptorHeapType DescriptorHeapsType)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device2*, uint, CpuDescriptorHandle*, CpuDescriptorHandle*, DescriptorHeapType, void>)(lpVtbl[24]))((ID3D12Device2*)Unsafe.AsPointer(ref this), NumDescriptors, DestDescriptorRangeStart, SrcDescriptorRangeStart, DescriptorHeapsType);
+		((delegate* unmanaged[Stdcall]<ID3D12Device2*, uint, CpuDescriptorHandle, CpuDescriptorHandle, DescriptorHeapType, void>)(lpVtbl[24]))((ID3D12Device2*)Unsafe.AsPointer(ref this), NumDescriptors, DestDescriptorRangeStart, SrcDescriptorRangeStart, DescriptorHeapsType);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.GetResourceAllocationInfo" />
diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device3.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device3.cs
index 016945d..71d76f0 100644
--- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device3.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device3.cs
@@ -189,49 +189,49 @@ public unsafe partial struct ID3D12Device3 : INativeGuid
 	/// <inheritdoc cref="ID3D12Device.CreateConstantBufferView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public void CreateConstantBufferView(ConstantBufferViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateConstantBufferView(ConstantBufferViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device3*, ConstantBufferViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[17]))((ID3D12Device3*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device3*, ConstantBufferViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[17]))((ID3D12Device3*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateShaderResourceView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(18)]
-	public void CreateShaderResourceView(ID3D12Resource* pResource, ShaderResourceViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateShaderResourceView(ID3D12Resource* pResource, ShaderResourceViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device3*, ID3D12Resource*, ShaderResourceViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[18]))((ID3D12Device3*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device3*, ID3D12Resource*, ShaderResourceViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[18]))((ID3D12Device3*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateUnorderedAccessView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public void CreateUnorderedAccessView(ID3D12Resource* pResource, ID3D12Resource* pCounterResource, UnorderedAccessViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateUnorderedAccessView(ID3D12Resource* pResource, ID3D12Resource* pCounterResource, UnorderedAccessViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device3*, ID3D12Resource*, ID3D12Resource*, UnorderedAccessViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[19]))((ID3D12Device3*)Unsafe.AsPointer(ref this), pResource, pCounterResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device3*, ID3D12Resource*, ID3D12Resource*, UnorderedAccessViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[19]))((ID3D12Device3*)Unsafe.AsPointer(ref this), pResource, pCounterResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateRenderTargetView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(20)]
-	public void CreateRenderTargetView(ID3D12Resource* pResource, RenderTargetViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateRenderTargetView(ID3D12Resource* pResource, RenderTargetViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device3*, ID3D12Resource*, RenderTargetViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[20]))((ID3D12Device3*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device3*, ID3D12Resource*, RenderTargetViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[20]))((ID3D12Device3*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateDepthStencilView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(21)]
-	public void CreateDepthStencilView(ID3D12Resource* pResource, DepthStencilViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateDepthStencilView(ID3D12Resource* pResource, DepthStencilViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device3*, ID3D12Resource*, DepthStencilViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[21]))((ID3D12Device3*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device3*, ID3D12Resource*, DepthStencilViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[21]))((ID3D12Device3*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateSampler" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(22)]
-	public void CreateSampler(SamplerDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateSampler(SamplerDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device3*, SamplerDescription*, CpuDescriptorHandle*, void>)(lpVtbl[22]))((ID3D12Device3*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device3*, SamplerDescription*, CpuDescriptorHandle, void>)(lpVtbl[22]))((ID3D12Device3*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CopyDescriptors" />
@@ -245,9 +245,9 @@ public unsafe partial struct ID3D12Device3 : INativeGuid
 	/// <inheritdoc cref="ID3D12Device.CopyDescriptorsSimple" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(24)]
-	public void CopyDescriptorsSimple(uint NumDescriptors, CpuDescriptorHandle* DestDescriptorRangeStart, CpuDescriptorHandle* SrcDescriptorRangeStart, DescriptorHeapType DescriptorHeapsType)
+	public void CopyDescriptorsSimple(uint NumDescriptors, CpuDescriptorHandle DestDescriptorRangeStart, CpuDescriptorHandle SrcDescriptorRangeStart, DescriptorHeapType DescriptorHeapsType)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device3*, uint, CpuDescriptorHandle*, CpuDescriptorHandle*, DescriptorHeapType, void>)(lpVtbl[24]))((ID3D12Device3*)Unsafe.AsPointer(ref this), NumDescriptors, DestDescriptorRangeStart, SrcDescriptorRangeStart, DescriptorHeapsType);
+		((delegate* unmanaged[Stdcall]<ID3D12Device3*, uint, CpuDescriptorHandle, CpuDescriptorHandle, DescriptorHeapType, void>)(lpVtbl[24]))((ID3D12Device3*)Unsafe.AsPointer(ref this), NumDescriptors, DestDescriptorRangeStart, SrcDescriptorRangeStart, DescriptorHeapsType);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.GetResourceAllocationInfo" />
diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device4.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device4.cs
index f548efb..a0e8c79 100644
--- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device4.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device4.cs
@@ -189,49 +189,49 @@ public unsafe partial struct ID3D12Device4 : INativeGuid
 	/// <inheritdoc cref="ID3D12Device.CreateConstantBufferView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public void CreateConstantBufferView(ConstantBufferViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateConstantBufferView(ConstantBufferViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device4*, ConstantBufferViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[17]))((ID3D12Device4*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device4*, ConstantBufferViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[17]))((ID3D12Device4*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateShaderResourceView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(18)]
-	public void CreateShaderResourceView(ID3D12Resource* pResource, ShaderResourceViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateShaderResourceView(ID3D12Resource* pResource, ShaderResourceViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device4*, ID3D12Resource*, ShaderResourceViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[18]))((ID3D12Device4*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device4*, ID3D12Resource*, ShaderResourceViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[18]))((ID3D12Device4*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateUnorderedAccessView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public void CreateUnorderedAccessView(ID3D12Resource* pResource, ID3D12Resource* pCounterResource, UnorderedAccessViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateUnorderedAccessView(ID3D12Resource* pResource, ID3D12Resource* pCounterResource, UnorderedAccessViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device4*, ID3D12Resource*, ID3D12Resource*, UnorderedAccessViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[19]))((ID3D12Device4*)Unsafe.AsPointer(ref this), pResource, pCounterResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device4*, ID3D12Resource*, ID3D12Resource*, UnorderedAccessViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[19]))((ID3D12Device4*)Unsafe.AsPointer(ref this), pResource, pCounterResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateRenderTargetView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(20)]
-	public void CreateRenderTargetView(ID3D12Resource* pResource, RenderTargetViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateRenderTargetView(ID3D12Resource* pResource, RenderTargetViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device4*, ID3D12Resource*, RenderTargetViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[20]))((ID3D12Device4*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device4*, ID3D12Resource*, RenderTargetViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[20]))((ID3D12Device4*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateDepthStencilView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(21)]
-	public void CreateDepthStencilView(ID3D12Resource* pResource, DepthStencilViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateDepthStencilView(ID3D12Resource* pResource, DepthStencilViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device4*, ID3D12Resource*, DepthStencilViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[21]))((ID3D12Device4*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device4*, ID3D12Resource*, DepthStencilViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[21]))((ID3D12Device4*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateSampler" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(22)]
-	public void CreateSampler(SamplerDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateSampler(SamplerDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device4*, SamplerDescription*, CpuDescriptorHandle*, void>)(lpVtbl[22]))((ID3D12Device4*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device4*, SamplerDescription*, CpuDescriptorHandle, void>)(lpVtbl[22]))((ID3D12Device4*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CopyDescriptors" />
@@ -245,9 +245,9 @@ public unsafe partial struct ID3D12Device4 : INativeGuid
 	/// <inheritdoc cref="ID3D12Device.CopyDescriptorsSimple" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(24)]
-	public void CopyDescriptorsSimple(uint NumDescriptors, CpuDescriptorHandle* DestDescriptorRangeStart, CpuDescriptorHandle* SrcDescriptorRangeStart, DescriptorHeapType DescriptorHeapsType)
+	public void CopyDescriptorsSimple(uint NumDescriptors, CpuDescriptorHandle DestDescriptorRangeStart, CpuDescriptorHandle SrcDescriptorRangeStart, DescriptorHeapType DescriptorHeapsType)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device4*, uint, CpuDescriptorHandle*, CpuDescriptorHandle*, DescriptorHeapType, void>)(lpVtbl[24]))((ID3D12Device4*)Unsafe.AsPointer(ref this), NumDescriptors, DestDescriptorRangeStart, SrcDescriptorRangeStart, DescriptorHeapsType);
+		((delegate* unmanaged[Stdcall]<ID3D12Device4*, uint, CpuDescriptorHandle, CpuDescriptorHandle, DescriptorHeapType, void>)(lpVtbl[24]))((ID3D12Device4*)Unsafe.AsPointer(ref this), NumDescriptors, DestDescriptorRangeStart, SrcDescriptorRangeStart, DescriptorHeapsType);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.GetResourceAllocationInfo" />
diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device5.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device5.cs
index 2c53705..2850657 100644
--- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device5.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device5.cs
@@ -189,49 +189,49 @@ public unsafe partial struct ID3D12Device5 : INativeGuid
 	/// <inheritdoc cref="ID3D12Device.CreateConstantBufferView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public void CreateConstantBufferView(ConstantBufferViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateConstantBufferView(ConstantBufferViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device5*, ConstantBufferViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[17]))((ID3D12Device5*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device5*, ConstantBufferViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[17]))((ID3D12Device5*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateShaderResourceView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(18)]
-	public void CreateShaderResourceView(ID3D12Resource* pResource, ShaderResourceViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateShaderResourceView(ID3D12Resource* pResource, ShaderResourceViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device5*, ID3D12Resource*, ShaderResourceViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[18]))((ID3D12Device5*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device5*, ID3D12Resource*, ShaderResourceViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[18]))((ID3D12Device5*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateUnorderedAccessView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public void CreateUnorderedAccessView(ID3D12Resource* pResource, ID3D12Resource* pCounterResource, UnorderedAccessViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateUnorderedAccessView(ID3D12Resource* pResource, ID3D12Resource* pCounterResource, UnorderedAccessViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device5*, ID3D12Resource*, ID3D12Resource*, UnorderedAccessViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[19]))((ID3D12Device5*)Unsafe.AsPointer(ref this), pResource, pCounterResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device5*, ID3D12Resource*, ID3D12Resource*, UnorderedAccessViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[19]))((ID3D12Device5*)Unsafe.AsPointer(ref this), pResource, pCounterResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateRenderTargetView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(20)]
-	public void CreateRenderTargetView(ID3D12Resource* pResource, RenderTargetViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateRenderTargetView(ID3D12Resource* pResource, RenderTargetViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device5*, ID3D12Resource*, RenderTargetViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[20]))((ID3D12Device5*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device5*, ID3D12Resource*, RenderTargetViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[20]))((ID3D12Device5*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateDepthStencilView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(21)]
-	public void CreateDepthStencilView(ID3D12Resource* pResource, DepthStencilViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateDepthStencilView(ID3D12Resource* pResource, DepthStencilViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device5*, ID3D12Resource*, DepthStencilViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[21]))((ID3D12Device5*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device5*, ID3D12Resource*, DepthStencilViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[21]))((ID3D12Device5*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateSampler" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(22)]
-	public void CreateSampler(SamplerDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateSampler(SamplerDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device5*, SamplerDescription*, CpuDescriptorHandle*, void>)(lpVtbl[22]))((ID3D12Device5*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device5*, SamplerDescription*, CpuDescriptorHandle, void>)(lpVtbl[22]))((ID3D12Device5*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CopyDescriptors" />
@@ -245,9 +245,9 @@ public unsafe partial struct ID3D12Device5 : INativeGuid
 	/// <inheritdoc cref="ID3D12Device.CopyDescriptorsSimple" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(24)]
-	public void CopyDescriptorsSimple(uint NumDescriptors, CpuDescriptorHandle* DestDescriptorRangeStart, CpuDescriptorHandle* SrcDescriptorRangeStart, DescriptorHeapType DescriptorHeapsType)
+	public void CopyDescriptorsSimple(uint NumDescriptors, CpuDescriptorHandle DestDescriptorRangeStart, CpuDescriptorHandle SrcDescriptorRangeStart, DescriptorHeapType DescriptorHeapsType)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device5*, uint, CpuDescriptorHandle*, CpuDescriptorHandle*, DescriptorHeapType, void>)(lpVtbl[24]))((ID3D12Device5*)Unsafe.AsPointer(ref this), NumDescriptors, DestDescriptorRangeStart, SrcDescriptorRangeStart, DescriptorHeapsType);
+		((delegate* unmanaged[Stdcall]<ID3D12Device5*, uint, CpuDescriptorHandle, CpuDescriptorHandle, DescriptorHeapType, void>)(lpVtbl[24]))((ID3D12Device5*)Unsafe.AsPointer(ref this), NumDescriptors, DestDescriptorRangeStart, SrcDescriptorRangeStart, DescriptorHeapsType);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.GetResourceAllocationInfo" />
diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device6.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device6.cs
index fd25e80..b9892d4 100644
--- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device6.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device6.cs
@@ -189,49 +189,49 @@ public unsafe partial struct ID3D12Device6 : INativeGuid
 	/// <inheritdoc cref="ID3D12Device.CreateConstantBufferView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public void CreateConstantBufferView(ConstantBufferViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateConstantBufferView(ConstantBufferViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device6*, ConstantBufferViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[17]))((ID3D12Device6*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device6*, ConstantBufferViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[17]))((ID3D12Device6*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateShaderResourceView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(18)]
-	public void CreateShaderResourceView(ID3D12Resource* pResource, ShaderResourceViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateShaderResourceView(ID3D12Resource* pResource, ShaderResourceViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device6*, ID3D12Resource*, ShaderResourceViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[18]))((ID3D12Device6*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device6*, ID3D12Resource*, ShaderResourceViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[18]))((ID3D12Device6*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateUnorderedAccessView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public void CreateUnorderedAccessView(ID3D12Resource* pResource, ID3D12Resource* pCounterResource, UnorderedAccessViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateUnorderedAccessView(ID3D12Resource* pResource, ID3D12Resource* pCounterResource, UnorderedAccessViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device6*, ID3D12Resource*, ID3D12Resource*, UnorderedAccessViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[19]))((ID3D12Device6*)Unsafe.AsPointer(ref this), pResource, pCounterResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device6*, ID3D12Resource*, ID3D12Resource*, UnorderedAccessViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[19]))((ID3D12Device6*)Unsafe.AsPointer(ref this), pResource, pCounterResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateRenderTargetView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(20)]
-	public void CreateRenderTargetView(ID3D12Resource* pResource, RenderTargetViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateRenderTargetView(ID3D12Resource* pResource, RenderTargetViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device6*, ID3D12Resource*, RenderTargetViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[20]))((ID3D12Device6*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device6*, ID3D12Resource*, RenderTargetViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[20]))((ID3D12Device6*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateDepthStencilView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(21)]
-	public void CreateDepthStencilView(ID3D12Resource* pResource, DepthStencilViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateDepthStencilView(ID3D12Resource* pResource, DepthStencilViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device6*, ID3D12Resource*, DepthStencilViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[21]))((ID3D12Device6*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device6*, ID3D12Resource*, DepthStencilViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[21]))((ID3D12Device6*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateSampler" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(22)]
-	public void CreateSampler(SamplerDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateSampler(SamplerDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device6*, SamplerDescription*, CpuDescriptorHandle*, void>)(lpVtbl[22]))((ID3D12Device6*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device6*, SamplerDescription*, CpuDescriptorHandle, void>)(lpVtbl[22]))((ID3D12Device6*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CopyDescriptors" />
@@ -245,9 +245,9 @@ public unsafe partial struct ID3D12Device6 : INativeGuid
 	/// <inheritdoc cref="ID3D12Device.CopyDescriptorsSimple" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(24)]
-	public void CopyDescriptorsSimple(uint NumDescriptors, CpuDescriptorHandle* DestDescriptorRangeStart, CpuDescriptorHandle* SrcDescriptorRangeStart, DescriptorHeapType DescriptorHeapsType)
+	public void CopyDescriptorsSimple(uint NumDescriptors, CpuDescriptorHandle DestDescriptorRangeStart, CpuDescriptorHandle SrcDescriptorRangeStart, DescriptorHeapType DescriptorHeapsType)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device6*, uint, CpuDescriptorHandle*, CpuDescriptorHandle*, DescriptorHeapType, void>)(lpVtbl[24]))((ID3D12Device6*)Unsafe.AsPointer(ref this), NumDescriptors, DestDescriptorRangeStart, SrcDescriptorRangeStart, DescriptorHeapsType);
+		((delegate* unmanaged[Stdcall]<ID3D12Device6*, uint, CpuDescriptorHandle, CpuDescriptorHandle, DescriptorHeapType, void>)(lpVtbl[24]))((ID3D12Device6*)Unsafe.AsPointer(ref this), NumDescriptors, DestDescriptorRangeStart, SrcDescriptorRangeStart, DescriptorHeapsType);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.GetResourceAllocationInfo" />
diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device7.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device7.cs
index 647c3a6..060fe2d 100644
--- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device7.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device7.cs
@@ -189,49 +189,49 @@ public unsafe partial struct ID3D12Device7 : INativeGuid
 	/// <inheritdoc cref="ID3D12Device.CreateConstantBufferView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public void CreateConstantBufferView(ConstantBufferViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateConstantBufferView(ConstantBufferViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device7*, ConstantBufferViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[17]))((ID3D12Device7*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device7*, ConstantBufferViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[17]))((ID3D12Device7*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateShaderResourceView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(18)]
-	public void CreateShaderResourceView(ID3D12Resource* pResource, ShaderResourceViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateShaderResourceView(ID3D12Resource* pResource, ShaderResourceViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device7*, ID3D12Resource*, ShaderResourceViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[18]))((ID3D12Device7*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device7*, ID3D12Resource*, ShaderResourceViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[18]))((ID3D12Device7*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateUnorderedAccessView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public void CreateUnorderedAccessView(ID3D12Resource* pResource, ID3D12Resource* pCounterResource, UnorderedAccessViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateUnorderedAccessView(ID3D12Resource* pResource, ID3D12Resource* pCounterResource, UnorderedAccessViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device7*, ID3D12Resource*, ID3D12Resource*, UnorderedAccessViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[19]))((ID3D12Device7*)Unsafe.AsPointer(ref this), pResource, pCounterResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device7*, ID3D12Resource*, ID3D12Resource*, UnorderedAccessViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[19]))((ID3D12Device7*)Unsafe.AsPointer(ref this), pResource, pCounterResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateRenderTargetView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(20)]
-	public void CreateRenderTargetView(ID3D12Resource* pResource, RenderTargetViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateRenderTargetView(ID3D12Resource* pResource, RenderTargetViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device7*, ID3D12Resource*, RenderTargetViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[20]))((ID3D12Device7*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device7*, ID3D12Resource*, RenderTargetViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[20]))((ID3D12Device7*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateDepthStencilView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(21)]
-	public void CreateDepthStencilView(ID3D12Resource* pResource, DepthStencilViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateDepthStencilView(ID3D12Resource* pResource, DepthStencilViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device7*, ID3D12Resource*, DepthStencilViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[21]))((ID3D12Device7*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device7*, ID3D12Resource*, DepthStencilViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[21]))((ID3D12Device7*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateSampler" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(22)]
-	public void CreateSampler(SamplerDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateSampler(SamplerDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device7*, SamplerDescription*, CpuDescriptorHandle*, void>)(lpVtbl[22]))((ID3D12Device7*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device7*, SamplerDescription*, CpuDescriptorHandle, void>)(lpVtbl[22]))((ID3D12Device7*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CopyDescriptors" />
@@ -245,9 +245,9 @@ public unsafe partial struct ID3D12Device7 : INativeGuid
 	/// <inheritdoc cref="ID3D12Device.CopyDescriptorsSimple" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(24)]
-	public void CopyDescriptorsSimple(uint NumDescriptors, CpuDescriptorHandle* DestDescriptorRangeStart, CpuDescriptorHandle* SrcDescriptorRangeStart, DescriptorHeapType DescriptorHeapsType)
+	public void CopyDescriptorsSimple(uint NumDescriptors, CpuDescriptorHandle DestDescriptorRangeStart, CpuDescriptorHandle SrcDescriptorRangeStart, DescriptorHeapType DescriptorHeapsType)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device7*, uint, CpuDescriptorHandle*, CpuDescriptorHandle*, DescriptorHeapType, void>)(lpVtbl[24]))((ID3D12Device7*)Unsafe.AsPointer(ref this), NumDescriptors, DestDescriptorRangeStart, SrcDescriptorRangeStart, DescriptorHeapsType);
+		((delegate* unmanaged[Stdcall]<ID3D12Device7*, uint, CpuDescriptorHandle, CpuDescriptorHandle, DescriptorHeapType, void>)(lpVtbl[24]))((ID3D12Device7*)Unsafe.AsPointer(ref this), NumDescriptors, DestDescriptorRangeStart, SrcDescriptorRangeStart, DescriptorHeapsType);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.GetResourceAllocationInfo" />
diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device8.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device8.cs
index 9623e64..e2dea29 100644
--- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device8.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device8.cs
@@ -189,49 +189,49 @@ public unsafe partial struct ID3D12Device8 : INativeGuid
 	/// <inheritdoc cref="ID3D12Device.CreateConstantBufferView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public void CreateConstantBufferView(ConstantBufferViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateConstantBufferView(ConstantBufferViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device8*, ConstantBufferViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[17]))((ID3D12Device8*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device8*, ConstantBufferViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[17]))((ID3D12Device8*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateShaderResourceView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(18)]
-	public void CreateShaderResourceView(ID3D12Resource* pResource, ShaderResourceViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateShaderResourceView(ID3D12Resource* pResource, ShaderResourceViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device8*, ID3D12Resource*, ShaderResourceViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[18]))((ID3D12Device8*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device8*, ID3D12Resource*, ShaderResourceViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[18]))((ID3D12Device8*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateUnorderedAccessView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public void CreateUnorderedAccessView(ID3D12Resource* pResource, ID3D12Resource* pCounterResource, UnorderedAccessViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateUnorderedAccessView(ID3D12Resource* pResource, ID3D12Resource* pCounterResource, UnorderedAccessViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device8*, ID3D12Resource*, ID3D12Resource*, UnorderedAccessViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[19]))((ID3D12Device8*)Unsafe.AsPointer(ref this), pResource, pCounterResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device8*, ID3D12Resource*, ID3D12Resource*, UnorderedAccessViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[19]))((ID3D12Device8*)Unsafe.AsPointer(ref this), pResource, pCounterResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateRenderTargetView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(20)]
-	public void CreateRenderTargetView(ID3D12Resource* pResource, RenderTargetViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateRenderTargetView(ID3D12Resource* pResource, RenderTargetViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device8*, ID3D12Resource*, RenderTargetViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[20]))((ID3D12Device8*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device8*, ID3D12Resource*, RenderTargetViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[20]))((ID3D12Device8*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateDepthStencilView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(21)]
-	public void CreateDepthStencilView(ID3D12Resource* pResource, DepthStencilViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateDepthStencilView(ID3D12Resource* pResource, DepthStencilViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device8*, ID3D12Resource*, DepthStencilViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[21]))((ID3D12Device8*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device8*, ID3D12Resource*, DepthStencilViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[21]))((ID3D12Device8*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateSampler" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(22)]
-	public void CreateSampler(SamplerDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateSampler(SamplerDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device8*, SamplerDescription*, CpuDescriptorHandle*, void>)(lpVtbl[22]))((ID3D12Device8*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device8*, SamplerDescription*, CpuDescriptorHandle, void>)(lpVtbl[22]))((ID3D12Device8*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CopyDescriptors" />
@@ -245,9 +245,9 @@ public unsafe partial struct ID3D12Device8 : INativeGuid
 	/// <inheritdoc cref="ID3D12Device.CopyDescriptorsSimple" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(24)]
-	public void CopyDescriptorsSimple(uint NumDescriptors, CpuDescriptorHandle* DestDescriptorRangeStart, CpuDescriptorHandle* SrcDescriptorRangeStart, DescriptorHeapType DescriptorHeapsType)
+	public void CopyDescriptorsSimple(uint NumDescriptors, CpuDescriptorHandle DestDescriptorRangeStart, CpuDescriptorHandle SrcDescriptorRangeStart, DescriptorHeapType DescriptorHeapsType)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device8*, uint, CpuDescriptorHandle*, CpuDescriptorHandle*, DescriptorHeapType, void>)(lpVtbl[24]))((ID3D12Device8*)Unsafe.AsPointer(ref this), NumDescriptors, DestDescriptorRangeStart, SrcDescriptorRangeStart, DescriptorHeapsType);
+		((delegate* unmanaged[Stdcall]<ID3D12Device8*, uint, CpuDescriptorHandle, CpuDescriptorHandle, DescriptorHeapType, void>)(lpVtbl[24]))((ID3D12Device8*)Unsafe.AsPointer(ref this), NumDescriptors, DestDescriptorRangeStart, SrcDescriptorRangeStart, DescriptorHeapsType);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.GetResourceAllocationInfo" />
@@ -626,9 +626,9 @@ public unsafe partial struct ID3D12Device8 : INativeGuid
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="ID3D12Device8::CreateSamplerFeedbackUnorderedAccessView"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(71)]
-	public void CreateSamplerFeedbackUnorderedAccessView(ID3D12Resource* pTargetedResource, ID3D12Resource* pFeedbackResource, CpuDescriptorHandle* DestDescriptor)
+	public void CreateSamplerFeedbackUnorderedAccessView(ID3D12Resource* pTargetedResource, ID3D12Resource* pFeedbackResource, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device8*, ID3D12Resource*, ID3D12Resource*, CpuDescriptorHandle*, void>)(lpVtbl[71]))((ID3D12Device8*)Unsafe.AsPointer(ref this), pTargetedResource, pFeedbackResource, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device8*, ID3D12Resource*, ID3D12Resource*, CpuDescriptorHandle, void>)(lpVtbl[71]))((ID3D12Device8*)Unsafe.AsPointer(ref this), pTargetedResource, pFeedbackResource, DestDescriptor);
 	}
 
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="ID3D12Device8::GetCopyableFootprints1"]/*' />
diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device9.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device9.cs
index 089c028..7091547 100644
--- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device9.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12Device9.cs
@@ -189,49 +189,49 @@ public unsafe partial struct ID3D12Device9 : INativeGuid
 	/// <inheritdoc cref="ID3D12Device.CreateConstantBufferView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public void CreateConstantBufferView(ConstantBufferViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateConstantBufferView(ConstantBufferViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device9*, ConstantBufferViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[17]))((ID3D12Device9*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device9*, ConstantBufferViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[17]))((ID3D12Device9*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateShaderResourceView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(18)]
-	public void CreateShaderResourceView(ID3D12Resource* pResource, ShaderResourceViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateShaderResourceView(ID3D12Resource* pResource, ShaderResourceViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device9*, ID3D12Resource*, ShaderResourceViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[18]))((ID3D12Device9*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device9*, ID3D12Resource*, ShaderResourceViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[18]))((ID3D12Device9*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateUnorderedAccessView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(19)]
-	public void CreateUnorderedAccessView(ID3D12Resource* pResource, ID3D12Resource* pCounterResource, UnorderedAccessViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateUnorderedAccessView(ID3D12Resource* pResource, ID3D12Resource* pCounterResource, UnorderedAccessViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device9*, ID3D12Resource*, ID3D12Resource*, UnorderedAccessViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[19]))((ID3D12Device9*)Unsafe.AsPointer(ref this), pResource, pCounterResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device9*, ID3D12Resource*, ID3D12Resource*, UnorderedAccessViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[19]))((ID3D12Device9*)Unsafe.AsPointer(ref this), pResource, pCounterResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateRenderTargetView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(20)]
-	public void CreateRenderTargetView(ID3D12Resource* pResource, RenderTargetViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateRenderTargetView(ID3D12Resource* pResource, RenderTargetViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device9*, ID3D12Resource*, RenderTargetViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[20]))((ID3D12Device9*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device9*, ID3D12Resource*, RenderTargetViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[20]))((ID3D12Device9*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateDepthStencilView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(21)]
-	public void CreateDepthStencilView(ID3D12Resource* pResource, DepthStencilViewDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateDepthStencilView(ID3D12Resource* pResource, DepthStencilViewDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device9*, ID3D12Resource*, DepthStencilViewDescription*, CpuDescriptorHandle*, void>)(lpVtbl[21]))((ID3D12Device9*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device9*, ID3D12Resource*, DepthStencilViewDescription*, CpuDescriptorHandle, void>)(lpVtbl[21]))((ID3D12Device9*)Unsafe.AsPointer(ref this), pResource, pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CreateSampler" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(22)]
-	public void CreateSampler(SamplerDescription* pDesc, CpuDescriptorHandle* DestDescriptor)
+	public void CreateSampler(SamplerDescription* pDesc, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device9*, SamplerDescription*, CpuDescriptorHandle*, void>)(lpVtbl[22]))((ID3D12Device9*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device9*, SamplerDescription*, CpuDescriptorHandle, void>)(lpVtbl[22]))((ID3D12Device9*)Unsafe.AsPointer(ref this), pDesc, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.CopyDescriptors" />
@@ -245,9 +245,9 @@ public unsafe partial struct ID3D12Device9 : INativeGuid
 	/// <inheritdoc cref="ID3D12Device.CopyDescriptorsSimple" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(24)]
-	public void CopyDescriptorsSimple(uint NumDescriptors, CpuDescriptorHandle* DestDescriptorRangeStart, CpuDescriptorHandle* SrcDescriptorRangeStart, DescriptorHeapType DescriptorHeapsType)
+	public void CopyDescriptorsSimple(uint NumDescriptors, CpuDescriptorHandle DestDescriptorRangeStart, CpuDescriptorHandle SrcDescriptorRangeStart, DescriptorHeapType DescriptorHeapsType)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device9*, uint, CpuDescriptorHandle*, CpuDescriptorHandle*, DescriptorHeapType, void>)(lpVtbl[24]))((ID3D12Device9*)Unsafe.AsPointer(ref this), NumDescriptors, DestDescriptorRangeStart, SrcDescriptorRangeStart, DescriptorHeapsType);
+		((delegate* unmanaged[Stdcall]<ID3D12Device9*, uint, CpuDescriptorHandle, CpuDescriptorHandle, DescriptorHeapType, void>)(lpVtbl[24]))((ID3D12Device9*)Unsafe.AsPointer(ref this), NumDescriptors, DestDescriptorRangeStart, SrcDescriptorRangeStart, DescriptorHeapsType);
 	}
 
 	/// <inheritdoc cref="ID3D12Device.GetResourceAllocationInfo" />
@@ -626,9 +626,9 @@ public unsafe partial struct ID3D12Device9 : INativeGuid
 	/// <inheritdoc cref="ID3D12Device8.CreateSamplerFeedbackUnorderedAccessView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(71)]
-	public void CreateSamplerFeedbackUnorderedAccessView(ID3D12Resource* pTargetedResource, ID3D12Resource* pFeedbackResource, CpuDescriptorHandle* DestDescriptor)
+	public void CreateSamplerFeedbackUnorderedAccessView(ID3D12Resource* pTargetedResource, ID3D12Resource* pFeedbackResource, CpuDescriptorHandle DestDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12Device9*, ID3D12Resource*, ID3D12Resource*, CpuDescriptorHandle*, void>)(lpVtbl[71]))((ID3D12Device9*)Unsafe.AsPointer(ref this), pTargetedResource, pFeedbackResource, DestDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12Device9*, ID3D12Resource*, ID3D12Resource*, CpuDescriptorHandle, void>)(lpVtbl[71]))((ID3D12Device9*)Unsafe.AsPointer(ref this), pTargetedResource, pFeedbackResource, DestDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12Device8.GetCopyableFootprints1" />
diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList.cs
index 5e42ac9..c335dd9 100644
--- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList.cs
@@ -301,17 +301,17 @@ public unsafe partial struct ID3D12GraphicsCommandList : INativeGuid
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="ID3D12GraphicsCommandList::SetComputeRootDescriptorTable"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public void SetComputeRootDescriptorTable(uint RootParameterIndex, GpuDescriptorHandle* BaseDescriptor)
+	public void SetComputeRootDescriptorTable(uint RootParameterIndex, GpuDescriptorHandle BaseDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList*, uint, GpuDescriptorHandle*, void>)(lpVtbl[31]))((ID3D12GraphicsCommandList*)Unsafe.AsPointer(ref this), RootParameterIndex, BaseDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList*, uint, GpuDescriptorHandle, void>)(lpVtbl[31]))((ID3D12GraphicsCommandList*)Unsafe.AsPointer(ref this), RootParameterIndex, BaseDescriptor);
 	}
 
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="ID3D12GraphicsCommandList::SetGraphicsRootDescriptorTable"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(32)]
-	public void SetGraphicsRootDescriptorTable(uint RootParameterIndex, GpuDescriptorHandle* BaseDescriptor)
+	public void SetGraphicsRootDescriptorTable(uint RootParameterIndex, GpuDescriptorHandle BaseDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList*, uint, GpuDescriptorHandle*, void>)(lpVtbl[32]))((ID3D12GraphicsCommandList*)Unsafe.AsPointer(ref this), RootParameterIndex, BaseDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList*, uint, GpuDescriptorHandle, void>)(lpVtbl[32]))((ID3D12GraphicsCommandList*)Unsafe.AsPointer(ref this), RootParameterIndex, BaseDescriptor);
 	}
 
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="ID3D12GraphicsCommandList::SetComputeRoot32BitConstant"]/*' />
@@ -429,33 +429,33 @@ public unsafe partial struct ID3D12GraphicsCommandList : INativeGuid
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="ID3D12GraphicsCommandList::ClearDepthStencilView"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(47)]
-	public void ClearDepthStencilView(CpuDescriptorHandle* DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, RawRect* pRects)
+	public void ClearDepthStencilView(CpuDescriptorHandle DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, RawRect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList*, CpuDescriptorHandle*, ClearFlags, float, byte, uint, RawRect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList*, CpuDescriptorHandle, ClearFlags, float, byte, uint, RawRect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
 	}
 
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="ID3D12GraphicsCommandList::ClearRenderTargetView"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(48)]
-	public void ClearRenderTargetView(CpuDescriptorHandle* RenderTargetView, float* ColorRGBA, uint NumRects, RawRect* pRects)
+	public void ClearRenderTargetView(CpuDescriptorHandle RenderTargetView, float* ColorRGBA, uint NumRects, RawRect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList*, CpuDescriptorHandle*, float*, uint, RawRect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList*, CpuDescriptorHandle, float*, uint, RawRect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
 	}
 
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="ID3D12GraphicsCommandList::ClearUnorderedAccessViewUint"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(49)]
-	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle* ViewGPUHandleInCurrentHeap, CpuDescriptorHandle* ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, RawRect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList*, GpuDescriptorHandle*, CpuDescriptorHandle*, ID3D12Resource*, uint*, uint, RawRect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, uint*, uint, RawRect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="ID3D12GraphicsCommandList::ClearUnorderedAccessViewFloat"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(50)]
-	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle* ViewGPUHandleInCurrentHeap, CpuDescriptorHandle* ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, RawRect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList*, GpuDescriptorHandle*, CpuDescriptorHandle*, ID3D12Resource*, float*, uint, RawRect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, float*, uint, RawRect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="ID3D12GraphicsCommandList::DiscardResource"]/*' />
diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList1.cs
index 1cabc4f..20cff2e 100644
--- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList1.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList1.cs
@@ -301,17 +301,17 @@ public unsafe partial struct ID3D12GraphicsCommandList1 : INativeGuid
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.SetComputeRootDescriptorTable" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public void SetComputeRootDescriptorTable(uint RootParameterIndex, GpuDescriptorHandle* BaseDescriptor)
+	public void SetComputeRootDescriptorTable(uint RootParameterIndex, GpuDescriptorHandle BaseDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList1*, uint, GpuDescriptorHandle*, void>)(lpVtbl[31]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), RootParameterIndex, BaseDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList1*, uint, GpuDescriptorHandle, void>)(lpVtbl[31]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), RootParameterIndex, BaseDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.SetGraphicsRootDescriptorTable" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(32)]
-	public void SetGraphicsRootDescriptorTable(uint RootParameterIndex, GpuDescriptorHandle* BaseDescriptor)
+	public void SetGraphicsRootDescriptorTable(uint RootParameterIndex, GpuDescriptorHandle BaseDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList1*, uint, GpuDescriptorHandle*, void>)(lpVtbl[32]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), RootParameterIndex, BaseDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList1*, uint, GpuDescriptorHandle, void>)(lpVtbl[32]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), RootParameterIndex, BaseDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.SetComputeRoot32BitConstant" />
@@ -429,33 +429,33 @@ public unsafe partial struct ID3D12GraphicsCommandList1 : INativeGuid
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearDepthStencilView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(47)]
-	public void ClearDepthStencilView(CpuDescriptorHandle* DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, RawRect* pRects)
+	public void ClearDepthStencilView(CpuDescriptorHandle DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, RawRect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList1*, CpuDescriptorHandle*, ClearFlags, float, byte, uint, RawRect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList1*, CpuDescriptorHandle, ClearFlags, float, byte, uint, RawRect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearRenderTargetView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(48)]
-	public void ClearRenderTargetView(CpuDescriptorHandle* RenderTargetView, float* ColorRGBA, uint NumRects, RawRect* pRects)
+	public void ClearRenderTargetView(CpuDescriptorHandle RenderTargetView, float* ColorRGBA, uint NumRects, RawRect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList1*, CpuDescriptorHandle*, float*, uint, RawRect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList1*, CpuDescriptorHandle, float*, uint, RawRect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearUnorderedAccessViewUint" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(49)]
-	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle* ViewGPUHandleInCurrentHeap, CpuDescriptorHandle* ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, RawRect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList1*, GpuDescriptorHandle*, CpuDescriptorHandle*, ID3D12Resource*, uint*, uint, RawRect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList1*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, uint*, uint, RawRect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearUnorderedAccessViewFloat" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(50)]
-	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle* ViewGPUHandleInCurrentHeap, CpuDescriptorHandle* ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, RawRect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList1*, GpuDescriptorHandle*, CpuDescriptorHandle*, ID3D12Resource*, float*, uint, RawRect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList1*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, float*, uint, RawRect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.DiscardResource" />
diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList2.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList2.cs
index eb13a7f..3237f48 100644
--- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList2.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList2.cs
@@ -301,17 +301,17 @@ public unsafe partial struct ID3D12GraphicsCommandList2 : INativeGuid
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.SetComputeRootDescriptorTable" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public void SetComputeRootDescriptorTable(uint RootParameterIndex, GpuDescriptorHandle* BaseDescriptor)
+	public void SetComputeRootDescriptorTable(uint RootParameterIndex, GpuDescriptorHandle BaseDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList2*, uint, GpuDescriptorHandle*, void>)(lpVtbl[31]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), RootParameterIndex, BaseDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList2*, uint, GpuDescriptorHandle, void>)(lpVtbl[31]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), RootParameterIndex, BaseDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.SetGraphicsRootDescriptorTable" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(32)]
-	public void SetGraphicsRootDescriptorTable(uint RootParameterIndex, GpuDescriptorHandle* BaseDescriptor)
+	public void SetGraphicsRootDescriptorTable(uint RootParameterIndex, GpuDescriptorHandle BaseDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList2*, uint, GpuDescriptorHandle*, void>)(lpVtbl[32]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), RootParameterIndex, BaseDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList2*, uint, GpuDescriptorHandle, void>)(lpVtbl[32]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), RootParameterIndex, BaseDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.SetComputeRoot32BitConstant" />
@@ -429,33 +429,33 @@ public unsafe partial struct ID3D12GraphicsCommandList2 : INativeGuid
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearDepthStencilView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(47)]
-	public void ClearDepthStencilView(CpuDescriptorHandle* DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, RawRect* pRects)
+	public void ClearDepthStencilView(CpuDescriptorHandle DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, RawRect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList2*, CpuDescriptorHandle*, ClearFlags, float, byte, uint, RawRect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList2*, CpuDescriptorHandle, ClearFlags, float, byte, uint, RawRect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearRenderTargetView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(48)]
-	public void ClearRenderTargetView(CpuDescriptorHandle* RenderTargetView, float* ColorRGBA, uint NumRects, RawRect* pRects)
+	public void ClearRenderTargetView(CpuDescriptorHandle RenderTargetView, float* ColorRGBA, uint NumRects, RawRect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList2*, CpuDescriptorHandle*, float*, uint, RawRect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList2*, CpuDescriptorHandle, float*, uint, RawRect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearUnorderedAccessViewUint" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(49)]
-	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle* ViewGPUHandleInCurrentHeap, CpuDescriptorHandle* ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, RawRect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList2*, GpuDescriptorHandle*, CpuDescriptorHandle*, ID3D12Resource*, uint*, uint, RawRect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList2*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, uint*, uint, RawRect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearUnorderedAccessViewFloat" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(50)]
-	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle* ViewGPUHandleInCurrentHeap, CpuDescriptorHandle* ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, RawRect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList2*, GpuDescriptorHandle*, CpuDescriptorHandle*, ID3D12Resource*, float*, uint, RawRect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList2*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, float*, uint, RawRect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.DiscardResource" />
diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList3.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList3.cs
index aa86822..66cc0f4 100644
--- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList3.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList3.cs
@@ -301,17 +301,17 @@ public unsafe partial struct ID3D12GraphicsCommandList3 : INativeGuid
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.SetComputeRootDescriptorTable" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public void SetComputeRootDescriptorTable(uint RootParameterIndex, GpuDescriptorHandle* BaseDescriptor)
+	public void SetComputeRootDescriptorTable(uint RootParameterIndex, GpuDescriptorHandle BaseDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList3*, uint, GpuDescriptorHandle*, void>)(lpVtbl[31]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), RootParameterIndex, BaseDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList3*, uint, GpuDescriptorHandle, void>)(lpVtbl[31]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), RootParameterIndex, BaseDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.SetGraphicsRootDescriptorTable" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(32)]
-	public void SetGraphicsRootDescriptorTable(uint RootParameterIndex, GpuDescriptorHandle* BaseDescriptor)
+	public void SetGraphicsRootDescriptorTable(uint RootParameterIndex, GpuDescriptorHandle BaseDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList3*, uint, GpuDescriptorHandle*, void>)(lpVtbl[32]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), RootParameterIndex, BaseDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList3*, uint, GpuDescriptorHandle, void>)(lpVtbl[32]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), RootParameterIndex, BaseDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.SetComputeRoot32BitConstant" />
@@ -429,33 +429,33 @@ public unsafe partial struct ID3D12GraphicsCommandList3 : INativeGuid
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearDepthStencilView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(47)]
-	public void ClearDepthStencilView(CpuDescriptorHandle* DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, RawRect* pRects)
+	public void ClearDepthStencilView(CpuDescriptorHandle DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, RawRect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList3*, CpuDescriptorHandle*, ClearFlags, float, byte, uint, RawRect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList3*, CpuDescriptorHandle, ClearFlags, float, byte, uint, RawRect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearRenderTargetView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(48)]
-	public void ClearRenderTargetView(CpuDescriptorHandle* RenderTargetView, float* ColorRGBA, uint NumRects, RawRect* pRects)
+	public void ClearRenderTargetView(CpuDescriptorHandle RenderTargetView, float* ColorRGBA, uint NumRects, RawRect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList3*, CpuDescriptorHandle*, float*, uint, RawRect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList3*, CpuDescriptorHandle, float*, uint, RawRect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearUnorderedAccessViewUint" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(49)]
-	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle* ViewGPUHandleInCurrentHeap, CpuDescriptorHandle* ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, RawRect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList3*, GpuDescriptorHandle*, CpuDescriptorHandle*, ID3D12Resource*, uint*, uint, RawRect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList3*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, uint*, uint, RawRect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearUnorderedAccessViewFloat" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(50)]
-	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle* ViewGPUHandleInCurrentHeap, CpuDescriptorHandle* ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, RawRect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList3*, GpuDescriptorHandle*, CpuDescriptorHandle*, ID3D12Resource*, float*, uint, RawRect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList3*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, float*, uint, RawRect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.DiscardResource" />
diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList4.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList4.cs
index 5adf2e6..db3da24 100644
--- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList4.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList4.cs
@@ -301,17 +301,17 @@ public unsafe partial struct ID3D12GraphicsCommandList4 : INativeGuid
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.SetComputeRootDescriptorTable" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public void SetComputeRootDescriptorTable(uint RootParameterIndex, GpuDescriptorHandle* BaseDescriptor)
+	public void SetComputeRootDescriptorTable(uint RootParameterIndex, GpuDescriptorHandle BaseDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList4*, uint, GpuDescriptorHandle*, void>)(lpVtbl[31]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), RootParameterIndex, BaseDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList4*, uint, GpuDescriptorHandle, void>)(lpVtbl[31]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), RootParameterIndex, BaseDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.SetGraphicsRootDescriptorTable" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(32)]
-	public void SetGraphicsRootDescriptorTable(uint RootParameterIndex, GpuDescriptorHandle* BaseDescriptor)
+	public void SetGraphicsRootDescriptorTable(uint RootParameterIndex, GpuDescriptorHandle BaseDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList4*, uint, GpuDescriptorHandle*, void>)(lpVtbl[32]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), RootParameterIndex, BaseDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList4*, uint, GpuDescriptorHandle, void>)(lpVtbl[32]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), RootParameterIndex, BaseDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.SetComputeRoot32BitConstant" />
@@ -429,33 +429,33 @@ public unsafe partial struct ID3D12GraphicsCommandList4 : INativeGuid
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearDepthStencilView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(47)]
-	public void ClearDepthStencilView(CpuDescriptorHandle* DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, RawRect* pRects)
+	public void ClearDepthStencilView(CpuDescriptorHandle DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, RawRect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList4*, CpuDescriptorHandle*, ClearFlags, float, byte, uint, RawRect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList4*, CpuDescriptorHandle, ClearFlags, float, byte, uint, RawRect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearRenderTargetView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(48)]
-	public void ClearRenderTargetView(CpuDescriptorHandle* RenderTargetView, float* ColorRGBA, uint NumRects, RawRect* pRects)
+	public void ClearRenderTargetView(CpuDescriptorHandle RenderTargetView, float* ColorRGBA, uint NumRects, RawRect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList4*, CpuDescriptorHandle*, float*, uint, RawRect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList4*, CpuDescriptorHandle, float*, uint, RawRect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearUnorderedAccessViewUint" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(49)]
-	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle* ViewGPUHandleInCurrentHeap, CpuDescriptorHandle* ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, RawRect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList4*, GpuDescriptorHandle*, CpuDescriptorHandle*, ID3D12Resource*, uint*, uint, RawRect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList4*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, uint*, uint, RawRect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearUnorderedAccessViewFloat" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(50)]
-	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle* ViewGPUHandleInCurrentHeap, CpuDescriptorHandle* ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, RawRect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList4*, GpuDescriptorHandle*, CpuDescriptorHandle*, ID3D12Resource*, float*, uint, RawRect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList4*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, float*, uint, RawRect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.DiscardResource" />
diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList5.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList5.cs
index f372c86..8b6f5ea 100644
--- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList5.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList5.cs
@@ -301,17 +301,17 @@ public unsafe partial struct ID3D12GraphicsCommandList5 : INativeGuid
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.SetComputeRootDescriptorTable" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public void SetComputeRootDescriptorTable(uint RootParameterIndex, GpuDescriptorHandle* BaseDescriptor)
+	public void SetComputeRootDescriptorTable(uint RootParameterIndex, GpuDescriptorHandle BaseDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList5*, uint, GpuDescriptorHandle*, void>)(lpVtbl[31]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), RootParameterIndex, BaseDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList5*, uint, GpuDescriptorHandle, void>)(lpVtbl[31]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), RootParameterIndex, BaseDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.SetGraphicsRootDescriptorTable" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(32)]
-	public void SetGraphicsRootDescriptorTable(uint RootParameterIndex, GpuDescriptorHandle* BaseDescriptor)
+	public void SetGraphicsRootDescriptorTable(uint RootParameterIndex, GpuDescriptorHandle BaseDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList5*, uint, GpuDescriptorHandle*, void>)(lpVtbl[32]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), RootParameterIndex, BaseDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList5*, uint, GpuDescriptorHandle, void>)(lpVtbl[32]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), RootParameterIndex, BaseDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.SetComputeRoot32BitConstant" />
@@ -429,33 +429,33 @@ public unsafe partial struct ID3D12GraphicsCommandList5 : INativeGuid
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearDepthStencilView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(47)]
-	public void ClearDepthStencilView(CpuDescriptorHandle* DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, RawRect* pRects)
+	public void ClearDepthStencilView(CpuDescriptorHandle DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, RawRect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList5*, CpuDescriptorHandle*, ClearFlags, float, byte, uint, RawRect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList5*, CpuDescriptorHandle, ClearFlags, float, byte, uint, RawRect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearRenderTargetView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(48)]
-	public void ClearRenderTargetView(CpuDescriptorHandle* RenderTargetView, float* ColorRGBA, uint NumRects, RawRect* pRects)
+	public void ClearRenderTargetView(CpuDescriptorHandle RenderTargetView, float* ColorRGBA, uint NumRects, RawRect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList5*, CpuDescriptorHandle*, float*, uint, RawRect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList5*, CpuDescriptorHandle, float*, uint, RawRect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearUnorderedAccessViewUint" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(49)]
-	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle* ViewGPUHandleInCurrentHeap, CpuDescriptorHandle* ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, RawRect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList5*, GpuDescriptorHandle*, CpuDescriptorHandle*, ID3D12Resource*, uint*, uint, RawRect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList5*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, uint*, uint, RawRect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearUnorderedAccessViewFloat" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(50)]
-	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle* ViewGPUHandleInCurrentHeap, CpuDescriptorHandle* ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, RawRect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList5*, GpuDescriptorHandle*, CpuDescriptorHandle*, ID3D12Resource*, float*, uint, RawRect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList5*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, float*, uint, RawRect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.DiscardResource" />
diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList6.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList6.cs
index 5970635..4952109 100644
--- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList6.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList6.cs
@@ -301,17 +301,17 @@ public unsafe partial struct ID3D12GraphicsCommandList6 : INativeGuid
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.SetComputeRootDescriptorTable" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public void SetComputeRootDescriptorTable(uint RootParameterIndex, GpuDescriptorHandle* BaseDescriptor)
+	public void SetComputeRootDescriptorTable(uint RootParameterIndex, GpuDescriptorHandle BaseDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList6*, uint, GpuDescriptorHandle*, void>)(lpVtbl[31]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), RootParameterIndex, BaseDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList6*, uint, GpuDescriptorHandle, void>)(lpVtbl[31]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), RootParameterIndex, BaseDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.SetGraphicsRootDescriptorTable" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(32)]
-	public void SetGraphicsRootDescriptorTable(uint RootParameterIndex, GpuDescriptorHandle* BaseDescriptor)
+	public void SetGraphicsRootDescriptorTable(uint RootParameterIndex, GpuDescriptorHandle BaseDescriptor)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList6*, uint, GpuDescriptorHandle*, void>)(lpVtbl[32]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), RootParameterIndex, BaseDescriptor);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList6*, uint, GpuDescriptorHandle, void>)(lpVtbl[32]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), RootParameterIndex, BaseDescriptor);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.SetComputeRoot32BitConstant" />
@@ -429,33 +429,33 @@ public unsafe partial struct ID3D12GraphicsCommandList6 : INativeGuid
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearDepthStencilView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(47)]
-	public void ClearDepthStencilView(CpuDescriptorHandle* DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, RawRect* pRects)
+	public void ClearDepthStencilView(CpuDescriptorHandle DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, RawRect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList6*, CpuDescriptorHandle*, ClearFlags, float, byte, uint, RawRect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList6*, CpuDescriptorHandle, ClearFlags, float, byte, uint, RawRect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearRenderTargetView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(48)]
-	public void ClearRenderTargetView(CpuDescriptorHandle* RenderTargetView, float* ColorRGBA, uint NumRects, RawRect* pRects)
+	public void ClearRenderTargetView(CpuDescriptorHandle RenderTargetView, float* ColorRGBA, uint NumRects, RawRect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList6*, CpuDescriptorHandle*, float*, uint, RawRect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList6*, CpuDescriptorHandle, float*, uint, RawRect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearUnorderedAccessViewUint" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(49)]
-	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle* ViewGPUHandleInCurrentHeap, CpuDescriptorHandle* ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, RawRect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList6*, GpuDescriptorHandle*, CpuDescriptorHandle*, ID3D12Resource*, uint*, uint, RawRect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList6*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, uint*, uint, RawRect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearUnorderedAccessViewFloat" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(50)]
-	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle* ViewGPUHandleInCurrentHeap, CpuDescriptorHandle* ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, RawRect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList6*, GpuDescriptorHandle*, CpuDescriptorHandle*, ID3D12Resource*, float*, uint, RawRect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList6*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, float*, uint, RawRect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.DiscardResource" />
diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/Graphics.DirectWrite.Apis.Functions.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/Graphics.DirectWrite.Apis.Functions.cs
index 54c4a93..ebd311d 100644
--- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/Graphics.DirectWrite.Apis.Functions.cs
+++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/Graphics.DirectWrite.Apis.Functions.cs
@@ -13,5 +13,5 @@ public static unsafe partial class Apis
 {
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="DWriteCreateFactory"]/*' />
 	[DllImport("DWrite.dll", ExactSpelling = true)]
-	public static extern HResult DWriteCreateFactory(FactoryType factoryType, Guid* iid, IUnknown** factory);
+	public static extern HResult DWriteCreateFactory(FactoryType factoryType, Guid* iid, void** factory);
 }
diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalyzer1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalyzer1.cs
index 536b1fe..e9a9478 100644
--- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalyzer1.cs
+++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalyzer1.cs
@@ -141,9 +141,9 @@ public unsafe partial struct IDWriteTextAnalyzer1 : INativeGuid
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTextAnalyzer1::GetBaseline"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(11)]
-	public HResult GetBaseline(IDWriteFontFace* fontFace, Baseline baseline, Bool32 isVertical, Bool32 isSimulationAllowed, ScriptAnalysis* scriptAnalysis, ushort* localeName, int* baselineCoordinate, Bool32* exists)
+	public HResult GetBaseline(IDWriteFontFace* fontFace, Baseline baseline, Bool32 isVertical, Bool32 isSimulationAllowed, ScriptAnalysis scriptAnalysis, ushort* localeName, int* baselineCoordinate, Bool32* exists)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer1*, IDWriteFontFace*, Baseline, Bool32, Bool32, ScriptAnalysis*, ushort*, int*, Bool32*, int>)(lpVtbl[11]))((IDWriteTextAnalyzer1*)Unsafe.AsPointer(ref this), fontFace, baseline, isVertical, isSimulationAllowed, scriptAnalysis, localeName, baselineCoordinate, exists);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer1*, IDWriteFontFace*, Baseline, Bool32, Bool32, ScriptAnalysis, ushort*, int*, Bool32*, int>)(lpVtbl[11]))((IDWriteTextAnalyzer1*)Unsafe.AsPointer(ref this), fontFace, baseline, isVertical, isSimulationAllowed, scriptAnalysis, localeName, baselineCoordinate, exists);
 	}
 
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTextAnalyzer1::AnalyzeVerticalGlyphOrientation"]/*' />
@@ -165,9 +165,9 @@ public unsafe partial struct IDWriteTextAnalyzer1 : INativeGuid
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTextAnalyzer1::GetScriptProperties"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(14)]
-	public HResult GetScriptProperties(ScriptAnalysis* scriptAnalysis, ScriptProperties* scriptProperties)
+	public HResult GetScriptProperties(ScriptAnalysis scriptAnalysis, ScriptProperties* scriptProperties)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer1*, ScriptAnalysis*, ScriptProperties*, int>)(lpVtbl[14]))((IDWriteTextAnalyzer1*)Unsafe.AsPointer(ref this), scriptAnalysis, scriptProperties);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer1*, ScriptAnalysis, ScriptProperties*, int>)(lpVtbl[14]))((IDWriteTextAnalyzer1*)Unsafe.AsPointer(ref this), scriptAnalysis, scriptProperties);
 	}
 
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTextAnalyzer1::GetTextComplexity"]/*' />
@@ -181,9 +181,9 @@ public unsafe partial struct IDWriteTextAnalyzer1 : INativeGuid
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTextAnalyzer1::GetJustificationOpportunities"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public HResult GetJustificationOpportunities(IDWriteFontFace* fontFace, float fontEmSize, ScriptAnalysis* scriptAnalysis, uint textLength, uint glyphCount, ushort* textString, ushort* clusterMap, ShapingGlyphProperties* glyphProperties, JustificationOpportunity* justificationOpportunities)
+	public HResult GetJustificationOpportunities(IDWriteFontFace* fontFace, float fontEmSize, ScriptAnalysis scriptAnalysis, uint textLength, uint glyphCount, ushort* textString, ushort* clusterMap, ShapingGlyphProperties* glyphProperties, JustificationOpportunity* justificationOpportunities)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer1*, IDWriteFontFace*, float, ScriptAnalysis*, uint, uint, ushort*, ushort*, ShapingGlyphProperties*, JustificationOpportunity*, int>)(lpVtbl[16]))((IDWriteTextAnalyzer1*)Unsafe.AsPointer(ref this), fontFace, fontEmSize, scriptAnalysis, textLength, glyphCount, textString, clusterMap, glyphProperties, justificationOpportunities);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer1*, IDWriteFontFace*, float, ScriptAnalysis, uint, uint, ushort*, ushort*, ShapingGlyphProperties*, JustificationOpportunity*, int>)(lpVtbl[16]))((IDWriteTextAnalyzer1*)Unsafe.AsPointer(ref this), fontFace, fontEmSize, scriptAnalysis, textLength, glyphCount, textString, clusterMap, glyphProperties, justificationOpportunities);
 	}
 
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTextAnalyzer1::JustifyGlyphAdvances"]/*' />
@@ -197,9 +197,9 @@ public unsafe partial struct IDWriteTextAnalyzer1 : INativeGuid
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTextAnalyzer1::GetJustifiedGlyphs"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(18)]
-	public HResult GetJustifiedGlyphs(IDWriteFontFace* fontFace, float fontEmSize, ScriptAnalysis* scriptAnalysis, uint textLength, uint glyphCount, uint maxGlyphCount, ushort* clusterMap, ushort* glyphIndices, float* glyphAdvances, float* justifiedGlyphAdvances, GlyphOffset* justifiedGlyphOffsets, ShapingGlyphProperties* glyphProperties, uint* actualGlyphCount, ushort* modifiedClusterMap, ushort* modifiedGlyphIndices, float* modifiedGlyphAdvances, GlyphOffset* modifiedGlyphOffsets)
+	public HResult GetJustifiedGlyphs(IDWriteFontFace* fontFace, float fontEmSize, ScriptAnalysis scriptAnalysis, uint textLength, uint glyphCount, uint maxGlyphCount, ushort* clusterMap, ushort* glyphIndices, float* glyphAdvances, float* justifiedGlyphAdvances, GlyphOffset* justifiedGlyphOffsets, ShapingGlyphProperties* glyphProperties, uint* actualGlyphCount, ushort* modifiedClusterMap, ushort* modifiedGlyphIndices, float* modifiedGlyphAdvances, GlyphOffset* modifiedGlyphOffsets)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer1*, IDWriteFontFace*, float, ScriptAnalysis*, uint, uint, uint, ushort*, ushort*, float*, float*, GlyphOffset*, ShapingGlyphProperties*, uint*, ushort*, ushort*, float*, GlyphOffset*, int>)(lpVtbl[18]))((IDWriteTextAnalyzer1*)Unsafe.AsPointer(ref this), fontFace, fontEmSize, scriptAnalysis, textLength, glyphCount, maxGlyphCount, clusterMap, glyphIndices, glyphAdvances, justifiedGlyphAdvances, justifiedGlyphOffsets, glyphProperties, actualGlyphCount, modifiedClusterMap, modifiedGlyphIndices, modifiedGlyphAdvances, modifiedGlyphOffsets);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer1*, IDWriteFontFace*, float, ScriptAnalysis, uint, uint, uint, ushort*, ushort*, float*, float*, GlyphOffset*, ShapingGlyphProperties*, uint*, ushort*, ushort*, float*, GlyphOffset*, int>)(lpVtbl[18]))((IDWriteTextAnalyzer1*)Unsafe.AsPointer(ref this), fontFace, fontEmSize, scriptAnalysis, textLength, glyphCount, maxGlyphCount, clusterMap, glyphIndices, glyphAdvances, justifiedGlyphAdvances, justifiedGlyphOffsets, glyphProperties, actualGlyphCount, modifiedClusterMap, modifiedGlyphIndices, modifiedGlyphAdvances, modifiedGlyphOffsets);
 	}
 }
 
diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalyzer2.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalyzer2.cs
index 38da01e..1a138db 100644
--- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalyzer2.cs
+++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextAnalyzer2.cs
@@ -141,9 +141,9 @@ public unsafe partial struct IDWriteTextAnalyzer2 : INativeGuid
 	/// <inheritdoc cref="IDWriteTextAnalyzer1.GetBaseline" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(11)]
-	public HResult GetBaseline(IDWriteFontFace* fontFace, Baseline baseline, Bool32 isVertical, Bool32 isSimulationAllowed, ScriptAnalysis* scriptAnalysis, ushort* localeName, int* baselineCoordinate, Bool32* exists)
+	public HResult GetBaseline(IDWriteFontFace* fontFace, Baseline baseline, Bool32 isVertical, Bool32 isSimulationAllowed, ScriptAnalysis scriptAnalysis, ushort* localeName, int* baselineCoordinate, Bool32* exists)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer2*, IDWriteFontFace*, Baseline, Bool32, Bool32, ScriptAnalysis*, ushort*, int*, Bool32*, int>)(lpVtbl[11]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), fontFace, baseline, isVertical, isSimulationAllowed, scriptAnalysis, localeName, baselineCoordinate, exists);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer2*, IDWriteFontFace*, Baseline, Bool32, Bool32, ScriptAnalysis, ushort*, int*, Bool32*, int>)(lpVtbl[11]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), fontFace, baseline, isVertical, isSimulationAllowed, scriptAnalysis, localeName, baselineCoordinate, exists);
 	}
 
 	/// <inheritdoc cref="IDWriteTextAnalyzer1.AnalyzeVerticalGlyphOrientation" />
@@ -165,9 +165,9 @@ public unsafe partial struct IDWriteTextAnalyzer2 : INativeGuid
 	/// <inheritdoc cref="IDWriteTextAnalyzer1.GetScriptProperties" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(14)]
-	public HResult GetScriptProperties(ScriptAnalysis* scriptAnalysis, ScriptProperties* scriptProperties)
+	public HResult GetScriptProperties(ScriptAnalysis scriptAnalysis, ScriptProperties* scriptProperties)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer2*, ScriptAnalysis*, ScriptProperties*, int>)(lpVtbl[14]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), scriptAnalysis, scriptProperties);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer2*, ScriptAnalysis, ScriptProperties*, int>)(lpVtbl[14]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), scriptAnalysis, scriptProperties);
 	}
 
 	/// <inheritdoc cref="IDWriteTextAnalyzer1.GetTextComplexity" />
@@ -181,9 +181,9 @@ public unsafe partial struct IDWriteTextAnalyzer2 : INativeGuid
 	/// <inheritdoc cref="IDWriteTextAnalyzer1.GetJustificationOpportunities" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public HResult GetJustificationOpportunities(IDWriteFontFace* fontFace, float fontEmSize, ScriptAnalysis* scriptAnalysis, uint textLength, uint glyphCount, ushort* textString, ushort* clusterMap, ShapingGlyphProperties* glyphProperties, JustificationOpportunity* justificationOpportunities)
+	public HResult GetJustificationOpportunities(IDWriteFontFace* fontFace, float fontEmSize, ScriptAnalysis scriptAnalysis, uint textLength, uint glyphCount, ushort* textString, ushort* clusterMap, ShapingGlyphProperties* glyphProperties, JustificationOpportunity* justificationOpportunities)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer2*, IDWriteFontFace*, float, ScriptAnalysis*, uint, uint, ushort*, ushort*, ShapingGlyphProperties*, JustificationOpportunity*, int>)(lpVtbl[16]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), fontFace, fontEmSize, scriptAnalysis, textLength, glyphCount, textString, clusterMap, glyphProperties, justificationOpportunities);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer2*, IDWriteFontFace*, float, ScriptAnalysis, uint, uint, ushort*, ushort*, ShapingGlyphProperties*, JustificationOpportunity*, int>)(lpVtbl[16]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), fontFace, fontEmSize, scriptAnalysis, textLength, glyphCount, textString, clusterMap, glyphProperties, justificationOpportunities);
 	}
 
 	/// <inheritdoc cref="IDWriteTextAnalyzer1.JustifyGlyphAdvances" />
@@ -197,9 +197,9 @@ public unsafe partial struct IDWriteTextAnalyzer2 : INativeGuid
 	/// <inheritdoc cref="IDWriteTextAnalyzer1.GetJustifiedGlyphs" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(18)]
-	public HResult GetJustifiedGlyphs(IDWriteFontFace* fontFace, float fontEmSize, ScriptAnalysis* scriptAnalysis, uint textLength, uint glyphCount, uint maxGlyphCount, ushort* clusterMap, ushort* glyphIndices, float* glyphAdvances, float* justifiedGlyphAdvances, GlyphOffset* justifiedGlyphOffsets, ShapingGlyphProperties* glyphProperties, uint* actualGlyphCount, ushort* modifiedClusterMap, ushort* modifiedGlyphIndices, float* modifiedGlyphAdvances, GlyphOffset* modifiedGlyphOffsets)
+	public HResult GetJustifiedGlyphs(IDWriteFontFace* fontFace, float fontEmSize, ScriptAnalysis scriptAnalysis, uint textLength, uint glyphCount, uint maxGlyphCount, ushort* clusterMap, ushort* glyphIndices, float* glyphAdvances, float* justifiedGlyphAdvances, GlyphOffset* justifiedGlyphOffsets, ShapingGlyphProperties* glyphProperties, uint* actualGlyphCount, ushort* modifiedClusterMap, ushort* modifiedGlyphIndices, float* modifiedGlyphAdvances, GlyphOffset* modifiedGlyphOffsets)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer2*, IDWriteFontFace*, float, ScriptAnalysis*, uint, uint, uint, ushort*, ushort*, float*, float*, GlyphOffset*, ShapingGlyphProperties*, uint*, ushort*, ushort*, float*, GlyphOffset*, int>)(lpVtbl[18]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), fontFace, fontEmSize, scriptAnalysis, textLength, glyphCount, maxGlyphCount, clusterMap, glyphIndices, glyphAdvances, justifiedGlyphAdvances, justifiedGlyphOffsets, glyphProperties, actualGlyphCount, modifiedClusterMap, modifiedGlyphIndices, modifiedGlyphAdvances, modifiedGlyphOffsets);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer2*, IDWriteFontFace*, float, ScriptAnalysis, uint, uint, uint, ushort*, ushort*, float*, float*, GlyphOffset*, ShapingGlyphProperties*, uint*, ushort*, ushort*, float*, GlyphOffset*, int>)(lpVtbl[18]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), fontFace, fontEmSize, scriptAnalysis, textLength, glyphCount, maxGlyphCount, clusterMap, glyphIndices, glyphAdvances, justifiedGlyphAdvances, justifiedGlyphOffsets, glyphProperties, actualGlyphCount, modifiedClusterMap, modifiedGlyphIndices, modifiedGlyphAdvances, modifiedGlyphOffsets);
 	}
 
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTextAnalyzer2::GetGlyphOrientationTransform"]/*' />
@@ -213,17 +213,17 @@ public unsafe partial struct IDWriteTextAnalyzer2 : INativeGuid
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTextAnalyzer2::GetTypographicFeatures"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(20)]
-	public HResult GetTypographicFeatures(IDWriteFontFace* fontFace, ScriptAnalysis* scriptAnalysis, ushort* localeName, uint maxTagCount, uint* actualTagCount, FontFeatureTag* tags)
+	public HResult GetTypographicFeatures(IDWriteFontFace* fontFace, ScriptAnalysis scriptAnalysis, ushort* localeName, uint maxTagCount, uint* actualTagCount, FontFeatureTag* tags)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer2*, IDWriteFontFace*, ScriptAnalysis*, ushort*, uint, uint*, FontFeatureTag*, int>)(lpVtbl[20]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), fontFace, scriptAnalysis, localeName, maxTagCount, actualTagCount, tags);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer2*, IDWriteFontFace*, ScriptAnalysis, ushort*, uint, uint*, FontFeatureTag*, int>)(lpVtbl[20]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), fontFace, scriptAnalysis, localeName, maxTagCount, actualTagCount, tags);
 	}
 
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTextAnalyzer2::CheckTypographicFeature"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(21)]
-	public HResult CheckTypographicFeature(IDWriteFontFace* fontFace, ScriptAnalysis* scriptAnalysis, ushort* localeName, FontFeatureTag featureTag, uint glyphCount, ushort* glyphIndices, byte* featureApplies)
+	public HResult CheckTypographicFeature(IDWriteFontFace* fontFace, ScriptAnalysis scriptAnalysis, ushort* localeName, FontFeatureTag featureTag, uint glyphCount, ushort* glyphIndices, byte* featureApplies)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer2*, IDWriteFontFace*, ScriptAnalysis*, ushort*, FontFeatureTag, uint, ushort*, byte*, int>)(lpVtbl[21]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), fontFace, scriptAnalysis, localeName, featureTag, glyphCount, glyphIndices, featureApplies);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextAnalyzer2*, IDWriteFontFace*, ScriptAnalysis, ushort*, FontFeatureTag, uint, ushort*, byte*, int>)(lpVtbl[21]))((IDWriteTextAnalyzer2*)Unsafe.AsPointer(ref this), fontFace, scriptAnalysis, localeName, featureTag, glyphCount, glyphIndices, featureApplies);
 	}
 }
 
diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout.cs
index 098a6cc..ddd0bff 100644
--- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout.cs
+++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout.cs
@@ -293,97 +293,97 @@ public unsafe partial struct IDWriteTextLayout : INativeGuid
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTextLayout::SetFontCollection"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(30)]
-	public HResult SetFontCollection(IDWriteFontCollection* fontCollection, TextRange* textRange)
+	public HResult SetFontCollection(IDWriteFontCollection* fontCollection, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout*, IDWriteFontCollection*, TextRange*, int>)(lpVtbl[30]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), fontCollection, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout*, IDWriteFontCollection*, TextRange, int>)(lpVtbl[30]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), fontCollection, textRange);
 	}
 
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTextLayout::SetFontFamilyName"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public HResult SetFontFamilyName(ushort* fontFamilyName, TextRange* textRange)
+	public HResult SetFontFamilyName(ushort* fontFamilyName, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout*, ushort*, TextRange*, int>)(lpVtbl[31]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), fontFamilyName, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout*, ushort*, TextRange, int>)(lpVtbl[31]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), fontFamilyName, textRange);
 	}
 
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTextLayout::SetFontWeight"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(32)]
-	public HResult SetFontWeight(FontWeight fontWeight, TextRange* textRange)
+	public HResult SetFontWeight(FontWeight fontWeight, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout*, FontWeight, TextRange*, int>)(lpVtbl[32]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), fontWeight, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout*, FontWeight, TextRange, int>)(lpVtbl[32]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), fontWeight, textRange);
 	}
 
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTextLayout::SetFontStyle"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(33)]
-	public HResult SetFontStyle(FontStyle fontStyle, TextRange* textRange)
+	public HResult SetFontStyle(FontStyle fontStyle, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout*, FontStyle, TextRange*, int>)(lpVtbl[33]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), fontStyle, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout*, FontStyle, TextRange, int>)(lpVtbl[33]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), fontStyle, textRange);
 	}
 
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTextLayout::SetFontStretch"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(34)]
-	public HResult SetFontStretch(FontStretch fontStretch, TextRange* textRange)
+	public HResult SetFontStretch(FontStretch fontStretch, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout*, FontStretch, TextRange*, int>)(lpVtbl[34]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), fontStretch, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout*, FontStretch, TextRange, int>)(lpVtbl[34]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), fontStretch, textRange);
 	}
 
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTextLayout::SetFontSize"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(35)]
-	public HResult SetFontSize(float fontSize, TextRange* textRange)
+	public HResult SetFontSize(float fontSize, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout*, float, TextRange*, int>)(lpVtbl[35]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), fontSize, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout*, float, TextRange, int>)(lpVtbl[35]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), fontSize, textRange);
 	}
 
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTextLayout::SetUnderline"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(36)]
-	public HResult SetUnderline(Bool32 hasUnderline, TextRange* textRange)
+	public HResult SetUnderline(Bool32 hasUnderline, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout*, Bool32, TextRange*, int>)(lpVtbl[36]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), hasUnderline, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout*, Bool32, TextRange, int>)(lpVtbl[36]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), hasUnderline, textRange);
 	}
 
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTextLayout::SetStrikethrough"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(37)]
-	public HResult SetStrikethrough(Bool32 hasStrikethrough, TextRange* textRange)
+	public HResult SetStrikethrough(Bool32 hasStrikethrough, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout*, Bool32, TextRange*, int>)(lpVtbl[37]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), hasStrikethrough, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout*, Bool32, TextRange, int>)(lpVtbl[37]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), hasStrikethrough, textRange);
 	}
 
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTextLayout::SetDrawingEffect"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(38)]
-	public HResult SetDrawingEffect(IUnknown* drawingEffect, TextRange* textRange)
+	public HResult SetDrawingEffect(IUnknown* drawingEffect, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout*, IUnknown*, TextRange*, int>)(lpVtbl[38]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), drawingEffect, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout*, IUnknown*, TextRange, int>)(lpVtbl[38]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), drawingEffect, textRange);
 	}
 
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTextLayout::SetInlineObject"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(39)]
-	public HResult SetInlineObject(IDWriteInlineObject* inlineObject, TextRange* textRange)
+	public HResult SetInlineObject(IDWriteInlineObject* inlineObject, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout*, IDWriteInlineObject*, TextRange*, int>)(lpVtbl[39]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), inlineObject, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout*, IDWriteInlineObject*, TextRange, int>)(lpVtbl[39]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), inlineObject, textRange);
 	}
 
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTextLayout::SetTypography"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(40)]
-	public HResult SetTypography(IDWriteTypography* typography, TextRange* textRange)
+	public HResult SetTypography(IDWriteTypography* typography, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout*, IDWriteTypography*, TextRange*, int>)(lpVtbl[40]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), typography, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout*, IDWriteTypography*, TextRange, int>)(lpVtbl[40]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), typography, textRange);
 	}
 
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTextLayout::SetLocaleName"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(41)]
-	public HResult SetLocaleName(ushort* localeName, TextRange* textRange)
+	public HResult SetLocaleName(ushort* localeName, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout*, ushort*, TextRange*, int>)(lpVtbl[41]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), localeName, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout*, ushort*, TextRange, int>)(lpVtbl[41]))((IDWriteTextLayout*)Unsafe.AsPointer(ref this), localeName, textRange);
 	}
 
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTextLayout::GetMaxWidth"]/*' />
diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout1.cs
index e62969e..b1d8eb2 100644
--- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout1.cs
+++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout1.cs
@@ -293,97 +293,97 @@ public unsafe partial struct IDWriteTextLayout1 : INativeGuid
 	/// <inheritdoc cref="IDWriteTextLayout.SetFontCollection" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(30)]
-	public HResult SetFontCollection(IDWriteFontCollection* fontCollection, TextRange* textRange)
+	public HResult SetFontCollection(IDWriteFontCollection* fontCollection, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout1*, IDWriteFontCollection*, TextRange*, int>)(lpVtbl[30]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), fontCollection, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout1*, IDWriteFontCollection*, TextRange, int>)(lpVtbl[30]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), fontCollection, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetFontFamilyName" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public HResult SetFontFamilyName(ushort* fontFamilyName, TextRange* textRange)
+	public HResult SetFontFamilyName(ushort* fontFamilyName, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout1*, ushort*, TextRange*, int>)(lpVtbl[31]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), fontFamilyName, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout1*, ushort*, TextRange, int>)(lpVtbl[31]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), fontFamilyName, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetFontWeight" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(32)]
-	public HResult SetFontWeight(FontWeight fontWeight, TextRange* textRange)
+	public HResult SetFontWeight(FontWeight fontWeight, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout1*, FontWeight, TextRange*, int>)(lpVtbl[32]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), fontWeight, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout1*, FontWeight, TextRange, int>)(lpVtbl[32]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), fontWeight, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetFontStyle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(33)]
-	public HResult SetFontStyle(FontStyle fontStyle, TextRange* textRange)
+	public HResult SetFontStyle(FontStyle fontStyle, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout1*, FontStyle, TextRange*, int>)(lpVtbl[33]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), fontStyle, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout1*, FontStyle, TextRange, int>)(lpVtbl[33]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), fontStyle, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetFontStretch" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(34)]
-	public HResult SetFontStretch(FontStretch fontStretch, TextRange* textRange)
+	public HResult SetFontStretch(FontStretch fontStretch, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout1*, FontStretch, TextRange*, int>)(lpVtbl[34]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), fontStretch, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout1*, FontStretch, TextRange, int>)(lpVtbl[34]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), fontStretch, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetFontSize" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(35)]
-	public HResult SetFontSize(float fontSize, TextRange* textRange)
+	public HResult SetFontSize(float fontSize, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout1*, float, TextRange*, int>)(lpVtbl[35]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), fontSize, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout1*, float, TextRange, int>)(lpVtbl[35]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), fontSize, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetUnderline" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(36)]
-	public HResult SetUnderline(Bool32 hasUnderline, TextRange* textRange)
+	public HResult SetUnderline(Bool32 hasUnderline, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout1*, Bool32, TextRange*, int>)(lpVtbl[36]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), hasUnderline, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout1*, Bool32, TextRange, int>)(lpVtbl[36]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), hasUnderline, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetStrikethrough" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(37)]
-	public HResult SetStrikethrough(Bool32 hasStrikethrough, TextRange* textRange)
+	public HResult SetStrikethrough(Bool32 hasStrikethrough, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout1*, Bool32, TextRange*, int>)(lpVtbl[37]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), hasStrikethrough, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout1*, Bool32, TextRange, int>)(lpVtbl[37]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), hasStrikethrough, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetDrawingEffect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(38)]
-	public HResult SetDrawingEffect(IUnknown* drawingEffect, TextRange* textRange)
+	public HResult SetDrawingEffect(IUnknown* drawingEffect, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout1*, IUnknown*, TextRange*, int>)(lpVtbl[38]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), drawingEffect, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout1*, IUnknown*, TextRange, int>)(lpVtbl[38]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), drawingEffect, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetInlineObject" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(39)]
-	public HResult SetInlineObject(IDWriteInlineObject* inlineObject, TextRange* textRange)
+	public HResult SetInlineObject(IDWriteInlineObject* inlineObject, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout1*, IDWriteInlineObject*, TextRange*, int>)(lpVtbl[39]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), inlineObject, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout1*, IDWriteInlineObject*, TextRange, int>)(lpVtbl[39]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), inlineObject, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetTypography" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(40)]
-	public HResult SetTypography(IDWriteTypography* typography, TextRange* textRange)
+	public HResult SetTypography(IDWriteTypography* typography, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout1*, IDWriteTypography*, TextRange*, int>)(lpVtbl[40]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), typography, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout1*, IDWriteTypography*, TextRange, int>)(lpVtbl[40]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), typography, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetLocaleName" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(41)]
-	public HResult SetLocaleName(ushort* localeName, TextRange* textRange)
+	public HResult SetLocaleName(ushort* localeName, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout1*, ushort*, TextRange*, int>)(lpVtbl[41]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), localeName, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout1*, ushort*, TextRange, int>)(lpVtbl[41]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), localeName, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.GetMaxWidth" />
@@ -589,9 +589,9 @@ public unsafe partial struct IDWriteTextLayout1 : INativeGuid
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTextLayout1::SetPairKerning"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(67)]
-	public HResult SetPairKerning(Bool32 isPairKerningEnabled, TextRange* textRange)
+	public HResult SetPairKerning(Bool32 isPairKerningEnabled, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout1*, Bool32, TextRange*, int>)(lpVtbl[67]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), isPairKerningEnabled, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout1*, Bool32, TextRange, int>)(lpVtbl[67]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), isPairKerningEnabled, textRange);
 	}
 
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTextLayout1::GetPairKerning"]/*' />
@@ -605,9 +605,9 @@ public unsafe partial struct IDWriteTextLayout1 : INativeGuid
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTextLayout1::SetCharacterSpacing"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(69)]
-	public HResult SetCharacterSpacing(float leadingSpacing, float trailingSpacing, float minimumAdvanceWidth, TextRange* textRange)
+	public HResult SetCharacterSpacing(float leadingSpacing, float trailingSpacing, float minimumAdvanceWidth, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout1*, float, float, float, TextRange*, int>)(lpVtbl[69]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), leadingSpacing, trailingSpacing, minimumAdvanceWidth, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout1*, float, float, float, TextRange, int>)(lpVtbl[69]))((IDWriteTextLayout1*)Unsafe.AsPointer(ref this), leadingSpacing, trailingSpacing, minimumAdvanceWidth, textRange);
 	}
 
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTextLayout1::GetCharacterSpacing"]/*' />
diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout2.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout2.cs
index 657fb43..e6a5beb 100644
--- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout2.cs
+++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout2.cs
@@ -293,97 +293,97 @@ public unsafe partial struct IDWriteTextLayout2 : INativeGuid
 	/// <inheritdoc cref="IDWriteTextLayout.SetFontCollection" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(30)]
-	public HResult SetFontCollection(IDWriteFontCollection* fontCollection, TextRange* textRange)
+	public HResult SetFontCollection(IDWriteFontCollection* fontCollection, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout2*, IDWriteFontCollection*, TextRange*, int>)(lpVtbl[30]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), fontCollection, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout2*, IDWriteFontCollection*, TextRange, int>)(lpVtbl[30]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), fontCollection, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetFontFamilyName" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public HResult SetFontFamilyName(ushort* fontFamilyName, TextRange* textRange)
+	public HResult SetFontFamilyName(ushort* fontFamilyName, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout2*, ushort*, TextRange*, int>)(lpVtbl[31]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), fontFamilyName, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout2*, ushort*, TextRange, int>)(lpVtbl[31]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), fontFamilyName, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetFontWeight" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(32)]
-	public HResult SetFontWeight(FontWeight fontWeight, TextRange* textRange)
+	public HResult SetFontWeight(FontWeight fontWeight, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout2*, FontWeight, TextRange*, int>)(lpVtbl[32]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), fontWeight, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout2*, FontWeight, TextRange, int>)(lpVtbl[32]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), fontWeight, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetFontStyle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(33)]
-	public HResult SetFontStyle(FontStyle fontStyle, TextRange* textRange)
+	public HResult SetFontStyle(FontStyle fontStyle, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout2*, FontStyle, TextRange*, int>)(lpVtbl[33]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), fontStyle, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout2*, FontStyle, TextRange, int>)(lpVtbl[33]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), fontStyle, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetFontStretch" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(34)]
-	public HResult SetFontStretch(FontStretch fontStretch, TextRange* textRange)
+	public HResult SetFontStretch(FontStretch fontStretch, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout2*, FontStretch, TextRange*, int>)(lpVtbl[34]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), fontStretch, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout2*, FontStretch, TextRange, int>)(lpVtbl[34]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), fontStretch, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetFontSize" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(35)]
-	public HResult SetFontSize(float fontSize, TextRange* textRange)
+	public HResult SetFontSize(float fontSize, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout2*, float, TextRange*, int>)(lpVtbl[35]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), fontSize, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout2*, float, TextRange, int>)(lpVtbl[35]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), fontSize, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetUnderline" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(36)]
-	public HResult SetUnderline(Bool32 hasUnderline, TextRange* textRange)
+	public HResult SetUnderline(Bool32 hasUnderline, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout2*, Bool32, TextRange*, int>)(lpVtbl[36]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), hasUnderline, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout2*, Bool32, TextRange, int>)(lpVtbl[36]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), hasUnderline, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetStrikethrough" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(37)]
-	public HResult SetStrikethrough(Bool32 hasStrikethrough, TextRange* textRange)
+	public HResult SetStrikethrough(Bool32 hasStrikethrough, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout2*, Bool32, TextRange*, int>)(lpVtbl[37]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), hasStrikethrough, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout2*, Bool32, TextRange, int>)(lpVtbl[37]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), hasStrikethrough, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetDrawingEffect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(38)]
-	public HResult SetDrawingEffect(IUnknown* drawingEffect, TextRange* textRange)
+	public HResult SetDrawingEffect(IUnknown* drawingEffect, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout2*, IUnknown*, TextRange*, int>)(lpVtbl[38]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), drawingEffect, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout2*, IUnknown*, TextRange, int>)(lpVtbl[38]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), drawingEffect, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetInlineObject" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(39)]
-	public HResult SetInlineObject(IDWriteInlineObject* inlineObject, TextRange* textRange)
+	public HResult SetInlineObject(IDWriteInlineObject* inlineObject, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout2*, IDWriteInlineObject*, TextRange*, int>)(lpVtbl[39]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), inlineObject, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout2*, IDWriteInlineObject*, TextRange, int>)(lpVtbl[39]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), inlineObject, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetTypography" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(40)]
-	public HResult SetTypography(IDWriteTypography* typography, TextRange* textRange)
+	public HResult SetTypography(IDWriteTypography* typography, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout2*, IDWriteTypography*, TextRange*, int>)(lpVtbl[40]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), typography, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout2*, IDWriteTypography*, TextRange, int>)(lpVtbl[40]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), typography, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetLocaleName" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(41)]
-	public HResult SetLocaleName(ushort* localeName, TextRange* textRange)
+	public HResult SetLocaleName(ushort* localeName, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout2*, ushort*, TextRange*, int>)(lpVtbl[41]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), localeName, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout2*, ushort*, TextRange, int>)(lpVtbl[41]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), localeName, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.GetMaxWidth" />
@@ -589,9 +589,9 @@ public unsafe partial struct IDWriteTextLayout2 : INativeGuid
 	/// <inheritdoc cref="IDWriteTextLayout1.SetPairKerning" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(67)]
-	public HResult SetPairKerning(Bool32 isPairKerningEnabled, TextRange* textRange)
+	public HResult SetPairKerning(Bool32 isPairKerningEnabled, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout2*, Bool32, TextRange*, int>)(lpVtbl[67]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), isPairKerningEnabled, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout2*, Bool32, TextRange, int>)(lpVtbl[67]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), isPairKerningEnabled, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout1.GetPairKerning" />
@@ -605,9 +605,9 @@ public unsafe partial struct IDWriteTextLayout2 : INativeGuid
 	/// <inheritdoc cref="IDWriteTextLayout1.SetCharacterSpacing" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(69)]
-	public HResult SetCharacterSpacing(float leadingSpacing, float trailingSpacing, float minimumAdvanceWidth, TextRange* textRange)
+	public HResult SetCharacterSpacing(float leadingSpacing, float trailingSpacing, float minimumAdvanceWidth, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout2*, float, float, float, TextRange*, int>)(lpVtbl[69]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), leadingSpacing, trailingSpacing, minimumAdvanceWidth, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout2*, float, float, float, TextRange, int>)(lpVtbl[69]))((IDWriteTextLayout2*)Unsafe.AsPointer(ref this), leadingSpacing, trailingSpacing, minimumAdvanceWidth, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout1.GetCharacterSpacing" />
diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout3.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout3.cs
index 211b92f..a7ec997 100644
--- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout3.cs
+++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout3.cs
@@ -293,97 +293,97 @@ public unsafe partial struct IDWriteTextLayout3 : INativeGuid
 	/// <inheritdoc cref="IDWriteTextLayout.SetFontCollection" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(30)]
-	public HResult SetFontCollection(IDWriteFontCollection* fontCollection, TextRange* textRange)
+	public HResult SetFontCollection(IDWriteFontCollection* fontCollection, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout3*, IDWriteFontCollection*, TextRange*, int>)(lpVtbl[30]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), fontCollection, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout3*, IDWriteFontCollection*, TextRange, int>)(lpVtbl[30]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), fontCollection, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetFontFamilyName" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public HResult SetFontFamilyName(ushort* fontFamilyName, TextRange* textRange)
+	public HResult SetFontFamilyName(ushort* fontFamilyName, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout3*, ushort*, TextRange*, int>)(lpVtbl[31]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), fontFamilyName, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout3*, ushort*, TextRange, int>)(lpVtbl[31]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), fontFamilyName, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetFontWeight" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(32)]
-	public HResult SetFontWeight(FontWeight fontWeight, TextRange* textRange)
+	public HResult SetFontWeight(FontWeight fontWeight, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout3*, FontWeight, TextRange*, int>)(lpVtbl[32]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), fontWeight, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout3*, FontWeight, TextRange, int>)(lpVtbl[32]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), fontWeight, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetFontStyle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(33)]
-	public HResult SetFontStyle(FontStyle fontStyle, TextRange* textRange)
+	public HResult SetFontStyle(FontStyle fontStyle, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout3*, FontStyle, TextRange*, int>)(lpVtbl[33]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), fontStyle, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout3*, FontStyle, TextRange, int>)(lpVtbl[33]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), fontStyle, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetFontStretch" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(34)]
-	public HResult SetFontStretch(FontStretch fontStretch, TextRange* textRange)
+	public HResult SetFontStretch(FontStretch fontStretch, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout3*, FontStretch, TextRange*, int>)(lpVtbl[34]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), fontStretch, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout3*, FontStretch, TextRange, int>)(lpVtbl[34]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), fontStretch, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetFontSize" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(35)]
-	public HResult SetFontSize(float fontSize, TextRange* textRange)
+	public HResult SetFontSize(float fontSize, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout3*, float, TextRange*, int>)(lpVtbl[35]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), fontSize, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout3*, float, TextRange, int>)(lpVtbl[35]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), fontSize, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetUnderline" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(36)]
-	public HResult SetUnderline(Bool32 hasUnderline, TextRange* textRange)
+	public HResult SetUnderline(Bool32 hasUnderline, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout3*, Bool32, TextRange*, int>)(lpVtbl[36]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), hasUnderline, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout3*, Bool32, TextRange, int>)(lpVtbl[36]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), hasUnderline, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetStrikethrough" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(37)]
-	public HResult SetStrikethrough(Bool32 hasStrikethrough, TextRange* textRange)
+	public HResult SetStrikethrough(Bool32 hasStrikethrough, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout3*, Bool32, TextRange*, int>)(lpVtbl[37]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), hasStrikethrough, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout3*, Bool32, TextRange, int>)(lpVtbl[37]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), hasStrikethrough, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetDrawingEffect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(38)]
-	public HResult SetDrawingEffect(IUnknown* drawingEffect, TextRange* textRange)
+	public HResult SetDrawingEffect(IUnknown* drawingEffect, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout3*, IUnknown*, TextRange*, int>)(lpVtbl[38]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), drawingEffect, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout3*, IUnknown*, TextRange, int>)(lpVtbl[38]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), drawingEffect, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetInlineObject" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(39)]
-	public HResult SetInlineObject(IDWriteInlineObject* inlineObject, TextRange* textRange)
+	public HResult SetInlineObject(IDWriteInlineObject* inlineObject, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout3*, IDWriteInlineObject*, TextRange*, int>)(lpVtbl[39]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), inlineObject, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout3*, IDWriteInlineObject*, TextRange, int>)(lpVtbl[39]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), inlineObject, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetTypography" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(40)]
-	public HResult SetTypography(IDWriteTypography* typography, TextRange* textRange)
+	public HResult SetTypography(IDWriteTypography* typography, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout3*, IDWriteTypography*, TextRange*, int>)(lpVtbl[40]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), typography, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout3*, IDWriteTypography*, TextRange, int>)(lpVtbl[40]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), typography, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetLocaleName" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(41)]
-	public HResult SetLocaleName(ushort* localeName, TextRange* textRange)
+	public HResult SetLocaleName(ushort* localeName, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout3*, ushort*, TextRange*, int>)(lpVtbl[41]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), localeName, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout3*, ushort*, TextRange, int>)(lpVtbl[41]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), localeName, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.GetMaxWidth" />
@@ -589,9 +589,9 @@ public unsafe partial struct IDWriteTextLayout3 : INativeGuid
 	/// <inheritdoc cref="IDWriteTextLayout1.SetPairKerning" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(67)]
-	public HResult SetPairKerning(Bool32 isPairKerningEnabled, TextRange* textRange)
+	public HResult SetPairKerning(Bool32 isPairKerningEnabled, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout3*, Bool32, TextRange*, int>)(lpVtbl[67]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), isPairKerningEnabled, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout3*, Bool32, TextRange, int>)(lpVtbl[67]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), isPairKerningEnabled, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout1.GetPairKerning" />
@@ -605,9 +605,9 @@ public unsafe partial struct IDWriteTextLayout3 : INativeGuid
 	/// <inheritdoc cref="IDWriteTextLayout1.SetCharacterSpacing" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(69)]
-	public HResult SetCharacterSpacing(float leadingSpacing, float trailingSpacing, float minimumAdvanceWidth, TextRange* textRange)
+	public HResult SetCharacterSpacing(float leadingSpacing, float trailingSpacing, float minimumAdvanceWidth, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout3*, float, float, float, TextRange*, int>)(lpVtbl[69]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), leadingSpacing, trailingSpacing, minimumAdvanceWidth, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout3*, float, float, float, TextRange, int>)(lpVtbl[69]))((IDWriteTextLayout3*)Unsafe.AsPointer(ref this), leadingSpacing, trailingSpacing, minimumAdvanceWidth, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout1.GetCharacterSpacing" />
diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout4.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout4.cs
index b7ae827..0d8b8b7 100644
--- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout4.cs
+++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTextLayout4.cs
@@ -293,97 +293,97 @@ public unsafe partial struct IDWriteTextLayout4 : INativeGuid
 	/// <inheritdoc cref="IDWriteTextLayout.SetFontCollection" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(30)]
-	public HResult SetFontCollection(IDWriteFontCollection* fontCollection, TextRange* textRange)
+	public HResult SetFontCollection(IDWriteFontCollection* fontCollection, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, IDWriteFontCollection*, TextRange*, int>)(lpVtbl[30]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), fontCollection, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, IDWriteFontCollection*, TextRange, int>)(lpVtbl[30]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), fontCollection, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetFontFamilyName" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public HResult SetFontFamilyName(ushort* fontFamilyName, TextRange* textRange)
+	public HResult SetFontFamilyName(ushort* fontFamilyName, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, ushort*, TextRange*, int>)(lpVtbl[31]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), fontFamilyName, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, ushort*, TextRange, int>)(lpVtbl[31]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), fontFamilyName, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetFontWeight" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(32)]
-	public HResult SetFontWeight(FontWeight fontWeight, TextRange* textRange)
+	public HResult SetFontWeight(FontWeight fontWeight, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, FontWeight, TextRange*, int>)(lpVtbl[32]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), fontWeight, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, FontWeight, TextRange, int>)(lpVtbl[32]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), fontWeight, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetFontStyle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(33)]
-	public HResult SetFontStyle(FontStyle fontStyle, TextRange* textRange)
+	public HResult SetFontStyle(FontStyle fontStyle, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, FontStyle, TextRange*, int>)(lpVtbl[33]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), fontStyle, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, FontStyle, TextRange, int>)(lpVtbl[33]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), fontStyle, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetFontStretch" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(34)]
-	public HResult SetFontStretch(FontStretch fontStretch, TextRange* textRange)
+	public HResult SetFontStretch(FontStretch fontStretch, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, FontStretch, TextRange*, int>)(lpVtbl[34]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), fontStretch, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, FontStretch, TextRange, int>)(lpVtbl[34]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), fontStretch, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetFontSize" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(35)]
-	public HResult SetFontSize(float fontSize, TextRange* textRange)
+	public HResult SetFontSize(float fontSize, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, float, TextRange*, int>)(lpVtbl[35]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), fontSize, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, float, TextRange, int>)(lpVtbl[35]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), fontSize, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetUnderline" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(36)]
-	public HResult SetUnderline(Bool32 hasUnderline, TextRange* textRange)
+	public HResult SetUnderline(Bool32 hasUnderline, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, Bool32, TextRange*, int>)(lpVtbl[36]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), hasUnderline, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, Bool32, TextRange, int>)(lpVtbl[36]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), hasUnderline, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetStrikethrough" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(37)]
-	public HResult SetStrikethrough(Bool32 hasStrikethrough, TextRange* textRange)
+	public HResult SetStrikethrough(Bool32 hasStrikethrough, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, Bool32, TextRange*, int>)(lpVtbl[37]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), hasStrikethrough, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, Bool32, TextRange, int>)(lpVtbl[37]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), hasStrikethrough, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetDrawingEffect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(38)]
-	public HResult SetDrawingEffect(IUnknown* drawingEffect, TextRange* textRange)
+	public HResult SetDrawingEffect(IUnknown* drawingEffect, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, IUnknown*, TextRange*, int>)(lpVtbl[38]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), drawingEffect, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, IUnknown*, TextRange, int>)(lpVtbl[38]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), drawingEffect, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetInlineObject" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(39)]
-	public HResult SetInlineObject(IDWriteInlineObject* inlineObject, TextRange* textRange)
+	public HResult SetInlineObject(IDWriteInlineObject* inlineObject, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, IDWriteInlineObject*, TextRange*, int>)(lpVtbl[39]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), inlineObject, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, IDWriteInlineObject*, TextRange, int>)(lpVtbl[39]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), inlineObject, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetTypography" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(40)]
-	public HResult SetTypography(IDWriteTypography* typography, TextRange* textRange)
+	public HResult SetTypography(IDWriteTypography* typography, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, IDWriteTypography*, TextRange*, int>)(lpVtbl[40]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), typography, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, IDWriteTypography*, TextRange, int>)(lpVtbl[40]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), typography, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.SetLocaleName" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(41)]
-	public HResult SetLocaleName(ushort* localeName, TextRange* textRange)
+	public HResult SetLocaleName(ushort* localeName, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, ushort*, TextRange*, int>)(lpVtbl[41]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), localeName, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, ushort*, TextRange, int>)(lpVtbl[41]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), localeName, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout.GetMaxWidth" />
@@ -589,9 +589,9 @@ public unsafe partial struct IDWriteTextLayout4 : INativeGuid
 	/// <inheritdoc cref="IDWriteTextLayout1.SetPairKerning" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(67)]
-	public HResult SetPairKerning(Bool32 isPairKerningEnabled, TextRange* textRange)
+	public HResult SetPairKerning(Bool32 isPairKerningEnabled, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, Bool32, TextRange*, int>)(lpVtbl[67]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), isPairKerningEnabled, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, Bool32, TextRange, int>)(lpVtbl[67]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), isPairKerningEnabled, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout1.GetPairKerning" />
@@ -605,9 +605,9 @@ public unsafe partial struct IDWriteTextLayout4 : INativeGuid
 	/// <inheritdoc cref="IDWriteTextLayout1.SetCharacterSpacing" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(69)]
-	public HResult SetCharacterSpacing(float leadingSpacing, float trailingSpacing, float minimumAdvanceWidth, TextRange* textRange)
+	public HResult SetCharacterSpacing(float leadingSpacing, float trailingSpacing, float minimumAdvanceWidth, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, float, float, float, TextRange*, int>)(lpVtbl[69]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), leadingSpacing, trailingSpacing, minimumAdvanceWidth, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, float, float, float, TextRange, int>)(lpVtbl[69]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), leadingSpacing, trailingSpacing, minimumAdvanceWidth, textRange);
 	}
 
 	/// <inheritdoc cref="IDWriteTextLayout1.GetCharacterSpacing" />
@@ -725,9 +725,9 @@ public unsafe partial struct IDWriteTextLayout4 : INativeGuid
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTextLayout4::SetFontAxisValues"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(84)]
-	public HResult SetFontAxisValues(FontAxisValue* fontAxisValues, uint fontAxisValueCount, TextRange* textRange)
+	public HResult SetFontAxisValues(FontAxisValue* fontAxisValues, uint fontAxisValueCount, TextRange textRange)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, FontAxisValue*, uint, TextRange*, int>)(lpVtbl[84]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), fontAxisValues, fontAxisValueCount, textRange);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTextLayout4*, FontAxisValue*, uint, TextRange, int>)(lpVtbl[84]))((IDWriteTextLayout4*)Unsafe.AsPointer(ref this), fontAxisValues, fontAxisValueCount, textRange);
 	}
 
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTextLayout4::GetFontAxisValueCount"]/*' />
diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTypography.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTypography.cs
index 7a66959..77e10b6 100644
--- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTypography.cs
+++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteTypography.cs
@@ -77,9 +77,9 @@ public unsafe partial struct IDWriteTypography : INativeGuid
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTypography::AddFontFeature"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(3)]
-	public HResult AddFontFeature(FontFeature* fontFeature)
+	public HResult AddFontFeature(FontFeature fontFeature)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteTypography*, FontFeature*, int>)(lpVtbl[3]))((IDWriteTypography*)Unsafe.AsPointer(ref this), fontFeature);
+		return ((delegate* unmanaged[Stdcall]<IDWriteTypography*, FontFeature, int>)(lpVtbl[3]))((IDWriteTypography*)Unsafe.AsPointer(ref this), fontFeature);
 	}
 
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteTypography::GetFontFeatureCount"]/*' />
diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/Graphics.Dxgi.Enums.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/Graphics.Dxgi.Enums.cs
index 791db17..2518611 100644
--- a/src/Vortice.Win32.Graphics.Dxgi/Generated/Graphics.Dxgi.Enums.cs
+++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/Graphics.Dxgi.Enums.cs
@@ -30,6 +30,35 @@ public enum ResourcePriority : uint
 	Maximum = 3355443200,
 }
 
+/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_USAGE"]/*' />
+/// <unmanaged>DXGI_USAGE</unmanaged>
+[Flags]
+public enum Usage : uint
+{
+	None = 0,
+	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_USAGE::DXGI_USAGE_SHADER_INPUT"]/*' />
+	/// <unmanaged>DXGI_USAGE_SHADER_INPUT</unmanaged>
+	ShaderInput = 16,
+	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_USAGE::DXGI_USAGE_RENDER_TARGET_OUTPUT"]/*' />
+	/// <unmanaged>DXGI_USAGE_RENDER_TARGET_OUTPUT</unmanaged>
+	RenderTargetOutput = 32,
+	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_USAGE::DXGI_USAGE_BACK_BUFFER"]/*' />
+	/// <unmanaged>DXGI_USAGE_BACK_BUFFER</unmanaged>
+	BackBuffer = 64,
+	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_USAGE::DXGI_USAGE_SHARED"]/*' />
+	/// <unmanaged>DXGI_USAGE_SHARED</unmanaged>
+	Shared = 128,
+	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_USAGE::DXGI_USAGE_READ_ONLY"]/*' />
+	/// <unmanaged>DXGI_USAGE_READ_ONLY</unmanaged>
+	ReadOnly = 256,
+	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_USAGE::DXGI_USAGE_DISCARD_ON_PRESENT"]/*' />
+	/// <unmanaged>DXGI_USAGE_DISCARD_ON_PRESENT</unmanaged>
+	DiscardOnPresent = 512,
+	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_USAGE::DXGI_USAGE_UNORDERED_ACCESS"]/*' />
+	/// <unmanaged>DXGI_USAGE_UNORDERED_ACCESS</unmanaged>
+	UnorderedAccess = 1024,
+}
+
 /// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_RESIDENCY"]/*' />
 /// <unmanaged>DXGI_RESIDENCY</unmanaged>
 public enum Residency : int
@@ -1498,27 +1527,6 @@ public enum MessageId : int
 	/// <unmanaged>DXGI_MSG_Phone_IDXGISwapChain_GetBackgroundColor_FlipSequentialRequired</unmanaged>
 	Phone_IDXGISwapChain_GetBackgroundColor_FlipSequentialRequired = 1031,
 }
-/// <unmanaged>DXGI_USAGE</unmanaged>
-[Flags]
-public enum Usage : uint
-{
-	None = 0,
-	/// <unmanaged>DXGI_USAGE_SHADER_INPUT</unmanaged>
-	ShaderInput = 16,
-	/// <unmanaged>DXGI_USAGE_RENDER_TARGET_OUTPUT</unmanaged>
-	RenderTargetOutput = 32,
-	/// <unmanaged>DXGI_USAGE_BACK_BUFFER</unmanaged>
-	BackBuffer = 64,
-	/// <unmanaged>DXGI_USAGE_SHARED</unmanaged>
-	Shared = 128,
-	/// <unmanaged>DXGI_USAGE_READ_ONLY</unmanaged>
-	ReadOnly = 256,
-	/// <unmanaged>DXGI_USAGE_DISCARD_ON_PRESENT</unmanaged>
-	DiscardOnPresent = 512,
-	/// <unmanaged>DXGI_USAGE_UNORDERED_ACCESS</unmanaged>
-	UnorderedAccess = 1024,
-}
-
 /// <unmanaged>DXGI_MAP</unmanaged>
 [Flags]
 public enum MapFlags : uint
diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIResource.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIResource.cs
index ce22b53..f18a5da 100644
--- a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIResource.cs
+++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIResource.cs
@@ -125,9 +125,9 @@ public unsafe partial struct IDXGIResource : INativeGuid
 	/// <include file='../Dxgi.xml' path='doc/member[@name="IDXGIResource::GetUsage"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(9)]
-	public HResult GetUsage(uint* pUsage)
+	public HResult GetUsage(Usage* pUsage)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIResource*, uint*, int>)(lpVtbl[9]))((IDXGIResource*)Unsafe.AsPointer(ref this), pUsage);
+		return ((delegate* unmanaged[Stdcall]<IDXGIResource*, Usage*, int>)(lpVtbl[9]))((IDXGIResource*)Unsafe.AsPointer(ref this), pUsage);
 	}
 
 	/// <include file='../Dxgi.xml' path='doc/member[@name="IDXGIResource::SetEvictionPriority"]/*' />
diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIResource1.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIResource1.cs
index 503204f..99a3cae 100644
--- a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIResource1.cs
+++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIResource1.cs
@@ -125,9 +125,9 @@ public unsafe partial struct IDXGIResource1 : INativeGuid
 	/// <inheritdoc cref="IDXGIResource.GetUsage" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(9)]
-	public HResult GetUsage(uint* pUsage)
+	public HResult GetUsage(Usage* pUsage)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIResource1*, uint*, int>)(lpVtbl[9]))((IDXGIResource1*)Unsafe.AsPointer(ref this), pUsage);
+		return ((delegate* unmanaged[Stdcall]<IDXGIResource1*, Usage*, int>)(lpVtbl[9]))((IDXGIResource1*)Unsafe.AsPointer(ref this), pUsage);
 	}
 
 	/// <inheritdoc cref="IDXGIResource.SetEvictionPriority" />