diff --git a/Cargo.lock b/Cargo.lock index ca01c39f..31a824e6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2376,31 +2376,30 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.61.1" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5ee8f3d025738cb02bad7868bbb5f8a6327501e870bf51f1b455b0a2454a419" +checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580" dependencies = [ "windows-collections", "windows-core", "windows-future", - "windows-link", "windows-numerics", ] [[package]] name = "windows-collections" -version = "0.2.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8" +checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610" dependencies = [ "windows-core", ] [[package]] name = "windows-core" -version = "0.61.0" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ "windows-implement", "windows-interface", @@ -2411,19 +2410,20 @@ dependencies = [ [[package]] name = "windows-future" -version = "0.2.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a1d6bbefcb7b60acd19828e1bc965da6fcf18a7e39490c5f8be71e54a19ba32" +checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb" dependencies = [ "windows-core", "windows-link", + "windows-threading", ] [[package]] name = "windows-implement" -version = "0.60.0" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", @@ -2432,9 +2432,9 @@ dependencies = [ [[package]] name = "windows-interface" -version = "0.59.1" +version = "0.59.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", @@ -2443,15 +2443,15 @@ dependencies = [ [[package]] name = "windows-link" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] name = "windows-numerics" -version = "0.2.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1" +checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26" dependencies = [ "windows-core", "windows-link", @@ -2459,18 +2459,18 @@ dependencies = [ [[package]] name = "windows-result" -version = "0.3.2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ "windows-link", ] [[package]] name = "windows-strings" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" dependencies = [ "windows-link", ] @@ -2548,6 +2548,15 @@ dependencies = [ "windows_x86_64_msvc 0.52.6", ] +[[package]] +name = "windows-threading" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37" +dependencies = [ + "windows-link", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" diff --git a/platforms/windows/Cargo.toml b/platforms/windows/Cargo.toml index 748c5b41..753c548b 100644 --- a/platforms/windows/Cargo.toml +++ b/platforms/windows/Cargo.toml @@ -20,10 +20,10 @@ accesskit = { version = "0.23.0", path = "../../common" } accesskit_consumer = { version = "0.33.1", path = "../../consumer" } hashbrown.workspace = true static_assertions = "1.1.0" -windows-core = "0.61.0" +windows-core = "0.62.0" [dependencies.windows] -version = "0.61.1" +version = "0.62.0" features = [ "Win32_Foundation", "Win32_Globalization", diff --git a/platforms/windows/examples/hello_world.rs b/platforms/windows/examples/hello_world.rs index 33a71a4f..cc45dd47 100644 --- a/platforms/windows/examples/hello_world.rs +++ b/platforms/windows/examples/hello_world.rs @@ -31,7 +31,7 @@ static WINDOW_CLASS_ATOM: Lazy = Lazy::new(|| { let atom = unsafe { RegisterClassW(&wc) }; if atom == 0 { - panic!("{}", Error::from_win32()); + panic!("{}", Error::from_thread()); } atom }); @@ -344,7 +344,7 @@ fn create_window(title: &str, initial_focus: NodeId) -> Result { )? }; if window.is_invalid() { - return Err(Error::from_win32()); + return Err(Error::from_thread()); } Ok(window) diff --git a/platforms/windows/src/subclass.rs b/platforms/windows/src/subclass.rs index 0f93418b..3bfe6538 100644 --- a/platforms/windows/src/subclass.rs +++ b/platforms/windows/src/subclass.rs @@ -17,7 +17,7 @@ use windows::{ use crate::{Adapter, QueuedEvents}; fn win32_error() -> ! { - panic!("{}", Error::from_win32()) + panic!("{}", Error::from_thread()) } // Work around a difference between the SetWindowLongPtrW API definition diff --git a/platforms/windows/src/tests/mod.rs b/platforms/windows/src/tests/mod.rs index 17aed866..c7436885 100644 --- a/platforms/windows/src/tests/mod.rs +++ b/platforms/windows/src/tests/mod.rs @@ -45,7 +45,7 @@ static WINDOW_CLASS_ATOM: Lazy = Lazy::new(|| { let atom = unsafe { RegisterClassW(&wc) }; if atom == 0 { - panic!("{}", Error::from_win32()); + panic!("{}", Error::from_thread()); } atom }); @@ -161,7 +161,7 @@ fn create_window( )? }; if window.is_invalid() { - return Err(Error::from_win32()); + return Err(Error::from_thread()); } Ok(window) diff --git a/platforms/windows/src/tests/subclassed.rs b/platforms/windows/src/tests/subclassed.rs index d81236c8..36ee313a 100644 --- a/platforms/windows/src/tests/subclassed.rs +++ b/platforms/windows/src/tests/subclassed.rs @@ -133,7 +133,7 @@ static WINDOW_CLASS_ATOM: Lazy = Lazy::new(|| { let atom = unsafe { RegisterClassW(&wc) }; if atom == 0 { - panic!("{}", Error::from_win32()); + panic!("{}", Error::from_thread()); } atom }); @@ -159,7 +159,7 @@ fn create_window(title: &str) -> HWND { } .unwrap(); if window.is_invalid() { - panic!("{}", Error::from_win32()); + panic!("{}", Error::from_thread()); } window