Stock collection support for IVectorView

crates/libs/bindgen/src/extensions/impl/Foundation/Collections/Iterable.rs

@@ -1,13 +1,13 @@
 #[::windows::core::implement(IIterable<T>)]
-struct Iterable<T>
+struct StockIterable<T>
 where
     T: ::windows::core::RuntimeType + 'static,
     <T as ::windows::core::Type<T>>::Default: ::std::clone::Clone,
 {
     values: std::vec::Vec<T::Default>,
 }
 
-impl<T> IIterable_Impl<T> for Iterable<T>
+impl<T> IIterable_Impl<T> for StockIterable<T>
 where
     T: ::windows::core::RuntimeType,
     <T as ::windows::core::Type<T>>::Default: ::std::clone::Clone,
@@ -16,7 +16,7 @@ where
         unsafe {
             // TODO: ideally we can do an AddRef rather than a QI here (via cast)...
             // and then we can get rid of the unsafe as well.
-            Ok(Iterator {
+            Ok(StockIterator {
                 owner: self.cast()?,
                 current: 0.into(),
             }
@@ -26,7 +26,7 @@ where
 }
 
 #[::windows::core::implement(IIterator<T>)]
-struct Iterator<T>
+struct StockIterator<T>
 where
     T: ::windows::core::RuntimeType + 'static,
     <T as ::windows::core::Type<T>>::Default: ::std::clone::Clone,
@@ -35,13 +35,13 @@ where
     current: ::std::sync::atomic::AtomicUsize,
 }
 
-impl<T> IIterator_Impl<T> for Iterator<T>
+impl<T> IIterator_Impl<T> for StockIterator<T>
 where
     T: ::windows::core::RuntimeType,
     <T as ::windows::core::Type<T>>::Default: ::std::clone::Clone,
 {
     fn Current(&self) -> ::windows::core::Result<T> {
-        let owner = ::windows::core::AsImpl::as_impl(&self.owner);
+        let owner: &StockIterable<T> = ::windows::core::AsImpl::as_impl(&self.owner);
         let current = self.current.load(::std::sync::atomic::Ordering::Relaxed);
 
         if owner.values.len() > current {
@@ -52,14 +52,14 @@ where
     }
 
     fn HasCurrent(&self) -> ::windows::core::Result<bool> {
-        let owner = ::windows::core::AsImpl::as_impl(&self.owner);
+        let owner: &StockIterable<T> = ::windows::core::AsImpl::as_impl(&self.owner);
         let current = self.current.load(::std::sync::atomic::Ordering::Relaxed);
 
         Ok(owner.values.len() > current)
     }
 
     fn MoveNext(&self) -> ::windows::core::Result<bool> {
-        let owner = ::windows::core::AsImpl::as_impl(&self.owner);
+        let owner: &StockIterable<T> = ::windows::core::AsImpl::as_impl(&self.owner);
         let current = self.current.load(::std::sync::atomic::Ordering::Relaxed);
 
         if current < owner.values.len() {
@@ -71,7 +71,7 @@ where
     }
 
     fn GetMany(&self, values: &mut [T::Default]) -> ::windows::core::Result<u32> {
-        let owner = ::windows::core::AsImpl::as_impl(&self.owner);
+        let owner: &StockIterable<T> = ::windows::core::AsImpl::as_impl(&self.owner);
         let current = self.current.load(::std::sync::atomic::Ordering::Relaxed);
 
         let actual = std::cmp::min(owner.values.len() - current, values.len());
@@ -91,6 +91,6 @@ where
     type Error = ::windows::core::Error;
     fn try_from(values: ::std::vec::Vec<T::Default>) -> ::windows::core::Result<Self> {
         // TODO: should provide a fallible try_into or more explicit allocator
-        Ok(Iterable { values }.into())
+        Ok(StockIterable { values }.into())
     }
 }

crates/libs/bindgen/src/extensions/impl/Foundation/Collections/VectorView.rs

@@ -0,0 +1,132 @@
+#[windows::core::implement(IVectorView<T>, IIterable<T>)]
+struct StockVectorView<T>
+where
+    T: windows::core::RuntimeType + 'static,
+    <T as windows::core::Type<T>>::Default: std::clone::Clone + std::cmp::PartialEq,
+{
+    values: std::vec::Vec<T::Default>,
+}
+
+impl<T> IIterable_Impl<T> for StockVectorView<T>
+where
+    T: windows::core::RuntimeType,
+    <T as windows::core::Type<T>>::Default: std::clone::Clone + std::cmp::PartialEq,
+{
+    fn First(&self) -> windows::core::Result<IIterator<T>> {
+        unsafe {
+            // TODO: ideally we can do an AddRef rather than a QI here (via cast)...
+            // and then we can get rid of the unsafe as well.
+            Ok(StockVectorViewIterator {
+                owner: self.cast()?,
+                current: 0.into(),
+            }
+            .into())
+        }
+    }
+}
+
+impl<T> IVectorView_Impl<T> for StockVectorView<T>
+where
+    T: windows::core::RuntimeType,
+    <T as windows::core::Type<T>>::Default: std::clone::Clone + std::cmp::PartialEq,
+{
+    fn GetAt(&self, index: u32) -> windows::core::Result<T> {
+        let item = self
+            .values
+            .get(index as usize)
+            .ok_or_else(|| windows::core::Error::from(windows::imp::E_BOUNDS))?;
+        T::from_default(item)
+    }
+    fn Size(&self) -> windows::core::Result<u32> {
+        Ok(self.values.len() as _)
+    }
+    fn IndexOf(&self, value: &T::Default, result: &mut u32) -> windows::core::Result<bool> {
+        match self.values.iter().position(|element| element == value) {
+            Some(index) => {
+                *result = index as _;
+                Ok(true)
+            }
+            None => Ok(false),
+        }
+    }
+    fn GetMany(&self, current: u32, values: &mut [T::Default]) -> windows::core::Result<u32> {
+        let current = current as usize;
+        if current >= self.values.len() {
+            return Ok(0);
+        }
+        let actual = std::cmp::min(self.values.len() - current, values.len());
+        let (values, _) = values.split_at_mut(actual);
+        values.clone_from_slice(&self.values[current..current + actual]);
+        Ok(actual as _)
+    }
+}
+
+#[::windows::core::implement(IIterator<T>)]
+struct StockVectorViewIterator<T>
+where
+    T: ::windows::core::RuntimeType + 'static,
+    <T as ::windows::core::Type<T>>::Default: std::clone::Clone + std::cmp::PartialEq,
+{
+    owner: IIterable<T>,
+    current: ::std::sync::atomic::AtomicUsize,
+}
+
+impl<T> IIterator_Impl<T> for StockVectorViewIterator<T>
+where
+    T: ::windows::core::RuntimeType,
+    <T as ::windows::core::Type<T>>::Default: std::clone::Clone + std::cmp::PartialEq,
+{
+    fn Current(&self) -> ::windows::core::Result<T> {
+        let owner: &StockVectorView<T> = ::windows::core::AsImpl::as_impl(&self.owner);
+        let current = self.current.load(::std::sync::atomic::Ordering::Relaxed);
+
+        if owner.values.len() > current {
+            T::from_default(&owner.values[current])
+        } else {
+            Err(windows::core::Error::from(windows::imp::E_BOUNDS))
+        }
+    }
+
+    fn HasCurrent(&self) -> ::windows::core::Result<bool> {
+        let owner: &StockVectorView<T> = ::windows::core::AsImpl::as_impl(&self.owner);
+        let current = self.current.load(::std::sync::atomic::Ordering::Relaxed);
+
+        Ok(owner.values.len() > current)
+    }
+
+    fn MoveNext(&self) -> ::windows::core::Result<bool> {
+        let owner: &StockVectorView<T> = ::windows::core::AsImpl::as_impl(&self.owner);
+        let current = self.current.load(::std::sync::atomic::Ordering::Relaxed);
+
+        if current < owner.values.len() {
+            self.current
+                .fetch_add(1, ::std::sync::atomic::Ordering::Relaxed);
+        }
+
+        Ok(owner.values.len() > current + 1)
+    }
+
+    fn GetMany(&self, values: &mut [T::Default]) -> ::windows::core::Result<u32> {
+        let owner: &StockVectorView<T> = ::windows::core::AsImpl::as_impl(&self.owner);
+        let current = self.current.load(::std::sync::atomic::Ordering::Relaxed);
+
+        let actual = std::cmp::min(owner.values.len() - current, values.len());
+        let (values, _) = values.split_at_mut(actual);
+        values.clone_from_slice(&owner.values[current..current + actual]);
+        self.current
+            .fetch_add(actual, ::std::sync::atomic::Ordering::Relaxed);
+        Ok(actual as _)
+    }
+}
+
+impl<T> ::core::convert::TryFrom<::std::vec::Vec<T::Default>> for IVectorView<T>
+where
+    T: ::windows::core::RuntimeType,
+    <T as ::windows::core::Type<T>>::Default: std::clone::Clone + std::cmp::PartialEq,
+{
+    type Error = ::windows::core::Error;
+    fn try_from(values: ::std::vec::Vec<T::Default>) -> ::windows::core::Result<Self> {
+        // TODO: should provide a fallible try_into or more explicit allocator
+        Ok(StockVectorView { values }.into())
+    }
+}

crates/libs/bindgen/src/extensions/mod.rs

@@ -46,7 +46,10 @@ pub fn gen_mod(gen: &Gen, namespace: &str) -> TokenStream {
 
 pub fn gen_impl(namespace: &str) -> TokenStream {
     match namespace {
-        "Windows.Foundation.Collections" => include_str!("impl/Foundation/Collections/Iterable.rs"),
+        "Windows.Foundation.Collections" => concat!(
+            include_str!("impl/Foundation/Collections/Iterable.rs"),
+            include_str!("impl/Foundation/Collections/VectorView.rs"),
+        ),
         _ => "",
     }
     .into()