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

include: Use UINT32 for IVectorView<T> index/size arguments.

parent 03e3bf53
...@@ -117,7 +117,7 @@ static HRESULT STDMETHODCALLTYPE vector_view_gamepad_GetTrustLevel( ...@@ -117,7 +117,7 @@ static HRESULT STDMETHODCALLTYPE vector_view_gamepad_GetTrustLevel(
} }
static HRESULT STDMETHODCALLTYPE vector_view_gamepad_GetAt( static HRESULT STDMETHODCALLTYPE vector_view_gamepad_GetAt(
IVectorView_Gamepad *iface, ULONG index, IGamepad **value) IVectorView_Gamepad *iface, UINT32 index, IGamepad **value)
{ {
FIXME("iface %p, index %#x, value %p stub!\n", iface, index, value); FIXME("iface %p, index %#x, value %p stub!\n", iface, index, value);
*value = NULL; *value = NULL;
...@@ -125,7 +125,7 @@ static HRESULT STDMETHODCALLTYPE vector_view_gamepad_GetAt( ...@@ -125,7 +125,7 @@ static HRESULT STDMETHODCALLTYPE vector_view_gamepad_GetAt(
} }
static HRESULT STDMETHODCALLTYPE vector_view_gamepad_get_Size( static HRESULT STDMETHODCALLTYPE vector_view_gamepad_get_Size(
IVectorView_Gamepad *iface, ULONG *value) IVectorView_Gamepad *iface, UINT32 *value)
{ {
FIXME("iface %p, value %p stub!\n", iface, value); FIXME("iface %p, value %p stub!\n", iface, value);
*value = 0; *value = 0;
...@@ -133,7 +133,7 @@ static HRESULT STDMETHODCALLTYPE vector_view_gamepad_get_Size( ...@@ -133,7 +133,7 @@ static HRESULT STDMETHODCALLTYPE vector_view_gamepad_get_Size(
} }
static HRESULT STDMETHODCALLTYPE vector_view_gamepad_IndexOf( static HRESULT STDMETHODCALLTYPE vector_view_gamepad_IndexOf(
IVectorView_Gamepad *iface, IGamepad *element, ULONG *index, BOOLEAN *found) IVectorView_Gamepad *iface, IGamepad *element, UINT32 *index, BOOLEAN *found)
{ {
FIXME("iface %p, element %p, index %p, found %p stub!\n", iface, element, index, found); FIXME("iface %p, element %p, index %p, found %p stub!\n", iface, element, index, found);
*index = 0; *index = 0;
...@@ -142,8 +142,8 @@ static HRESULT STDMETHODCALLTYPE vector_view_gamepad_IndexOf( ...@@ -142,8 +142,8 @@ static HRESULT STDMETHODCALLTYPE vector_view_gamepad_IndexOf(
} }
static HRESULT STDMETHODCALLTYPE vector_view_gamepad_GetMany( static HRESULT STDMETHODCALLTYPE vector_view_gamepad_GetMany(
IVectorView_Gamepad *iface, ULONG start_index, IVectorView_Gamepad *iface, UINT32 start_index,
ULONG items_size, IGamepad **items, UINT *value) UINT32 items_size, IGamepad **items, UINT *value)
{ {
FIXME("iface %p, start_index %#x, items %p, value %p stub!\n", iface, start_index, items, value); FIXME("iface %p, start_index %#x, items %p, value %p stub!\n", iface, start_index, items, value);
*value = 0; *value = 0;
...@@ -243,7 +243,7 @@ static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_GetTrustLevel( ...@@ -243,7 +243,7 @@ static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_GetTrustLevel(
} }
static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_GetAt( static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_GetAt(
IVectorView_RawGameController *iface, ULONG index, IRawGameController **value) IVectorView_RawGameController *iface, UINT32 index, IRawGameController **value)
{ {
FIXME("iface %p, index %#x, value %p stub!\n", iface, index, value); FIXME("iface %p, index %#x, value %p stub!\n", iface, index, value);
*value = NULL; *value = NULL;
...@@ -251,7 +251,7 @@ static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_GetAt( ...@@ -251,7 +251,7 @@ static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_GetAt(
} }
static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_get_Size( static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_get_Size(
IVectorView_RawGameController *iface, ULONG *value) IVectorView_RawGameController *iface, UINT32 *value)
{ {
FIXME("iface %p, value %p stub!\n", iface, value); FIXME("iface %p, value %p stub!\n", iface, value);
*value = 0; *value = 0;
...@@ -259,7 +259,7 @@ static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_get_Size( ...@@ -259,7 +259,7 @@ static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_get_Size(
} }
static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_IndexOf( static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_IndexOf(
IVectorView_RawGameController *iface, IRawGameController *element, ULONG *index, BOOLEAN *found) IVectorView_RawGameController *iface, IRawGameController *element, UINT32 *index, BOOLEAN *found)
{ {
FIXME("iface %p, element %p, index %p, found %p stub!\n", iface, element, index, found); FIXME("iface %p, element %p, index %p, found %p stub!\n", iface, element, index, found);
*index = 0; *index = 0;
...@@ -268,8 +268,8 @@ static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_IndexOf( ...@@ -268,8 +268,8 @@ static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_IndexOf(
} }
static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_GetMany( static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_GetMany(
IVectorView_RawGameController *iface, ULONG start_index, IVectorView_RawGameController *iface, UINT32 start_index,
ULONG items_size, IRawGameController **items, UINT *value) UINT32 items_size, IRawGameController **items, UINT *value)
{ {
FIXME("iface %p, start_index %#x, items %p, value %p stub!\n", iface, start_index, items, value); FIXME("iface %p, start_index %#x, items %p, value %p stub!\n", iface, start_index, items, value);
*value = 0; *value = 0;
......
...@@ -115,7 +115,7 @@ static void test_Gamepad(void) ...@@ -115,7 +115,7 @@ static void test_Gamepad(void)
BOOLEAN found; BOOLEAN found;
HSTRING str; HSTRING str;
HRESULT hr; HRESULT hr;
ULONG size; UINT32 size;
gamepad_event_handler.IEventHandler_Gamepad_iface.lpVtbl = &gamepad_event_handler_vtbl; gamepad_event_handler.IEventHandler_Gamepad_iface.lpVtbl = &gamepad_event_handler_vtbl;
...@@ -292,7 +292,7 @@ static void test_RawGameController(void) ...@@ -292,7 +292,7 @@ static void test_RawGameController(void)
BOOLEAN found; BOOLEAN found;
HSTRING str; HSTRING str;
HRESULT hr; HRESULT hr;
ULONG size; UINT32 size;
controller_event_handler.IEventHandler_RawGameController_iface.lpVtbl = &controller_event_handler_vtbl; controller_event_handler.IEventHandler_RawGameController_iface.lpVtbl = &controller_event_handler_vtbl;
......
...@@ -116,14 +116,14 @@ static HRESULT STDMETHODCALLTYPE vector_view_voice_information_GetTrustLevel( ...@@ -116,14 +116,14 @@ static HRESULT STDMETHODCALLTYPE vector_view_voice_information_GetTrustLevel(
} }
static HRESULT STDMETHODCALLTYPE vector_view_voice_information_GetAt( static HRESULT STDMETHODCALLTYPE vector_view_voice_information_GetAt(
IVectorView_VoiceInformation *iface, ULONG index, IVoiceInformation **value) IVectorView_VoiceInformation *iface, UINT32 index, IVoiceInformation **value)
{ {
FIXME("iface %p, index %#x, value %p stub!\n", iface, index, value); FIXME("iface %p, index %#x, value %p stub!\n", iface, index, value);
return S_OK; return S_OK;
} }
static HRESULT STDMETHODCALLTYPE vector_view_voice_information_get_Size( static HRESULT STDMETHODCALLTYPE vector_view_voice_information_get_Size(
IVectorView_VoiceInformation *iface, ULONG *value) IVectorView_VoiceInformation *iface, UINT32 *value)
{ {
FIXME("iface %p, value %p stub!\n", iface, value); FIXME("iface %p, value %p stub!\n", iface, value);
*value = 0; *value = 0;
...@@ -131,7 +131,7 @@ static HRESULT STDMETHODCALLTYPE vector_view_voice_information_get_Size( ...@@ -131,7 +131,7 @@ static HRESULT STDMETHODCALLTYPE vector_view_voice_information_get_Size(
} }
static HRESULT STDMETHODCALLTYPE vector_view_voice_information_IndexOf( static HRESULT STDMETHODCALLTYPE vector_view_voice_information_IndexOf(
IVectorView_VoiceInformation *iface, IVoiceInformation *element, ULONG *index, BOOLEAN *value) IVectorView_VoiceInformation *iface, IVoiceInformation *element, UINT32 *index, BOOLEAN *value)
{ {
FIXME("iface %p, element %p, index %p, value %p stub!\n", iface, element, index, value); FIXME("iface %p, element %p, index %p, value %p stub!\n", iface, element, index, value);
*value = FALSE; *value = FALSE;
...@@ -139,8 +139,8 @@ static HRESULT STDMETHODCALLTYPE vector_view_voice_information_IndexOf( ...@@ -139,8 +139,8 @@ static HRESULT STDMETHODCALLTYPE vector_view_voice_information_IndexOf(
} }
static HRESULT STDMETHODCALLTYPE vector_view_voice_information_GetMany( static HRESULT STDMETHODCALLTYPE vector_view_voice_information_GetMany(
IVectorView_VoiceInformation *iface, ULONG start_index, IVectorView_VoiceInformation *iface, UINT32 start_index,
ULONG items_size, IVoiceInformation **items, UINT *value) UINT32 items_size, IVoiceInformation **items, UINT *value)
{ {
FIXME("iface %p, start_index %#x, items %p, value %p stub!\n", iface, start_index, items, value); FIXME("iface %p, start_index %#x, items %p, value %p stub!\n", iface, start_index, items, value);
*value = 0; *value = 0;
......
...@@ -53,7 +53,7 @@ static void test_SpeechSynthesizer(void) ...@@ -53,7 +53,7 @@ static void test_SpeechSynthesizer(void)
IAgileObject *agile_object = NULL, *tmp_agile_object = NULL; IAgileObject *agile_object = NULL, *tmp_agile_object = NULL;
HSTRING str; HSTRING str;
HRESULT hr; HRESULT hr;
ULONG size; UINT32 size;
hr = pRoInitialize(RO_INIT_MULTITHREADED); hr = pRoInitialize(RO_INIT_MULTITHREADED);
ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr);
......
...@@ -101,10 +101,10 @@ cpp_quote("#endif") ...@@ -101,10 +101,10 @@ cpp_quote("#endif")
] ]
interface IVectorView<T> : IInspectable interface IVectorView<T> : IInspectable
{ {
HRESULT GetAt([in] ULONG index, [out, retval] T *value); HRESULT GetAt([in] UINT32 index, [out, retval] T *value);
[propget] HRESULT Size([out, retval] ULONG *value); [propget] HRESULT Size([out, retval] UINT32 *value);
HRESULT IndexOf([in, optional] T element, [out] ULONG *index, [out, retval] BOOLEAN *value); HRESULT IndexOf([in, optional] T element, [out] UINT32 *index, [out, retval] BOOLEAN *value);
HRESULT GetMany([in] ULONG start_index, [in] ULONG items_size, [out] T *items, [out, retval] ULONG *value); HRESULT GetMany([in] UINT32 start_index, [in] UINT32 items_size, [out] T *items, [out, retval] UINT32 *value);
} }
} }
#endif #endif
......
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