Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Windows metadata #3342

Merged
merged 11 commits into from
Nov 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/actions/fix-environment/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ runs:
- name: Update packages
shell: pwsh
run: |
C:\msys64\usr\bin\pacman.exe -S --noconfirm mingw-w64-x86_64-binutils
C:\msys64\usr\bin\pacman.exe -S --noconfirm mingw-w64-x86_64-llvm
C:\msys64\usr\bin\pacman.exe -S --noconfirm mingw-w64-i686-gcc
C:\msys64\usr\bin\pacman.exe -S --noconfirm mingw-w64-x86_64-gcc
C:\msys64\usr\bin\pacman.exe --sync --refresh --noconfirm mingw-w64-x86_64-binutils
C:\msys64\usr\bin\pacman.exe --sync --refresh --noconfirm mingw-w64-x86_64-llvm
C:\msys64\usr\bin\pacman.exe --sync --refresh --noconfirm mingw-w64-i686-gcc
C:\msys64\usr\bin\pacman.exe --sync --refresh --noconfirm mingw-w64-x86_64-gcc
Binary file modified crates/libs/bindgen/default/Windows.Wdk.winmd
Binary file not shown.
Binary file modified crates/libs/bindgen/default/Windows.Win32.winmd
Binary file not shown.
Binary file modified crates/libs/bindgen/default/Windows.winmd
Binary file not shown.
6 changes: 3 additions & 3 deletions crates/libs/bindgen/default/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ like [ILSpy](https://github.com/icsharpcode/ILSpy).
## `Windows.Win32.winmd`

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

## `Windows.Wdk.winmd`

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

## `Windows.winmd`

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

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

Expand Down
2 changes: 1 addition & 1 deletion crates/libs/bindgen/src/metadata.rs
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ impl Signature {
}

// Then we see if we can infer retval-like behavior more conservatively.
self.params.last().map_or(false, |param| param.is_retval())
self.params.last().is_some_and(|param| param.is_retval())
kennykerr marked this conversation as resolved.
Show resolved Hide resolved
&& self.params[..self.params.len() - 1].iter().all(|param| {
let flags = param.def.flags();
!flags.contains(ParamAttributes::Out)
Expand Down
5 changes: 5 additions & 0 deletions crates/libs/sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,21 @@ Win32_Data_HtmlHelp = ["Win32_Data"]
Win32_Data_RightsManagement = ["Win32_Data"]
Win32_Devices = ["Win32"]
Win32_Devices_AllJoyn = ["Win32_Devices"]
Win32_Devices_Beep = ["Win32_Devices"]
Win32_Devices_BiometricFramework = ["Win32_Devices"]
Win32_Devices_Bluetooth = ["Win32_Devices"]
Win32_Devices_Cdrom = ["Win32_Devices"]
Win32_Devices_Communication = ["Win32_Devices"]
Win32_Devices_DeviceAndDriverInstallation = ["Win32_Devices"]
Win32_Devices_DeviceQuery = ["Win32_Devices"]
Win32_Devices_Display = ["Win32_Devices"]
Win32_Devices_Dvd = ["Win32_Devices"]
Win32_Devices_Enumeration = ["Win32_Devices"]
Win32_Devices_Enumeration_Pnp = ["Win32_Devices_Enumeration"]
Win32_Devices_Fax = ["Win32_Devices"]
Win32_Devices_HumanInterfaceDevice = ["Win32_Devices"]
Win32_Devices_Nfc = ["Win32_Devices"]
Win32_Devices_Nfp = ["Win32_Devices"]
Win32_Devices_PortableDevices = ["Win32_Devices"]
Win32_Devices_Properties = ["Win32_Devices"]
Win32_Devices_Pwm = ["Win32_Devices"]
Expand Down
2 changes: 1 addition & 1 deletion crates/libs/sys/features.json

Large diffs are not rendered by default.

42 changes: 14 additions & 28 deletions crates/libs/sys/src/Windows/Wdk/Devices/Bluetooth/mod.rs
Original file line number Diff line number Diff line change
@@ -1,31 +1,17 @@
#[cfg(feature = "Win32_Devices_Properties")]
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 };
#[cfg(feature = "Win32_Devices_Properties")]
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 };
#[cfg(feature = "Win32_Devices_Properties")]
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 };
#[cfg(feature = "Win32_Devices_Properties")]
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 };
#[cfg(feature = "Win32_Devices_Properties")]
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 };
#[cfg(feature = "Win32_Devices_Properties")]
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 };
#[cfg(feature = "Win32_Devices_Properties")]
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 };
#[cfg(feature = "Win32_Devices_Properties")]
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 };
#[cfg(feature = "Win32_Devices_Properties")]
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 };
#[cfg(feature = "Win32_Devices_Properties")]
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 };
#[cfg(feature = "Win32_Devices_Properties")]
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 };
#[cfg(feature = "Win32_Devices_Properties")]
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 };
#[cfg(feature = "Win32_Devices_Properties")]
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 };
#[cfg(feature = "Win32_Devices_Properties")]
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 };
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 };
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 };
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 };
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 };
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 };
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 };
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 };
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 };
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 };
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 };
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 };
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 };
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 };
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 };
pub const GUID_BTHDDI_PROFILE_DRIVER_INTERFACE: windows_sys::core::GUID = windows_sys::core::GUID::from_u128(0x94a59aa8_4383_4286_aa4f_34a160f40004);
pub const GUID_BTHDDI_SDP_NODE_INTERFACE: windows_sys::core::GUID = windows_sys::core::GUID::from_u128(0x81a7fdf3_86c1_4be8_a8c8_2a6d188b4177);
pub const GUID_BTHDDI_SDP_PARSE_INTERFACE: windows_sys::core::GUID = windows_sys::core::GUID::from_u128(0x4e719439_9cf1_4bab_ac1d_3279865743d2);
Expand Down
21 changes: 12 additions & 9 deletions crates/libs/sys/src/Windows/Wdk/Foundation/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1100,34 +1100,37 @@ pub struct MDL {
pub ByteOffset: u32,
}
#[repr(C)]
#[cfg(feature = "Win32_Security")]
#[derive(Clone, Copy)]
pub struct OBJECT_ATTRIBUTES {
pub Length: u32,
pub RootDirectory: super::super::Win32::Foundation::HANDLE,
pub ObjectName: *const super::super::Win32::Foundation::UNICODE_STRING,
pub Attributes: u32,
pub SecurityDescriptor: *const core::ffi::c_void,
pub SecurityQualityOfService: *const core::ffi::c_void,
pub Attributes: super::super::Win32::Foundation::OBJECT_ATTRIBUTE_FLAGS,
pub SecurityDescriptor: *const super::super::Win32::Security::SECURITY_DESCRIPTOR,
pub SecurityQualityOfService: *const super::super::Win32::Security::SECURITY_QUALITY_OF_SERVICE,
riverar marked this conversation as resolved.
Show resolved Hide resolved
}
#[repr(C)]
#[cfg(feature = "Win32_Security")]
#[derive(Clone, Copy)]
pub struct OBJECT_ATTRIBUTES32 {
pub Length: u32,
pub RootDirectory: u32,
pub ObjectName: u32,
pub Attributes: u32,
pub SecurityDescriptor: u32,
pub SecurityQualityOfService: u32,
pub Attributes: super::super::Win32::Foundation::OBJECT_ATTRIBUTE_FLAGS,
pub SecurityDescriptor: *const super::super::Win32::Security::SECURITY_DESCRIPTOR,
pub SecurityQualityOfService: *const super::super::Win32::Security::SECURITY_QUALITY_OF_SERVICE,
}
#[repr(C)]
#[cfg(feature = "Win32_Security")]
#[derive(Clone, Copy)]
pub struct OBJECT_ATTRIBUTES64 {
pub Length: u32,
pub RootDirectory: u64,
pub ObjectName: u64,
pub Attributes: u32,
pub SecurityDescriptor: u64,
pub SecurityQualityOfService: u64,
pub Attributes: super::super::Win32::Foundation::OBJECT_ATTRIBUTE_FLAGS,
pub SecurityDescriptor: *const super::super::Win32::Security::SECURITY_DESCRIPTOR,
pub SecurityQualityOfService: *const super::super::Win32::Security::SECURITY_QUALITY_OF_SERVICE,
}
#[repr(C)]
#[derive(Clone, Copy)]
Expand Down
Loading