From 623e811fd51435b46b09ecd1d4f5a6547cfd052b Mon Sep 17 00:00:00 2001 From: Kenny Kerr Date: Fri, 5 Jan 2024 12:37:40 -0600 Subject: [PATCH] tests --- crates/tests/component/src/bindings.rs | 20 ++-- crates/tests/component_client/src/bindings.rs | 20 ++-- crates/tests/riddle/src/generic_interfaces.rs | 74 ++++++------ crates/tests/riddle/src/params.rs | 10 +- crates/tests/standalone/src/b_calendar.rs | 68 +++++------ crates/tests/standalone/src/b_stringable.rs | 10 +- crates/tests/standalone/src/b_uri.rs | 110 +++++++++--------- 7 files changed, 156 insertions(+), 156 deletions(-) diff --git a/crates/tests/component/src/bindings.rs b/crates/tests/component/src/bindings.rs index d9a833ad74..1aea822cea 100644 --- a/crates/tests/component/src/bindings.rs +++ b/crates/tests/component/src/bindings.rs @@ -13,6 +13,11 @@ pub mod Nested { IThing_Vtbl, 0x5448be22_9873_5ae6_9106_f6e8455d2fdd ); + ::windows_core::imp::interface_hierarchy!( + IThing, + ::windows_core::IUnknown, + ::windows_core::IInspectable + ); impl IThing { pub fn Method(&self) -> ::windows_core::Result<()> { let this = self; @@ -24,11 +29,6 @@ pub mod Nested { } } } - ::windows_core::imp::interface_hierarchy!( - IThing, - ::windows_core::IUnknown, - ::windows_core::IInspectable - ); impl ::windows_core::RuntimeType for IThing { const SIGNATURE: ::windows_core::imp::ConstBuffer = ::windows_core::imp::ConstBuffer::for_interface::(); @@ -123,6 +123,11 @@ pub struct IClass_Vtbl { #[repr(transparent)] #[derive(::core::cmp::PartialEq, ::core::cmp::Eq, ::core::fmt::Debug, ::core::clone::Clone)] pub struct Class(::windows_core::IUnknown); +::windows_core::imp::interface_hierarchy!( + Class, + ::windows_core::IUnknown, + ::windows_core::IInspectable +); impl Class { pub fn new() -> ::windows_core::Result { Self::IActivationFactory(|f| f.ActivateInstance::()) @@ -250,11 +255,6 @@ unsafe impl ::windows_core::Interface for Class { impl ::windows_core::RuntimeName for Class { const NAME: &'static str = "test_component.Class"; } -::windows_core::imp::interface_hierarchy!( - Class, - ::windows_core::IUnknown, - ::windows_core::IInspectable -); unsafe impl ::core::marker::Send for Class {} unsafe impl ::core::marker::Sync for Class {} #[repr(transparent)] diff --git a/crates/tests/component_client/src/bindings.rs b/crates/tests/component_client/src/bindings.rs index 20e698966b..9d57a549de 100644 --- a/crates/tests/component_client/src/bindings.rs +++ b/crates/tests/component_client/src/bindings.rs @@ -13,6 +13,11 @@ pub mod Nested { IThing_Vtbl, 0x5448be22_9873_5ae6_9106_f6e8455d2fdd ); + ::windows_core::imp::interface_hierarchy!( + IThing, + ::windows_core::IUnknown, + ::windows_core::IInspectable + ); impl IThing { pub fn Method(&self) -> ::windows_core::Result<()> { let this = self; @@ -24,11 +29,6 @@ pub mod Nested { } } } - ::windows_core::imp::interface_hierarchy!( - IThing, - ::windows_core::IUnknown, - ::windows_core::IInspectable - ); impl ::windows_core::RuntimeType for IThing { const SIGNATURE: ::windows_core::imp::ConstBuffer = ::windows_core::imp::ConstBuffer::for_interface::(); @@ -91,6 +91,11 @@ pub struct IClass_Vtbl { #[repr(transparent)] #[derive(::core::cmp::PartialEq, ::core::cmp::Eq, ::core::fmt::Debug, ::core::clone::Clone)] pub struct Class(::windows_core::IUnknown); +::windows_core::imp::interface_hierarchy!( + Class, + ::windows_core::IUnknown, + ::windows_core::IInspectable +); impl Class { pub fn new() -> ::windows_core::Result { Self::IActivationFactory(|f| f.ActivateInstance::()) @@ -218,11 +223,6 @@ unsafe impl ::windows_core::Interface for Class { impl ::windows_core::RuntimeName for Class { const NAME: &'static str = "test_component.Class"; } -::windows_core::imp::interface_hierarchy!( - Class, - ::windows_core::IUnknown, - ::windows_core::IInspectable -); unsafe impl ::core::marker::Send for Class {} unsafe impl ::core::marker::Sync for Class {} #[repr(transparent)] diff --git a/crates/tests/riddle/src/generic_interfaces.rs b/crates/tests/riddle/src/generic_interfaces.rs index 137e7b42ef..268a6c4657 100644 --- a/crates/tests/riddle/src/generic_interfaces.rs +++ b/crates/tests/riddle/src/generic_interfaces.rs @@ -12,6 +12,14 @@ pub struct IIterable(::windows_core::IUnknown, ::core::marker::PhantomData) where T: ::windows_core::RuntimeType + 'static; +impl ::windows_core::CanInto<::windows_core::IUnknown> + for IIterable +{ +} +impl ::windows_core::CanInto<::windows_core::IInspectable> + for IIterable +{ +} impl IIterable { pub fn First(&self) -> ::windows_core::Result> { let this = self; @@ -25,14 +33,6 @@ impl IIterable { } } } -impl ::windows_core::CanInto<::windows_core::IUnknown> - for IIterable -{ -} -impl ::windows_core::CanInto<::windows_core::IInspectable> - for IIterable -{ -} impl ::windows_core::RuntimeType for IIterable { const SIGNATURE: ::windows_core::imp::ConstBuffer = { ::windows_core::imp::ConstBuffer::new() @@ -66,6 +66,14 @@ where pub struct IIterator(::windows_core::IUnknown, ::core::marker::PhantomData) where T: ::windows_core::RuntimeType + 'static; +impl ::windows_core::CanInto<::windows_core::IUnknown> + for IIterator +{ +} +impl ::windows_core::CanInto<::windows_core::IInspectable> + for IIterator +{ +} impl IIterator { pub fn get_Current(&self) -> ::windows_core::Result { let this = self; @@ -101,14 +109,6 @@ impl IIterator { } } } -impl ::windows_core::CanInto<::windows_core::IUnknown> - for IIterator -{ -} -impl ::windows_core::CanInto<::windows_core::IInspectable> - for IIterator -{ -} impl ::windows_core::RuntimeType for IIterator { const SIGNATURE: ::windows_core::imp::ConstBuffer = { ::windows_core::imp::ConstBuffer::new() @@ -155,6 +155,14 @@ pub struct IKeyValuePair( where K: ::windows_core::RuntimeType + 'static, V: ::windows_core::RuntimeType + 'static; +impl + ::windows_core::CanInto<::windows_core::IUnknown> for IKeyValuePair +{ +} +impl + ::windows_core::CanInto<::windows_core::IInspectable> for IKeyValuePair +{ +} impl IKeyValuePair { @@ -181,14 +189,6 @@ impl - ::windows_core::CanInto<::windows_core::IUnknown> for IKeyValuePair -{ -} -impl - ::windows_core::CanInto<::windows_core::IInspectable> for IKeyValuePair -{ -} impl ::windows_core::RuntimeType for IKeyValuePair { @@ -239,6 +239,19 @@ pub struct IMapView( where K: ::windows_core::RuntimeType + 'static, V: ::windows_core::RuntimeType + 'static; +impl + ::windows_core::CanInto<::windows_core::IUnknown> for IMapView +{ +} +impl + ::windows_core::CanInto<::windows_core::IInspectable> for IMapView +{ +} +impl + ::windows_core::CanInto>> for IMapView +{ + const QUERY: bool = true; +} impl IMapView { @@ -301,19 +314,6 @@ impl - ::windows_core::CanInto<::windows_core::IUnknown> for IMapView -{ -} -impl - ::windows_core::CanInto<::windows_core::IInspectable> for IMapView -{ -} -impl - ::windows_core::CanInto>> for IMapView -{ - const QUERY: bool = true; -} impl ::windows_core::RuntimeType for IMapView { diff --git a/crates/tests/riddle/src/params.rs b/crates/tests/riddle/src/params.rs index 5097e30d1a..7a1b422167 100644 --- a/crates/tests/riddle/src/params.rs +++ b/crates/tests/riddle/src/params.rs @@ -8,6 +8,11 @@ clippy::all )] ::windows_core::imp::com_interface!(IParams, IParams_Vtbl, 0); +::windows_core::imp::interface_hierarchy!( + IParams, + ::windows_core::IUnknown, + ::windows_core::IInspectable +); impl IParams { pub fn Nothing(&self) -> ::windows_core::Result<()> { let this = self; @@ -188,11 +193,6 @@ impl IParams { } } } -::windows_core::imp::interface_hierarchy!( - IParams, - ::windows_core::IUnknown, - ::windows_core::IInspectable -); impl ::windows_core::RuntimeType for IParams { const SIGNATURE: ::windows_core::imp::ConstBuffer = ::windows_core::imp::ConstBuffer::for_interface::(); diff --git a/crates/tests/standalone/src/b_calendar.rs b/crates/tests/standalone/src/b_calendar.rs index f5651657e3..f08023eb4b 100644 --- a/crates/tests/standalone/src/b_calendar.rs +++ b/crates/tests/standalone/src/b_calendar.rs @@ -10,6 +10,11 @@ #[repr(transparent)] #[derive(::core::cmp::PartialEq, ::core::cmp::Eq, ::core::fmt::Debug, ::core::clone::Clone)] pub struct Calendar(::windows_core::IUnknown); +::windows_core::imp::interface_hierarchy!( + Calendar, + ::windows_core::IUnknown, + ::windows_core::IInspectable +); impl Calendar { pub fn new() -> ::windows_core::Result { Self::IActivationFactory(|f| f.ActivateInstance::()) @@ -1274,11 +1279,6 @@ unsafe impl ::windows_core::Interface for Calendar { impl ::windows_core::RuntimeName for Calendar { const NAME: &'static str = "Windows.Globalization.Calendar"; } -::windows_core::imp::interface_hierarchy!( - Calendar, - ::windows_core::IUnknown, - ::windows_core::IInspectable -); unsafe impl ::core::marker::Send for Calendar {} unsafe impl ::core::marker::Sync for Calendar {} #[repr(C)] @@ -1804,6 +1804,14 @@ pub struct ICalendarFactory2_Vtbl { pub struct IIterable(::windows_core::IUnknown, ::core::marker::PhantomData) where T: ::windows_core::RuntimeType + 'static; +impl ::windows_core::CanInto<::windows_core::IUnknown> + for IIterable +{ +} +impl ::windows_core::CanInto<::windows_core::IInspectable> + for IIterable +{ +} impl IIterable { pub fn First(&self) -> ::windows_core::Result> { let this = self; @@ -1817,14 +1825,6 @@ impl IIterable { } } } -impl ::windows_core::CanInto<::windows_core::IUnknown> - for IIterable -{ -} -impl ::windows_core::CanInto<::windows_core::IInspectable> - for IIterable -{ -} impl ::windows_core::RuntimeType for IIterable { const SIGNATURE: ::windows_core::imp::ConstBuffer = { ::windows_core::imp::ConstBuffer::new() @@ -1872,6 +1872,14 @@ where pub struct IIterator(::windows_core::IUnknown, ::core::marker::PhantomData) where T: ::windows_core::RuntimeType + 'static; +impl ::windows_core::CanInto<::windows_core::IUnknown> + for IIterator +{ +} +impl ::windows_core::CanInto<::windows_core::IInspectable> + for IIterator +{ +} impl IIterator { pub fn Current(&self) -> ::windows_core::Result { let this = self; @@ -1923,14 +1931,6 @@ impl IIterator { } } } -impl ::windows_core::CanInto<::windows_core::IUnknown> - for IIterator -{ -} -impl ::windows_core::CanInto<::windows_core::IInspectable> - for IIterator -{ -} impl ::windows_core::RuntimeType for IIterator { const SIGNATURE: ::windows_core::imp::ConstBuffer = { ::windows_core::imp::ConstBuffer::new() @@ -2015,6 +2015,19 @@ pub struct ITimeZoneOnCalendar_Vtbl { pub struct IVectorView(::windows_core::IUnknown, ::core::marker::PhantomData) where T: ::windows_core::RuntimeType + 'static; +impl ::windows_core::CanInto<::windows_core::IUnknown> + for IVectorView +{ +} +impl ::windows_core::CanInto<::windows_core::IInspectable> + for IVectorView +{ +} +impl ::windows_core::CanInto> + for IVectorView +{ + const QUERY: bool = true; +} impl IVectorView { pub fn GetAt(&self, index: u32) -> ::windows_core::Result { let this = self; @@ -2085,19 +2098,6 @@ impl IVectorView { } } } -impl ::windows_core::CanInto<::windows_core::IUnknown> - for IVectorView -{ -} -impl ::windows_core::CanInto<::windows_core::IInspectable> - for IVectorView -{ -} -impl ::windows_core::CanInto> - for IVectorView -{ - const QUERY: bool = true; -} impl ::windows_core::RuntimeType for IVectorView { const SIGNATURE: ::windows_core::imp::ConstBuffer = { ::windows_core::imp::ConstBuffer::new() diff --git a/crates/tests/standalone/src/b_stringable.rs b/crates/tests/standalone/src/b_stringable.rs index 0d9b45f259..dd8608e84b 100644 --- a/crates/tests/standalone/src/b_stringable.rs +++ b/crates/tests/standalone/src/b_stringable.rs @@ -12,6 +12,11 @@ IStringable_Vtbl, 0x96369f54_8eb6_48f0_abce_c1b211e627c3 ); +::windows_core::imp::interface_hierarchy!( + IStringable, + ::windows_core::IUnknown, + ::windows_core::IInspectable +); impl IStringable { pub fn ToString(&self) -> ::windows_core::Result<::windows_core::HSTRING> { let this = self; @@ -25,11 +30,6 @@ impl IStringable { } } } -::windows_core::imp::interface_hierarchy!( - IStringable, - ::windows_core::IUnknown, - ::windows_core::IInspectable -); impl ::windows_core::RuntimeType for IStringable { const SIGNATURE: ::windows_core::imp::ConstBuffer = ::windows_core::imp::ConstBuffer::for_interface::(); diff --git a/crates/tests/standalone/src/b_uri.rs b/crates/tests/standalone/src/b_uri.rs index c4e84b97b3..3c00c41196 100644 --- a/crates/tests/standalone/src/b_uri.rs +++ b/crates/tests/standalone/src/b_uri.rs @@ -12,6 +12,14 @@ pub struct IIterable(::windows_core::IUnknown, ::core::marker::PhantomData) where T: ::windows_core::RuntimeType + 'static; +impl ::windows_core::CanInto<::windows_core::IUnknown> + for IIterable +{ +} +impl ::windows_core::CanInto<::windows_core::IInspectable> + for IIterable +{ +} impl IIterable { pub fn First(&self) -> ::windows_core::Result> { let this = self; @@ -25,14 +33,6 @@ impl IIterable { } } } -impl ::windows_core::CanInto<::windows_core::IUnknown> - for IIterable -{ -} -impl ::windows_core::CanInto<::windows_core::IInspectable> - for IIterable -{ -} impl ::windows_core::RuntimeType for IIterable { const SIGNATURE: ::windows_core::imp::ConstBuffer = { ::windows_core::imp::ConstBuffer::new() @@ -80,6 +80,14 @@ where pub struct IIterator(::windows_core::IUnknown, ::core::marker::PhantomData) where T: ::windows_core::RuntimeType + 'static; +impl ::windows_core::CanInto<::windows_core::IUnknown> + for IIterator +{ +} +impl ::windows_core::CanInto<::windows_core::IInspectable> + for IIterator +{ +} impl IIterator { pub fn Current(&self) -> ::windows_core::Result { let this = self; @@ -131,14 +139,6 @@ impl IIterator { } } } -impl ::windows_core::CanInto<::windows_core::IUnknown> - for IIterator -{ -} -impl ::windows_core::CanInto<::windows_core::IInspectable> - for IIterator -{ -} impl ::windows_core::RuntimeType for IIterator { const SIGNATURE: ::windows_core::imp::ConstBuffer = { ::windows_core::imp::ConstBuffer::new() @@ -196,6 +196,11 @@ where IStringable_Vtbl, 0x96369f54_8eb6_48f0_abce_c1b211e627c3 ); +::windows_core::imp::interface_hierarchy!( + IStringable, + ::windows_core::IUnknown, + ::windows_core::IInspectable +); impl IStringable { pub fn ToString(&self) -> ::windows_core::Result<::windows_core::HSTRING> { let this = self; @@ -209,11 +214,6 @@ impl IStringable { } } } -::windows_core::imp::interface_hierarchy!( - IStringable, - ::windows_core::IUnknown, - ::windows_core::IInspectable -); impl ::windows_core::RuntimeType for IStringable { const SIGNATURE: ::windows_core::imp::ConstBuffer = ::windows_core::imp::ConstBuffer::for_interface::(); @@ -371,6 +371,19 @@ pub struct IUriRuntimeClassWithAbsoluteCanonicalUri_Vtbl { pub struct IVectorView(::windows_core::IUnknown, ::core::marker::PhantomData) where T: ::windows_core::RuntimeType + 'static; +impl ::windows_core::CanInto<::windows_core::IUnknown> + for IVectorView +{ +} +impl ::windows_core::CanInto<::windows_core::IInspectable> + for IVectorView +{ +} +impl ::windows_core::CanInto> + for IVectorView +{ + const QUERY: bool = true; +} impl IVectorView { pub fn GetAt(&self, index: u32) -> ::windows_core::Result { let this = self; @@ -441,19 +454,6 @@ impl IVectorView { } } } -impl ::windows_core::CanInto<::windows_core::IUnknown> - for IVectorView -{ -} -impl ::windows_core::CanInto<::windows_core::IInspectable> - for IVectorView -{ -} -impl ::windows_core::CanInto> - for IVectorView -{ - const QUERY: bool = true; -} impl ::windows_core::RuntimeType for IVectorView { const SIGNATURE: ::windows_core::imp::ConstBuffer = { ::windows_core::imp::ConstBuffer::new() @@ -542,6 +542,11 @@ where IWwwFormUrlDecoderEntry_Vtbl, 0x125e7431_f678_4e8e_b670_20a9b06c512d ); +::windows_core::imp::interface_hierarchy!( + IWwwFormUrlDecoderEntry, + ::windows_core::IUnknown, + ::windows_core::IInspectable +); impl IWwwFormUrlDecoderEntry { pub fn Name(&self) -> ::windows_core::Result<::windows_core::HSTRING> { let this = self; @@ -566,11 +571,6 @@ impl IWwwFormUrlDecoderEntry { } } } -::windows_core::imp::interface_hierarchy!( - IWwwFormUrlDecoderEntry, - ::windows_core::IUnknown, - ::windows_core::IInspectable -); impl ::windows_core::RuntimeType for IWwwFormUrlDecoderEntry { const SIGNATURE: ::windows_core::imp::ConstBuffer = ::windows_core::imp::ConstBuffer::for_interface::(); @@ -621,6 +621,12 @@ pub struct IWwwFormUrlDecoderRuntimeClassFactory_Vtbl { #[repr(transparent)] #[derive(::core::cmp::PartialEq, ::core::cmp::Eq, ::core::fmt::Debug, ::core::clone::Clone)] pub struct Uri(::windows_core::IUnknown); +::windows_core::imp::interface_hierarchy!( + Uri, + ::windows_core::IUnknown, + ::windows_core::IInspectable +); +::windows_core::imp::required_hierarchy!(Uri, IStringable); impl Uri { pub fn ToString(&self) -> ::windows_core::Result<::windows_core::HSTRING> { let this = &::windows_core::Interface::cast::(self)?; @@ -932,17 +938,21 @@ unsafe impl ::windows_core::Interface for Uri { impl ::windows_core::RuntimeName for Uri { const NAME: &'static str = "Windows.Foundation.Uri"; } -::windows_core::imp::interface_hierarchy!( - Uri, - ::windows_core::IUnknown, - ::windows_core::IInspectable -); -::windows_core::imp::required_hierarchy!(Uri, IStringable); unsafe impl ::core::marker::Send for Uri {} unsafe impl ::core::marker::Sync for Uri {} #[repr(transparent)] #[derive(::core::cmp::PartialEq, ::core::cmp::Eq, ::core::fmt::Debug, ::core::clone::Clone)] pub struct WwwFormUrlDecoder(::windows_core::IUnknown); +::windows_core::imp::interface_hierarchy!( + WwwFormUrlDecoder, + ::windows_core::IUnknown, + ::windows_core::IInspectable +); +::windows_core::imp::required_hierarchy!( + WwwFormUrlDecoder, + IIterable, + IVectorView +); impl WwwFormUrlDecoder { pub fn First(&self) -> ::windows_core::Result> { let this = &::windows_core::Interface::cast::>(self)?; @@ -1080,15 +1090,5 @@ impl ::core::iter::IntoIterator for &WwwFormUrlDecoder { VectorViewIterator::new(::windows_core::Interface::cast(self).ok()) } } -::windows_core::imp::interface_hierarchy!( - WwwFormUrlDecoder, - ::windows_core::IUnknown, - ::windows_core::IInspectable -); -::windows_core::imp::required_hierarchy!( - WwwFormUrlDecoder, - IIterable, - IVectorView -); unsafe impl ::core::marker::Send for WwwFormUrlDecoder {} unsafe impl ::core::marker::Sync for WwwFormUrlDecoder {}