dxgi: Override enum (flags) ABI type to UINT when used in structures

Even though my previous contribution in #1757 added `AssociatedEnum`
annotations to both function parameters and structure fields for some
enum types, language bindings like windows-rs can only generate ABI
conversions for parameters (and return types) inside functions when
there's a mismatch (untyped enums are assumed to be `INT`, whereas
structures and functions usually use `UINT` instead of the enum name).
There is no place for this in `repr(C)` structs (in Rust), requiring
us to get more creative to use the original `UINT` ABI while still
replacing the field type with that of the relevant self-descriptive
enum type.

Instead, move these (also rather disconnected) annotations and
references on those enums and their respective fields to `enums.json`,
where we can set the `AssociatedEnum` attribute at once in a more
coherent way while above all allowing us to override the enum/flags
ABI type to match how it's used by the APIs in function parameters and
struct fields.

Author: MarijnS95

generation/WinSDK/Partitions/Dxgi/settings.rsp

@@ -13,11 +13,7 @@ _D3DCOLORVALUE
 <IncludeRoot>/um/dxprogrammablecapture.h
 --namespace
 Windows.Win32.Graphics.Dxgi
---with-attribute
-DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAGS=Flags
-DXGI_OFFER_RESOURCE_FLAGS=Flags
-DXGI_OUTDUPL_FLAG=Flags
-DXGI_OVERLAY_COLOR_SPACE_SUPPORT_FLAG=Flags
-DXGI_OVERLAY_SUPPORT_FLAG=Flags
-DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG=Flags
-DXGI_SWAP_CHAIN_FLAG=Flags
+--with-type
+DXGI_OUTDUPL_FLAG=uint
+DXGI_SWAP_CHAIN_FLAG=uint
+DXGI_ADAPTER_FLAG=uint

generation/WinSDK/emitter.settings.rsp

@@ -51,6 +51,13 @@ DETACH_VIRTUAL_DISK_FLAG
 DRAWPROGRESSFLAGS
 DXGI_ADAPTER_FLAG
 DXGI_DEBUG_RLO_FLAGS
+DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAGS
+DXGI_OFFER_RESOURCE_FLAGS
+DXGI_OUTDUPL_FLAG
+DXGI_OVERLAY_COLOR_SPACE_SUPPORT_FLAG
+DXGI_OVERLAY_SUPPORT_FLAG
+DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG
+DXGI_SWAP_CHAIN_FLAG
 EXPAND_VIRTUAL_DISK_FLAG
 FILEOPENDIALOGOPTIONS
 FORK_VIRTUAL_DISK_FLAG
@@ -1824,29 +1831,30 @@ GetFileVersionInfoSizeA=[CanReturnMultipleSuccessValues]
 GetFileVersionInfoSizeW=[CanReturnMultipleSuccessValues]
 CertCreateCertificateContext=[CanReturnMultipleSuccessValues]
 DeviceIoControl::lpOverlapped=[In][Out][Optional][Retained]
-DXGI_ADAPTER_DESC1::Flags=[AssociatedEnum("DXGI_ADAPTER_FLAG")]
-DXGI_ADAPTER_DESC2::Flags=[AssociatedEnum("DXGI_ADAPTER_FLAG")]
-DXGI_DECODE_SWAP_CHAIN_DESC::Flags=[AssociatedEnum("DXGI_SWAP_CHAIN_FLAG")]
-DXGI_SWAP_CHAIN_DESC::Flags=[AssociatedEnum("DXGI_SWAP_CHAIN_FLAG")]
-DXGI_SWAP_CHAIN_DESC1::Flags=[AssociatedEnum("DXGI_SWAP_CHAIN_FLAG")]
-IDXGIDevice4::OfferResources1::Flags=[AssociatedEnum("DXGI_OFFER_RESOURCE_FLAGS")]
-IDXGIOutput3::CheckOverlaySupport::pFlags=[AssociatedEnum("DXGI_OVERLAY_SUPPORT_FLAG")]
-IDXGIOutput4::CheckOverlayColorSpaceSupport::pFlags=[AssociatedEnum("DXGI_OVERLAY_COLOR_SPACE_SUPPORT_FLAG")]
-IDXGIOutput6::CheckHardwareCompositionSupport::pFlags=[AssociatedEnum("DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAGS")]
-IDXGISwapChain::ResizeBuffers::SwapChainFlags=[AssociatedEnum("DXGI_SWAP_CHAIN_FLAG")]
-IDXGISwapChain3::CheckColorSpaceSupport::pColorSpaceSupport=[AssociatedEnum("DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG")]
-IDXGISwapChain3::ResizeBuffers1::SwapChainFlags=[AssociatedEnum("DXGI_SWAP_CHAIN_FLAG")]
+DXGI_ADAPTER_DESC1::Flags=DXGI_ADAPTER_FLAG
+DXGI_ADAPTER_DESC2::Flags=DXGI_ADAPTER_FLAG
+DXGI_DECODE_SWAP_CHAIN_DESC::Flags=DXGI_SWAP_CHAIN_FLAG
+DXGI_SWAP_CHAIN_DESC::Flags=DXGI_SWAP_CHAIN_FLAG
+DXGI_SWAP_CHAIN_DESC1::Flags=DXGI_SWAP_CHAIN_FLAG
 IDXGIAdapter::GetDesc::pDesc=[RetVal]
 IDXGIAdapter1::GetDesc1::pDesc=[RetVal]
 IDXGIAdapter2::GetDesc2::pDesc=[RetVal]
 IDXGIAdapter4::GetDesc3::pDesc=[RetVal]
+IDXGIDevice4::OfferResources1::Flags=[AssociatedEnum("DXGI_OFFER_RESOURCE_FLAGS")]
 IDXGIOutput::GetDesc::pDesc=[RetVal]
+IDXGIOutput3::CheckOverlaySupport::pFlags=[AssociatedEnum("DXGI_OVERLAY_SUPPORT_FLAG")]
+IDXGIOutput4::CheckOverlayColorSpaceSupport::pFlags=[AssociatedEnum("DXGI_OVERLAY_COLOR_SPACE_SUPPORT_FLAG")]
+IDXGIOutput5::DuplicateOutput1::Flags=DXGI_OUTDUPL_FLAG
+IDXGIOutput6::CheckHardwareCompositionSupport::pFlags=[AssociatedEnum("DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAGS")]
 IDXGIOutput6::GetDesc1::pDesc=[RetVal]
 IDXGIOutputDuplication::GetDesc::pDesc=[RetVal]
 IDXGISurface::GetDesc::pDesc=[RetVal]
 IDXGISwapChain::GetDesc::pDesc=[RetVal]
+IDXGISwapChain::ResizeBuffers::SwapChainFlags=DXGI_SWAP_CHAIN_FLAG
 IDXGISwapChain1::GetDesc1::pDesc=[RetVal]
 IDXGISwapChain1::GetFullscreenDesc::pDesc=[RetVal]
+IDXGISwapChain3::CheckColorSpaceSupport::pColorSpaceSupport=[AssociatedEnum("DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG")]
+IDXGISwapChain3::ResizeBuffers1::SwapChainFlags=DXGI_SWAP_CHAIN_FLAG
 LPWPUCLOSEEVENT::hEvent=WSAEVENT
 LPWPUCREATEEVENT::return=WSAEVENT
 LPWPURESETEVENT::hEvent=WSAEVENT
@@ -1869,4 +1877,4 @@ IPropertyStoreCapabilities::IsPropertyWritable=[CanReturnMultipleSuccessValues]
 MFCreateAttributes::ppMFAttributes=[ComOutPtr]
 StartServiceCtrlDispatcherA::lpServiceStartTable=[NativeArrayInfo]
 StartServiceCtrlDispatcherW::lpServiceStartTable=[NativeArrayInfo]
-PMPRADMINCONNECTIONHANGUPNOTIFICATION3::param3=RAS_CONNECTION_3*
+PMPRADMINCONNECTIONHANGUPNOTIFICATION3::param3=RAS_CONNECTION_3*

scripts/ChangesSinceLastRelease.txt

@@ -29,3 +29,39 @@ Windows.Win32.System.LibraryLoader.Apis.QueryOptionalDelayLoadedAPI added
 # Correct PMPRADMINCONNECTIONHANGUPNOTIFICATION3 parameter 4
 Windows.Win32.NetworkManagement.Rras.PMPRADMINCONNECTIONHANGUPNOTIFICATION3.Invoke : param3 : [In] => [In,Out]
 Windows.Win32.NetworkManagement.Rras.PMPRADMINCONNECTIONHANGUPNOTIFICATION3.Invoke : param3...RAS_CONNECTION_3 => RAS_CONNECTION_3*
+# dxgi: Override enum (flags) ABI type to UINT when used in structures
+Windows.Win32.Graphics.Dxgi.DXGI_ADAPTER_DESC1.Flags : [AssociatedEnum(DXGI_ADAPTER_FLAG)] =>
+Windows.Win32.Graphics.Dxgi.DXGI_ADAPTER_DESC1.Flags...System.UInt32 => Windows.Win32.Graphics.Dxgi.DXGI_ADAPTER_FLAG
+Windows.Win32.Graphics.Dxgi.DXGI_ADAPTER_DESC2.Flags : [AssociatedEnum(DXGI_ADAPTER_FLAG)] =>
+Windows.Win32.Graphics.Dxgi.DXGI_ADAPTER_DESC2.Flags...System.UInt32 => Windows.Win32.Graphics.Dxgi.DXGI_ADAPTER_FLAG
+Windows.Win32.Graphics.Dxgi.DXGI_ADAPTER_FLAG.DXGI_ADAPTER_FLAG_NONE value init changed Int32->UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_ADAPTER_FLAG.DXGI_ADAPTER_FLAG_REMOTE value init changed Int32->UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_ADAPTER_FLAG.DXGI_ADAPTER_FLAG_SOFTWARE value init changed Int32->UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_ADAPTER_FLAG.value__...System.Int32 => System.UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_DECODE_SWAP_CHAIN_DESC.Flags : [AssociatedEnum(DXGI_SWAP_CHAIN_FLAG)] =>
+Windows.Win32.Graphics.Dxgi.DXGI_DECODE_SWAP_CHAIN_DESC.Flags...System.UInt32 => Windows.Win32.Graphics.Dxgi.DXGI_SWAP_CHAIN_FLAG
+Windows.Win32.Graphics.Dxgi.DXGI_OUTDUPL_FLAG.DXGI_OUTDUPL_COMPOSITED_UI_CAPTURE_ONLY value init changed Int32->UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_OUTDUPL_FLAG.value__...System.Int32 => System.UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_SWAP_CHAIN_DESC.Flags : [AssociatedEnum(DXGI_SWAP_CHAIN_FLAG)] =>
+Windows.Win32.Graphics.Dxgi.DXGI_SWAP_CHAIN_DESC.Flags...System.UInt32 => Windows.Win32.Graphics.Dxgi.DXGI_SWAP_CHAIN_FLAG
+Windows.Win32.Graphics.Dxgi.DXGI_SWAP_CHAIN_DESC1.Flags : [AssociatedEnum(DXGI_SWAP_CHAIN_FLAG)] =>
+Windows.Win32.Graphics.Dxgi.DXGI_SWAP_CHAIN_DESC1.Flags...System.UInt32 => Windows.Win32.Graphics.Dxgi.DXGI_SWAP_CHAIN_FLAG
+Windows.Win32.Graphics.Dxgi.DXGI_SWAP_CHAIN_FLAG.DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH value init changed Int32->UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_SWAP_CHAIN_FLAG.DXGI_SWAP_CHAIN_FLAG_ALLOW_TEARING value init changed Int32->UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_SWAP_CHAIN_FLAG.DXGI_SWAP_CHAIN_FLAG_DISPLAY_ONLY value init changed Int32->UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_SWAP_CHAIN_FLAG.DXGI_SWAP_CHAIN_FLAG_FOREGROUND_LAYER value init changed Int32->UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_SWAP_CHAIN_FLAG.DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT value init changed Int32->UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_SWAP_CHAIN_FLAG.DXGI_SWAP_CHAIN_FLAG_FULLSCREEN_VIDEO value init changed Int32->UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_SWAP_CHAIN_FLAG.DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE value init changed Int32->UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_SWAP_CHAIN_FLAG.DXGI_SWAP_CHAIN_FLAG_HW_PROTECTED value init changed Int32->UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_SWAP_CHAIN_FLAG.DXGI_SWAP_CHAIN_FLAG_NONPREROTATED value init changed Int32->UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_SWAP_CHAIN_FLAG.DXGI_SWAP_CHAIN_FLAG_RESTRICT_SHARED_RESOURCE_DRIVER value init changed Int32->UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_SWAP_CHAIN_FLAG.DXGI_SWAP_CHAIN_FLAG_RESTRICTED_CONTENT value init changed Int32->UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_SWAP_CHAIN_FLAG.DXGI_SWAP_CHAIN_FLAG_RESTRICTED_TO_ALL_HOLOGRAPHIC_DISPLAYS value init changed Int32->UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_SWAP_CHAIN_FLAG.DXGI_SWAP_CHAIN_FLAG_YUV_VIDEO value init changed Int32->UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_SWAP_CHAIN_FLAG.value__...System.Int32 => System.UInt32
+Windows.Win32.Graphics.Dxgi.IDXGIOutput5.DuplicateOutput1 : Flags...UInt32 => DXGI_OUTDUPL_FLAG
+Windows.Win32.Graphics.Dxgi.IDXGISwapChain.ResizeBuffers : SwapChainFlags : [AssociatedEnum(DXGI_SWAP_CHAIN_FLAG),In] => [In]
+Windows.Win32.Graphics.Dxgi.IDXGISwapChain.ResizeBuffers : SwapChainFlags...UInt32 => DXGI_SWAP_CHAIN_FLAG
+Windows.Win32.Graphics.Dxgi.IDXGISwapChain3.ResizeBuffers1 : SwapChainFlags : [AssociatedEnum(DXGI_SWAP_CHAIN_FLAG),In] => [In]
+Windows.Win32.Graphics.Dxgi.IDXGISwapChain3.ResizeBuffers1 : SwapChainFlags...UInt32 => DXGI_SWAP_CHAIN_FLAG