Skip to content

Commit f86349d

Browse files
kennykerrkennykerr
authored
Update Win32 metadata v47 (#2400)
1 parent 3e3c87b commit f86349d

File tree

143 files changed

+194236
-182301
lines changed

Some content is hidden

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

143 files changed

+194236
-182301
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ fn gen_sys_function(gen: &Gen, def: MethodDef) -> TokenStream {
2323
let scope = gen.reader.impl_map_scope(impl_map);
2424
let link = gen.reader.module_ref_name(scope).to_lowercase();
2525

26+
// TODO: skip inline functions for now.
27+
if link == "forceinline" {
28+
return TokenStream::new();
29+
}
30+
2631
let params = signature.params.iter().map(|p| {
2732
let name = gen.param_name(p.def);
2833
let tokens = gen.type_default_name(&p.ty);
@@ -82,6 +87,11 @@ fn gen_win_function(gen: &Gen, def: MethodDef) -> TokenStream {
8287
let scope = gen.reader.impl_map_scope(impl_map);
8388
let link = gen.reader.module_ref_name(scope).to_lowercase();
8489

90+
// TODO: skip inline functions for now.
91+
if link == "forceinline" {
92+
return TokenStream::new();
93+
}
94+
8595
if gen.namespace.starts_with("Windows.") {
8696
quote! {
8797
::windows::imp::link!(#link #extern_abi fn #name(#(#abi_params),*) #abi_return_type);

‎crates/libs/metadata/default/Windows.Win32.Interop.winmd

32 Bytes
Binary file not shown.

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

66 KB
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ the `.winmd` files in this folder are licensed via MIT or Apache-2.0.
55

66
## Windows.Win32.winmd
77
- Source: https://www.nuget.org/packages/Microsoft.Windows.SDK.Win32Metadata/
8-
- Version: 46.0.5
8+
- Version: 47.0.26
99

1010
## Windows.Wdk.winmd
1111
- Source: https://www.nuget.org/packages/Microsoft.Windows.WDK.Win32Metadata/

‎crates/libs/sys/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ Win32_System_Antimalware = ["Win32_System"]
177177
Win32_System_ApplicationInstallationAndServicing = ["Win32_System"]
178178
Win32_System_ApplicationVerifier = ["Win32_System"]
179179
Win32_System_AssessmentTool = ["Win32_System"]
180+
Win32_System_ClrHosting = ["Win32_System"]
180181
Win32_System_Com = ["Win32_System"]
181182
Win32_System_Com_CallObj = ["Win32_System_Com"]
182183
Win32_System_Com_ChannelCredentials = ["Win32_System_Com"]
@@ -197,6 +198,8 @@ Win32_System_Diagnostics = ["Win32_System"]
197198
Win32_System_Diagnostics_Ceip = ["Win32_System_Diagnostics"]
198199
Win32_System_Diagnostics_ClrProfiling = ["Win32_System_Diagnostics"]
199200
Win32_System_Diagnostics_Debug = ["Win32_System_Diagnostics"]
201+
Win32_System_Diagnostics_Debug_ActiveScript = ["Win32_System_Diagnostics_Debug"]
202+
Win32_System_Diagnostics_Debug_Extensions = ["Win32_System_Diagnostics_Debug"]
200203
Win32_System_Diagnostics_Etw = ["Win32_System_Diagnostics"]
201204
Win32_System_Diagnostics_ProcessSnapshotting = ["Win32_System_Diagnostics"]
202205
Win32_System_Diagnostics_ToolHelp = ["Win32_System_Diagnostics"]

‎crates/libs/sys/src/Windows/Win32/Data/HtmlHelp/mod.rs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,16 @@ pub const HHACT_TOC_PREV: i32 = 21i32;
210210
#[doc = "*Required features: `\"Win32_Data_HtmlHelp\"`*"]
211211
pub const HHACT_ZOOM: i32 = 19i32;
212212
#[doc = "*Required features: `\"Win32_Data_HtmlHelp\"`*"]
213+
pub const HHN_FIRST: u32 = 4294966436u32;
214+
#[doc = "*Required features: `\"Win32_Data_HtmlHelp\"`*"]
215+
pub const HHN_LAST: u32 = 4294966417u32;
216+
#[doc = "*Required features: `\"Win32_Data_HtmlHelp\"`*"]
217+
pub const HHN_NAVCOMPLETE: u32 = 4294966436u32;
218+
#[doc = "*Required features: `\"Win32_Data_HtmlHelp\"`*"]
219+
pub const HHN_TRACK: u32 = 4294966435u32;
220+
#[doc = "*Required features: `\"Win32_Data_HtmlHelp\"`*"]
221+
pub const HHN_WINDOW_CREATE: u32 = 4294966434u32;
222+
#[doc = "*Required features: `\"Win32_Data_HtmlHelp\"`*"]
213223
pub const HHWIN_BUTTON_BACK: u32 = 4u32;
214224
#[doc = "*Required features: `\"Win32_Data_HtmlHelp\"`*"]
215225
pub const HHWIN_BUTTON_BROWSE_BCK: u32 = 256u32;
@@ -753,7 +763,7 @@ impl ::core::clone::Clone for HH_GLOBAL_PROPERTY {
753763
#[cfg(feature = "Win32_Foundation")]
754764
pub struct HH_POPUP {
755765
pub cbStruct: i32,
756-
pub hinst: super::super::Foundation::HINSTANCE,
766+
pub hinst: super::super::Foundation::HMODULE,
757767
pub idString: u32,
758768
pub pszText: *mut i8,
759769
pub pt: super::super::Foundation::POINT,

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313
#[cfg(feature = "Win32_Foundation")]
1414
::windows_sys::core::link ! ( "bluetoothapis.dll""system" #[doc = "*Required features: `\"Win32_Devices_Bluetooth\"`, `\"Win32_Foundation\"`*"] fn BluetoothEnumerateInstalledServices ( hradio : super::super::Foundation:: HANDLE , pbtdi : *const BLUETOOTH_DEVICE_INFO , pcserviceinout : *mut u32 , pguidservices : *mut ::windows_sys::core::GUID ) -> u32 );
1515
#[cfg(feature = "Win32_Foundation")]
16-
::windows_sys::core::link ! ( "bluetoothapis.dll""system" #[doc = "*Required features: `\"Win32_Devices_Bluetooth\"`, `\"Win32_Foundation\"`*"] fn BluetoothFindDeviceClose ( hfind : isize ) -> super::super::Foundation:: BOOL );
16+
::windows_sys::core::link ! ( "bluetoothapis.dll""system" #[doc = "*Required features: `\"Win32_Devices_Bluetooth\"`, `\"Win32_Foundation\"`*"] fn BluetoothFindDeviceClose ( hfind : HBLUETOOTH_DEVICE_FIND ) -> super::super::Foundation:: BOOL );
1717
#[cfg(feature = "Win32_Foundation")]
18-
::windows_sys::core::link ! ( "bluetoothapis.dll""system" #[doc = "*Required features: `\"Win32_Devices_Bluetooth\"`, `\"Win32_Foundation\"`*"] fn BluetoothFindFirstDevice ( pbtsp : *const BLUETOOTH_DEVICE_SEARCH_PARAMS , pbtdi : *mut BLUETOOTH_DEVICE_INFO ) -> isize );
18+
::windows_sys::core::link ! ( "bluetoothapis.dll""system" #[doc = "*Required features: `\"Win32_Devices_Bluetooth\"`, `\"Win32_Foundation\"`*"] fn BluetoothFindFirstDevice ( pbtsp : *const BLUETOOTH_DEVICE_SEARCH_PARAMS , pbtdi : *mut BLUETOOTH_DEVICE_INFO ) -> HBLUETOOTH_DEVICE_FIND );
1919
#[cfg(feature = "Win32_Foundation")]
20-
::windows_sys::core::link ! ( "bluetoothapis.dll""system" #[doc = "*Required features: `\"Win32_Devices_Bluetooth\"`, `\"Win32_Foundation\"`*"] fn BluetoothFindFirstRadio ( pbtfrp : *const BLUETOOTH_FIND_RADIO_PARAMS , phradio : *mut super::super::Foundation:: HANDLE ) -> isize );
20+
::windows_sys::core::link ! ( "bluetoothapis.dll""system" #[doc = "*Required features: `\"Win32_Devices_Bluetooth\"`, `\"Win32_Foundation\"`*"] fn BluetoothFindFirstRadio ( pbtfrp : *const BLUETOOTH_FIND_RADIO_PARAMS , phradio : *mut super::super::Foundation:: HANDLE ) -> HBLUETOOTH_RADIO_FIND );
2121
#[cfg(feature = "Win32_Foundation")]
22-
::windows_sys::core::link ! ( "bluetoothapis.dll""system" #[doc = "*Required features: `\"Win32_Devices_Bluetooth\"`, `\"Win32_Foundation\"`*"] fn BluetoothFindNextDevice ( hfind : isize , pbtdi : *mut BLUETOOTH_DEVICE_INFO ) -> super::super::Foundation:: BOOL );
22+
::windows_sys::core::link ! ( "bluetoothapis.dll""system" #[doc = "*Required features: `\"Win32_Devices_Bluetooth\"`, `\"Win32_Foundation\"`*"] fn BluetoothFindNextDevice ( hfind : HBLUETOOTH_DEVICE_FIND , pbtdi : *mut BLUETOOTH_DEVICE_INFO ) -> super::super::Foundation:: BOOL );
2323
#[cfg(feature = "Win32_Foundation")]
24-
::windows_sys::core::link ! ( "bluetoothapis.dll""system" #[doc = "*Required features: `\"Win32_Devices_Bluetooth\"`, `\"Win32_Foundation\"`*"] fn BluetoothFindNextRadio ( hfind : isize , phradio : *mut super::super::Foundation:: HANDLE ) -> super::super::Foundation:: BOOL );
24+
::windows_sys::core::link ! ( "bluetoothapis.dll""system" #[doc = "*Required features: `\"Win32_Devices_Bluetooth\"`, `\"Win32_Foundation\"`*"] fn BluetoothFindNextRadio ( hfind : HBLUETOOTH_RADIO_FIND , phradio : *mut super::super::Foundation:: HANDLE ) -> super::super::Foundation:: BOOL );
2525
#[cfg(feature = "Win32_Foundation")]
26-
::windows_sys::core::link ! ( "bluetoothapis.dll""system" #[doc = "*Required features: `\"Win32_Devices_Bluetooth\"`, `\"Win32_Foundation\"`*"] fn BluetoothFindRadioClose ( hfind : isize ) -> super::super::Foundation:: BOOL );
26+
::windows_sys::core::link ! ( "bluetoothapis.dll""system" #[doc = "*Required features: `\"Win32_Devices_Bluetooth\"`, `\"Win32_Foundation\"`*"] fn BluetoothFindRadioClose ( hfind : HBLUETOOTH_RADIO_FIND ) -> super::super::Foundation:: BOOL );
2727
#[cfg(feature = "Win32_Foundation")]
2828
::windows_sys::core::link ! ( "bluetoothapis.dll""system" #[doc = "*Required features: `\"Win32_Devices_Bluetooth\"`, `\"Win32_Foundation\"`*"] fn BluetoothGATTAbortReliableWrite ( hdevice : super::super::Foundation:: HANDLE , reliablewritecontext : u64 , flags : u32 ) -> ::windows_sys::core::HRESULT );
2929
#[cfg(feature = "Win32_Foundation")]
@@ -2536,6 +2536,8 @@ impl ::core::clone::Clone for BTH_SET_SERVICE {
25362536
}
25372537
}
25382538
pub type HANDLE_SDP_TYPE = u64;
2539+
pub type HBLUETOOTH_DEVICE_FIND = isize;
2540+
pub type HBLUETOOTH_RADIO_FIND = isize;
25392541
#[repr(C, packed(1))]
25402542
#[doc = "*Required features: `\"Win32_Devices_Bluetooth\"`*"]
25412543
pub struct RFCOMM_COMMAND {

‎crates/libs/sys/src/Windows/Win32/Devices/DeviceAndDriverInstallation/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,9 +284,9 @@
284284
#[cfg(feature = "Win32_Foundation")]
285285
::windows_sys::core::link ! ( "newdev.dll""system" #[doc = "*Required features: `\"Win32_Devices_DeviceAndDriverInstallation\"`, `\"Win32_Foundation\"`*"] fn DiUninstallDriverW ( hwndparent : super::super::Foundation:: HWND , infpath : ::windows_sys::core::PCWSTR , flags : u32 , needreboot : *mut super::super::Foundation:: BOOL ) -> super::super::Foundation:: BOOL );
286286
#[cfg(feature = "Win32_Foundation")]
287-
::windows_sys::core::link ! ( "setupapi.dll""system" #[doc = "*Required features: `\"Win32_Devices_DeviceAndDriverInstallation\"`, `\"Win32_Foundation\"`*"] fn InstallHinfSectionA ( window : super::super::Foundation:: HWND , modulehandle : super::super::Foundation:: HINSTANCE , commandline : ::windows_sys::core::PCSTR , showcommand : i32 ) -> ( ) );
287+
::windows_sys::core::link ! ( "setupapi.dll""system" #[doc = "*Required features: `\"Win32_Devices_DeviceAndDriverInstallation\"`, `\"Win32_Foundation\"`*"] fn InstallHinfSectionA ( window : super::super::Foundation:: HWND , modulehandle : super::super::Foundation:: HMODULE , commandline : ::windows_sys::core::PCSTR , showcommand : i32 ) -> ( ) );
288288
#[cfg(feature = "Win32_Foundation")]
289-
::windows_sys::core::link ! ( "setupapi.dll""system" #[doc = "*Required features: `\"Win32_Devices_DeviceAndDriverInstallation\"`, `\"Win32_Foundation\"`*"] fn InstallHinfSectionW ( window : super::super::Foundation:: HWND , modulehandle : super::super::Foundation:: HINSTANCE , commandline : ::windows_sys::core::PCWSTR , showcommand : i32 ) -> ( ) );
289+
::windows_sys::core::link ! ( "setupapi.dll""system" #[doc = "*Required features: `\"Win32_Devices_DeviceAndDriverInstallation\"`, `\"Win32_Foundation\"`*"] fn InstallHinfSectionW ( window : super::super::Foundation:: HWND , modulehandle : super::super::Foundation:: HMODULE , commandline : ::windows_sys::core::PCWSTR , showcommand : i32 ) -> ( ) );
290290
#[cfg(feature = "Win32_Foundation")]
291291
::windows_sys::core::link ! ( "setupapi.dll""system" #[doc = "*Required features: `\"Win32_Devices_DeviceAndDriverInstallation\"`, `\"Win32_Foundation\"`*"] fn SetupAddInstallSectionToDiskSpaceListA ( diskspace : *const ::core::ffi::c_void , infhandle : *const ::core::ffi::c_void , layoutinfhandle : *const ::core::ffi::c_void , sectionname : ::windows_sys::core::PCSTR , reserved1 : *const ::core::ffi::c_void , reserved2 : u32 ) -> super::super::Foundation:: BOOL );
292292
#[cfg(feature = "Win32_Foundation")]

‎crates/libs/sys/src/Windows/Win32/Devices/Fax/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
::windows_sys::core::link ! ( "winfax.dll""system" #[doc = "*Required features: `\"Win32_Devices_Fax\"`, `\"Win32_Foundation\"`*"] fn FaxUnregisterServiceProviderW ( deviceprovider : ::windows_sys::core::PCWSTR ) -> super::super::Foundation:: BOOL );
114114
::windows_sys::core::link ! ( "fxsutility.dll""system" #[doc = "*Required features: `\"Win32_Devices_Fax\"`*"] fn SendToFaxRecipient ( sndmode : SendToMode , lpfilename : ::windows_sys::core::PCWSTR ) -> u32 );
115115
#[cfg(feature = "Win32_Foundation")]
116-
::windows_sys::core::link ! ( "sti.dll""system" #[doc = "*Required features: `\"Win32_Devices_Fax\"`, `\"Win32_Foundation\"`*"] fn StiCreateInstanceW ( hinst : super::super::Foundation:: HINSTANCE , dwver : u32 , ppsti : *mut IStillImageW , punkouter : ::windows_sys::core::IUnknown ) -> ::windows_sys::core::HRESULT );
116+
::windows_sys::core::link ! ( "sti.dll""system" #[doc = "*Required features: `\"Win32_Devices_Fax\"`, `\"Win32_Foundation\"`*"] fn StiCreateInstanceW ( hinst : super::super::Foundation:: HMODULE , dwver : u32 , ppsti : *mut IStillImageW , punkouter : ::windows_sys::core::IUnknown ) -> ::windows_sys::core::HRESULT );
117117
pub type IFaxAccount = *mut ::core::ffi::c_void;
118118
pub type IFaxAccountFolders = *mut ::core::ffi::c_void;
119119
pub type IFaxAccountIncomingArchive = *mut ::core::ffi::c_void;
@@ -2251,10 +2251,10 @@ pub type PFAX_EXT_GET_DATA = ::core::option::Option<unsafe extern "system" fn(pa
22512251
pub type PFAX_EXT_INITIALIZE_CONFIG = ::core::option::Option<unsafe extern "system" fn(param0: PFAX_EXT_GET_DATA, param1: PFAX_EXT_SET_DATA, param2: PFAX_EXT_REGISTER_FOR_EVENTS, param3: PFAX_EXT_UNREGISTER_FOR_EVENTS, param4: PFAX_EXT_FREE_BUFFER) -> ::windows_sys::core::HRESULT>;
22522252
#[doc = "*Required features: `\"Win32_Devices_Fax\"`, `\"Win32_Foundation\"`*"]
22532253
#[cfg(feature = "Win32_Foundation")]
2254-
pub type PFAX_EXT_REGISTER_FOR_EVENTS = ::core::option::Option<unsafe extern "system" fn(param0: super::super::Foundation::HINSTANCE, param1: u32, param2: FAX_ENUM_DEVICE_ID_SOURCE, param3: ::windows_sys::core::PCWSTR, param4: PFAX_EXT_CONFIG_CHANGE) -> super::super::Foundation::HANDLE>;
2254+
pub type PFAX_EXT_REGISTER_FOR_EVENTS = ::core::option::Option<unsafe extern "system" fn(param0: super::super::Foundation::HMODULE, param1: u32, param2: FAX_ENUM_DEVICE_ID_SOURCE, param3: ::windows_sys::core::PCWSTR, param4: PFAX_EXT_CONFIG_CHANGE) -> super::super::Foundation::HANDLE>;
22552255
#[doc = "*Required features: `\"Win32_Devices_Fax\"`, `\"Win32_Foundation\"`*"]
22562256
#[cfg(feature = "Win32_Foundation")]
2257-
pub type PFAX_EXT_SET_DATA = ::core::option::Option<unsafe extern "system" fn(param0: super::super::Foundation::HINSTANCE, param1: u32, param2: FAX_ENUM_DEVICE_ID_SOURCE, param3: ::windows_sys::core::PCWSTR, param4: *mut u8, param5: u32) -> u32>;
2257+
pub type PFAX_EXT_SET_DATA = ::core::option::Option<unsafe extern "system" fn(param0: super::super::Foundation::HMODULE, param1: u32, param2: FAX_ENUM_DEVICE_ID_SOURCE, param3: ::windows_sys::core::PCWSTR, param4: *mut u8, param5: u32) -> u32>;
22582258
#[doc = "*Required features: `\"Win32_Devices_Fax\"`, `\"Win32_Foundation\"`*"]
22592259
#[cfg(feature = "Win32_Foundation")]
22602260
pub type PFAX_EXT_UNREGISTER_FOR_EVENTS = ::core::option::Option<unsafe extern "system" fn(param0: super::super::Foundation::HANDLE) -> u32>;

0 commit comments

Comments
 (0)