diff --git a/Directory.Build.props b/Directory.Build.props index e457fcb..9b3feac 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -15,7 +15,7 @@ true $(MSBuildThisFileDirectory)NuGet.config - 1.8.5 + 1.8.6 true diff --git a/src/Generator/Program.cs b/src/Generator/Program.cs index ddd2665..1070400 100644 --- a/src/Generator/Program.cs +++ b/src/Generator/Program.cs @@ -4,6 +4,7 @@ using System.Dynamic; using System.Globalization; using System.Text; +using System.Text.RegularExpressions; using Newtonsoft.Json; namespace Generator; @@ -1022,24 +1023,12 @@ public static class Program { "IDXGIDevice::CreateSurface::Usage", "DXGI_USAGE" }, { "IDXGIOutput::GetDisplayModeList::Flags", "DXGI_ENUM_MODES" }, { "IDXGISwapChain::Present::Flags", "DXGI_PRESENT" }, - { "IDXGISwapChain1::Present::Flags", "DXGI_PRESENT" }, - { "IDXGISwapChain2::Present::Flags", "DXGI_PRESENT" }, - { "IDXGISwapChain3::Present::Flags", "DXGI_PRESENT" }, - { "IDXGISwapChain4::Present::Flags", "DXGI_PRESENT" }, - { "IDXGISwapChain::ResizeBuffers::SwapChainFlags", "DXGI_SWAP_CHAIN_FLAG" }, - { "IDXGISwapChain1::ResizeBuffers::SwapChainFlags", "DXGI_SWAP_CHAIN_FLAG" }, - { "IDXGISwapChain2::ResizeBuffers::SwapChainFlags", "DXGI_SWAP_CHAIN_FLAG" }, - { "IDXGISwapChain3::ResizeBuffers::SwapChainFlags", "DXGI_SWAP_CHAIN_FLAG" }, - { "IDXGISwapChain4::ResizeBuffers::SwapChainFlags", "DXGI_SWAP_CHAIN_FLAG" }, + { "IDXGIFactory::MakeWindowAssociation::Flags", "DXGI_MWA" }, // D3D11 { "ID3D11DeviceContext::Map::MapFlags", "D3D11_MAP_FLAG" }, { "ID3D11DeviceContext::ClearDepthStencilView::ClearFlags", "D3D11_CLEAR_FLAG" }, - { "ID3D11DeviceContext1::ClearDepthStencilView::ClearFlags", "D3D11_CLEAR_FLAG" }, - { "ID3D11DeviceContext2::ClearDepthStencilView::ClearFlags", "D3D11_CLEAR_FLAG" }, - { "ID3D11DeviceContext3::ClearDepthStencilView::ClearFlags", "D3D11_CLEAR_FLAG" }, - { "ID3D11DeviceContext4::ClearDepthStencilView::ClearFlags", "D3D11_CLEAR_FLAG" }, // D3D12 @@ -2532,7 +2521,10 @@ public static class Program { if (string.IsNullOrEmpty(memberLookup) == false) { + string interfaceType = memberLookup.Split("::")[0]; + string parameterNameLookup = $"{memberLookup}::{parameter.Name}"; + retryLookup: if (s_mapFunctionParameters.TryGetValue(parameterNameLookup, out string? remapType)) { if (remapType.Contains('.')) @@ -2551,6 +2543,16 @@ public static class Program } else { + var result = Regex.Match(interfaceType, @"\d+$", RegexOptions.RightToLeft); + if (result.Success) + { + string interfaceTypeNoNumber = interfaceType.Replace(result.Value, string.Empty); + memberLookup = memberLookup.Replace(interfaceType, interfaceTypeNoNumber); + parameterNameLookup = $"{memberLookup}::{parameter.Name}"; + interfaceType = interfaceTypeNoNumber; + goto retryLookup; + } + parameterType = GetTypeName(parameter.Type, asPointer); } } diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/IWICImagingFactory2.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/IWICImagingFactory2.cs index 950f63f..bc85e94 100644 --- a/src/Vortice.Win32.Graphics.Direct2D/Generated/IWICImagingFactory2.cs +++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/IWICImagingFactory2.cs @@ -51,9 +51,9 @@ public unsafe partial struct IWICImagingFactory2 : INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(0)] - public HResult CreateDecoderFromFilename(ushort* wzFilename, Guid* pguidVendor, uint dwDesiredAccess, Graphics.Imaging.WICDecodeOptions metadataOptions, Graphics.Imaging.IWICBitmapDecoder** ppIDecoder) + public HResult CreateDecoderFromFilename(ushort* wzFilename, Guid* pguidVendor, NativeFileAccess dwDesiredAccess, Graphics.Imaging.WICDecodeOptions metadataOptions, Graphics.Imaging.IWICBitmapDecoder** ppIDecoder) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[0]))((IWICImagingFactory2*)Unsafe.AsPointer(ref this), wzFilename, pguidVendor, dwDesiredAccess, metadataOptions, ppIDecoder); + return ((delegate* unmanaged[Stdcall])(lpVtbl[0]))((IWICImagingFactory2*)Unsafe.AsPointer(ref this), wzFilename, pguidVendor, dwDesiredAccess, metadataOptions, ppIDecoder); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext1.cs index 7adbb2a..4b8d3b8 100644 --- a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext1.cs +++ b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext1.cs @@ -477,9 +477,9 @@ public unsafe partial struct ID3D11DeviceContext1 : INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(53)] - public void ClearDepthStencilView(ID3D11DepthStencilView* pDepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil) + public void ClearDepthStencilView(ID3D11DepthStencilView* pDepthStencilView, uint ClearFlags, float Depth, byte Stencil) { - ((delegate* unmanaged[Stdcall])(lpVtbl[53]))((ID3D11DeviceContext1*)Unsafe.AsPointer(ref this), pDepthStencilView, ClearFlags, Depth, Stencil); + ((delegate* unmanaged[Stdcall])(lpVtbl[53]))((ID3D11DeviceContext1*)Unsafe.AsPointer(ref this), pDepthStencilView, ClearFlags, Depth, Stencil); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext2.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext2.cs index c862695..4caee67 100644 --- a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext2.cs +++ b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext2.cs @@ -165,9 +165,9 @@ public unsafe partial struct ID3D11DeviceContext2 : INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(14)] - public HResult Map(ID3D11Resource* pResource, uint Subresource, MapMode MapType, uint MapFlags, MappedSubresource* pMappedResource) + public HResult Map(ID3D11Resource* pResource, uint Subresource, MapMode MapType, MapFlags MapFlags, MappedSubresource* pMappedResource) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[14]))((ID3D11DeviceContext2*)Unsafe.AsPointer(ref this), pResource, Subresource, MapType, MapFlags, pMappedResource); + return ((delegate* unmanaged[Stdcall])(lpVtbl[14]))((ID3D11DeviceContext2*)Unsafe.AsPointer(ref this), pResource, Subresource, MapType, MapFlags, pMappedResource); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext3.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext3.cs index 05fe4cb..c7b2e7e 100644 --- a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext3.cs +++ b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext3.cs @@ -477,9 +477,9 @@ public unsafe partial struct ID3D11DeviceContext3 : INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(53)] - public void ClearDepthStencilView(ID3D11DepthStencilView* pDepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil) + public void ClearDepthStencilView(ID3D11DepthStencilView* pDepthStencilView, uint ClearFlags, float Depth, byte Stencil) { - ((delegate* unmanaged[Stdcall])(lpVtbl[53]))((ID3D11DeviceContext3*)Unsafe.AsPointer(ref this), pDepthStencilView, ClearFlags, Depth, Stencil); + ((delegate* unmanaged[Stdcall])(lpVtbl[53]))((ID3D11DeviceContext3*)Unsafe.AsPointer(ref this), pDepthStencilView, ClearFlags, Depth, Stencil); } /// diff --git a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext4.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext4.cs index 5877a09..1fe6ee1 100644 --- a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext4.cs +++ b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext4.cs @@ -165,9 +165,9 @@ public unsafe partial struct ID3D11DeviceContext4 : INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(14)] - public HResult Map(ID3D11Resource* pResource, uint Subresource, MapMode MapType, uint MapFlags, MappedSubresource* pMappedResource) + public HResult Map(ID3D11Resource* pResource, uint Subresource, MapMode MapType, MapFlags MapFlags, MappedSubresource* pMappedResource) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[14]))((ID3D11DeviceContext4*)Unsafe.AsPointer(ref this), pResource, Subresource, MapType, MapFlags, pMappedResource); + return ((delegate* unmanaged[Stdcall])(lpVtbl[14]))((ID3D11DeviceContext4*)Unsafe.AsPointer(ref this), pResource, Subresource, MapType, MapFlags, pMappedResource); } /// diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIDevice1.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIDevice1.cs index 5c895e6..6d9a488 100644 --- a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIDevice1.cs +++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIDevice1.cs @@ -117,9 +117,9 @@ public unsafe partial struct IDXGIDevice1 : INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult CreateSurface(SurfaceDescription* pDesc, uint NumSurfaces, uint Usage, SharedResource* pSharedResource, IDXGISurface** ppSurface) + public HResult CreateSurface(SurfaceDescription* pDesc, uint NumSurfaces, Usage Usage, SharedResource* pSharedResource, IDXGISurface** ppSurface) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIDevice1*)Unsafe.AsPointer(ref this), pDesc, NumSurfaces, Usage, pSharedResource, ppSurface); + return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIDevice1*)Unsafe.AsPointer(ref this), pDesc, NumSurfaces, Usage, pSharedResource, ppSurface); } /// diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIDevice2.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIDevice2.cs index b98f51b..8534ff0 100644 --- a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIDevice2.cs +++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIDevice2.cs @@ -117,9 +117,9 @@ public unsafe partial struct IDXGIDevice2 : INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult CreateSurface(SurfaceDescription* pDesc, uint NumSurfaces, uint Usage, SharedResource* pSharedResource, IDXGISurface** ppSurface) + public HResult CreateSurface(SurfaceDescription* pDesc, uint NumSurfaces, Usage Usage, SharedResource* pSharedResource, IDXGISurface** ppSurface) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIDevice2*)Unsafe.AsPointer(ref this), pDesc, NumSurfaces, Usage, pSharedResource, ppSurface); + return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIDevice2*)Unsafe.AsPointer(ref this), pDesc, NumSurfaces, Usage, pSharedResource, ppSurface); } /// diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIDevice3.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIDevice3.cs index 29b9801..3e17a86 100644 --- a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIDevice3.cs +++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIDevice3.cs @@ -117,9 +117,9 @@ public unsafe partial struct IDXGIDevice3 : INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult CreateSurface(SurfaceDescription* pDesc, uint NumSurfaces, uint Usage, SharedResource* pSharedResource, IDXGISurface** ppSurface) + public HResult CreateSurface(SurfaceDescription* pDesc, uint NumSurfaces, Usage Usage, SharedResource* pSharedResource, IDXGISurface** ppSurface) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIDevice3*)Unsafe.AsPointer(ref this), pDesc, NumSurfaces, Usage, pSharedResource, ppSurface); + return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIDevice3*)Unsafe.AsPointer(ref this), pDesc, NumSurfaces, Usage, pSharedResource, ppSurface); } /// diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIDevice4.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIDevice4.cs index 210b302..58c8bca 100644 --- a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIDevice4.cs +++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIDevice4.cs @@ -117,9 +117,9 @@ public unsafe partial struct IDXGIDevice4 : INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult CreateSurface(SurfaceDescription* pDesc, uint NumSurfaces, uint Usage, SharedResource* pSharedResource, IDXGISurface** ppSurface) + public HResult CreateSurface(SurfaceDescription* pDesc, uint NumSurfaces, Usage Usage, SharedResource* pSharedResource, IDXGISurface** ppSurface) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIDevice4*)Unsafe.AsPointer(ref this), pDesc, NumSurfaces, Usage, pSharedResource, ppSurface); + return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIDevice4*)Unsafe.AsPointer(ref this), pDesc, NumSurfaces, Usage, pSharedResource, ppSurface); } /// diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory.cs index bb639c2..f7a2157 100644 --- a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory.cs +++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory.cs @@ -117,9 +117,9 @@ public unsafe partial struct IDXGIFactory : INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult MakeWindowAssociation(IntPtr WindowHandle, uint Flags) + public HResult MakeWindowAssociation(IntPtr WindowHandle, WindowAssociationFlags Flags) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIFactory*)Unsafe.AsPointer(ref this), WindowHandle, Flags); + return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIFactory*)Unsafe.AsPointer(ref this), WindowHandle, Flags); } /// diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory1.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory1.cs index 4c1dda3..f94f584 100644 --- a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory1.cs +++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory1.cs @@ -117,9 +117,9 @@ public unsafe partial struct IDXGIFactory1 : INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult MakeWindowAssociation(IntPtr WindowHandle, uint Flags) + public HResult MakeWindowAssociation(IntPtr WindowHandle, WindowAssociationFlags Flags) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIFactory1*)Unsafe.AsPointer(ref this), WindowHandle, Flags); + return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIFactory1*)Unsafe.AsPointer(ref this), WindowHandle, Flags); } /// diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory2.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory2.cs index 6dcee39..bbfe931 100644 --- a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory2.cs +++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory2.cs @@ -117,9 +117,9 @@ public unsafe partial struct IDXGIFactory2 : INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult MakeWindowAssociation(IntPtr WindowHandle, uint Flags) + public HResult MakeWindowAssociation(IntPtr WindowHandle, WindowAssociationFlags Flags) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIFactory2*)Unsafe.AsPointer(ref this), WindowHandle, Flags); + return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIFactory2*)Unsafe.AsPointer(ref this), WindowHandle, Flags); } /// diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory3.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory3.cs index 4ae464e..1ac6a6d 100644 --- a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory3.cs +++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory3.cs @@ -117,9 +117,9 @@ public unsafe partial struct IDXGIFactory3 : INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult MakeWindowAssociation(IntPtr WindowHandle, uint Flags) + public HResult MakeWindowAssociation(IntPtr WindowHandle, WindowAssociationFlags Flags) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIFactory3*)Unsafe.AsPointer(ref this), WindowHandle, Flags); + return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIFactory3*)Unsafe.AsPointer(ref this), WindowHandle, Flags); } /// diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory4.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory4.cs index 43846cd..bc3bf42 100644 --- a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory4.cs +++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory4.cs @@ -117,9 +117,9 @@ public unsafe partial struct IDXGIFactory4 : INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult MakeWindowAssociation(IntPtr WindowHandle, uint Flags) + public HResult MakeWindowAssociation(IntPtr WindowHandle, WindowAssociationFlags Flags) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIFactory4*)Unsafe.AsPointer(ref this), WindowHandle, Flags); + return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIFactory4*)Unsafe.AsPointer(ref this), WindowHandle, Flags); } /// diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory5.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory5.cs index f16afc3..6fca2d9 100644 --- a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory5.cs +++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory5.cs @@ -117,9 +117,9 @@ public unsafe partial struct IDXGIFactory5 : INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult MakeWindowAssociation(IntPtr WindowHandle, uint Flags) + public HResult MakeWindowAssociation(IntPtr WindowHandle, WindowAssociationFlags Flags) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIFactory5*)Unsafe.AsPointer(ref this), WindowHandle, Flags); + return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIFactory5*)Unsafe.AsPointer(ref this), WindowHandle, Flags); } /// diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory6.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory6.cs index b532050..76ab8e7 100644 --- a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory6.cs +++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory6.cs @@ -117,9 +117,9 @@ public unsafe partial struct IDXGIFactory6 : INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult MakeWindowAssociation(IntPtr WindowHandle, uint Flags) + public HResult MakeWindowAssociation(IntPtr WindowHandle, WindowAssociationFlags Flags) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIFactory6*)Unsafe.AsPointer(ref this), WindowHandle, Flags); + return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIFactory6*)Unsafe.AsPointer(ref this), WindowHandle, Flags); } /// diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory7.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory7.cs index 183ab63..148e429 100644 --- a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory7.cs +++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIFactory7.cs @@ -117,9 +117,9 @@ public unsafe partial struct IDXGIFactory7 : INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult MakeWindowAssociation(IntPtr WindowHandle, uint Flags) + public HResult MakeWindowAssociation(IntPtr WindowHandle, WindowAssociationFlags Flags) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIFactory7*)Unsafe.AsPointer(ref this), WindowHandle, Flags); + return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIFactory7*)Unsafe.AsPointer(ref this), WindowHandle, Flags); } /// diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIOutput1.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIOutput1.cs index eee7ce4..001cee9 100644 --- a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIOutput1.cs +++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIOutput1.cs @@ -117,9 +117,9 @@ public unsafe partial struct IDXGIOutput1 : INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult GetDisplayModeList(Common.Format EnumFormat, uint Flags, uint* pNumModes, Common.ModeDescription* pDesc) + public HResult GetDisplayModeList(Common.Format EnumFormat, EnumModesFlags Flags, uint* pNumModes, Common.ModeDescription* pDesc) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIOutput1*)Unsafe.AsPointer(ref this), EnumFormat, Flags, pNumModes, pDesc); + return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIOutput1*)Unsafe.AsPointer(ref this), EnumFormat, Flags, pNumModes, pDesc); } /// diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIOutput2.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIOutput2.cs index 5b18b48..feef468 100644 --- a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIOutput2.cs +++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIOutput2.cs @@ -117,9 +117,9 @@ public unsafe partial struct IDXGIOutput2 : INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult GetDisplayModeList(Common.Format EnumFormat, uint Flags, uint* pNumModes, Common.ModeDescription* pDesc) + public HResult GetDisplayModeList(Common.Format EnumFormat, EnumModesFlags Flags, uint* pNumModes, Common.ModeDescription* pDesc) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIOutput2*)Unsafe.AsPointer(ref this), EnumFormat, Flags, pNumModes, pDesc); + return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIOutput2*)Unsafe.AsPointer(ref this), EnumFormat, Flags, pNumModes, pDesc); } /// diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIOutput3.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIOutput3.cs index ef871cf..b2e3bfe 100644 --- a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIOutput3.cs +++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIOutput3.cs @@ -117,9 +117,9 @@ public unsafe partial struct IDXGIOutput3 : INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult GetDisplayModeList(Common.Format EnumFormat, uint Flags, uint* pNumModes, Common.ModeDescription* pDesc) + public HResult GetDisplayModeList(Common.Format EnumFormat, EnumModesFlags Flags, uint* pNumModes, Common.ModeDescription* pDesc) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIOutput3*)Unsafe.AsPointer(ref this), EnumFormat, Flags, pNumModes, pDesc); + return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIOutput3*)Unsafe.AsPointer(ref this), EnumFormat, Flags, pNumModes, pDesc); } /// diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIOutput4.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIOutput4.cs index e08e5bf..6146e42 100644 --- a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIOutput4.cs +++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIOutput4.cs @@ -117,9 +117,9 @@ public unsafe partial struct IDXGIOutput4 : INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult GetDisplayModeList(Common.Format EnumFormat, uint Flags, uint* pNumModes, Common.ModeDescription* pDesc) + public HResult GetDisplayModeList(Common.Format EnumFormat, EnumModesFlags Flags, uint* pNumModes, Common.ModeDescription* pDesc) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIOutput4*)Unsafe.AsPointer(ref this), EnumFormat, Flags, pNumModes, pDesc); + return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIOutput4*)Unsafe.AsPointer(ref this), EnumFormat, Flags, pNumModes, pDesc); } /// diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIOutput5.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIOutput5.cs index 3bf8ec9..4cdd80c 100644 --- a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIOutput5.cs +++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIOutput5.cs @@ -117,9 +117,9 @@ public unsafe partial struct IDXGIOutput5 : INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult GetDisplayModeList(Common.Format EnumFormat, uint Flags, uint* pNumModes, Common.ModeDescription* pDesc) + public HResult GetDisplayModeList(Common.Format EnumFormat, EnumModesFlags Flags, uint* pNumModes, Common.ModeDescription* pDesc) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIOutput5*)Unsafe.AsPointer(ref this), EnumFormat, Flags, pNumModes, pDesc); + return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIOutput5*)Unsafe.AsPointer(ref this), EnumFormat, Flags, pNumModes, pDesc); } /// diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIOutput6.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIOutput6.cs index 0c4c539..1da837c 100644 --- a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIOutput6.cs +++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIOutput6.cs @@ -117,9 +117,9 @@ public unsafe partial struct IDXGIOutput6 : INativeGuid /// [MethodImpl(MethodImplOptions.AggressiveInlining)] [VtblIndex(8)] - public HResult GetDisplayModeList(Common.Format EnumFormat, uint Flags, uint* pNumModes, Common.ModeDescription* pDesc) + public HResult GetDisplayModeList(Common.Format EnumFormat, EnumModesFlags Flags, uint* pNumModes, Common.ModeDescription* pDesc) { - return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIOutput6*)Unsafe.AsPointer(ref this), EnumFormat, Flags, pNumModes, pDesc); + return ((delegate* unmanaged[Stdcall])(lpVtbl[8]))((IDXGIOutput6*)Unsafe.AsPointer(ref this), EnumFormat, Flags, pNumModes, pDesc); } ///