diff --git a/generation/WinSDK/Partitions/Dxgi/settings.rsp b/generation/WinSDK/Partitions/Dxgi/settings.rsp
index bdbf32893..e7c641ea4 100644
--- a/generation/WinSDK/Partitions/Dxgi/settings.rsp
+++ b/generation/WinSDK/Partitions/Dxgi/settings.rsp
@@ -14,6 +14,8 @@ _D3DCOLORVALUE
 --namespace
 Windows.Win32.Graphics.Dxgi
 --with-attribute
+DXGI_ADAPTER_FLAG=Flags
+DXGI_DEBUG_RLO_FLAGS=Flags
 DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAGS=Flags
 DXGI_OFFER_RESOURCE_FLAGS=Flags
 DXGI_OUTDUPL_FLAG=Flags
@@ -21,3 +23,12 @@ 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_ADAPTER_FLAG=uint
+DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAGS=uint
+DXGI_OFFER_RESOURCE_FLAGS=uint
+DXGI_OUTDUPL_FLAG=uint
+DXGI_OVERLAY_COLOR_SPACE_SUPPORT_FLAG=uint
+DXGI_OVERLAY_SUPPORT_FLAG=uint
+DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG=uint
+DXGI_SWAP_CHAIN_FLAG=uint
diff --git a/generation/WinSDK/emitter.settings.rsp b/generation/WinSDK/emitter.settings.rsp
index d55afbdc8..cd1a3d991 100644
--- a/generation/WinSDK/emitter.settings.rsp
+++ b/generation/WinSDK/emitter.settings.rsp
@@ -51,8 +51,6 @@ DELETE_SNAPSHOT_VHDSET_FLAG
 DEPENDENT_DISK_FLAG
 DETACH_VIRTUAL_DISK_FLAG
 DRAWPROGRESSFLAGS
-DXGI_ADAPTER_FLAG
-DXGI_DEBUG_RLO_FLAGS
 EXPAND_VIRTUAL_DISK_FLAG
 FILEOPENDIALOGOPTIONS
 FORK_VIRTUAL_DISK_FLAG
@@ -1827,29 +1825,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=DXGI_OFFER_RESOURCE_FLAGS
 IDXGIOutput::GetDesc::pDesc=[RetVal]
+IDXGIOutput3::CheckOverlaySupport::pFlags=DXGI_OVERLAY_SUPPORT_FLAG
+IDXGIOutput4::CheckOverlayColorSpaceSupport::pFlags=DXGI_OVERLAY_COLOR_SPACE_SUPPORT_FLAG
+IDXGIOutput5::DuplicateOutput1::Flags=DXGI_OUTDUPL_FLAG
+IDXGIOutput6::CheckHardwareCompositionSupport::pFlags=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=DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG
+IDXGISwapChain3::ResizeBuffers1::SwapChainFlags=DXGI_SWAP_CHAIN_FLAG
 LPWPUCLOSEEVENT::hEvent=WSAEVENT
 LPWPUCREATEEVENT::return=WSAEVENT
 LPWPURESETEVENT::hEvent=WSAEVENT
diff --git a/scripts/ChangesSinceLastRelease.txt b/scripts/ChangesSinceLastRelease.txt
index b5c43cee1..88e6a2005 100644
--- a/scripts/ChangesSinceLastRelease.txt
+++ b/scripts/ChangesSinceLastRelease.txt
@@ -112,3 +112,64 @@ Windows.Win32.Graphics.Printing.Apis.FindClosePrinterChangeNotification : hChang
 Windows.Win32.Graphics.Printing.Apis.FindFirstPrinterChangeNotification : return...HANDLE => FINDPRINTERCHANGENOTIFICATION_HANDLE
 Windows.Win32.Graphics.Printing.Apis.FindNextPrinterChangeNotification : hChange...HANDLE => FINDPRINTERCHANGENOTIFICATION_HANDLE
 Windows.Win32.Graphics.Printing.FINDPRINTERCHANGENOTIFICATION_HANDLE added
+# 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
+# dxgi: Replace all flags enums/types with uint type
+Windows.Win32.Graphics.Dxgi.DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAGS.DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAG_CURSOR_STRETCHED value init changed Int32->UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAGS.DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAG_FULLSCREEN value init changed Int32->UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAGS.DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAG_WINDOWED value init changed Int32->UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAGS.value__...System.Int32 => System.UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_OFFER_RESOURCE_FLAGS.DXGI_OFFER_RESOURCE_FLAG_ALLOW_DECOMMIT value init changed Int32->UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_OFFER_RESOURCE_FLAGS.value__...System.Int32 => System.UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_OVERLAY_COLOR_SPACE_SUPPORT_FLAG.DXGI_OVERLAY_COLOR_SPACE_SUPPORT_FLAG_PRESENT value init changed Int32->UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_OVERLAY_COLOR_SPACE_SUPPORT_FLAG.value__...System.Int32 => System.UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_OVERLAY_SUPPORT_FLAG.DXGI_OVERLAY_SUPPORT_FLAG_DIRECT value init changed Int32->UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_OVERLAY_SUPPORT_FLAG.DXGI_OVERLAY_SUPPORT_FLAG_SCALING value init changed Int32->UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_OVERLAY_SUPPORT_FLAG.value__...System.Int32 => System.UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG.DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG_OVERLAY_PRESENT value init changed Int32->UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG.DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG_PRESENT value init changed Int32->UInt32
+Windows.Win32.Graphics.Dxgi.DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG.value__...System.Int32 => System.UInt32
+Windows.Win32.Graphics.Dxgi.IDXGIDevice4.OfferResources1 : Flags : [AssociatedEnum(DXGI_OFFER_RESOURCE_FLAGS),In] => [In]
+Windows.Win32.Graphics.Dxgi.IDXGIDevice4.OfferResources1 : Flags...UInt32 => DXGI_OFFER_RESOURCE_FLAGS
+Windows.Win32.Graphics.Dxgi.IDXGIOutput3.CheckOverlaySupport : pFlags : [AssociatedEnum(DXGI_OVERLAY_SUPPORT_FLAG),Out] => [Out]
+Windows.Win32.Graphics.Dxgi.IDXGIOutput3.CheckOverlaySupport : pFlags...UInt32* => DXGI_OVERLAY_SUPPORT_FLAG*
+Windows.Win32.Graphics.Dxgi.IDXGIOutput4.CheckOverlayColorSpaceSupport : pFlags : [AssociatedEnum(DXGI_OVERLAY_COLOR_SPACE_SUPPORT_FLAG),Out] => [Out]
+Windows.Win32.Graphics.Dxgi.IDXGIOutput4.CheckOverlayColorSpaceSupport : pFlags...UInt32* => DXGI_OVERLAY_COLOR_SPACE_SUPPORT_FLAG*
+Windows.Win32.Graphics.Dxgi.IDXGIOutput6.CheckHardwareCompositionSupport : pFlags : [AssociatedEnum(DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAGS),Out] => [Out]
+Windows.Win32.Graphics.Dxgi.IDXGIOutput6.CheckHardwareCompositionSupport : pFlags...UInt32* => DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAGS*
+Windows.Win32.Graphics.Dxgi.IDXGISwapChain3.CheckColorSpaceSupport : pColorSpaceSupport : [AssociatedEnum(DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG),Out] => [Out]
+Windows.Win32.Graphics.Dxgi.IDXGISwapChain3.CheckColorSpaceSupport : pColorSpaceSupport...UInt32* => DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG*