Skip to content

Commit d93e81d

Browse files
riverarriverar
authored
Update Windows metadata (#3342)
1 parent 7ae4d44 commit d93e81d

File tree

154 files changed

+16098
-12743
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+16098
-12743
lines changed

‎.github/actions/fix-environment/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ runs:
6060
- name: Update packages
6161
shell: pwsh
6262
run: |
63-
C:\msys64\usr\bin\pacman.exe -S --noconfirm mingw-w64-x86_64-binutils
64-
C:\msys64\usr\bin\pacman.exe -S --noconfirm mingw-w64-x86_64-llvm
65-
C:\msys64\usr\bin\pacman.exe -S --noconfirm mingw-w64-i686-gcc
66-
C:\msys64\usr\bin\pacman.exe -S --noconfirm mingw-w64-x86_64-gcc
63+
C:\msys64\usr\bin\pacman.exe --sync --refresh --noconfirm mingw-w64-x86_64-binutils
64+
C:\msys64\usr\bin\pacman.exe --sync --refresh --noconfirm mingw-w64-x86_64-llvm
65+
C:\msys64\usr\bin\pacman.exe --sync --refresh --noconfirm mingw-w64-i686-gcc
66+
C:\msys64\usr\bin\pacman.exe --sync --refresh --noconfirm mingw-w64-x86_64-gcc

‎crates/libs/bindgen/default/Windows.Wdk.winmd

-9.42 KB
Binary file not shown.

‎crates/libs/bindgen/default/Windows.Win32.winmd

32.5 KB
Binary file not shown.

‎crates/libs/bindgen/default/Windows.winmd

27 KB
Binary file not shown.

‎crates/libs/bindgen/default/readme.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ like [ILSpy](https://github.com/icsharpcode/ILSpy).
55
## `Windows.Win32.winmd`
66

77
- Source: <https://www.nuget.org/packages/Microsoft.Windows.SDK.Win32Metadata/>
8-
- Version: `61.0.15`
8+
- Version: `63.0.31`
99

1010
## `Windows.Wdk.winmd`
1111

1212
- Source: <https://www.nuget.org/packages/Microsoft.Windows.WDK.Win32Metadata/>
13-
- Version: `0.12.8`
13+
- Version: `0.13.25`
1414

1515
## `Windows.winmd`
1616

1717
- Source: <https://www.nuget.org/packages/Microsoft.Windows.SDK.Contracts>
18-
- Version: `10.0.26100.1`
18+
- Version: `10.0.26100.1742`
1919

2020
The `Windows.winmd` file was created by merging the .winmd files from the last nuget package as follows:
2121

‎crates/libs/bindgen/src/metadata.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ impl Signature {
240240
}
241241

242242
// Then we see if we can infer retval-like behavior more conservatively.
243-
self.params.last().map_or(false, |param| param.is_retval())
243+
self.params.last().is_some_and(|param| param.is_retval())
244244
&& self.params[..self.params.len() - 1].iter().all(|param| {
245245
let flags = param.def.flags();
246246
!flags.contains(ParamAttributes::Out)

‎crates/libs/sys/Cargo.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,21 @@ Win32_Data_HtmlHelp = ["Win32_Data"]
5959
Win32_Data_RightsManagement = ["Win32_Data"]
6060
Win32_Devices = ["Win32"]
6161
Win32_Devices_AllJoyn = ["Win32_Devices"]
62+
Win32_Devices_Beep = ["Win32_Devices"]
6263
Win32_Devices_BiometricFramework = ["Win32_Devices"]
6364
Win32_Devices_Bluetooth = ["Win32_Devices"]
65+
Win32_Devices_Cdrom = ["Win32_Devices"]
6466
Win32_Devices_Communication = ["Win32_Devices"]
6567
Win32_Devices_DeviceAndDriverInstallation = ["Win32_Devices"]
6668
Win32_Devices_DeviceQuery = ["Win32_Devices"]
6769
Win32_Devices_Display = ["Win32_Devices"]
70+
Win32_Devices_Dvd = ["Win32_Devices"]
6871
Win32_Devices_Enumeration = ["Win32_Devices"]
6972
Win32_Devices_Enumeration_Pnp = ["Win32_Devices_Enumeration"]
7073
Win32_Devices_Fax = ["Win32_Devices"]
7174
Win32_Devices_HumanInterfaceDevice = ["Win32_Devices"]
75+
Win32_Devices_Nfc = ["Win32_Devices"]
76+
Win32_Devices_Nfp = ["Win32_Devices"]
7277
Win32_Devices_PortableDevices = ["Win32_Devices"]
7378
Win32_Devices_Properties = ["Win32_Devices"]
7479
Win32_Devices_Pwm = ["Win32_Devices"]

‎crates/libs/sys/features.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎crates/libs/sys/src/Windows/Wdk/Devices/Bluetooth/mod.rs

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,17 @@
1-
#[cfg(feature = "Win32_Devices_Properties")]
2-
pub const DEVPKEY_Bluetooth_ClassOfDevice: super::super::super::Win32::Devices::Properties::DEVPROPKEY = super::super::super::Win32::Devices::Properties::DEVPROPKEY { fmtid: windows_sys::core::GUID::from_u128(0x2bd67d8b_8beb_48d5_87e0_6cda3428040a), pid: 10 };
3-
#[cfg(feature = "Win32_Devices_Properties")]
4-
pub const DEVPKEY_Bluetooth_ClassOfDevice_Deprecated: super::super::super::Win32::Devices::Properties::DEVPROPKEY = super::super::super::Win32::Devices::Properties::DEVPROPKEY { fmtid: windows_sys::core::GUID::from_u128(0x2bd67d8b_8beb_48d5_87e0_6cda3428040a), pid: 4 };
5-
#[cfg(feature = "Win32_Devices_Properties")]
6-
pub const DEVPKEY_Bluetooth_DeviceAddress: super::super::super::Win32::Devices::Properties::DEVPROPKEY = super::super::super::Win32::Devices::Properties::DEVPROPKEY { fmtid: windows_sys::core::GUID::from_u128(0x2bd67d8b_8beb_48d5_87e0_6cda3428040a), pid: 1 };
7-
#[cfg(feature = "Win32_Devices_Properties")]
8-
pub const DEVPKEY_Bluetooth_DeviceFlags: super::super::super::Win32::Devices::Properties::DEVPROPKEY = super::super::super::Win32::Devices::Properties::DEVPROPKEY { fmtid: windows_sys::core::GUID::from_u128(0x2bd67d8b_8beb_48d5_87e0_6cda3428040a), pid: 3 };
9-
#[cfg(feature = "Win32_Devices_Properties")]
10-
pub const DEVPKEY_Bluetooth_DeviceManufacturer: super::super::super::Win32::Devices::Properties::DEVPROPKEY = super::super::super::Win32::Devices::Properties::DEVPROPKEY { fmtid: windows_sys::core::GUID::from_u128(0x2bd67d8b_8beb_48d5_87e0_6cda3428040a), pid: 4 };
11-
#[cfg(feature = "Win32_Devices_Properties")]
12-
pub const DEVPKEY_Bluetooth_DeviceModelNumber: super::super::super::Win32::Devices::Properties::DEVPROPKEY = super::super::super::Win32::Devices::Properties::DEVPROPKEY { fmtid: windows_sys::core::GUID::from_u128(0x2bd67d8b_8beb_48d5_87e0_6cda3428040a), pid: 5 };
13-
#[cfg(feature = "Win32_Devices_Properties")]
14-
pub const DEVPKEY_Bluetooth_DevicePID: super::super::super::Win32::Devices::Properties::DEVPROPKEY = super::super::super::Win32::Devices::Properties::DEVPROPKEY { fmtid: windows_sys::core::GUID::from_u128(0x2bd67d8b_8beb_48d5_87e0_6cda3428040a), pid: 8 };
15-
#[cfg(feature = "Win32_Devices_Properties")]
16-
pub const DEVPKEY_Bluetooth_DeviceProductVersion: super::super::super::Win32::Devices::Properties::DEVPROPKEY = super::super::super::Win32::Devices::Properties::DEVPROPKEY { fmtid: windows_sys::core::GUID::from_u128(0x2bd67d8b_8beb_48d5_87e0_6cda3428040a), pid: 9 };
17-
#[cfg(feature = "Win32_Devices_Properties")]
18-
pub const DEVPKEY_Bluetooth_DeviceVID: super::super::super::Win32::Devices::Properties::DEVPROPKEY = super::super::super::Win32::Devices::Properties::DEVPROPKEY { fmtid: windows_sys::core::GUID::from_u128(0x2bd67d8b_8beb_48d5_87e0_6cda3428040a), pid: 7 };
19-
#[cfg(feature = "Win32_Devices_Properties")]
20-
pub const DEVPKEY_Bluetooth_DeviceVIDSource: super::super::super::Win32::Devices::Properties::DEVPROPKEY = super::super::super::Win32::Devices::Properties::DEVPROPKEY { fmtid: windows_sys::core::GUID::from_u128(0x2bd67d8b_8beb_48d5_87e0_6cda3428040a), pid: 6 };
21-
#[cfg(feature = "Win32_Devices_Properties")]
22-
pub const DEVPKEY_Bluetooth_LastConnectedTime: super::super::super::Win32::Devices::Properties::DEVPROPKEY = super::super::super::Win32::Devices::Properties::DEVPROPKEY { fmtid: windows_sys::core::GUID::from_u128(0x2bd67d8b_8beb_48d5_87e0_6cda3428040a), pid: 11 };
23-
#[cfg(feature = "Win32_Devices_Properties")]
24-
pub const DEVPKEY_Bluetooth_LastConnectedTime_Deprecated: super::super::super::Win32::Devices::Properties::DEVPROPKEY = super::super::super::Win32::Devices::Properties::DEVPROPKEY { fmtid: windows_sys::core::GUID::from_u128(0x2bd67d8b_8beb_48d5_87e0_6cda3428040a), pid: 5 };
25-
#[cfg(feature = "Win32_Devices_Properties")]
26-
pub const DEVPKEY_Bluetooth_LastSeenTime: super::super::super::Win32::Devices::Properties::DEVPROPKEY = super::super::super::Win32::Devices::Properties::DEVPROPKEY { fmtid: windows_sys::core::GUID::from_u128(0x2bd67d8b_8beb_48d5_87e0_6cda3428040a), pid: 12 };
27-
#[cfg(feature = "Win32_Devices_Properties")]
28-
pub const DEVPKEY_Bluetooth_ServiceGUID: super::super::super::Win32::Devices::Properties::DEVPROPKEY = super::super::super::Win32::Devices::Properties::DEVPROPKEY { fmtid: windows_sys::core::GUID::from_u128(0x2bd67d8b_8beb_48d5_87e0_6cda3428040a), pid: 2 };
1+
pub const DEVPKEY_Bluetooth_ClassOfDevice: super::super::super::Win32::Foundation::DEVPROPKEY = super::super::super::Win32::Foundation::DEVPROPKEY { fmtid: windows_sys::core::GUID::from_u128(0x2bd67d8b_8beb_48d5_87e0_6cda3428040a), pid: 10 };
2+
pub const DEVPKEY_Bluetooth_ClassOfDevice_Deprecated: super::super::super::Win32::Foundation::DEVPROPKEY = super::super::super::Win32::Foundation::DEVPROPKEY { fmtid: windows_sys::core::GUID::from_u128(0x2bd67d8b_8beb_48d5_87e0_6cda3428040a), pid: 4 };
3+
pub const DEVPKEY_Bluetooth_DeviceAddress: super::super::super::Win32::Foundation::DEVPROPKEY = super::super::super::Win32::Foundation::DEVPROPKEY { fmtid: windows_sys::core::GUID::from_u128(0x2bd67d8b_8beb_48d5_87e0_6cda3428040a), pid: 1 };
4+
pub const DEVPKEY_Bluetooth_DeviceFlags: super::super::super::Win32::Foundation::DEVPROPKEY = super::super::super::Win32::Foundation::DEVPROPKEY { fmtid: windows_sys::core::GUID::from_u128(0x2bd67d8b_8beb_48d5_87e0_6cda3428040a), pid: 3 };
5+
pub const DEVPKEY_Bluetooth_DeviceManufacturer: super::super::super::Win32::Foundation::DEVPROPKEY = super::super::super::Win32::Foundation::DEVPROPKEY { fmtid: windows_sys::core::GUID::from_u128(0x2bd67d8b_8beb_48d5_87e0_6cda3428040a), pid: 4 };
6+
pub const DEVPKEY_Bluetooth_DeviceModelNumber: super::super::super::Win32::Foundation::DEVPROPKEY = super::super::super::Win32::Foundation::DEVPROPKEY { fmtid: windows_sys::core::GUID::from_u128(0x2bd67d8b_8beb_48d5_87e0_6cda3428040a), pid: 5 };
7+
pub const DEVPKEY_Bluetooth_DevicePID: super::super::super::Win32::Foundation::DEVPROPKEY = super::super::super::Win32::Foundation::DEVPROPKEY { fmtid: windows_sys::core::GUID::from_u128(0x2bd67d8b_8beb_48d5_87e0_6cda3428040a), pid: 8 };
8+
pub const DEVPKEY_Bluetooth_DeviceProductVersion: super::super::super::Win32::Foundation::DEVPROPKEY = super::super::super::Win32::Foundation::DEVPROPKEY { fmtid: windows_sys::core::GUID::from_u128(0x2bd67d8b_8beb_48d5_87e0_6cda3428040a), pid: 9 };
9+
pub const DEVPKEY_Bluetooth_DeviceVID: super::super::super::Win32::Foundation::DEVPROPKEY = super::super::super::Win32::Foundation::DEVPROPKEY { fmtid: windows_sys::core::GUID::from_u128(0x2bd67d8b_8beb_48d5_87e0_6cda3428040a), pid: 7 };
10+
pub const DEVPKEY_Bluetooth_DeviceVIDSource: super::super::super::Win32::Foundation::DEVPROPKEY = super::super::super::Win32::Foundation::DEVPROPKEY { fmtid: windows_sys::core::GUID::from_u128(0x2bd67d8b_8beb_48d5_87e0_6cda3428040a), pid: 6 };
11+
pub const DEVPKEY_Bluetooth_LastConnectedTime: super::super::super::Win32::Foundation::DEVPROPKEY = super::super::super::Win32::Foundation::DEVPROPKEY { fmtid: windows_sys::core::GUID::from_u128(0x2bd67d8b_8beb_48d5_87e0_6cda3428040a), pid: 11 };
12+
pub const DEVPKEY_Bluetooth_LastConnectedTime_Deprecated: super::super::super::Win32::Foundation::DEVPROPKEY = super::super::super::Win32::Foundation::DEVPROPKEY { fmtid: windows_sys::core::GUID::from_u128(0x2bd67d8b_8beb_48d5_87e0_6cda3428040a), pid: 5 };
13+
pub const DEVPKEY_Bluetooth_LastSeenTime: super::super::super::Win32::Foundation::DEVPROPKEY = super::super::super::Win32::Foundation::DEVPROPKEY { fmtid: windows_sys::core::GUID::from_u128(0x2bd67d8b_8beb_48d5_87e0_6cda3428040a), pid: 12 };
14+
pub const DEVPKEY_Bluetooth_ServiceGUID: super::super::super::Win32::Foundation::DEVPROPKEY = super::super::super::Win32::Foundation::DEVPROPKEY { fmtid: windows_sys::core::GUID::from_u128(0x2bd67d8b_8beb_48d5_87e0_6cda3428040a), pid: 2 };
2915
pub const GUID_BTHDDI_PROFILE_DRIVER_INTERFACE: windows_sys::core::GUID = windows_sys::core::GUID::from_u128(0x94a59aa8_4383_4286_aa4f_34a160f40004);
3016
pub const GUID_BTHDDI_SDP_NODE_INTERFACE: windows_sys::core::GUID = windows_sys::core::GUID::from_u128(0x81a7fdf3_86c1_4be8_a8c8_2a6d188b4177);
3117
pub const GUID_BTHDDI_SDP_PARSE_INTERFACE: windows_sys::core::GUID = windows_sys::core::GUID::from_u128(0x4e719439_9cf1_4bab_ac1d_3279865743d2);

‎crates/libs/sys/src/Windows/Wdk/Foundation/mod.rs

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1100,34 +1100,37 @@ pub struct MDL {
11001100
pub ByteOffset: u32,
11011101
}
11021102
#[repr(C)]
1103+
#[cfg(feature = "Win32_Security")]
11031104
#[derive(Clone, Copy)]
11041105
pub struct OBJECT_ATTRIBUTES {
11051106
pub Length: u32,
11061107
pub RootDirectory: super::super::Win32::Foundation::HANDLE,
11071108
pub ObjectName: *const super::super::Win32::Foundation::UNICODE_STRING,
1108-
pub Attributes: u32,
1109-
pub SecurityDescriptor: *const core::ffi::c_void,
1110-
pub SecurityQualityOfService: *const core::ffi::c_void,
1109+
pub Attributes: super::super::Win32::Foundation::OBJECT_ATTRIBUTE_FLAGS,
1110+
pub SecurityDescriptor: *const super::super::Win32::Security::SECURITY_DESCRIPTOR,
1111+
pub SecurityQualityOfService: *const super::super::Win32::Security::SECURITY_QUALITY_OF_SERVICE,
11111112
}
11121113
#[repr(C)]
1114+
#[cfg(feature = "Win32_Security")]
11131115
#[derive(Clone, Copy)]
11141116
pub struct OBJECT_ATTRIBUTES32 {
11151117
pub Length: u32,
11161118
pub RootDirectory: u32,
11171119
pub ObjectName: u32,
1118-
pub Attributes: u32,
1119-
pub SecurityDescriptor: u32,
1120-
pub SecurityQualityOfService: u32,
1120+
pub Attributes: super::super::Win32::Foundation::OBJECT_ATTRIBUTE_FLAGS,
1121+
pub SecurityDescriptor: *const super::super::Win32::Security::SECURITY_DESCRIPTOR,
1122+
pub SecurityQualityOfService: *const super::super::Win32::Security::SECURITY_QUALITY_OF_SERVICE,
11211123
}
11221124
#[repr(C)]
1125+
#[cfg(feature = "Win32_Security")]
11231126
#[derive(Clone, Copy)]
11241127
pub struct OBJECT_ATTRIBUTES64 {
11251128
pub Length: u32,
11261129
pub RootDirectory: u64,
11271130
pub ObjectName: u64,
1128-
pub Attributes: u32,
1129-
pub SecurityDescriptor: u64,
1130-
pub SecurityQualityOfService: u64,
1131+
pub Attributes: super::super::Win32::Foundation::OBJECT_ATTRIBUTE_FLAGS,
1132+
pub SecurityDescriptor: *const super::super::Win32::Security::SECURITY_DESCRIPTOR,
1133+
pub SecurityQualityOfService: *const super::super::Win32::Security::SECURITY_QUALITY_OF_SERVICE,
11311134
}
11321135
#[repr(C)]
11331136
#[derive(Clone, Copy)]

0 commit comments

Comments
 (0)