diff --git a/Cargo.lock b/Cargo.lock index 084d669..7f761da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -45,6 +45,11 @@ dependencies = [ "windows 0.48.0", "windows 0.51.1", "windows 0.52.0", + "windows 0.53.0", + "windows 0.54.0", + "windows 0.56.0", + "windows 0.57.0", + "windows 0.58.0", ] [[package]] @@ -53,6 +58,24 @@ version = "0.2.152" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +[[package]] +name = "proc-macro2" +version = "1.0.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + [[package]] name = "raw-window-handle" version = "0.1.2" @@ -102,6 +125,23 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" +[[package]] +name = "syn" +version = "2.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + [[package]] name = "winapi" version = "0.2.8" @@ -351,7 +391,57 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core 0.52.0", - "windows-targets 0.52.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efc5cf48f83140dcaab716eeaea345f9e93d0018fb81162753a3f76c3397b538" +dependencies = [ + "windows-core 0.53.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +dependencies = [ + "windows-core 0.54.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" +dependencies = [ + "windows-core 0.56.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" +dependencies = [ + "windows-core 0.57.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" +dependencies = [ + "windows-core 0.58.0", + "windows-targets 0.52.6", ] [[package]] @@ -369,7 +459,158 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dcc5b895a6377f1ab9fa55acedab1fd5ac0db66ad1e6c7f47e28a22e446a5dd" +dependencies = [ + "windows-result 0.1.2", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +dependencies = [ + "windows-result 0.1.2", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" +dependencies = [ + "windows-implement 0.56.0", + "windows-interface 0.56.0", + "windows-result 0.1.2", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" +dependencies = [ + "windows-implement 0.57.0", + "windows-interface 0.57.0", + "windows-result 0.1.2", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +dependencies = [ + "windows-implement 0.58.0", + "windows-interface 0.58.0", + "windows-result 0.2.0", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-implement" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-implement" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-interface" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-interface" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-interface" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result 0.2.0", + "windows-targets 0.52.6", ] [[package]] @@ -404,17 +645,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -443,9 +685,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -527,9 +769,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -611,9 +853,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -695,9 +943,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -779,9 +1027,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -809,9 +1057,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -893,6 +1141,6 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" diff --git a/Cargo.toml b/Cargo.toml index 7295ae9..1f1a85d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,6 +44,12 @@ winapi-0-3 = { package = "winapi", version = "0.3", optional = winapi-0-2 = { package = "winapi", version = "0.2", optional = true } #winapi-0-1 = { package = "winapi", version = "0.1", optional = true } # XXX: doesn't compile on modern rustc? spams e.g.: error: type `HKEY__` is private +windows-0-58 = { package = "windows", version = "0.58", optional = true, features = ["UI_Core", "Win32_Foundation", "Win32_System_WinRT"] } +windows-0-57 = { package = "windows", version = "0.57", optional = true, features = ["UI_Core", "Win32_Foundation", "Win32_System_WinRT"] } +windows-0-56 = { package = "windows", version = "0.56", optional = true, features = ["UI_Core", "Win32_Foundation", "Win32_System_WinRT"] } +#windows-0-55 = { package = "windows", version = "0.55", optional = true, features = ["UI_Core", "Win32_Foundation", "Win32_System_WinRT"] } +windows-0-54 = { package = "windows", version = "0.54", optional = true, features = ["UI_Core", "Win32_Foundation", "Win32_System_WinRT"] } +windows-0-53 = { package = "windows", version = "0.53", optional = true, features = ["UI_Core", "Win32_Foundation", "Win32_System_WinRT"] } windows-0-52 = { package = "windows", version = "0.52", optional = true, features = ["UI_Core", "Win32_Foundation", "Win32_System_WinRT"] } windows-0-51 = { package = "windows", version = "0.51", optional = true, features = ["UI_Core", "Win32_Foundation", "Win32_System_WinRT"] } #windows-0-50 = { package = "windows", version = "0.50", optional = true, features = ["UI_Core", "Win32_Foundation", "Win32_System_WinRT"] } diff --git a/src/interop/_interop.rs b/src/interop/_interop.rs index 59989d9..b8b8df7 100644 --- a/src/interop/_interop.rs +++ b/src/interop/_interop.rs @@ -25,6 +25,15 @@ mod core; +#[cfg(feature = "windows-0-58")] mod windows_0_58 { use windows_0_58 as windows; include!("windows-0.56.rs"); } +// windows = "0.58": HWND's field changed from an integer into a pointer +#[cfg(feature = "windows-0-57")] mod windows_0_57 { use windows_0_57 as windows; include!("windows-0.56.rs"); } +#[cfg(feature = "windows-0-56")] mod windows_0_56 { use windows_0_56 as windows; include!("windows-0.56.rs"); } +// windows = "0.56": Param renamed to ParamValue, IntoParam renamed to Param +#[cfg(feature = "windows-0-55")] mod windows_0_55 { use windows_0_55 as windows; include!("windows-0.53.rs"); } +#[cfg(feature = "windows-0-54")] mod windows_0_54 { use windows_0_54 as windows; include!("windows-0.53.rs"); } +#[cfg(feature = "windows-0-53")] mod windows_0_53 { use windows_0_53 as windows; include!("windows-0.53.rs"); } +// windows = "0.53": windows::core::ComInterface renamed back to windows::core::Interface #[cfg(feature = "windows-0-52")] mod windows_0_52 { use windows_0_52 as windows; include!("windows-0.46.rs"); } #[cfg(feature = "windows-0-51")] mod windows_0_51 { use windows_0_51 as windows; include!("windows-0.46.rs"); } #[cfg(feature = "windows-0-50")] mod windows_0_50 { use windows_0_50 as windows; include!("windows-0.46.rs"); } diff --git a/src/interop/windows-0.53.rs b/src/interop/windows-0.53.rs new file mode 100644 index 0000000..93ff64e --- /dev/null +++ b/src/interop/windows-0.53.rs @@ -0,0 +1,16 @@ +use windows::{ + core::{Interface, Error, IntoParam, Param}, + UI::Core::{CoreWindow, ICoreWindow}, + Win32::Foundation::HWND, + Win32::System::WinRT::ICoreWindowInterop, +}; + +impl From for crate::HWND { fn from(hwnd: HWND ) -> Self { Self::from_isize(hwnd.0) } } +impl From for HWND { fn from(hwnd: crate::HWND ) -> Self { Self(hwnd.to_isize()) } } +impl From for HWND { fn from(hwnd: crate::NonNullHWND ) -> Self { Self(hwnd.to_isize()) } } + +impl TryFrom<&CoreWindow > for crate::HWND { type Error = Error; fn try_from(core_window: &CoreWindow ) -> Result { unsafe { Ok(core_window.cast::()?.WindowHandle()?.into()) } } } +impl TryFrom<&ICoreWindow > for crate::HWND { type Error = Error; fn try_from(core_window: &ICoreWindow) -> Result { unsafe { Ok(core_window.cast::()?.WindowHandle()?.into()) } } } + +impl IntoParam for crate::HWND { unsafe fn into_param(self) -> Param { Param::Owned(self.into()) } } +impl IntoParam for crate::NonNullHWND { unsafe fn into_param(self) -> Param { Param::Owned(self.into()) } } diff --git a/src/interop/windows-0.56.rs b/src/interop/windows-0.56.rs new file mode 100644 index 0000000..75bf51e --- /dev/null +++ b/src/interop/windows-0.56.rs @@ -0,0 +1,16 @@ +use windows::{ + core::{Interface, Error, Param, ParamValue}, + UI::Core::{CoreWindow, ICoreWindow}, + Win32::Foundation::HWND, + Win32::System::WinRT::ICoreWindowInterop, +}; + +impl From for crate::HWND { fn from(hwnd: HWND ) -> Self { Self::from_isize(hwnd.0 as _) } } +impl From for HWND { fn from(hwnd: crate::HWND ) -> Self { Self(hwnd.to_isize() as _) } } +impl From for HWND { fn from(hwnd: crate::NonNullHWND ) -> Self { Self(hwnd.to_isize() as _) } } + +impl TryFrom<&CoreWindow > for crate::HWND { type Error = Error; fn try_from(core_window: &CoreWindow ) -> Result { unsafe { Ok(core_window.cast::()?.WindowHandle()?.into()) } } } +impl TryFrom<&ICoreWindow > for crate::HWND { type Error = Error; fn try_from(core_window: &ICoreWindow) -> Result { unsafe { Ok(core_window.cast::()?.WindowHandle()?.into()) } } } + +impl Param for crate::HWND { unsafe fn param(self) -> ParamValue { ParamValue::Owned(self.into()) } } +impl Param for crate::NonNullHWND { unsafe fn param(self) -> ParamValue { ParamValue::Owned(self.into()) } } diff --git a/src/values/hwnd.conversion.md b/src/values/hwnd.conversion.md index 100791c..156c559 100644 --- a/src/values/hwnd.conversion.md +++ b/src/values/hwnd.conversion.md @@ -36,7 +36,8 @@ | `ver` | convert [windows](https://microsoft.github.io/windows-docs-rs/doc/windows/)::* → [`hwnd0::HWND`] | convert [`hwnd0::HWND`] → [windows](https://microsoft.github.io/windows-docs-rs/doc/windows/)::* | |:-----------------------------:| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| `0-52`
..
`0-46` | [From]<[HWND](https://microsoft.github.io/windows-docs-rs/doc/windows/Win32/Foundation/struct.HWND.html)>
[TryFrom]<&[CoreWindow](https://microsoft.github.io/windows-docs-rs/doc/windows/UI/Core/struct.CoreWindow.html)>
[TryFrom]<&[ICoreWindow](https://microsoft.github.io/windows-docs-rs/doc/windows/UI/Core/struct.ICoreWindow.html)> | [From]<[hwnd0::HWND]> for [HWND](https://microsoft.github.io/windows-docs-rs/doc/windows/Win32/Foundation/struct.HWND.html)
IntoParam<[HWND](https://microsoft.github.io/windows-docs-rs/doc/windows/Win32/Foundation/struct.HWND.html)> for [hwnd0::HWND] | +| `0-58`
..
`0-57` | [From]<[HWND](https://microsoft.github.io/windows-docs-rs/doc/windows/Win32/Foundation/struct.HWND.html)>
[TryFrom]<&[CoreWindow](https://microsoft.github.io/windows-docs-rs/doc/windows/UI/Core/struct.CoreWindow.html)>
[TryFrom]<&[ICoreWindow](https://microsoft.github.io/windows-docs-rs/doc/windows/UI/Core/struct.ICoreWindow.html)> | [From]<[hwnd0::HWND]> for [HWND](https://microsoft.github.io/windows-docs-rs/doc/windows/Win32/Foundation/struct.HWND.html)
Param<[HWND](https://microsoft.github.io/windows-docs-rs/doc/windows/Win32/Foundation/struct.HWND.html)> for [hwnd0::HWND] | +| `0-56`
..
`0-46` | [From]<HWND>
[TryFrom]<&CoreWindow>
[TryFrom]<&ICoreWindow> | [From]<[hwnd0::HWND]> for HWND
IntoParam<[HWND](https://microsoft.github.io/windows-docs-rs/doc/windows/Win32/Foundation/struct.HWND.html)> for [hwnd0::HWND] | | `0-45`
..
`0-44` | [From]<HWND>
[TryFrom]<&CoreWindow>
[TryFrom]<&ICoreWindow> | [From]<[hwnd0::HWND]> for HWND
[Into]<InParam<[HWND](https://microsoft.github.io/windows-docs-rs/doc/windows/Win32/Foundation/struct.HWND.html)>> for [hwnd0::HWND] | | `0-43`
..
`0-39` | [From]<HWND>
[TryFrom]<&CoreWindow>
[TryFrom]<&ICoreWindow> | [From]<[hwnd0::HWND]> for HWND
[Into]<InParam<\'_, [HWND](https://microsoft.github.io/windows-docs-rs/doc/windows/Win32/Foundation/struct.HWND.html)>> for [hwnd0::HWND] | | `0-38`
..
`0-35` | [From]<HWND>
[TryFrom]<&CoreWindow>
[TryFrom]<&ICoreWindow> | [From]<[hwnd0::HWND]> for HWND
IntoParam<\'_, [HWND](https://microsoft.github.io/windows-docs-rs/doc/windows/Win32/Foundation/struct.HWND.html)> for [hwnd0::HWND] | diff --git a/src/values/non_null_hwnd.conversion.md b/src/values/non_null_hwnd.conversion.md index 97a5018..5961224 100644 --- a/src/values/non_null_hwnd.conversion.md +++ b/src/values/non_null_hwnd.conversion.md @@ -36,7 +36,8 @@ | `ver` | convert [windows](https://microsoft.github.io/windows-docs-rs/doc/windows/)::* → [`hwnd0::NonNullHWND`] | convert [`hwnd0::NonNullHWND`] → [windows](https://microsoft.github.io/windows-docs-rs/doc/windows/)::* | |:-----------------------------:| ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| `0-52`
..
`0-46` | [TryFrom]<[HWND](https://microsoft.github.io/windows-docs-rs/doc/windows/Win32/Foundation/struct.HWND.html)>
[TryFrom]<&[CoreWindow](https://microsoft.github.io/windows-docs-rs/doc/windows/UI/Core/struct.CoreWindow.html)>
[TryFrom]<&[ICoreWindow](https://microsoft.github.io/windows-docs-rs/doc/windows/UI/Core/struct.ICoreWindow.html)> | [From]<[hwnd0::NonNullHWND]> for [HWND](https://microsoft.github.io/windows-docs-rs/doc/windows/Win32/Foundation/struct.HWND.html)
IntoParam<[HWND](https://microsoft.github.io/windows-docs-rs/doc/windows/Win32/Foundation/struct.HWND.html)> for [hwnd0::NonNullHWND] | +| `0-58`
..
`0-57` | [TryFrom]<[HWND](https://microsoft.github.io/windows-docs-rs/doc/windows/Win32/Foundation/struct.HWND.html)>
[TryFrom]<&[CoreWindow](https://microsoft.github.io/windows-docs-rs/doc/windows/UI/Core/struct.CoreWindow.html)>
[TryFrom]<&[ICoreWindow](https://microsoft.github.io/windows-docs-rs/doc/windows/UI/Core/struct.ICoreWindow.html)> | [From]<[hwnd0::NonNullHWND]> for [HWND](https://microsoft.github.io/windows-docs-rs/doc/windows/Win32/Foundation/struct.HWND.html)
Param<[HWND](https://microsoft.github.io/windows-docs-rs/doc/windows/Win32/Foundation/struct.HWND.html)> for [hwnd0::NonNullHWND] | +| `0-56`
..
`0-46` | [TryFrom]<HWND>
[TryFrom]<&CoreWindow>
[TryFrom]<&ICoreWindow> | [From]<[hwnd0::NonNullHWND]> for HWND
IntoParam<[HWND](https://microsoft.github.io/windows-docs-rs/doc/windows/Win32/Foundation/struct.HWND.html)> for [hwnd0::NonNullHWND] | | `0-45`
..
`0-44` | [TryFrom]<HWND>
[TryFrom]<&CoreWindow>
[TryFrom]<&ICoreWindow> | [From]<[hwnd0::NonNullHWND]> for HWND
[Into]<InParam<[HWND](https://microsoft.github.io/windows-docs-rs/doc/windows/Win32/Foundation/struct.HWND.html)>> for [hwnd0::NonNullHWND] | | `0-43`
..
`0-39` | [TryFrom]<HWND>
[TryFrom]<&CoreWindow>
[TryFrom]<&ICoreWindow> | [From]<[hwnd0::NonNullHWND]> for HWND
[Into]<InParam<\'_, [HWND](https://microsoft.github.io/windows-docs-rs/doc/windows/Win32/Foundation/struct.HWND.html)>> for [hwnd0::NonNullHWND] | | `0-38`
..
`0-35` | [TryFrom]<HWND>
[TryFrom]<&CoreWindow>
[TryFrom]<&ICoreWindow> | [From]<[hwnd0::NonNullHWND]> for HWND
IntoParam<\'_, [HWND](https://microsoft.github.io/windows-docs-rs/doc/windows/Win32/Foundation/struct.HWND.html)> for [hwnd0::NonNullHWND] |