[PATCH 3/4] include: Fix IIterator<T> declaration and missing IVector(View)<T> requires.
Rémi Bernon
rbernon at codeweavers.com
Wed Mar 9 02:47:59 CST 2022
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
---
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>;
--
2.35.1
More information about the wine-devel
mailing list