Rémi Bernon : include: Fix IIterator<T> declaration and missing IVector(View)<T> requires.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 474c588249ce75b87bfa3d2a25a5f681d53bb8c4
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=474c588249ce75b87bfa3d2a2...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Wed Mar  9 09:47:59 2022 +0100

include: Fix IIterator<T> declaration and missing IVector(View)<T> requires.

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 include/windows.foundation.collections.idl | 4 +++-
 include/windows.foundation.idl             | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl
index ed1f5e30793..5ed60ed176e 100644
--- a/include/windows.foundation.collections.idl
+++ b/include/windows.foundation.collections.idl
@@ -93,7 +93,7 @@ cpp_quote("#endif")
                 [propget] HRESULT Current([out, retval] T *value);
                 [propget] HRESULT HasCurrent([out, retval] BOOL *value);
                 HRESULT MoveNext([out, retval] BOOL *value);
-                HRESULT GetMany([in] UINT32 count, [in] UINT32 items_size, [out] T *items, [out, retval] UINT32 *value);
+                HRESULT GetMany([in] UINT32 items_size, [out] T *items, [out, retval] UINT32 *value);
             }
 
             [
@@ -134,6 +134,7 @@ cpp_quote("#endif")
                 uuid(bbe1fa4c-b0e3-4583-baef-1f1b2e483e56)
             ]
             interface IVectorView<T> : IInspectable
+                requires Windows.Foundation.Collections.IIterable<T>
             {
                 HRESULT GetAt([in] UINT32 index, [out, retval] T *value);
                 [propget] HRESULT Size([out, retval] UINT32 *value);
@@ -146,6 +147,7 @@ cpp_quote("#endif")
                 uuid(913337e9-11a1-4345-a3a2-4e7f956e222d)
             ]
             interface IVector<T> : IInspectable
+                requires Windows.Foundation.Collections.IIterable<T>
             {
                 HRESULT GetAt([in, optional] UINT32 index, [out, retval] T *value);
                 [propget] HRESULT Size([out, retval] UINT32 *value);
diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl
index a92a5d82424..e0fd35e45eb 100644
--- a/include/windows.foundation.idl
+++ b/include/windows.foundation.idl
@@ -159,7 +159,9 @@ namespace Windows {
     namespace Foundation {
         declare {
             interface Windows.Foundation.Collections.IIterable<HSTRING>;
+            interface Windows.Foundation.Collections.IIterable<IInspectable *>;
             interface Windows.Foundation.Collections.IIterator<HSTRING>;
+            interface Windows.Foundation.Collections.IIterator<IInspectable *>;
             interface Windows.Foundation.Collections.IVectorView<HSTRING>;
             interface Windows.Foundation.Collections.IVectorView<IInspectable *>;
             interface Windows.Foundation.Collections.IVector<HSTRING>;