Skip to content

W
wine-winehq
Commit 46f4975b authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard
Browse files
Options

windows.gaming.input: Introduce a generic IVector<IInspectable *> implementation.

And use it to factor all the IVectorView<T> stubs. Signed-off-by: 's avatarRémi Bernon <rbernon@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent c565d003
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 242 deletions
dlls/windows.gaming.input/Makefile.in
View file @ 46f4975b
......@@ -4,6 +4,7 @@ IMPORTS = combase uuid
C_SRCS = \
controller.c \
gamepad.c \
main.c
main.c \
vector.c
IDL_SRCS = classes.idl
dlls/windows.gaming.input/controller.c
View file @ 46f4975b
......@@ -23,124 +23,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(input);
struct controller_vector
{
IVectorView_RawGameController IVectorView_RawGameController_iface;
LONG ref;
};
static inline struct controller_vector *impl_from_IVectorView_RawGameController( IVectorView_RawGameController *iface )
{
return CONTAINING_RECORD( iface, struct controller_vector, IVectorView_RawGameController_iface );
}
static HRESULT WINAPI controllers_QueryInterface( IVectorView_RawGameController *iface, REFIID iid, void **out )
{
TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out );
if (IsEqualGUID( iid, &IID_IUnknown ) ||
IsEqualGUID( iid, &IID_IInspectable ) ||
IsEqualGUID( iid, &IID_IAgileObject ) ||
IsEqualGUID( iid, &IID_IVectorView_RawGameController ))
{
IUnknown_AddRef( iface );
*out = iface;
return S_OK;
}
WARN( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) );
*out = NULL;
return E_NOINTERFACE;
}
static ULONG WINAPI controllers_AddRef( IVectorView_RawGameController *iface )
{
struct controller_vector *impl = impl_from_IVectorView_RawGameController( iface );
ULONG ref = InterlockedIncrement( &impl->ref );
TRACE( "iface %p increasing refcount to %lu.\n", iface, ref );
return ref;
}
static ULONG WINAPI controllers_Release( IVectorView_RawGameController *iface )
{
struct controller_vector *impl = impl_from_IVectorView_RawGameController( iface );
ULONG ref = InterlockedDecrement( &impl->ref );
TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref );
return ref;
}
static HRESULT WINAPI controllers_GetIids( IVectorView_RawGameController *iface, ULONG *iid_count, IID **iids )
{
FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids );
return E_NOTIMPL;
}
static HRESULT WINAPI controllers_GetRuntimeClassName( IVectorView_RawGameController *iface, HSTRING *class_name )
{
FIXME( "iface %p, class_name %p stub!\n", iface, class_name );
return E_NOTIMPL;
}
static HRESULT WINAPI controllers_GetTrustLevel( IVectorView_RawGameController *iface, TrustLevel *trust_level )
{
FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level );
return E_NOTIMPL;
}
static HRESULT WINAPI controllers_GetAt( IVectorView_RawGameController *iface, UINT32 index, IRawGameController **value )
{
FIXME( "iface %p, index %u, value %p stub!\n", iface, index, value );
*value = NULL;
return E_BOUNDS;
}
static HRESULT WINAPI controllers_get_Size( IVectorView_RawGameController *iface, UINT32 *value )
{
FIXME( "iface %p, value %p stub!\n", iface, value );
*value = 0;
return S_OK;
}
static HRESULT WINAPI controllers_IndexOf( IVectorView_RawGameController *iface, IRawGameController *element,
UINT32 *index, BOOLEAN *found )
{
FIXME( "iface %p, element %p, index %p, found %p stub!\n", iface, element, index, found );
*index = 0;
*found = FALSE;
return S_OK;
}
static HRESULT WINAPI controllers_GetMany( IVectorView_RawGameController *iface, UINT32 start_index,
UINT32 items_size, IRawGameController **items, UINT *value )
{
FIXME( "iface %p, start_index %u, items_size %u, items %p, value %p stub!\n", iface,
start_index, items_size, items, value );
*value = 0;
return E_BOUNDS;
}
static const struct IVectorView_RawGameControllerVtbl controllers_vtbl =
{
controllers_QueryInterface,
controllers_AddRef,
controllers_Release,
/* IInspectable methods */
controllers_GetIids,
controllers_GetRuntimeClassName,
controllers_GetTrustLevel,
/* IVectorView<RawGameController> methods */
controllers_GetAt,
controllers_get_Size,
controllers_IndexOf,
controllers_GetMany,
};
static struct controller_vector controllers =
{
{&controllers_vtbl},
0,
};
struct controller_statics
{
IActivationFactory IActivationFactory_iface;
......@@ -307,10 +189,20 @@ static HRESULT WINAPI statics_remove_RawGameControllerRemoved( IRawGameControlle
static HRESULT WINAPI statics_get_RawGameControllers( IRawGameControllerStatics *iface, IVectorView_RawGameController **value )
{
static const GUID *view_iid = &IID_IVectorView_RawGameController;
static const GUID *iid = &IID_IVector_RawGameController;
IVector_RawGameController *controllers;
HRESULT hr;
TRACE( "iface %p, value %p.\n", iface, value );
*value = &controllers.IVectorView_RawGameController_iface;
IVectorView_RawGameController_AddRef( *value );
return S_OK;
if (SUCCEEDED(hr = vector_create( iid, view_iid, (void **)&controllers )))
{
hr = IVector_RawGameController_GetView( controllers, value );
IVector_RawGameController_Release( controllers );
}
return hr;
}
static HRESULT WINAPI statics_FromGameController( IRawGameControllerStatics *iface, IGameController *game_controller,
......
dlls/windows.gaming.input/gamepad.c
View file @ 46f4975b
......@@ -23,123 +23,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(input);
struct gamepad_vector
{
IVectorView_Gamepad IVectorView_Gamepad_iface;
LONG ref;
};
static inline struct gamepad_vector *impl_from_IVectorView_Gamepad( IVectorView_Gamepad *iface )
{
return CONTAINING_RECORD( iface, struct gamepad_vector, IVectorView_Gamepad_iface );
}
static HRESULT WINAPI gamepads_QueryInterface( IVectorView_Gamepad *iface, REFIID iid, void **out )
{
TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out );
if (IsEqualGUID( iid, &IID_IUnknown ) ||
IsEqualGUID( iid, &IID_IInspectable ) ||
IsEqualGUID( iid, &IID_IAgileObject ) ||
IsEqualGUID( iid, &IID_IVectorView_Gamepad ))
{
IUnknown_AddRef( iface );
*out = iface;
return S_OK;
}
WARN( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) );
*out = NULL;
return E_NOINTERFACE;
}
static ULONG WINAPI gamepads_AddRef( IVectorView_Gamepad *iface )
{
struct gamepad_vector *impl = impl_from_IVectorView_Gamepad( iface );
ULONG ref = InterlockedIncrement( &impl->ref );
TRACE( "iface %p increasing refcount to %lu.\n", iface, ref );
return ref;
}
static ULONG WINAPI gamepads_Release( IVectorView_Gamepad *iface )
{
struct gamepad_vector *impl = impl_from_IVectorView_Gamepad( iface );
ULONG ref = InterlockedDecrement( &impl->ref );
TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref );
return ref;
}
static HRESULT WINAPI gamepads_GetIids( IVectorView_Gamepad *iface, ULONG *iid_count, IID **iids )
{
FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids );
return E_NOTIMPL;
}
static HRESULT WINAPI gamepads_GetRuntimeClassName( IVectorView_Gamepad *iface, HSTRING *class_name )
{
FIXME( "iface %p, class_name %p stub!\n", iface, class_name );
return E_NOTIMPL;
}
static HRESULT WINAPI gamepads_GetTrustLevel( IVectorView_Gamepad *iface, TrustLevel *trust_level )
{
FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level );
return E_NOTIMPL;
}
static HRESULT WINAPI gamepads_GetAt( IVectorView_Gamepad *iface, UINT32 index, IGamepad **value )
{
FIXME( "iface %p, index %u, value %p stub!\n", iface, index, value );
*value = NULL;
return E_BOUNDS;
}
static HRESULT WINAPI gamepads_get_Size( IVectorView_Gamepad *iface, UINT32 *value )
{
FIXME( "iface %p, value %p stub!\n", iface, value );
*value = 0;
return S_OK;
}
static HRESULT WINAPI gamepads_IndexOf( IVectorView_Gamepad *iface, IGamepad *element, UINT32 *index, BOOLEAN *found )
{
FIXME( "iface %p, element %p, index %p, found %p stub!\n", iface, element, index, found );
*index = 0;
*found = FALSE;
return S_OK;
}
static HRESULT WINAPI gamepads_GetMany( IVectorView_Gamepad *iface, UINT32 start_index,
UINT32 items_size, IGamepad **items, UINT *value )
{
FIXME( "iface %p, start_index %u, items_size %u, items %p, value %p stub!\n", iface,
start_index, items_size, items, value );
*value = 0;
return E_BOUNDS;
}
static const struct IVectorView_GamepadVtbl gamepads_vtbl =
{
gamepads_QueryInterface,
gamepads_AddRef,
gamepads_Release,
/* IInspectable methods */
gamepads_GetIids,
gamepads_GetRuntimeClassName,
gamepads_GetTrustLevel,
/* IVectorView<VoiceInformation> methods */
gamepads_GetAt,
gamepads_get_Size,
gamepads_IndexOf,
gamepads_GetMany,
};
static struct gamepad_vector gamepads =
{
{&gamepads_vtbl},
0,
};
struct gamepad_statics
{
IActivationFactory IActivationFactory_iface;
......@@ -306,10 +189,20 @@ static HRESULT WINAPI statics_remove_GamepadRemoved( IGamepadStatics *iface, Eve
static HRESULT WINAPI statics_get_Gamepads( IGamepadStatics *iface, IVectorView_Gamepad **value )
{
static const GUID *view_iid = &IID_IVectorView_Gamepad;
static const GUID *iid = &IID_IVector_Gamepad;
IVector_Gamepad *gamepads;
HRESULT hr;
TRACE( "iface %p, value %p.\n", iface, value );
*value = &gamepads.IVectorView_Gamepad_iface;
IVectorView_Gamepad_AddRef( *value );
return S_OK;
if (SUCCEEDED(hr = vector_create( iid, view_iid, (void **)&gamepads )))
{
hr = IVector_Gamepad_GetView( gamepads, value );
IVector_Gamepad_Release( gamepads );
}
return hr;
}
static const struct IGamepadStaticsVtbl statics_vtbl =
......
dlls/windows.gaming.input/private.h
View file @ 46f4975b
......@@ -36,3 +36,5 @@
extern IActivationFactory *controller_factory;
extern IActivationFactory *gamepad_factory;
extern HRESULT vector_create( REFIID iid, REFIID view_iid, void **out );
include/windows.foundation.idl
View file @ 46f4975b
......@@ -161,7 +161,9 @@ namespace Windows {
interface Windows.Foundation.Collections.IIterable<HSTRING>;
interface Windows.Foundation.Collections.IIterator<HSTRING>;
interface Windows.Foundation.Collections.IVectorView<HSTRING>;
interface Windows.Foundation.Collections.IVectorView<IInspectable *>;
interface Windows.Foundation.Collections.IVector<HSTRING>;
interface Windows.Foundation.Collections.IVector<IInspectable *>;
interface Windows.Foundation.Collections.IMapView<HSTRING, Windows.Foundation.Collections.IVectorView<HSTRING>*>;
interface Windows.Foundation.AsyncOperationCompletedHandler<boolean>;
interface Windows.Foundation.IAsyncOperation<boolean>;
......
include/windows.gaming.input.idl
View file @ 46f4975b
......@@ -54,7 +54,9 @@ namespace Windows.Gaming.Input {
interface Windows.Foundation.TypedEventHandler<Windows.Gaming.Input.IGameController *, Windows.Gaming.Input.Headset *>;
interface Windows.Foundation.TypedEventHandler<Windows.Gaming.Input.IGameController *, Windows.System.UserChangedEventArgs *>;
interface Windows.Foundation.Collections.IVectorView<Gamepad *>;
interface Windows.Foundation.Collections.IVector<Gamepad *>;
interface Windows.Foundation.Collections.IVectorView<Windows.Gaming.Input.RawGameController *>;
interface Windows.Foundation.Collections.IVector<Windows.Gaming.Input.RawGameController *>;
}
[
......
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