Merge branch 'main' into rafael/raii-apis

microsoft · May 6, 2024 · d04ef84 · d04ef84
2 parents da8bddf + c0b2044
commit d04ef84
Show file tree

Hide file tree

Showing 8 changed files with 306 additions and 36 deletions.
diff --git a/generation/WinSDK/Partitions/Direct2D/settings.rsp b/generation/WinSDK/Partitions/Direct2D/settings.rsp
@@ -3,6 +3,7 @@ IWICBitmapSource
 IWICBitmap
 DWRITE_GLYPH_RUN
 DWRITE_GLYPH_RUN_DESCRIPTION
+DWRITE_PAINT_FEATURE_LEVEL
 --traverse
 <IncludeRoot>/um/d2d1_2helper.h
 <IncludeRoot>/um/d2d1_3helper.h

diff --git a/generation/WinSDK/Partitions/Dxgi/settings.rsp b/generation/WinSDK/Partitions/Dxgi/settings.rsp
@@ -13,3 +13,11 @@ _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
diff --git a/generation/WinSDK/autoTypes.json b/generation/WinSDK/autoTypes.json
@@ -1425,6 +1425,7 @@
     "Name": "SOCKET",
     "ValueType": "UIntPtr",
     "CloseApi": "closesocket",
+    "InvalidHandleValues": [ -1 ],
     "NativeTypedef": true
   },
   {
@@ -2366,12 +2367,14 @@
     "Name": "PTP_POOL",
     "ValueType": "typedef struct _TP_POOL",
     "CloseApi": "CloseThreadpool",
+    "InvalidHandleValues": [ 0 ],
     "NativeTypedef": true
   },
   {
     "Name": "PTP_CLEANUP_GROUP",
     "ValueType": "typedef struct _TP_CLEANUP_GROUP",
     "CloseApi": "CloseThreadpoolCleanupGroup",
+    "InvalidHandleValues": [ 0 ],
     "NativeTypedef": true
   },
   {
@@ -2564,6 +2567,7 @@
     "Name": "HIORING",
     "ValueType": "DECLARE_HANDLE",
     "CloseApi": "CloseIoRing",
+    "InvalidHandleValues": [ -1, 0 ],
     "NativeTypedef": true
   },
   {

diff --git a/generation/WinSDK/emitter.settings.rsp b/generation/WinSDK/emitter.settings.rsp
@@ -1308,7 +1308,6 @@ D3D12_ROOT_SIGNATURE_DESC1::pStaticSamplers=[NativeArrayInfo(CountFieldName = "N
 D3D12_STREAM_OUTPUT_DESC::pBufferStrides=[NativeArrayInfo(CountFieldName = "NumStrides")]
 D3D12_STREAM_OUTPUT_DESC::pSODeclaration=[NativeArrayInfo(CountFieldName = "NumEntries")]
 D3D12_VIEW_INSTANCING_DESC::pViewInstanceLocations=[NativeArrayInfo(CountFieldName = "ViewInstanceCount")]
-DXGI_SWAP_CHAIN_DESC1::Flags=[AssociatedEnum("DXGI_SWAP_CHAIN_FLAG")]
 CreatePipe::hReadPipe=[IgnoreIfReturn("0")]
 CreatePipe::hWritePipe=[IgnoreIfReturn("0")]
 MapViewOfFile::return=MEMORY_MAPPED_VIEW_ADDRESS
@@ -1814,4 +1813,27 @@ GetFileAttributesA=[CanReturnMultipleSuccessValues]
 GetFileAttributesW=[CanReturnMultipleSuccessValues]
 GetFileVersionInfoSizeA=[CanReturnMultipleSuccessValues]
 GetFileVersionInfoSizeW=[CanReturnMultipleSuccessValues]
-CertCreateCertificateContext=[CanReturnMultipleSuccessValues]
+CertCreateCertificateContext=[CanReturnMultipleSuccessValues]
+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")]
+IDXGIAdapter::GetDesc::pDesc=[RetVal]
+IDXGIAdapter1::GetDesc1::pDesc=[RetVal]
+IDXGIAdapter2::GetDesc2::pDesc=[RetVal]
+IDXGIAdapter4::GetDesc3::pDesc=[RetVal]
+IDXGIOutput::GetDesc::pDesc=[RetVal]
+IDXGIOutput6::GetDesc1::pDesc=[RetVal]
+IDXGIOutputDuplication::GetDesc::pDesc=[RetVal]
+IDXGISurface::GetDesc::pDesc=[RetVal]
+IDXGISwapChain::GetDesc::pDesc=[RetVal]
+IDXGISwapChain1::GetDesc1::pDesc=[RetVal]
+IDXGISwapChain1::GetFullscreenDesc::pDesc=[RetVal]
diff --git a/generation/WinSDK/enums.json b/generation/WinSDK/enums.json
@@ -32199,7 +32199,7 @@
   {
     "name": "UIA_EVENT_ID",
     "type": "int",
-    "members": [ 
+    "members": [
       {
         "name": "UIA_ToolTipOpenedEventId",
         "value": 20000
@@ -32408,7 +32408,7 @@
   {
     "name": "UIA_PROPERTY_ID",
     "type": "int",
-    "members": [ 
+    "members": [
       {
         "name": "UIA_RuntimeIdPropertyId",
         "value": 30000
@@ -33215,7 +33215,7 @@
   {
     "name": "UIA_TEXTATTRIBUTE_ID",
     "type": "int",
-    "members": [ 
+    "members": [
       {
         "name": "UIA_AnimationStyleAttributeId",
         "value": 40000
@@ -33424,7 +33424,7 @@
   {
     "name": "UIA_CONTROLTYPE_ID",
     "type": "int",
-    "members": [ 
+    "members": [
       {
         "name": "UIA_ButtonControlTypeId",
         "value": 50000
@@ -33606,7 +33606,7 @@
   {
     "name": "UIA_ANNOTATIONTYPE",
     "type": "int",
-    "members": [ 
+    "members": [
       {
         "name": "AnnotationType_Unknown",
         "value": 60000
@@ -33729,7 +33729,7 @@
   {
     "name": "UIA_STYLE_ID",
     "type": "int",
-    "members": [ 
+    "members": [
       {
         "name": "StyleId_Custom",
         "value": 70000
@@ -33820,7 +33820,7 @@
   {
     "name": "UIA_LANDMARKTYPE_ID",
     "type": "int",
-    "members": [ 
+    "members": [
       {
         "name": "UIA_CustomLandmarkTypeId",
         "value": 80000
@@ -33858,7 +33858,7 @@
   {
     "name": "UIA_HEADINGLEVEL_ID",
     "type": "int",
-    "members": [ 
+    "members": [
       {
         "name": "HeadingLevel_None",
         "value": 80050
@@ -33917,7 +33917,7 @@
     "namespace": "Windows.Win32.UI.Accessibility",
     "name": "UIA_CHANGE_ID",
     "type": "int",
-    "members": [ 
+    "members": [
       {
         "name": "UIA_SummaryChangeId",
         "value": 90000
@@ -33927,7 +33927,7 @@
   {
     "name": "UIA_METADATA_ID",
     "type": "int",
-    "members": [ 
+    "members": [
       {
         "name": "UIA_SayAsInterpretAsMetadataId",
         "value": 100000
@@ -34491,7 +34491,7 @@
     ]
   },
   {
-    "type": "int", 
+    "type": "int",
     "namespace": "Windows.Win32.UI.WindowsAndMessaging",
     "name": "SCROLLBAR_COMMAND",
     "members": [
@@ -34757,14 +34757,14 @@
     ]
   },
   {
+    "namespace": "Windows.Win32.Graphics.Dxgi",
     "type": "uint",
     "name": "DXGI_USAGE",
     "flags": true,
     "autoPopulate": {
       "filter": "DXGI_USAGE_",
       "header": "dxgi.h"
     },
-    "members": [],
     "uses": [
       {
         "struct": "DXGI_SWAP_CHAIN_DESC",
@@ -34782,6 +34782,141 @@
       }
     ]
   },
+  {
+    "namespace": "Windows.Win32.Graphics.Dxgi",
+    "type": "uint",
+    "name": "DXGI_PRESENT",
+    "flags": true,
+    "autoPopulate": {
+      "filter": "DXGI_PRESENT_",
+      "header": "dxgi.h"
+    },
+    "uses": [
+      {
+        "interface": "IDXGISwapChain",
+        "method": "Present",
+        "parameter": "Flags"
+      },
+      {
+        "interface": "IDXGISwapChain1",
+        "method": "Present1",
+        "parameter": "PresentFlags"
+      },
+      {
+        "interface": "IDXGIDecodeSwapChain",
+        "method": "PresentBuffer",
+        "parameter": "Flags"
+      }
+    ]
+  },
+  {
+    "namespace": "Windows.Win32.Graphics.Dxgi",
+    "type": "uint",
+    "name": "DXGI_ENUM_MODES",
+    "flags": true,
+    "autoPopulate": {
+      "filter": "DXGI_ENUM_MODES_",
+      "header": "dxgi.h;dxgi1_2.h"
+    },
+    "uses": [
+      {
+        "interface": "IDXGIOutput",
+        "method": "GetDisplayModeList",
+        "parameter": "Flags"
+      },
+      {
+        "interface": "IDXGIOutput1",
+        "method": "GetDisplayModeList1",
+        "parameter": "Flags"
+      }
+    ]
+  },
+  {
+    "namespace": "Windows.Win32.Graphics.Dxgi",
+    "type": "uint",
+    "name": "DXGI_MWA_FLAGS",
+    "flags": true,
+    "autoPopulate": {
+      "filter": "DXGI_MWA_",
+      "header": "dxgi.h"
+    },
+    "uses": [
+      {
+        "interface": "IDXGIFactory",
+        "method": "MakeWindowAssociation",
+        "parameter": "Flags"
+      }
+    ]
+  },
+  {
+    "namespace": "Windows.Win32.Graphics.Dxgi",
+    "type": "uint",
+    "name": "DXGI_MAP_FLAGS",
+    "flags": true,
+    "autoPopulate": {
+      "filter": "DXGI_MAP_",
+      "header": "dxgi.h"
+    },
+    "uses": [
+      {
+        "interface": "IDXGISurface",
+        "method": "Map",
+        "parameter": "MapFlags"
+      }
+    ]
+  },
+  {
+    "namespace": "Windows.Win32.Graphics.Dxgi",
+    "type": "uint",
+    "name": "DXGI_RESOURCE_PRIORITY",
+    "autoPopulate": {
+      "filter": "DXGI_RESOURCE_PRIORITY_",
+      "header": "dxgi.h"
+    },
+    "uses": [
+      {
+        "interface": "IDXGIResource",
+        "method": "SetEvictionPriority",
+        "parameter": "EvictionPriority"
+      },
+      {
+        "interface": "IDXGIResource",
+        "method": "GetEvictionPriority",
+        "parameter": "pEvictionPriority"
+      }
+    ]
+  },
+  {
+    "namespace": "Windows.Win32.Graphics.Dxgi",
+    "type": "uint",
+    "name": "DXGI_SHARED_RESOURCE_RW",
+    "flags": true,
+    "autoPopulate": {
+      "filter": "DXGI_SHARED_RESOURCE_",
+      "header": "dxgi1_2.h"
+    }
+  },
+  {
+    "namespace": "Windows.Win32.Graphics.Dxgi",
+    "type": "uint",
+    "name": "DXGI_CREATE_FACTORY_FLAGS",
+    "flags": true,
+    "autoPopulate": {
+      "filter": "DXGI_CREATE_FACTORY_",
+      "header": "dxgi1_3.h"
+    },
+    "uses": [
+      {
+        "method": "CreateDXGIFactory2",
+        "parameter": "Flags"
+      },
+      {
+        "interface": "IDXGIFactory3",
+        "method": "GetCreationFlags",
+        "parameter": "return"
+      }
+    ]
+  },
   {
     "namespace": "Windows.Win32.Data.HtmlHelp",
     "name": "HTML_HELP_COMMAND",