include: Fix boolean return value definition in IIterator<T> methods.
This commit is contained in:
parent
371827c3ef
commit
eaca0f44be
5 changed files with 20 additions and 20 deletions
|
@ -977,11 +977,11 @@ static void test_windows_gaming_input(void)
|
|||
HANDLE hwnd, thread, stop_event;
|
||||
IInspectable *tmp_inspectable;
|
||||
HDEVNOTIFY devnotify;
|
||||
boolean boolret;
|
||||
HSTRING str;
|
||||
UINT32 size;
|
||||
HRESULT hr;
|
||||
DWORD res;
|
||||
BOOL ret;
|
||||
MSG msg;
|
||||
|
||||
if (!load_combase_functions()) return;
|
||||
|
@ -1100,18 +1100,18 @@ static void test_windows_gaming_input(void)
|
|||
ok( hr == S_OK, "First returned %#lx\n", hr );
|
||||
IIterable_RawGameController_Release( iterable );
|
||||
|
||||
hr = IIterator_RawGameController_get_HasCurrent( iterator, &ret );
|
||||
hr = IIterator_RawGameController_get_HasCurrent( iterator, &boolret );
|
||||
ok( hr == S_OK, "First returned %#lx\n", hr );
|
||||
ok( ret == TRUE, "got HasCurrent %u\n", ret );
|
||||
hr = IIterator_RawGameController_MoveNext( iterator, &ret );
|
||||
ok( boolret == TRUE, "got HasCurrent %u\n", boolret );
|
||||
hr = IIterator_RawGameController_MoveNext( iterator, &boolret );
|
||||
ok( hr == S_OK, "First returned %#lx\n", hr );
|
||||
ok( ret == FALSE, "got MoveNext %u\n", ret );
|
||||
hr = IIterator_RawGameController_get_HasCurrent( iterator, &ret );
|
||||
ok( boolret == FALSE, "got MoveNext %u\n", boolret );
|
||||
hr = IIterator_RawGameController_get_HasCurrent( iterator, &boolret );
|
||||
ok( hr == S_OK, "First returned %#lx\n", hr );
|
||||
ok( ret == FALSE, "got MoveNext %u\n", ret );
|
||||
hr = IIterator_RawGameController_MoveNext( iterator, &ret );
|
||||
ok( boolret == FALSE, "got MoveNext %u\n", boolret );
|
||||
hr = IIterator_RawGameController_MoveNext( iterator, &boolret );
|
||||
ok( hr == S_OK, "First returned %#lx\n", hr );
|
||||
ok( ret == FALSE, "got MoveNext %u\n", ret );
|
||||
ok( boolret == FALSE, "got MoveNext %u\n", boolret );
|
||||
IIterator_RawGameController_Release( iterator );
|
||||
|
||||
IVectorView_RawGameController_Release( controller_view );
|
||||
|
|
|
@ -108,7 +108,7 @@ static HRESULT WINAPI iterator_get_Current( IIterator_IInspectable *iface, IInsp
|
|||
return IVectorView_IInspectable_GetAt( impl->view, impl->index, value );
|
||||
}
|
||||
|
||||
static HRESULT WINAPI iterator_get_HasCurrent( IIterator_IInspectable *iface, BOOL *value )
|
||||
static HRESULT WINAPI iterator_get_HasCurrent( IIterator_IInspectable *iface, boolean *value )
|
||||
{
|
||||
struct iterator *impl = impl_from_IIterator_IInspectable( iface );
|
||||
|
||||
|
@ -118,7 +118,7 @@ static HRESULT WINAPI iterator_get_HasCurrent( IIterator_IInspectable *iface, BO
|
|||
return S_OK;
|
||||
}
|
||||
|
||||
static HRESULT WINAPI iterator_MoveNext( IIterator_IInspectable *iface, BOOL *value )
|
||||
static HRESULT WINAPI iterator_MoveNext( IIterator_IInspectable *iface, boolean *value )
|
||||
{
|
||||
struct iterator *impl = impl_from_IIterator_IInspectable( iface );
|
||||
|
||||
|
|
|
@ -524,7 +524,7 @@ static HRESULT WINAPI iterator_hstring_get_Current( IIterator_HSTRING *iface, HS
|
|||
return hr;
|
||||
}
|
||||
|
||||
static HRESULT WINAPI iterator_hstring_get_HasCurrent( IIterator_HSTRING *iface, BOOL *value )
|
||||
static HRESULT WINAPI iterator_hstring_get_HasCurrent( IIterator_HSTRING *iface, boolean *value )
|
||||
{
|
||||
struct iterator_hstring *impl = impl_from_IIterator_HSTRING(iface);
|
||||
|
||||
|
@ -532,7 +532,7 @@ static HRESULT WINAPI iterator_hstring_get_HasCurrent( IIterator_HSTRING *iface,
|
|||
return S_OK;
|
||||
}
|
||||
|
||||
static HRESULT WINAPI iterator_hstring_MoveNext( IIterator_HSTRING *iface, BOOL *value )
|
||||
static HRESULT WINAPI iterator_hstring_MoveNext( IIterator_HSTRING *iface, boolean *value )
|
||||
{
|
||||
struct iterator_hstring *impl = impl_from_IIterator_HSTRING(iface);
|
||||
|
||||
|
|
|
@ -113,7 +113,7 @@ static HRESULT WINAPI iterator_hstring_get_Current( IIterator_HSTRING *iface, HS
|
|||
return IVectorView_HSTRING_GetAt(impl->view, impl->index, value);
|
||||
}
|
||||
|
||||
static HRESULT WINAPI iterator_hstring_get_HasCurrent( IIterator_HSTRING *iface, BOOL *value )
|
||||
static HRESULT WINAPI iterator_hstring_get_HasCurrent( IIterator_HSTRING *iface, boolean *value )
|
||||
{
|
||||
struct iterator_hstring *impl = impl_from_IIterator_HSTRING(iface);
|
||||
|
||||
|
@ -123,7 +123,7 @@ static HRESULT WINAPI iterator_hstring_get_HasCurrent( IIterator_HSTRING *iface,
|
|||
return S_OK;
|
||||
}
|
||||
|
||||
static HRESULT WINAPI iterator_hstring_MoveNext( IIterator_HSTRING *iface, BOOL *value )
|
||||
static HRESULT WINAPI iterator_hstring_MoveNext( IIterator_HSTRING *iface, boolean *value )
|
||||
{
|
||||
struct iterator_hstring *impl = impl_from_IIterator_HSTRING(iface);
|
||||
|
||||
|
@ -735,7 +735,7 @@ HRESULT vector_hstring_create_copy( IIterable_HSTRING *iterable, IVector_HSTRING
|
|||
struct vector_hstring *impl;
|
||||
IIterator_HSTRING *iterator;
|
||||
UINT32 capacity = 0;
|
||||
BOOL available;
|
||||
boolean available;
|
||||
HRESULT hr;
|
||||
|
||||
TRACE("iterable %p, out %p.\n", iterable, out);
|
||||
|
@ -865,7 +865,7 @@ static HRESULT WINAPI iterator_inspectable_get_Current( IIterator_IInspectable *
|
|||
return IVectorView_IInspectable_GetAt(impl->view, impl->index, value);
|
||||
}
|
||||
|
||||
static HRESULT WINAPI iterator_inspectable_get_HasCurrent( IIterator_IInspectable *iface, BOOL *value )
|
||||
static HRESULT WINAPI iterator_inspectable_get_HasCurrent( IIterator_IInspectable *iface, boolean *value )
|
||||
{
|
||||
struct iterator_inspectable *impl = impl_from_IIterator_IInspectable(iface);
|
||||
|
||||
|
@ -875,7 +875,7 @@ static HRESULT WINAPI iterator_inspectable_get_HasCurrent( IIterator_IInspectabl
|
|||
return S_OK;
|
||||
}
|
||||
|
||||
static HRESULT WINAPI iterator_inspectable_MoveNext( IIterator_IInspectable *iface, BOOL *value )
|
||||
static HRESULT WINAPI iterator_inspectable_MoveNext( IIterator_IInspectable *iface, boolean *value )
|
||||
{
|
||||
struct iterator_inspectable *impl = impl_from_IIterator_IInspectable(iface);
|
||||
|
||||
|
|
|
@ -148,8 +148,8 @@ cpp_quote("#endif")
|
|||
interface IIterator<T> : IInspectable
|
||||
{
|
||||
[propget] HRESULT Current([out, retval] T *value);
|
||||
[propget] HRESULT HasCurrent([out, retval] BOOL *value);
|
||||
HRESULT MoveNext([out, retval] BOOL *value);
|
||||
[propget] HRESULT HasCurrent([out, retval] boolean *value);
|
||||
HRESULT MoveNext([out, retval] boolean *value);
|
||||
HRESULT GetMany([in] UINT32 items_size, [out] T *items, [out, retval] UINT32 *value);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue