Update the win32 metadata to version 31.0.4 (#2009)

crates/libs/bindgen/src/lib.rs

@@ -63,9 +63,10 @@ pub fn namespace(gen: &Gen, tree: &Tree) -> String {
             TypeKind::Struct => {
                 if gen.reader.type_def_fields(def).next().is_none() {
                     if let Some(guid) = gen.reader.type_def_guid(def) {
+                        let ident = to_ident(name);
                         let value = gen.guid(&guid);
                         let guid = gen.type_name(&Type::GUID);
-                        let constant = quote! { pub const #name: #guid = #value; };
+                        let constant = quote! { pub const #ident: #guid = #value; };
                         types.entry(TypeKind::Class).or_default().entry(name).or_default().combine(&constant);
                         continue;
                     }

crates/libs/metadata/default/readme.md

@@ -4,7 +4,7 @@ dependent crate or workspace has an empty or non-existent `.windows/winmd` direc
 
 ## Windows.Win32.winmd
 - Source: https://www.nuget.org/packages/Microsoft.Windows.SDK.Win32Metadata/
-- Version: 30.0.12-preview
+- Version: 31.0.4-preview
 
 ## Windows.winmd
 - Source: https://www.nuget.org/packages/Microsoft.Windows.SDK.Contracts

crates/libs/sys/src/Windows/Win32/System/SystemServices/mod.rs

@@ -6763,6 +6763,22 @@ pub const MemSectionExtendedParameterSigningLevel: MEM_SECTION_EXTENDED_PARAMETE
 #[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
 pub const MemSectionExtendedParameterMax: MEM_SECTION_EXTENDED_PARAMETER_TYPE = 4i32;
 #[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub type MODIFIERKEYS_FLAGS = u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const MK_LBUTTON: MODIFIERKEYS_FLAGS = 1u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const MK_RBUTTON: MODIFIERKEYS_FLAGS = 2u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const MK_SHIFT: MODIFIERKEYS_FLAGS = 4u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const MK_CONTROL: MODIFIERKEYS_FLAGS = 8u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const MK_MBUTTON: MODIFIERKEYS_FLAGS = 16u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const MK_XBUTTON1: MODIFIERKEYS_FLAGS = 32u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const MK_XBUTTON2: MODIFIERKEYS_FLAGS = 64u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
 pub type MONITOR_DISPLAY_STATE = i32;
 #[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
 pub const PowerMonitorOff: MONITOR_DISPLAY_STATE = 0i32;
@@ -7037,6 +7053,72 @@ pub const SeLearningModeSettings: SE_LEARNING_MODE_DATA_TYPE = 1i32;
 #[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
 pub const SeLearningModeMax: SE_LEARNING_MODE_DATA_TYPE = 2i32;
 #[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub type STATIC_STYLES = u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_LEFT: STATIC_STYLES = 0u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_CENTER: STATIC_STYLES = 1u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_RIGHT: STATIC_STYLES = 2u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_ICON: STATIC_STYLES = 3u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_BLACKRECT: STATIC_STYLES = 4u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_GRAYRECT: STATIC_STYLES = 5u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_WHITERECT: STATIC_STYLES = 6u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_BLACKFRAME: STATIC_STYLES = 7u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_GRAYFRAME: STATIC_STYLES = 8u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_WHITEFRAME: STATIC_STYLES = 9u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_USERITEM: STATIC_STYLES = 10u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_SIMPLE: STATIC_STYLES = 11u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_LEFTNOWORDWRAP: STATIC_STYLES = 12u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_OWNERDRAW: STATIC_STYLES = 13u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_BITMAP: STATIC_STYLES = 14u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_ENHMETAFILE: STATIC_STYLES = 15u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_ETCHEDHORZ: STATIC_STYLES = 16u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_ETCHEDVERT: STATIC_STYLES = 17u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_ETCHEDFRAME: STATIC_STYLES = 18u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_TYPEMASK: STATIC_STYLES = 31u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_REALSIZECONTROL: STATIC_STYLES = 64u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_NOPREFIX: STATIC_STYLES = 128u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_NOTIFY: STATIC_STYLES = 256u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_CENTERIMAGE: STATIC_STYLES = 512u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_RIGHTJUST: STATIC_STYLES = 1024u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_REALSIZEIMAGE: STATIC_STYLES = 2048u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_SUNKEN: STATIC_STYLES = 4096u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_EDITCONTROL: STATIC_STYLES = 8192u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_ENDELLIPSIS: STATIC_STYLES = 16384u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_PATHELLIPSIS: STATIC_STYLES = 32768u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_WORDELLIPSIS: STATIC_STYLES = 49152u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
+pub const SS_ELLIPSISMASK: STATIC_STYLES = 49152u32;
+#[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
 pub type SharedVirtualDiskHandleState = i32;
 #[doc = "*Required features: `\"Win32_System_SystemServices\"`*"]
 pub const SharedVirtualDiskHandleStateNone: SharedVirtualDiskHandleState = 0i32;

crates/libs/sys/src/Windows/Win32/System/Threading/mod.rs

@@ -793,16 +793,16 @@ extern "system" {
     pub fn WaitForInputIdle(hprocess: super::super::Foundation::HANDLE, dwmilliseconds: u32) -> u32;
     #[doc = "*Required features: `\"Win32_System_Threading\"`, `\"Win32_Foundation\"`*"]
     #[cfg(feature = "Win32_Foundation")]
-    pub fn WaitForMultipleObjects(ncount: u32, lphandles: *const super::super::Foundation::HANDLE, bwaitall: super::super::Foundation::BOOL, dwmilliseconds: u32) -> u32;
+    pub fn WaitForMultipleObjects(ncount: u32, lphandles: *const super::super::Foundation::HANDLE, bwaitall: super::super::Foundation::BOOL, dwmilliseconds: u32) -> super::super::Foundation::WIN32_ERROR;
     #[doc = "*Required features: `\"Win32_System_Threading\"`, `\"Win32_Foundation\"`*"]
     #[cfg(feature = "Win32_Foundation")]
-    pub fn WaitForMultipleObjectsEx(ncount: u32, lphandles: *const super::super::Foundation::HANDLE, bwaitall: super::super::Foundation::BOOL, dwmilliseconds: u32, balertable: super::super::Foundation::BOOL) -> u32;
+    pub fn WaitForMultipleObjectsEx(ncount: u32, lphandles: *const super::super::Foundation::HANDLE, bwaitall: super::super::Foundation::BOOL, dwmilliseconds: u32, balertable: super::super::Foundation::BOOL) -> super::super::Foundation::WIN32_ERROR;
     #[doc = "*Required features: `\"Win32_System_Threading\"`, `\"Win32_Foundation\"`*"]
     #[cfg(feature = "Win32_Foundation")]
-    pub fn WaitForSingleObject(hhandle: super::super::Foundation::HANDLE, dwmilliseconds: u32) -> u32;
+    pub fn WaitForSingleObject(hhandle: super::super::Foundation::HANDLE, dwmilliseconds: u32) -> super::super::Foundation::WIN32_ERROR;
     #[doc = "*Required features: `\"Win32_System_Threading\"`, `\"Win32_Foundation\"`*"]
     #[cfg(feature = "Win32_Foundation")]
-    pub fn WaitForSingleObjectEx(hhandle: super::super::Foundation::HANDLE, dwmilliseconds: u32, balertable: super::super::Foundation::BOOL) -> u32;
+    pub fn WaitForSingleObjectEx(hhandle: super::super::Foundation::HANDLE, dwmilliseconds: u32, balertable: super::super::Foundation::BOOL) -> super::super::Foundation::WIN32_ERROR;
     #[doc = "*Required features: `\"Win32_System_Threading\"`, `\"Win32_Foundation\"`*"]
     #[cfg(feature = "Win32_Foundation")]
     pub fn WaitForThreadpoolIoCallbacks(pio: *mut TP_IO, fcancelpendingcallbacks: super::super::Foundation::BOOL);

crates/libs/sys/src/Windows/Win32/System/WindowsProgramming/mod.rs

@@ -497,7 +497,7 @@ extern "system" {
     pub fn SetPerUserSecValuesW(pperuser: *mut PERUSERSECTIONW) -> ::windows_sys::core::HRESULT;
     #[doc = "*Required features: `\"Win32_System_WindowsProgramming\"`, `\"Win32_Foundation\"`*"]
     #[cfg(feature = "Win32_Foundation")]
-    pub fn SignalObjectAndWait(hobjecttosignal: super::super::Foundation::HANDLE, hobjecttowaiton: super::super::Foundation::HANDLE, dwmilliseconds: u32, balertable: super::super::Foundation::BOOL) -> u32;
+    pub fn SignalObjectAndWait(hobjecttosignal: super::super::Foundation::HANDLE, hobjecttowaiton: super::super::Foundation::HANDLE, dwmilliseconds: u32, balertable: super::super::Foundation::BOOL) -> super::super::Foundation::WIN32_ERROR;
     #[doc = "*Required features: `\"Win32_System_WindowsProgramming\"`*"]
     pub fn TranslateInfStringA(pszinffilename: ::windows_sys::core::PCSTR, pszinstallsection: ::windows_sys::core::PCSTR, psztranslatesection: ::windows_sys::core::PCSTR, psztranslatekey: ::windows_sys::core::PCSTR, pszbuffer: ::windows_sys::core::PSTR, cchbuffer: u32, pdwrequiredsize: *mut u32, pvreserved: *mut ::core::ffi::c_void) -> ::windows_sys::core::HRESULT;
     #[doc = "*Required features: `\"Win32_System_WindowsProgramming\"`*"]

crates/libs/sys/src/Windows/Win32/UI/Controls/mod.rs

@@ -9149,7 +9149,7 @@ impl ::core::clone::Clone for COMBOBOXINFO {
 #[doc = "*Required features: `\"Win32_UI_Controls\"`, `\"Win32_Foundation\"`*"]
 #[cfg(feature = "Win32_Foundation")]
 pub struct COMPAREITEMSTRUCT {
-    pub CtlType: u32,
+    pub CtlType: DRAWITEMSTRUCT_CTL_TYPE,
     pub CtlID: u32,
     pub hwndItem: super::super::Foundation::HWND,
     pub itemID1: u32,
@@ -9971,7 +9971,7 @@ impl ::core::clone::Clone for MCHITTESTINFO {
 #[repr(C)]
 #[doc = "*Required features: `\"Win32_UI_Controls\"`*"]
 pub struct MEASUREITEMSTRUCT {
-    pub CtlType: u32,
+    pub CtlType: DRAWITEMSTRUCT_CTL_TYPE,
     pub CtlID: u32,
     pub itemID: u32,
     pub itemWidth: u32,

crates/libs/sys/src/Windows/Win32/UI/WindowsAndMessaging/mod.rs

@@ -2491,20 +2491,6 @@ pub const MKF_RIGHTBUTTONDOWN: u32 = 33554432u32;
 #[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
 pub const MKF_RIGHTBUTTONSEL: u32 = 536870912u32;
 #[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const MK_CONTROL: u32 = 8u32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const MK_LBUTTON: u32 = 1u32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const MK_MBUTTON: u32 = 16u32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const MK_RBUTTON: u32 = 2u32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const MK_SHIFT: u32 = 4u32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const MK_XBUTTON1: u32 = 32u32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const MK_XBUTTON2: u32 = 64u32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
 pub const MNC_CLOSE: u32 = 1u32;
 #[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
 pub const MNC_EXECUTE: u32 = 2u32;
@@ -3121,70 +3107,6 @@ pub const SOUND_SYSTEM_STARTUP: u32 = 1u32;
 #[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
 pub const SOUND_SYSTEM_WARNING: u32 = 6u32;
 #[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_BITMAP: i32 = 14i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_BLACKFRAME: i32 = 7i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_BLACKRECT: i32 = 4i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_CENTER: i32 = 1i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_CENTERIMAGE: i32 = 512i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_EDITCONTROL: i32 = 8192i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_ELLIPSISMASK: i32 = 49152i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_ENDELLIPSIS: i32 = 16384i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_ENHMETAFILE: i32 = 15i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_ETCHEDFRAME: i32 = 18i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_ETCHEDHORZ: i32 = 16i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_ETCHEDVERT: i32 = 17i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_GRAYFRAME: i32 = 8i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_GRAYRECT: i32 = 5i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_ICON: i32 = 3i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_LEFT: i32 = 0i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_LEFTNOWORDWRAP: i32 = 12i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_NOPREFIX: i32 = 128i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_NOTIFY: i32 = 256i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_OWNERDRAW: i32 = 13i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_PATHELLIPSIS: i32 = 32768i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_REALSIZECONTROL: i32 = 64i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_REALSIZEIMAGE: i32 = 2048i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_RIGHT: i32 = 2i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_RIGHTJUST: i32 = 1024i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_SIMPLE: i32 = 11i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_SUNKEN: i32 = 4096i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_TYPEMASK: i32 = 31i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_USERITEM: i32 = 10i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_WHITEFRAME: i32 = 9i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_WHITERECT: i32 = 6i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
-pub const SS_WORDELLIPSIS: i32 = 49152i32;
-#[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
 pub const STATE_SYSTEM_ALERT_HIGH: u32 = 268435456u32;
 #[doc = "*Required features: `\"Win32_UI_WindowsAndMessaging\"`*"]
 pub const STATE_SYSTEM_ALERT_LOW: u32 = 67108864u32;