CONFLICT_DETAILS can use two enums. Fixed #1646.

microsoft · Aug 30, 2023 · 13b19a2 · 13b19a2
1 parent 53607f0
commit 13b19a2
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 19 deletions.
diff --git a/generation/WinSDK/enums.json b/generation/WinSDK/enums.json
@@ -36115,25 +36115,6 @@
       }
     ]
   },
-  {
-    "name": "CM_CDMASK",
-    "flags": true,
-    "autoPopulate": {
-      "filter": "CM_CDMASK_",
-      "header": "cfgmgr32.h"
-    },
-    "members": [],
-    "uses": [
-      {
-        "struct": "CONFLICT_DETAILS_A",
-        "field": "CD_ulMask"
-      },
-      {
-        "struct": "CONFLICT_DETAILS_W",
-        "field": "CD_ulMask"
-      }
-    ]
-  },
   {
     "namespace": "Windows.Win32.Security.Cryptography",
     "name": "ALG_ID",
@@ -36556,6 +36537,44 @@
         "parameter": "Flags"
       }
     ]
+  },
+  {
+    "name": "CM_CDMASK",
+    "flags": true,
+    "autoPopulate": {
+      "filter": "CM_CDMASK_",
+      "header": "cfgmgr32.h"
+    },
+    "members": [],
+    "uses": [
+      {
+        "struct": "CONFLICT_DETAILS_A",
+        "field": "CD_ulMask"
+      },
+      {
+        "struct": "CONFLICT_DETAILS_W",
+        "field": "CD_ulMask"
+      }
+    ]
+  },
+  {
+    "name": "CM_CDFLAGS",
+    "flags": true,
+    "autoPopulate": {
+      "filter": "CM_CDFLAGS_",
+      "header": "cfgmgr32.h"
+    },
+    "members": [],
+    "uses": [
+      {
+        "struct": "CONFLICT_DETAILS_A",
+        "field": "CD_ulFlags"
+      },
+      {
+        "struct": "CONFLICT_DETAILS_W",
+        "field": "CD_ulFlags"
+      }
+    ]
   }
 ]
 }
diff --git a/scripts/ChangesSinceLastRelease.txt b/scripts/ChangesSinceLastRelease.txt
@@ -660,3 +660,13 @@ Windows.Win32.Devices.DeviceAndDriverInstallation.SPSVCINST_FLAGS.SPSVCINST_STAR
 Windows.Win32.Devices.DeviceAndDriverInstallation.SPSVCINST_FLAGS.SPSVCINST_STOPSERVICE added
 Windows.Win32.Devices.DeviceAndDriverInstallation.SPSVCINST_FLAGS.SPSVCINST_TAGTOFRONT added
 Windows.Win32.Devices.DeviceAndDriverInstallation.SPSVCINST_FLAGS.SPSVCINST_UNIQUE_NAME added
+# Fixed #1646.
+Windows.Win32.Devices.DeviceAndDriverInstallation.Apis.CM_CDFLAGS_DRIVER removed
+Windows.Win32.Devices.DeviceAndDriverInstallation.Apis.CM_CDFLAGS_RESERVED removed
+Windows.Win32.Devices.DeviceAndDriverInstallation.Apis.CM_CDFLAGS_ROOT_OWNED removed
+Windows.Win32.Devices.DeviceAndDriverInstallation.CM_CDFLAGS added
+Windows.Win32.Devices.DeviceAndDriverInstallation.CM_CDFLAGS.CM_CDFLAGS_DRIVER added
+Windows.Win32.Devices.DeviceAndDriverInstallation.CM_CDFLAGS.CM_CDFLAGS_RESERVED added
+Windows.Win32.Devices.DeviceAndDriverInstallation.CM_CDFLAGS.CM_CDFLAGS_ROOT_OWNED added
+Windows.Win32.Devices.DeviceAndDriverInstallation.CONFLICT_DETAILS_A.CD_ulFlags...System.UInt32 => Windows.Win32.Devices.DeviceAndDriverInstallation.CM_CDFLAGS
+Windows.Win32.Devices.DeviceAndDriverInstallation.CONFLICT_DETAILS_W.CD_ulFlags...System.UInt32 => Windows.Win32.Devices.DeviceAndDriverInstallation.CM_CDFLAGS