Merge pull request #366 from tannergooding/main

Updating d3d12 and d3dx12 bindings to v1.611.2

generation/DirectX/um/dwrite/generate.rsp

@@ -1,6 +1,7 @@
 @../../../settings.rsp
 @../../../remap.rsp
 --exclude
+DWRITE_BEGIN_INTERFACE
 DWRITE_DECLARE_INTERFACE
 DWRITE_MAKE_FONT_FEATURE_TAG
 DWRITE_MAKE_OPENTYPE_TAG

generation/Windows/shared/Iprtrmib/generate.rsp

@@ -19,3 +19,5 @@ TerraFX.Interop.Windows
 ../../../../tests/Interop/Windows/Windows/shared/Iprtrmib
 --traverse
 C:/Program Files (x86)/Windows Kits/10/Include/10.0.22621.0/shared/Iprtrmib.h
+--with-length
+_MIB_OPAQUE_INFO.rgbyData=1

generation/Windows/um/winioctl/generate.rsp

@@ -119,6 +119,8 @@ USN_RECORD_EXTENT=SupportedOSPlatform("windows6.3")
 USN_RECORD_V3=SupportedOSPlatform("windows6.2")
 USN_RECORD_V4=SupportedOSPlatform("windows6.3")
 USN_TRACK_MODIFIED_RANGES=SupportedOSPlatform("windows6.3")
+--with-length
+TXFS_READ_BACKUP_INFORMATION_OUT.Buffer=(int)(BufferLength)
 --with-type
 ASYNC_DUPLICATE_EXTENTS_STATUS_V1=uint
 CSV_NAMESPACE_INFO_V1=uint
@@ -134,3 +136,7 @@ HISTOGRAM_BUCKET_SIZE=uint
 STORAGE_ADAPTER_SERIAL_NUMBER_V1_SIZE=uint
 STORAGE_ADAPTER_SERIAL_NUMBER_V1_VERSION=uint
 STORAGE_COUNTERS_VERSION_V1=uint
+--with-length
+_STORAGE_QUERY_DEPENDENT_VOLUME_RESPONSE.Lev1Depends=(int)(NumberEntries)
+_STORAGE_QUERY_DEPENDENT_VOLUME_RESPONSE.Lev2Depends=(int)(NumberEntries)
+_TXFS_READ_BACKUP_INFORMATION_OUT.Buffer=(int)(BufferLength)

generation/Windows/um/winnt/generate.rsp

@@ -141,6 +141,7 @@ ISPTR
 IsReparseTagDirectory
 IsReparseTagMicrosoft
 IsReparseTagNameSurrogate
+IsReparseTagReserved
 ISTAG
 IsVirtualDiskFileShared
 IS_DISPATCHING

sources/Interop/Windows/DirectX/d3d12/d3d12/D3D12_CLEAR_VALUE.cs

@@ -11,7 +11,7 @@
 namespace TerraFX.Interop.DirectX;
 
 /// <include file='D3D12_CLEAR_VALUE.xml' path='doc/member[@name="D3D12_CLEAR_VALUE"]/*' />
-public unsafe partial struct D3D12_CLEAR_VALUE
+public partial struct D3D12_CLEAR_VALUE
 {
     /// <include file='D3D12_CLEAR_VALUE.xml' path='doc/member[@name="D3D12_CLEAR_VALUE.Format"]/*' />
     public DXGI_FORMAT Format;
@@ -27,7 +27,7 @@ public Span<float> Color
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         get
         {
-            return MemoryMarshal.CreateSpan(ref Anonymous.Color[0], 4);
+            return Anonymous.Color;
         }
     }
 
@@ -44,15 +44,22 @@ public ref D3D12_DEPTH_STENCIL_VALUE DepthStencil
 
     /// <include file='_Anonymous_e__Union.xml' path='doc/member[@name="_Anonymous_e__Union"]/*' />
     [StructLayout(LayoutKind.Explicit)]
-    public unsafe partial struct _Anonymous_e__Union
+    public partial struct _Anonymous_e__Union
     {
         /// <include file='_Anonymous_e__Union.xml' path='doc/member[@name="_Anonymous_e__Union.Color"]/*' />
         [FieldOffset(0)]
         [NativeTypeName("FLOAT[4]")]
-        public fixed float Color[4];
+        public _Color_e__FixedBuffer Color;
 
         /// <include file='_Anonymous_e__Union.xml' path='doc/member[@name="_Anonymous_e__Union.DepthStencil"]/*' />
         [FieldOffset(0)]
         public D3D12_DEPTH_STENCIL_VALUE DepthStencil;
+
+        /// <include file='_Color_e__FixedBuffer.xml' path='doc/member[@name="_Color_e__FixedBuffer"]/*' />
+        [InlineArray(4)]
+        public partial struct _Color_e__FixedBuffer
+        {
+            public float e0;
+        }
     }
 }

sources/Interop/Windows/DirectX/d3d12/d3d12/D3D12_RAYTRACING_INSTANCE_DESC.cs

@@ -8,11 +8,11 @@
 namespace TerraFX.Interop.DirectX;
 
 /// <include file='D3D12_RAYTRACING_INSTANCE_DESC.xml' path='doc/member[@name="D3D12_RAYTRACING_INSTANCE_DESC"]/*' />
-public unsafe partial struct D3D12_RAYTRACING_INSTANCE_DESC
+public partial struct D3D12_RAYTRACING_INSTANCE_DESC
 {
     /// <include file='D3D12_RAYTRACING_INSTANCE_DESC.xml' path='doc/member[@name="D3D12_RAYTRACING_INSTANCE_DESC.Transform"]/*' />
     [NativeTypeName("FLOAT[3][4]")]
-    public fixed float Transform[3 * 4];
+    public _Transform_e__FixedBuffer Transform;
 
     public uint _bitfield1;
 
@@ -89,4 +89,11 @@ readonly get
     /// <include file='D3D12_RAYTRACING_INSTANCE_DESC.xml' path='doc/member[@name="D3D12_RAYTRACING_INSTANCE_DESC.AccelerationStructure"]/*' />
     [NativeTypeName("D3D12_GPU_VIRTUAL_ADDRESS")]
     public ulong AccelerationStructure;
+
+    /// <include file='_Transform_e__FixedBuffer.xml' path='doc/member[@name="_Transform_e__FixedBuffer"]/*' />
+    [InlineArray(3 * 4)]
+    public partial struct _Transform_e__FixedBuffer
+    {
+        public float e0_0;
+    }
 }

sources/Interop/Windows/DirectX/d3d12/d3d12/D3D12_SAMPLER_DESC.cs

@@ -3,10 +3,12 @@
 // Ported from d3d12.h in microsoft/DirectX-Headers tag v1.606.4
 // Original source is Copyright © Microsoft. Licensed under the MIT license
 
+using System.Runtime.CompilerServices;
+
 namespace TerraFX.Interop.DirectX;
 
 /// <include file='D3D12_SAMPLER_DESC.xml' path='doc/member[@name="D3D12_SAMPLER_DESC"]/*' />
-public unsafe partial struct D3D12_SAMPLER_DESC
+public partial struct D3D12_SAMPLER_DESC
 {
     /// <include file='D3D12_SAMPLER_DESC.xml' path='doc/member[@name="D3D12_SAMPLER_DESC.Filter"]/*' />
     public D3D12_FILTER Filter;
@@ -31,11 +33,18 @@ public unsafe partial struct D3D12_SAMPLER_DESC
 
     /// <include file='D3D12_SAMPLER_DESC.xml' path='doc/member[@name="D3D12_SAMPLER_DESC.BorderColor"]/*' />
     [NativeTypeName("FLOAT[4]")]
-    public fixed float BorderColor[4];
+    public _BorderColor_e__FixedBuffer BorderColor;
 
     /// <include file='D3D12_SAMPLER_DESC.xml' path='doc/member[@name="D3D12_SAMPLER_DESC.MinLOD"]/*' />
     public float MinLOD;
 
     /// <include file='D3D12_SAMPLER_DESC.xml' path='doc/member[@name="D3D12_SAMPLER_DESC.MaxLOD"]/*' />
     public float MaxLOD;
+
+    /// <include file='_BorderColor_e__FixedBuffer.xml' path='doc/member[@name="_BorderColor_e__FixedBuffer"]/*' />
+    [InlineArray(4)]
+    public partial struct _BorderColor_e__FixedBuffer
+    {
+        public float e0;
+    }
 }

sources/Interop/Windows/DirectX/d3d12/d3d12/D3D12_SAMPLER_DESC2.cs

@@ -11,7 +11,7 @@
 namespace TerraFX.Interop.DirectX;
 
 /// <include file='D3D12_SAMPLER_DESC2.xml' path='doc/member[@name="D3D12_SAMPLER_DESC2"]/*' />
-public unsafe partial struct D3D12_SAMPLER_DESC2
+public partial struct D3D12_SAMPLER_DESC2
 {
     /// <include file='D3D12_SAMPLER_DESC2.xml' path='doc/member[@name="D3D12_SAMPLER_DESC2.Filter"]/*' />
     public D3D12_FILTER Filter;
@@ -54,7 +54,7 @@ public Span<float> FloatBorderColor
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         get
         {
-            return MemoryMarshal.CreateSpan(ref Anonymous.FloatBorderColor[0], 4);
+            return Anonymous.FloatBorderColor;
         }
     }
 
@@ -65,22 +65,36 @@ public Span<uint> UintBorderColor
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         get
         {
-            return MemoryMarshal.CreateSpan(ref Anonymous.UintBorderColor[0], 4);
+            return Anonymous.UintBorderColor;
         }
     }
 
     /// <include file='_Anonymous_e__Union.xml' path='doc/member[@name="_Anonymous_e__Union"]/*' />
     [StructLayout(LayoutKind.Explicit)]
-    public unsafe partial struct _Anonymous_e__Union
+    public partial struct _Anonymous_e__Union
     {
         /// <include file='_Anonymous_e__Union.xml' path='doc/member[@name="_Anonymous_e__Union.FloatBorderColor"]/*' />
         [FieldOffset(0)]
         [NativeTypeName("FLOAT[4]")]
-        public fixed float FloatBorderColor[4];
+        public _FloatBorderColor_e__FixedBuffer FloatBorderColor;
 
         /// <include file='_Anonymous_e__Union.xml' path='doc/member[@name="_Anonymous_e__Union.UintBorderColor"]/*' />
         [FieldOffset(0)]
         [NativeTypeName("UINT[4]")]
-        public fixed uint UintBorderColor[4];
+        public _UintBorderColor_e__FixedBuffer UintBorderColor;
+
+        /// <include file='_FloatBorderColor_e__FixedBuffer.xml' path='doc/member[@name="_FloatBorderColor_e__FixedBuffer"]/*' />
+        [InlineArray(4)]
+        public partial struct _FloatBorderColor_e__FixedBuffer
+        {
+            public float e0;
+        }
+
+        /// <include file='_UintBorderColor_e__FixedBuffer.xml' path='doc/member[@name="_UintBorderColor_e__FixedBuffer"]/*' />
+        [InlineArray(4)]
+        public partial struct _UintBorderColor_e__FixedBuffer
+        {
+            public uint e0;
+        }
     }
 }

sources/Interop/Windows/DirectX/d3d12/d3d12/D3D12_SERIALIZED_DATA_DRIVER_MATCHING_IDENTIFIER.cs

@@ -4,16 +4,24 @@
 // Original source is Copyright © Microsoft. Licensed under the MIT license
 
 using System;
+using System.Runtime.CompilerServices;
 
 namespace TerraFX.Interop.DirectX;
 
 /// <include file='D3D12_SERIALIZED_DATA_DRIVER_MATCHING_IDENTIFIER.xml' path='doc/member[@name="D3D12_SERIALIZED_DATA_DRIVER_MATCHING_IDENTIFIER"]/*' />
-public unsafe partial struct D3D12_SERIALIZED_DATA_DRIVER_MATCHING_IDENTIFIER
+public partial struct D3D12_SERIALIZED_DATA_DRIVER_MATCHING_IDENTIFIER
 {
     /// <include file='D3D12_SERIALIZED_DATA_DRIVER_MATCHING_IDENTIFIER.xml' path='doc/member[@name="D3D12_SERIALIZED_DATA_DRIVER_MATCHING_IDENTIFIER.DriverOpaqueGUID"]/*' />
     public Guid DriverOpaqueGUID;
 
     /// <include file='D3D12_SERIALIZED_DATA_DRIVER_MATCHING_IDENTIFIER.xml' path='doc/member[@name="D3D12_SERIALIZED_DATA_DRIVER_MATCHING_IDENTIFIER.DriverOpaqueVersioningData"]/*' />
     [NativeTypeName("BYTE[16]")]
-    public fixed byte DriverOpaqueVersioningData[16];
+    public _DriverOpaqueVersioningData_e__FixedBuffer DriverOpaqueVersioningData;
+
+    /// <include file='_DriverOpaqueVersioningData_e__FixedBuffer.xml' path='doc/member[@name="_DriverOpaqueVersioningData_e__FixedBuffer"]/*' />
+    [InlineArray(16)]
+    public partial struct _DriverOpaqueVersioningData_e__FixedBuffer
+    {
+        public byte e0;
+    }
 }

sources/Interop/Windows/DirectX/d3d12/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS.cs

@@ -8,7 +8,7 @@
 namespace TerraFX.Interop.DirectX;
 
 /// <include file='D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS.xml' path='doc/member[@name="D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS"]/*' />
-public unsafe partial struct D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS
+public partial struct D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS
 {
     /// <include file='D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS.xml' path='doc/member[@name="D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS.InputStream"]/*' />
     [NativeTypeName("D3D12_VIDEO_PROCESS_INPUT_STREAM[2]")]
@@ -25,7 +25,7 @@ public unsafe partial struct D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS
 
     /// <include file='D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS.xml' path='doc/member[@name="D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS.FilterLevels"]/*' />
     [NativeTypeName("INT[32]")]
-    public fixed int FilterLevels[32];
+    public _FilterLevels_e__FixedBuffer FilterLevels;
 
     /// <include file='D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS.xml' path='doc/member[@name="D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS.AlphaBlending"]/*' />
     public D3D12_VIDEO_PROCESS_ALPHA_BLENDING AlphaBlending;
@@ -36,4 +36,11 @@ public partial struct _InputStream_e__FixedBuffer
     {
         public D3D12_VIDEO_PROCESS_INPUT_STREAM e0;
     }
+
+    /// <include file='_FilterLevels_e__FixedBuffer.xml' path='doc/member[@name="_FilterLevels_e__FixedBuffer"]/*' />
+    [InlineArray(32)]
+    public partial struct _FilterLevels_e__FixedBuffer
+    {
+        public int e0;
+    }
 }

sources/Interop/Windows/DirectX/d3d12/d3d12video/D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS1.cs

@@ -8,7 +8,7 @@
 namespace TerraFX.Interop.DirectX;
 
 /// <include file='D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS1.xml' path='doc/member[@name="D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS1"]/*' />
-public unsafe partial struct D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS1
+public partial struct D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS1
 {
     /// <include file='D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS1.xml' path='doc/member[@name="D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS1.InputStream"]/*' />
     [NativeTypeName("D3D12_VIDEO_PROCESS_INPUT_STREAM[2]")]
@@ -25,7 +25,7 @@ public unsafe partial struct D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS1
 
     /// <include file='D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS1.xml' path='doc/member[@name="D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS1.FilterLevels"]/*' />
     [NativeTypeName("INT[32]")]
-    public fixed int FilterLevels[32];
+    public _FilterLevels_e__FixedBuffer FilterLevels;
 
     /// <include file='D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS1.xml' path='doc/member[@name="D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS1.AlphaBlending"]/*' />
     public D3D12_VIDEO_PROCESS_ALPHA_BLENDING AlphaBlending;
@@ -39,4 +39,11 @@ public partial struct _InputStream_e__FixedBuffer
     {
         public D3D12_VIDEO_PROCESS_INPUT_STREAM e0;
     }
+
+    /// <include file='_FilterLevels_e__FixedBuffer.xml' path='doc/member[@name="_FilterLevels_e__FixedBuffer"]/*' />
+    [InlineArray(32)]
+    public partial struct _FilterLevels_e__FixedBuffer
+    {
+        public int e0;
+    }
 }

sources/Interop/Windows/DirectX/d3d12/d3d12video/D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC.cs

@@ -3,12 +3,13 @@
 // Ported from d3d12video.h in microsoft/DirectX-Headers tag v1.606.4
 // Original source is Copyright © Microsoft. Licensed under the MIT license
 
+using System.Runtime.CompilerServices;
 using TerraFX.Interop.Windows;
 
 namespace TerraFX.Interop.DirectX;
 
 /// <include file='D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC.xml' path='doc/member[@name="D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC"]/*' />
-public unsafe partial struct D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC
+public partial struct D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC
 {
     /// <include file='D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC.xml' path='doc/member[@name="D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC.Format"]/*' />
     public DXGI_FORMAT Format;
@@ -24,11 +25,18 @@ public unsafe partial struct D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC
 
     /// <include file='D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC.xml' path='doc/member[@name="D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC.BackgroundColor"]/*' />
     [NativeTypeName("FLOAT[4]")]
-    public fixed float BackgroundColor[4];
+    public _BackgroundColor_e__FixedBuffer BackgroundColor;
 
     /// <include file='D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC.xml' path='doc/member[@name="D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC.FrameRate"]/*' />
     public DXGI_RATIONAL FrameRate;
 
     /// <include file='D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC.xml' path='doc/member[@name="D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC.EnableStereo"]/*' />
     public BOOL EnableStereo;
+
+    /// <include file='_BackgroundColor_e__FixedBuffer.xml' path='doc/member[@name="_BackgroundColor_e__FixedBuffer"]/*' />
+    [InlineArray(4)]
+    public partial struct _BackgroundColor_e__FixedBuffer
+    {
+        public float e0;
+    }
 }

sources/Interop/Windows/DirectX/shared/dxgi/DXGI_ADAPTER_DESC.cs

@@ -3,16 +3,17 @@
 // Ported from shared/dxgi.h in the Windows SDK for Windows 10.0.22621.0
 // Original source is Copyright © Microsoft. All rights reserved.
 
+using System.Runtime.CompilerServices;
 using TerraFX.Interop.Windows;
 
 namespace TerraFX.Interop.DirectX;
 
 /// <include file='DXGI_ADAPTER_DESC.xml' path='doc/member[@name="DXGI_ADAPTER_DESC"]/*' />
-public unsafe partial struct DXGI_ADAPTER_DESC
+public partial struct DXGI_ADAPTER_DESC
 {
     /// <include file='DXGI_ADAPTER_DESC.xml' path='doc/member[@name="DXGI_ADAPTER_DESC.Description"]/*' />
     [NativeTypeName("WCHAR[128]")]
-    public fixed char Description[128];
+    public _Description_e__FixedBuffer Description;
 
     /// <include file='DXGI_ADAPTER_DESC.xml' path='doc/member[@name="DXGI_ADAPTER_DESC.VendorId"]/*' />
     public uint VendorId;
@@ -40,4 +41,11 @@ public unsafe partial struct DXGI_ADAPTER_DESC
 
     /// <include file='DXGI_ADAPTER_DESC.xml' path='doc/member[@name="DXGI_ADAPTER_DESC.AdapterLuid"]/*' />
     public LUID AdapterLuid;
+
+    /// <include file='_Description_e__FixedBuffer.xml' path='doc/member[@name="_Description_e__FixedBuffer"]/*' />
+    [InlineArray(128)]
+    public partial struct _Description_e__FixedBuffer
+    {
+        public char e0;
+    }
 }

sources/Interop/Windows/DirectX/shared/dxgi/DXGI_ADAPTER_DESC1.cs

@@ -3,16 +3,17 @@
 // Ported from shared/dxgi.h in the Windows SDK for Windows 10.0.22621.0
 // Original source is Copyright © Microsoft. All rights reserved.
 
+using System.Runtime.CompilerServices;
 using TerraFX.Interop.Windows;
 
 namespace TerraFX.Interop.DirectX;
 
 /// <include file='DXGI_ADAPTER_DESC1.xml' path='doc/member[@name="DXGI_ADAPTER_DESC1"]/*' />
-public unsafe partial struct DXGI_ADAPTER_DESC1
+public partial struct DXGI_ADAPTER_DESC1
 {
     /// <include file='DXGI_ADAPTER_DESC1.xml' path='doc/member[@name="DXGI_ADAPTER_DESC1.Description"]/*' />
     [NativeTypeName("WCHAR[128]")]
-    public fixed char Description[128];
+    public _Description_e__FixedBuffer Description;
 
     /// <include file='DXGI_ADAPTER_DESC1.xml' path='doc/member[@name="DXGI_ADAPTER_DESC1.VendorId"]/*' />
     public uint VendorId;
@@ -43,4 +44,11 @@ public unsafe partial struct DXGI_ADAPTER_DESC1
 
     /// <include file='DXGI_ADAPTER_DESC1.xml' path='doc/member[@name="DXGI_ADAPTER_DESC1.Flags"]/*' />
     public uint Flags;
+
+    /// <include file='_Description_e__FixedBuffer.xml' path='doc/member[@name="_Description_e__FixedBuffer"]/*' />
+    [InlineArray(128)]
+    public partial struct _Description_e__FixedBuffer
+    {
+        public char e0;
+    }
 }