Commit 474c5882 authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard

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

parent b98b9ce7
...@@ -93,7 +93,7 @@ cpp_quote("#endif") ...@@ -93,7 +93,7 @@ cpp_quote("#endif")
[propget] HRESULT Current([out, retval] T *value); [propget] HRESULT Current([out, retval] T *value);
[propget] HRESULT HasCurrent([out, retval] BOOL *value); [propget] HRESULT HasCurrent([out, retval] BOOL *value);
HRESULT MoveNext([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") ...@@ -134,6 +134,7 @@ cpp_quote("#endif")
uuid(bbe1fa4c-b0e3-4583-baef-1f1b2e483e56) uuid(bbe1fa4c-b0e3-4583-baef-1f1b2e483e56)
] ]
interface IVectorView<T> : IInspectable interface IVectorView<T> : IInspectable
requires Windows.Foundation.Collections.IIterable<T>
{ {
HRESULT GetAt([in] UINT32 index, [out, retval] T *value); HRESULT GetAt([in] UINT32 index, [out, retval] T *value);
[propget] HRESULT Size([out, retval] UINT32 *value); [propget] HRESULT Size([out, retval] UINT32 *value);
...@@ -146,6 +147,7 @@ cpp_quote("#endif") ...@@ -146,6 +147,7 @@ cpp_quote("#endif")
uuid(913337e9-11a1-4345-a3a2-4e7f956e222d) uuid(913337e9-11a1-4345-a3a2-4e7f956e222d)
] ]
interface IVector<T> : IInspectable interface IVector<T> : IInspectable
requires Windows.Foundation.Collections.IIterable<T>
{ {
HRESULT GetAt([in, optional] UINT32 index, [out, retval] T *value); HRESULT GetAt([in, optional] UINT32 index, [out, retval] T *value);
[propget] HRESULT Size([out, retval] UINT32 *value); [propget] HRESULT Size([out, retval] UINT32 *value);
......
...@@ -159,7 +159,9 @@ namespace Windows { ...@@ -159,7 +159,9 @@ namespace Windows {
namespace Foundation { namespace Foundation {
declare { declare {
interface Windows.Foundation.Collections.IIterable<HSTRING>; interface Windows.Foundation.Collections.IIterable<HSTRING>;
interface Windows.Foundation.Collections.IIterable<IInspectable *>;
interface Windows.Foundation.Collections.IIterator<HSTRING>; interface Windows.Foundation.Collections.IIterator<HSTRING>;
interface Windows.Foundation.Collections.IIterator<IInspectable *>;
interface Windows.Foundation.Collections.IVectorView<HSTRING>; interface Windows.Foundation.Collections.IVectorView<HSTRING>;
interface Windows.Foundation.Collections.IVectorView<IInspectable *>; interface Windows.Foundation.Collections.IVectorView<IInspectable *>;
interface Windows.Foundation.Collections.IVector<HSTRING>; interface Windows.Foundation.Collections.IVector<HSTRING>;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment