Merge with main

microsoft · Sep 7, 2022 · 29de846 · 29de846
2 parents a08666e + 0250abb
commit 29de846
Show file tree

Hide file tree

Showing 3 changed files with 330 additions and 28 deletions.
diff --git a/generation/WinSDK/enums.json b/generation/WinSDK/enums.json
@@ -24264,41 +24264,28 @@
     ]
   },
   {
-    "name": "TTTOOLINFO_FLAGS",
+    "name": "TOOLTIP_FLAGS",
     "flags": true,
-    "members": [
-      {
-        "name": "TTF_ABSOLUTE"
-      },
-      {
-        "name": "TTF_CENTERTIP"
-      },
-      {
-        "name": "TTF_IDISHWND"
-      },
-      {
-        "name": "TTF_PARSELINKS"
-      },
-      {
-        "name": "TTF_RTLREADING"
-      },
+    "autoPopulate": {
+      "filter": "TTF_",
+      "header": "commctrl.h"
+    },
+    "members": [],
+    "uses": [
       {
-        "name": "TTF_SUBCLASS"
+        "struct": "TTTOOLINFOA",
+        "field": "uFlags"
       },
       {
-        "name": "TTF_TRACK"
+        "struct": "TTTOOLINFOW",
+        "field": "uFlags"
       },
       {
-        "name": "TTF_TRANSPARENT"
-      }
-    ],
-    "uses": [
-      {
-        "struct": "TTTOOLINFOA",
+        "struct": "NMTTDISPINFOW",
         "field": "uFlags"
       },
       {
-        "struct": "TTTOOLINFOW",
+        "struct": "NMTTDISPINFOA",
         "field": "uFlags"
       }
     ]
@@ -30799,11 +30786,195 @@
     "uses": [
       {
         "struct": "EMR",
-        "parameter": "iType"
+        "field": "iType"
       },
       {
         "struct": "ENHMETARECORD",
-        "parameter": "iType"
+        "field": "iType"
+      }
+    ]
+  },
+  {
+    "name": "NMLVGETINFOTIP_FLAGS",
+    "members": [
+      {
+        "name": "LVGIT_UNFOLDED"
+      },
+      {
+        "name": "LVGIT_ZERO",
+        "value": "0"
+      }
+    ],
+    "uses": [
+      {
+        "struct": "NMLVGETINFOTIPW",
+        "field": "dwFlags"
+      },
+      {
+        "struct": "NMLVGETINFOTIPA",
+        "field": "dwFlags"
+      }
+    ]
+  },
+  {
+    "name": "LIST_VIEW_ITEM_STATE_FLAGS",
+    "autoPopulate": {
+      "filter": "LVIS_",
+      "header": "commctrl.h"
+    },
+    "members": [],
+    "uses": [
+      {
+        "struct": "NMLVODSTATECHANGE",
+        "field": "uNewState"
+      },
+      {
+        "struct": "NMLVODSTATECHANGE",
+        "field": "uOldState"
+      },
+      {
+        "struct": "LVITEMW",
+        "field": "state"
+      },
+      {
+        "struct": "LVITEMW",
+        "field": "stateMask"
+      },
+      {
+        "struct": "LVITEMA",
+        "field": "state"
+      },
+      {
+        "struct": "LVITEMA",
+        "field": "stateMask"
+      }
+    ]
+  },
+  {
+    "name": "NM_TREEVIEW_ACTION",
+    "flags":"true",
+    "autoPopulate": {
+      "filter": "TVE_|TVC_",
+      "header": "commctrl.h"
+    },
+    "members": [],
+    "uses": [
+      {
+        "struct": "NMTREEVIEWW",
+        "field": "action"
+      },
+      {
+        "struct": "NMTREEVIEWA",
+        "field": "action"
+      }
+    ]
+  },
+  {
+    "name": "MONTH_CALDENDAR_MESSAGES_VIEW",
+    "autoPopulate": {
+      "filter": "MCMV_",
+      "header": "commctrl.h"
+    },
+    "members": [],
+    "uses": [
+      {
+        "struct": "NMVIEWCHANGE",
+        "field": "dwOldView"
+      },
+      {
+        "struct": "NMVIEWCHANGE",
+        "field": "dwNewView"
+      }
+    ]
+  },
+  {
+    "name": "TAB_CONTROL_ITEM_STATE",
+    "autoPopulate": {
+      "filter": "TCIS_",
+      "header": "commctrl.h"
+    },
+    "members": [],
+    "uses": [
+      {
+        "struct": "TCITEMW",
+        "field": "dwState"
+      },
+      {
+        "struct": "TCITEMW",
+        "field": "dwStateMask"
+      },
+      {
+        "struct": "TCITEMA",
+        "field": "dwState"
+      },
+      {
+        "struct": "TCITEMA",
+        "field": "dwStateMask"
+      }
+    ]
+  },
+  {
+    "name": "TREE_VIEW_ITEM_STATE_FLAGS",
+    "autoPopulate": {
+      "filter": "TVIS_",
+      "header": "commctrl.h"
+    },
+    "members": [],
+    "uses": [
+      {
+        "struct": "TVITEMW",
+        "field": "state"
+      },
+      {
+        "struct": "TVITEMW",
+        "field": "stateMask"
+      },
+      {
+        "struct": "TVITEMA",
+        "field": "state"
+      },
+      {
+        "struct": "TVITEMA",
+        "field": "stateMask"
+      }
+    ]
+  },
+  {
+    "name": "CTRLINFO_FLAGS",
+    "autoPopulate": {
+      "filter": "CTRLINFO_EATS_",
+      "header": "ocidl.h"
+    },
+    "members": [],
+    "uses": [
+      {
+        "struct": "CONTROLINFO",
+        "field": "dwFlags"
+      }
+    ]
+  },
+  {
+    "addUsesTo": "INVOKEKIND",
+    "uses": [
+      {
+        "interface": "IRecordInfo",
+        "method": "PutField",
+        "field": "wFlags"
+      },
+      {
+        "interface": "IRecordInfo",
+        "method": "PutFieldNoCopy",
+        "field": "wFlags"
+      }
+    ]
+  },
+  {
+    "addUsesTo": "OLECLOSE",
+    "uses": [
+      {
+        "interface": "IOleObject",
+        "method": "Close",
+        "field": "dwSaveOption"
       }
     ]
   },

diff --git a/generation/WinSDK/scraper.settings.rsp b/generation/WinSDK/scraper.settings.rsp
@@ -38,6 +38,7 @@ SHGDNF=uint
 PATHCCH_OPTIONS=uint
 VARENUM=ushort
 VARFLAGS=ushort
+FUNCFLAGS=ushort
 --exclude
 _TREEITEM
 _IMAGELIST

diff --git a/scripts/ChangesSinceLastRelease.txt b/scripts/ChangesSinceLastRelease.txt
@@ -742,6 +742,136 @@ Windows.Win32.UI.WindowsAndMessaging.Apis.DESKTOP_READOBJECTS removed
 Windows.Win32.UI.WindowsAndMessaging.Apis.DESKTOP_SWITCHDESKTOP removed
 Windows.Win32.UI.WindowsAndMessaging.Apis.DESKTOP_WRITEOBJECTS removed
 Windows.Win32.UI.WindowsAndMessaging.Apis.DF_ALLOWOTHERACCOUNTHOOK removed
+# Winforms enum changes
+Windows.Win32.Graphics.Gdi.EMR.iType...System.UInt32 => Windows.Win32.Graphics.Gdi.ENHANCED_METAFILE_RECORD_TYPE
+Windows.Win32.Graphics.Gdi.ENHMETARECORD.iType...System.UInt32 => Windows.Win32.Graphics.Gdi.ENHANCED_METAFILE_RECORD_TYPE
+Windows.Win32.System.Ole.FUNCFLAGS.value__...System.Int32 => System.UInt16
+Windows.Win32.UI.Controls.Apis.LVGIT_UNFOLDED removed
+Windows.Win32.UI.Controls.Apis.LVIS_ACTIVATING removed
+Windows.Win32.UI.Controls.Apis.LVIS_CUT removed
+Windows.Win32.UI.Controls.Apis.LVIS_DROPHILITED removed
+Windows.Win32.UI.Controls.Apis.LVIS_FOCUSED removed
+Windows.Win32.UI.Controls.Apis.LVIS_GLOW removed
+Windows.Win32.UI.Controls.Apis.LVIS_OVERLAYMASK removed
+Windows.Win32.UI.Controls.Apis.LVIS_SELECTED removed
+Windows.Win32.UI.Controls.Apis.LVIS_STATEIMAGEMASK removed
+Windows.Win32.UI.Controls.Apis.MCMV_CENTURY removed
+Windows.Win32.UI.Controls.Apis.MCMV_DECADE removed
+Windows.Win32.UI.Controls.Apis.MCMV_MAX removed
+Windows.Win32.UI.Controls.Apis.MCMV_MONTH removed
+Windows.Win32.UI.Controls.Apis.MCMV_YEAR removed
+Windows.Win32.UI.Controls.Apis.TCIS_BUTTONPRESSED removed
+Windows.Win32.UI.Controls.Apis.TCIS_HIGHLIGHTED removed
+Windows.Win32.UI.Controls.Apis.TTF_DI_SETITEM removed
+Windows.Win32.UI.Controls.Apis.TVC_BYKEYBOARD removed
+Windows.Win32.UI.Controls.Apis.TVC_BYMOUSE removed
+Windows.Win32.UI.Controls.Apis.TVC_UNKNOWN removed
+Windows.Win32.UI.Controls.Apis.TVE_COLLAPSE removed
+Windows.Win32.UI.Controls.Apis.TVE_COLLAPSERESET removed
+Windows.Win32.UI.Controls.Apis.TVE_EXPAND removed
+Windows.Win32.UI.Controls.Apis.TVE_EXPANDPARTIAL removed
+Windows.Win32.UI.Controls.Apis.TVE_TOGGLE removed
+Windows.Win32.UI.Controls.Apis.TVIS_BOLD removed
+Windows.Win32.UI.Controls.Apis.TVIS_CUT removed
+Windows.Win32.UI.Controls.Apis.TVIS_DROPHILITED removed
+Windows.Win32.UI.Controls.Apis.TVIS_EX_ALL removed
+Windows.Win32.UI.Controls.Apis.TVIS_EX_DISABLED removed
+Windows.Win32.UI.Controls.Apis.TVIS_EX_FLAT removed
+Windows.Win32.UI.Controls.Apis.TVIS_EXPANDED removed
+Windows.Win32.UI.Controls.Apis.TVIS_EXPANDEDONCE removed
+Windows.Win32.UI.Controls.Apis.TVIS_EXPANDPARTIAL removed
+Windows.Win32.UI.Controls.Apis.TVIS_OVERLAYMASK removed
+Windows.Win32.UI.Controls.Apis.TVIS_SELECTED removed
+Windows.Win32.UI.Controls.Apis.TVIS_STATEIMAGEMASK removed
+Windows.Win32.UI.Controls.Apis.TVIS_USERMASK removed
+Windows.Win32.UI.Controls.LIST_VIEW_ITEM_STATE_FLAGS added
+Windows.Win32.UI.Controls.LIST_VIEW_ITEM_STATE_FLAGS.LVIS_ACTIVATING added
+Windows.Win32.UI.Controls.LIST_VIEW_ITEM_STATE_FLAGS.LVIS_CUT added
+Windows.Win32.UI.Controls.LIST_VIEW_ITEM_STATE_FLAGS.LVIS_DROPHILITED added
+Windows.Win32.UI.Controls.LIST_VIEW_ITEM_STATE_FLAGS.LVIS_FOCUSED added
+Windows.Win32.UI.Controls.LIST_VIEW_ITEM_STATE_FLAGS.LVIS_GLOW added
+Windows.Win32.UI.Controls.LIST_VIEW_ITEM_STATE_FLAGS.LVIS_OVERLAYMASK added
+Windows.Win32.UI.Controls.LIST_VIEW_ITEM_STATE_FLAGS.LVIS_SELECTED added
+Windows.Win32.UI.Controls.LIST_VIEW_ITEM_STATE_FLAGS.LVIS_STATEIMAGEMASK added
+Windows.Win32.UI.Controls.LVITEMA.state...System.UInt32 => Windows.Win32.UI.Controls.LIST_VIEW_ITEM_STATE_FLAGS
+Windows.Win32.UI.Controls.LVITEMA.stateMask...System.UInt32 => Windows.Win32.UI.Controls.LIST_VIEW_ITEM_STATE_FLAGS
+Windows.Win32.UI.Controls.LVITEMW.state...System.UInt32 => Windows.Win32.UI.Controls.LIST_VIEW_ITEM_STATE_FLAGS
+Windows.Win32.UI.Controls.LVITEMW.stateMask...System.UInt32 => Windows.Win32.UI.Controls.LIST_VIEW_ITEM_STATE_FLAGS
+Windows.Win32.UI.Controls.MONTH_CALDENDAR_MESSAGES_VIEW added
+Windows.Win32.UI.Controls.MONTH_CALDENDAR_MESSAGES_VIEW.MCMV_CENTURY added
+Windows.Win32.UI.Controls.MONTH_CALDENDAR_MESSAGES_VIEW.MCMV_DECADE added
+Windows.Win32.UI.Controls.MONTH_CALDENDAR_MESSAGES_VIEW.MCMV_MAX added
+Windows.Win32.UI.Controls.MONTH_CALDENDAR_MESSAGES_VIEW.MCMV_MONTH added
+Windows.Win32.UI.Controls.MONTH_CALDENDAR_MESSAGES_VIEW.MCMV_YEAR added
+Windows.Win32.UI.Controls.NM_TREEVIEW_ACTION added
+Windows.Win32.UI.Controls.NM_TREEVIEW_ACTION.TVC_BYKEYBOARD added
+Windows.Win32.UI.Controls.NM_TREEVIEW_ACTION.TVC_BYMOUSE added
+Windows.Win32.UI.Controls.NM_TREEVIEW_ACTION.TVC_UNKNOWN added
+Windows.Win32.UI.Controls.NM_TREEVIEW_ACTION.TVE_COLLAPSE added
+Windows.Win32.UI.Controls.NM_TREEVIEW_ACTION.TVE_COLLAPSERESET added
+Windows.Win32.UI.Controls.NM_TREEVIEW_ACTION.TVE_EXPAND added
+Windows.Win32.UI.Controls.NM_TREEVIEW_ACTION.TVE_EXPANDPARTIAL added
+Windows.Win32.UI.Controls.NM_TREEVIEW_ACTION.TVE_TOGGLE added
+Windows.Win32.UI.Controls.NMLVGETINFOTIP_FLAGS added
+Windows.Win32.UI.Controls.NMLVGETINFOTIP_FLAGS.LVGIT_UNFOLDED added
+Windows.Win32.UI.Controls.NMLVGETINFOTIP_FLAGS.LVGIT_ZERO added
+Windows.Win32.UI.Controls.NMLVGETINFOTIPA.dwFlags...System.UInt32 => Windows.Win32.UI.Controls.NMLVGETINFOTIP_FLAGS
+Windows.Win32.UI.Controls.NMLVGETINFOTIPW.dwFlags...System.UInt32 => Windows.Win32.UI.Controls.NMLVGETINFOTIP_FLAGS
+Windows.Win32.UI.Controls.NMLVODSTATECHANGE.uNewState...System.UInt32 => Windows.Win32.UI.Controls.LIST_VIEW_ITEM_STATE_FLAGS
+Windows.Win32.UI.Controls.NMLVODSTATECHANGE.uOldState...System.UInt32 => Windows.Win32.UI.Controls.LIST_VIEW_ITEM_STATE_FLAGS
+Windows.Win32.UI.Controls.NMTREEVIEWA.action...System.UInt32 => Windows.Win32.UI.Controls.NM_TREEVIEW_ACTION
+Windows.Win32.UI.Controls.NMTREEVIEWW.action...System.UInt32 => Windows.Win32.UI.Controls.NM_TREEVIEW_ACTION
+Windows.Win32.UI.Controls.NMTTDISPINFOA.uFlags...System.UInt32 => Windows.Win32.UI.Controls.TOOLTIP_FLAGS
+Windows.Win32.UI.Controls.NMTTDISPINFOW.uFlags...System.UInt32 => Windows.Win32.UI.Controls.TOOLTIP_FLAGS
+Windows.Win32.UI.Controls.NMVIEWCHANGE.dwNewView...System.UInt32 => Windows.Win32.UI.Controls.MONTH_CALDENDAR_MESSAGES_VIEW
+Windows.Win32.UI.Controls.NMVIEWCHANGE.dwOldView...System.UInt32 => Windows.Win32.UI.Controls.MONTH_CALDENDAR_MESSAGES_VIEW
+Windows.Win32.UI.Controls.TAB_CONTROL_ITEM_STATE added
+Windows.Win32.UI.Controls.TAB_CONTROL_ITEM_STATE.TCIS_BUTTONPRESSED added
+Windows.Win32.UI.Controls.TAB_CONTROL_ITEM_STATE.TCIS_HIGHLIGHTED added
+Windows.Win32.UI.Controls.TCITEMA.dwState...System.UInt32 => Windows.Win32.UI.Controls.TAB_CONTROL_ITEM_STATE
+Windows.Win32.UI.Controls.TCITEMA.dwStateMask...System.UInt32 => Windows.Win32.UI.Controls.TAB_CONTROL_ITEM_STATE
+Windows.Win32.UI.Controls.TCITEMW.dwState...System.UInt32 => Windows.Win32.UI.Controls.TAB_CONTROL_ITEM_STATE
+Windows.Win32.UI.Controls.TCITEMW.dwStateMask...System.UInt32 => Windows.Win32.UI.Controls.TAB_CONTROL_ITEM_STATE
+Windows.Win32.UI.Controls.TOOLTIP_FLAGS added
+Windows.Win32.UI.Controls.TOOLTIP_FLAGS.TTF_ABSOLUTE added
+Windows.Win32.UI.Controls.TOOLTIP_FLAGS.TTF_CENTERTIP added
+Windows.Win32.UI.Controls.TOOLTIP_FLAGS.TTF_DI_SETITEM added
+Windows.Win32.UI.Controls.TOOLTIP_FLAGS.TTF_IDISHWND added
+Windows.Win32.UI.Controls.TOOLTIP_FLAGS.TTF_PARSELINKS added
+Windows.Win32.UI.Controls.TOOLTIP_FLAGS.TTF_RTLREADING added
+Windows.Win32.UI.Controls.TOOLTIP_FLAGS.TTF_SUBCLASS added
+Windows.Win32.UI.Controls.TOOLTIP_FLAGS.TTF_TRACK added
+Windows.Win32.UI.Controls.TOOLTIP_FLAGS.TTF_TRANSPARENT added
+Windows.Win32.UI.Controls.TREE_VIEW_ITEM_STATE_FLAGS added
+Windows.Win32.UI.Controls.TREE_VIEW_ITEM_STATE_FLAGS.TVIS_BOLD added
+Windows.Win32.UI.Controls.TREE_VIEW_ITEM_STATE_FLAGS.TVIS_CUT added
+Windows.Win32.UI.Controls.TREE_VIEW_ITEM_STATE_FLAGS.TVIS_DROPHILITED added
+Windows.Win32.UI.Controls.TREE_VIEW_ITEM_STATE_FLAGS.TVIS_EX_ALL added
+Windows.Win32.UI.Controls.TREE_VIEW_ITEM_STATE_FLAGS.TVIS_EX_DISABLED added
+Windows.Win32.UI.Controls.TREE_VIEW_ITEM_STATE_FLAGS.TVIS_EX_FLAT added
+Windows.Win32.UI.Controls.TREE_VIEW_ITEM_STATE_FLAGS.TVIS_EXPANDED added
+Windows.Win32.UI.Controls.TREE_VIEW_ITEM_STATE_FLAGS.TVIS_EXPANDEDONCE added
+Windows.Win32.UI.Controls.TREE_VIEW_ITEM_STATE_FLAGS.TVIS_EXPANDPARTIAL added
+Windows.Win32.UI.Controls.TREE_VIEW_ITEM_STATE_FLAGS.TVIS_OVERLAYMASK added
+Windows.Win32.UI.Controls.TREE_VIEW_ITEM_STATE_FLAGS.TVIS_SELECTED added
+Windows.Win32.UI.Controls.TREE_VIEW_ITEM_STATE_FLAGS.TVIS_STATEIMAGEMASK added
+Windows.Win32.UI.Controls.TREE_VIEW_ITEM_STATE_FLAGS.TVIS_USERMASK added
+Windows.Win32.UI.Controls.TTTOOLINFO_FLAGS removed
+Windows.Win32.UI.Controls.TTTOOLINFO_FLAGS.TTF_ABSOLUTE removed
+Windows.Win32.UI.Controls.TTTOOLINFO_FLAGS.TTF_CENTERTIP removed
+Windows.Win32.UI.Controls.TTTOOLINFO_FLAGS.TTF_IDISHWND removed
+Windows.Win32.UI.Controls.TTTOOLINFO_FLAGS.TTF_PARSELINKS removed
+Windows.Win32.UI.Controls.TTTOOLINFO_FLAGS.TTF_RTLREADING removed
+Windows.Win32.UI.Controls.TTTOOLINFO_FLAGS.TTF_SUBCLASS removed
+Windows.Win32.UI.Controls.TTTOOLINFO_FLAGS.TTF_TRACK removed
+Windows.Win32.UI.Controls.TTTOOLINFO_FLAGS.TTF_TRANSPARENT removed
+Windows.Win32.UI.Controls.TTTOOLINFOA.uFlags...Windows.Win32.UI.Controls.TTTOOLINFO_FLAGS => Windows.Win32.UI.Controls.TOOLTIP_FLAGS
+Windows.Win32.UI.Controls.TTTOOLINFOW.uFlags...Windows.Win32.UI.Controls.TTTOOLINFO_FLAGS => Windows.Win32.UI.Controls.TOOLTIP_FLAGS
+Windows.Win32.UI.Controls.TVITEMA.state...System.UInt32 => Windows.Win32.UI.Controls.TREE_VIEW_ITEM_STATE_FLAGS
+Windows.Win32.UI.Controls.TVITEMA.stateMask...System.UInt32 => Windows.Win32.UI.Controls.TREE_VIEW_ITEM_STATE_FLAGS
+Windows.Win32.UI.Controls.TVITEMW.state...System.UInt32 => Windows.Win32.UI.Controls.TREE_VIEW_ITEM_STATE_FLAGS
+Windows.Win32.UI.Controls.TVITEMW.stateMask...System.UInt32 => Windows.Win32.UI.Controls.TREE_VIEW_ITEM_STATE_FLAGS
+Windows.Win32.UI.WindowsAndMessaging.Apis.DF_ALLOWOTHERACCOUNTHOOK removed
 # Do a better job detecting enums changing param/field sizes
 Windows.Win32.Graphics.Gdi.CREATE_FONT_PACKAGE_SUBSET_ENCODING.value__...System.UInt32 => System.UInt16
 Windows.Win32.Graphics.Gdi.CREATE_FONT_PACKAGE_SUBSET_PLATFORM.value__...System.UInt32 => System.UInt16