[PATCH 1/3] windows.gaming.input: Split RawGameController runtimeclass to separate source.
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.gaming.input/Makefile.in | 1 + dlls/windows.gaming.input/controller.c | 348 +++++++++++++++++++++++++ dlls/windows.gaming.input/main.c | 289 ++------------------ dlls/windows.gaming.input/private.h | 37 +++ 4 files changed, 403 insertions(+), 272 deletions(-) create mode 100644 dlls/windows.gaming.input/controller.c create mode 100644 dlls/windows.gaming.input/private.h diff --git a/dlls/windows.gaming.input/Makefile.in b/dlls/windows.gaming.input/Makefile.in index fab3c4e62d5..cf926f8cb5a 100644 --- a/dlls/windows.gaming.input/Makefile.in +++ b/dlls/windows.gaming.input/Makefile.in @@ -2,6 +2,7 @@ MODULE = windows.gaming.input.dll IMPORTS = combase uuid C_SRCS = \ + controller.c \ main.c IDL_SRCS = classes.idl diff --git a/dlls/windows.gaming.input/controller.c b/dlls/windows.gaming.input/controller.c new file mode 100644 index 00000000000..c1964916600 --- /dev/null +++ b/dlls/windows.gaming.input/controller.c @@ -0,0 +1,348 @@ +/* WinRT Windows.Gaming.Input implementation + * + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "private.h" + +#include "wine/debug.h" + +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; + IRawGameControllerStatics IRawGameControllerStatics_iface; + LONG ref; +}; + +static inline struct controller_statics *impl_from_IActivationFactory( IActivationFactory *iface ) +{ + return CONTAINING_RECORD( iface, struct controller_statics, IActivationFactory_iface ); +} + +static inline struct controller_statics *impl_from_IRawGameControllerStatics( IRawGameControllerStatics *iface ) +{ + return CONTAINING_RECORD( iface, struct controller_statics, IRawGameControllerStatics_iface ); +} + +static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID iid, void **out ) +{ + struct controller_statics *impl = impl_from_IActivationFactory( iface ); + + 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_IActivationFactory )) + { + IUnknown_AddRef( iface ); + *out = iface; + return S_OK; + } + + if (IsEqualGUID( iid, &IID_IRawGameControllerStatics )) + { + IUnknown_AddRef( iface ); + *out = &impl->IRawGameControllerStatics_iface; + return S_OK; + } + + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI factory_AddRef( IActivationFactory *iface ) +{ + struct controller_statics *impl = impl_from_IActivationFactory( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p increasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI factory_Release( IActivationFactory *iface ) +{ + struct controller_statics *impl = impl_from_IActivationFactory( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static HRESULT WINAPI factory_GetIids( IActivationFactory *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 factory_GetRuntimeClassName( IActivationFactory *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI factory_GetTrustLevel( IActivationFactory *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI factory_ActivateInstance( IActivationFactory *iface, IInspectable **instance ) +{ + FIXME( "iface %p, instance %p stub!\n", iface, instance ); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl factory_vtbl = +{ + factory_QueryInterface, + factory_AddRef, + factory_Release, + /* IInspectable methods */ + factory_GetIids, + factory_GetRuntimeClassName, + factory_GetTrustLevel, + /* IActivationFactory methods */ + factory_ActivateInstance, +}; + +static HRESULT WINAPI statics_QueryInterface( IRawGameControllerStatics *iface, REFIID iid, void **out ) +{ + struct controller_statics *impl = impl_from_IRawGameControllerStatics( iface ); + return IActivationFactory_QueryInterface( &impl->IActivationFactory_iface, iid, out ); +} + +static ULONG WINAPI statics_AddRef( IRawGameControllerStatics *iface ) +{ + struct controller_statics *impl = impl_from_IRawGameControllerStatics( iface ); + return IActivationFactory_AddRef( &impl->IActivationFactory_iface ); +} + +static ULONG WINAPI statics_Release( IRawGameControllerStatics *iface ) +{ + struct controller_statics *impl = impl_from_IRawGameControllerStatics( iface ); + return IActivationFactory_Release( &impl->IActivationFactory_iface ); +} + +static HRESULT WINAPI statics_GetIids( IRawGameControllerStatics *iface, ULONG *iid_count, IID **iids ) +{ + struct controller_statics *impl = impl_from_IRawGameControllerStatics( iface ); + return IActivationFactory_Release( &impl->IActivationFactory_iface ); +} + +static HRESULT WINAPI statics_GetRuntimeClassName( IRawGameControllerStatics *iface, HSTRING *class_name ) +{ + struct controller_statics *impl = impl_from_IRawGameControllerStatics( iface ); + return IActivationFactory_Release( &impl->IActivationFactory_iface ); +} + +static HRESULT WINAPI statics_GetTrustLevel( IRawGameControllerStatics *iface, TrustLevel *trust_level ) +{ + struct controller_statics *impl = impl_from_IRawGameControllerStatics( iface ); + return IActivationFactory_Release( &impl->IActivationFactory_iface ); +} + +static HRESULT WINAPI statics_add_RawGameControllerAdded( IRawGameControllerStatics *iface, IEventHandler_RawGameController *value, + EventRegistrationToken *token ) +{ + FIXME( "iface %p, value %p, token %p stub!\n", iface, value, token ); + if (!value) return E_INVALIDARG; + token->value = 0; + return S_OK; +} + +static HRESULT WINAPI statics_remove_RawGameControllerAdded( IRawGameControllerStatics *iface, EventRegistrationToken token ) +{ + FIXME( "iface %p, token %#I64x stub!\n", iface, token.value ); + return S_OK; +} + +static HRESULT WINAPI statics_add_RawGameControllerRemoved( IRawGameControllerStatics *iface, IEventHandler_RawGameController *value, + EventRegistrationToken *token ) +{ + FIXME( "iface %p, value %p, token %p stub!\n", iface, value, token ); + if (!value) return E_INVALIDARG; + token->value = 0; + return S_OK; +} + +static HRESULT WINAPI statics_remove_RawGameControllerRemoved( IRawGameControllerStatics *iface, EventRegistrationToken token ) +{ + FIXME( "iface %p, token %#I64x stub!\n", iface, token.value ); + return S_OK; +} + +static HRESULT WINAPI statics_get_RawGameControllers( IRawGameControllerStatics *iface, IVectorView_RawGameController **value ) +{ + TRACE( "iface %p, value %p.\n", iface, value ); + *value = &controllers.IVectorView_RawGameController_iface; + IVectorView_RawGameController_AddRef( *value ); + return S_OK; +} + +static HRESULT WINAPI statics_FromGameController( IRawGameControllerStatics *iface, IGameController *game_controller, + IRawGameController **value ) +{ + FIXME( "iface %p, game_controller %p, value %p stub!\n", iface, game_controller, value ); + return E_NOTIMPL; +} + +static const struct IRawGameControllerStaticsVtbl statics_vtbl = +{ + statics_QueryInterface, + statics_AddRef, + statics_Release, + /* IInspectable methods */ + statics_GetIids, + statics_GetRuntimeClassName, + statics_GetTrustLevel, + /* IRawGameControllerStatics methods */ + statics_add_RawGameControllerAdded, + statics_remove_RawGameControllerAdded, + statics_add_RawGameControllerRemoved, + statics_remove_RawGameControllerRemoved, + statics_get_RawGameControllers, + statics_FromGameController, +}; + +static struct controller_statics controller_statics = +{ + {&factory_vtbl}, + {&statics_vtbl}, + 1, +}; + +IActivationFactory *controller_factory = &controller_statics.IActivationFactory_iface; diff --git a/dlls/windows.gaming.input/main.c b/dlls/windows.gaming.input/main.c index 5278ec261bd..4c407884115 100644 --- a/dlls/windows.gaming.input/main.c +++ b/dlls/windows.gaming.input/main.c @@ -18,34 +18,19 @@ */ #include <stdarg.h> +#include <stddef.h> #define COBJMACROS #include "windef.h" #include "winbase.h" -#include "winstring.h" -#include "wine/debug.h" -#include "objbase.h" #include "initguid.h" -#include "activation.h" +#include "private.h" -#define WIDL_using_Windows_Foundation -#define WIDL_using_Windows_Foundation_Collections -#include "windows.foundation.h" -#define WIDL_using_Windows_Gaming_Input -#include "windows.gaming.input.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(input); -static const char *debugstr_hstring(HSTRING hstr) -{ - const WCHAR *str; - UINT32 len; - if (hstr && !((ULONG_PTR)hstr >> 16)) return "(invalid)"; - str = WindowsGetStringRawBuffer(hstr, &len); - return wine_dbgstr_wn(str, len); -} - struct gamepad_vector { IVectorView_Gamepad IVectorView_Gamepad_iface; @@ -173,138 +158,10 @@ static struct gamepad_vector gamepads = 0 }; -struct raw_game_controller_vector -{ - IVectorView_RawGameController IVectorView_RawGameController_iface; - LONG ref; -}; - -static inline struct raw_game_controller_vector *impl_from_IVectorView_RawGameController(IVectorView_RawGameController *iface) -{ - return CONTAINING_RECORD(iface, struct raw_game_controller_vector, IVectorView_RawGameController_iface); -} - -static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_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 STDMETHODCALLTYPE vector_view_raw_game_controller_AddRef( - IVectorView_RawGameController *iface) -{ - struct raw_game_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 STDMETHODCALLTYPE vector_view_raw_game_controller_Release( - IVectorView_RawGameController *iface) -{ - struct raw_game_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 STDMETHODCALLTYPE vector_view_raw_game_controller_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 STDMETHODCALLTYPE vector_view_raw_game_controller_GetRuntimeClassName( - IVectorView_RawGameController *iface, HSTRING *class_name) -{ - FIXME("iface %p, class_name %p stub!\n", iface, class_name); - return E_NOTIMPL; -} - -static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_GetTrustLevel( - IVectorView_RawGameController *iface, TrustLevel *trust_level) -{ - FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); - return E_NOTIMPL; -} - -static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_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 STDMETHODCALLTYPE vector_view_raw_game_controller_get_Size( - IVectorView_RawGameController *iface, UINT32 *value) -{ - FIXME("iface %p, value %p stub!\n", iface, value); - *value = 0; - return S_OK; -} - -static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_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 STDMETHODCALLTYPE vector_view_raw_game_controller_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 vector_view_raw_game_controller_vtbl = -{ - vector_view_raw_game_controller_QueryInterface, - vector_view_raw_game_controller_AddRef, - vector_view_raw_game_controller_Release, - /* IInspectable methods */ - vector_view_raw_game_controller_GetIids, - vector_view_raw_game_controller_GetRuntimeClassName, - vector_view_raw_game_controller_GetTrustLevel, - /* IVectorView<RawGameController> methods */ - vector_view_raw_game_controller_GetAt, - vector_view_raw_game_controller_get_Size, - vector_view_raw_game_controller_IndexOf, - vector_view_raw_game_controller_GetMany, -}; - -static struct raw_game_controller_vector raw_game_controllers = -{ - {&vector_view_raw_game_controller_vtbl}, - 0 -}; - struct windows_gaming_input { IActivationFactory IActivationFactory_iface; IGamepadStatics IGamepadStatics_iface; - IRawGameControllerStatics IRawGameControllerStatics_iface; LONG ref; }; @@ -318,11 +175,6 @@ static inline struct windows_gaming_input *impl_from_IGamepadStatics(IGamepadSta return CONTAINING_RECORD(iface, struct windows_gaming_input, IGamepadStatics_iface); } -static inline struct windows_gaming_input *impl_from_IRawGameControllerStatics(IRawGameControllerStatics *iface) -{ - return CONTAINING_RECORD(iface, struct windows_gaming_input, IRawGameControllerStatics_iface); -} - static HRESULT STDMETHODCALLTYPE windows_gaming_input_QueryInterface( IActivationFactory *iface, REFIID iid, void **out) { @@ -347,13 +199,6 @@ static HRESULT STDMETHODCALLTYPE windows_gaming_input_QueryInterface( return S_OK; } - if (IsEqualGUID(iid, &IID_IRawGameControllerStatics)) - { - IUnknown_AddRef(iface); - *out = &impl->IRawGameControllerStatics_iface; - return S_OK; - } - FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); *out = NULL; return E_NOINTERFACE; @@ -518,119 +363,10 @@ static const struct IGamepadStaticsVtbl gamepad_statics_vtbl = gamepad_statics_get_Gamepads, }; -static HRESULT STDMETHODCALLTYPE raw_game_controller_statics_QueryInterface( - IRawGameControllerStatics *iface, REFIID iid, void **out) -{ - struct windows_gaming_input *impl = impl_from_IRawGameControllerStatics(iface); - return windows_gaming_input_QueryInterface(&impl->IActivationFactory_iface, iid, out); -} - -static ULONG STDMETHODCALLTYPE raw_game_controller_statics_AddRef( - IRawGameControllerStatics *iface) -{ - struct windows_gaming_input *impl = impl_from_IRawGameControllerStatics(iface); - return windows_gaming_input_AddRef(&impl->IActivationFactory_iface); -} - -static ULONG STDMETHODCALLTYPE raw_game_controller_statics_Release( - IRawGameControllerStatics *iface) -{ - struct windows_gaming_input *impl = impl_from_IRawGameControllerStatics(iface); - return windows_gaming_input_Release(&impl->IActivationFactory_iface); -} - -static HRESULT STDMETHODCALLTYPE raw_game_controller_statics_GetIids( - IRawGameControllerStatics *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 STDMETHODCALLTYPE raw_game_controller_statics_GetRuntimeClassName( - IRawGameControllerStatics *iface, HSTRING *class_name) -{ - FIXME("iface %p, class_name %p stub!\n", iface, class_name); - return E_NOTIMPL; -} - -static HRESULT STDMETHODCALLTYPE raw_game_controller_statics_GetTrustLevel( - IRawGameControllerStatics *iface, TrustLevel *trust_level) -{ - FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); - return E_NOTIMPL; -} - -static HRESULT STDMETHODCALLTYPE raw_game_controller_statics_add_RawGameControllerAdded( - IRawGameControllerStatics *iface, IEventHandler_RawGameController *value, EventRegistrationToken* token) -{ - FIXME("iface %p, value %p, token %p stub!\n", iface, value, token); - if (!value) return E_INVALIDARG; - token->value = 0; - return S_OK; -} - -static HRESULT STDMETHODCALLTYPE raw_game_controller_statics_remove_RawGameControllerAdded( - IRawGameControllerStatics *iface, EventRegistrationToken token) -{ - FIXME("iface %p, token %#I64x stub!\n", iface, token.value); - return S_OK; -} - -static HRESULT STDMETHODCALLTYPE raw_game_controller_statics_add_RawGameControllerRemoved( - IRawGameControllerStatics *iface, IEventHandler_RawGameController *value, EventRegistrationToken* token) -{ - FIXME("iface %p, value %p, token %p stub!\n", iface, value, token); - if (!value) return E_INVALIDARG; - token->value = 0; - return S_OK; -} - -static HRESULT STDMETHODCALLTYPE raw_game_controller_statics_remove_RawGameControllerRemoved( - IRawGameControllerStatics *iface, EventRegistrationToken token) -{ - FIXME("iface %p, token %#I64x stub!\n", iface, token.value); - return S_OK; -} - -static HRESULT STDMETHODCALLTYPE raw_game_controller_statics_get_RawGameControllers( - IRawGameControllerStatics *iface, IVectorView_RawGameController **value) -{ - TRACE("iface %p, value %p.\n", iface, value); - *value = &raw_game_controllers.IVectorView_RawGameController_iface; - IVectorView_RawGameController_AddRef(*value); - return S_OK; -} - -static HRESULT STDMETHODCALLTYPE raw_game_controller_statics_FromGameController( - IRawGameControllerStatics *iface, IGameController *game_controller, IRawGameController **value) -{ - FIXME("iface %p, game_controller %p, value %p stub!\n", iface, game_controller, value); - return E_NOTIMPL; -} - -static const struct IRawGameControllerStaticsVtbl raw_game_controller_statics_vtbl = -{ - raw_game_controller_statics_QueryInterface, - raw_game_controller_statics_AddRef, - raw_game_controller_statics_Release, - /* IInspectable methods */ - raw_game_controller_statics_GetIids, - raw_game_controller_statics_GetRuntimeClassName, - raw_game_controller_statics_GetTrustLevel, - /* IRawGameControllerStatics methods */ - raw_game_controller_statics_add_RawGameControllerAdded, - raw_game_controller_statics_remove_RawGameControllerAdded, - raw_game_controller_statics_add_RawGameControllerRemoved, - raw_game_controller_statics_remove_RawGameControllerRemoved, - raw_game_controller_statics_get_RawGameControllers, - raw_game_controller_statics_FromGameController, -}; - static struct windows_gaming_input windows_gaming_input = { {&activation_factory_vtbl}, {&gamepad_statics_vtbl}, - {&raw_game_controller_statics_vtbl}, 1 }; @@ -640,10 +376,19 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) return CLASS_E_CLASSNOTAVAILABLE; } -HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **factory) +HRESULT WINAPI DllGetActivationFactory( HSTRING class_str, IActivationFactory **factory ) { - TRACE("classid %s, factory %p.\n", debugstr_hstring(classid), factory); - *factory = &windows_gaming_input.IActivationFactory_iface; - IUnknown_AddRef(*factory); - return S_OK; + const WCHAR *buffer = WindowsGetStringRawBuffer( class_str, NULL ); + + TRACE( "class %s, factory %p.\n", debugstr_w(buffer), factory ); + + *factory = NULL; + + if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_RawGameController )) + IActivationFactory_AddRef( (*factory = controller_factory) ); + if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_Gamepad )) + IActivationFactory_AddRef( (*factory = &windows_gaming_input.IActivationFactory_iface) ); + + if (*factory) return S_OK; + return REGDB_E_CLASSNOTREG; } diff --git a/dlls/windows.gaming.input/private.h b/dlls/windows.gaming.input/private.h new file mode 100644 index 00000000000..69983effd5a --- /dev/null +++ b/dlls/windows.gaming.input/private.h @@ -0,0 +1,37 @@ +/* WinRT Windows.Gaming.Input implementation + * + * Copyright 2022 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stddef.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winstring.h" +#include "objbase.h" + +#include "activation.h" + +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections +#include "windows.foundation.h" +#define WIDL_using_Windows_Gaming_Input +#include "windows.gaming.input.h" + +extern IActivationFactory *controller_factory; -- 2.34.1
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.gaming.input/Makefile.in | 1 + dlls/windows.gaming.input/gamepad.c | 339 +++++++++++++++++++++++++ dlls/windows.gaming.input/main.c | 341 +------------------------- dlls/windows.gaming.input/private.h | 1 + 4 files changed, 342 insertions(+), 340 deletions(-) create mode 100644 dlls/windows.gaming.input/gamepad.c diff --git a/dlls/windows.gaming.input/Makefile.in b/dlls/windows.gaming.input/Makefile.in index cf926f8cb5a..251d3e81be5 100644 --- a/dlls/windows.gaming.input/Makefile.in +++ b/dlls/windows.gaming.input/Makefile.in @@ -3,6 +3,7 @@ IMPORTS = combase uuid C_SRCS = \ controller.c \ + gamepad.c \ main.c IDL_SRCS = classes.idl diff --git a/dlls/windows.gaming.input/gamepad.c b/dlls/windows.gaming.input/gamepad.c new file mode 100644 index 00000000000..fe985e089fa --- /dev/null +++ b/dlls/windows.gaming.input/gamepad.c @@ -0,0 +1,339 @@ +/* WinRT Windows.Gaming.Input implementation + * + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "private.h" + +#include "wine/debug.h" + +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; + IGamepadStatics IGamepadStatics_iface; + LONG ref; +}; + +static inline struct gamepad_statics *impl_from_IActivationFactory( IActivationFactory *iface ) +{ + return CONTAINING_RECORD( iface, struct gamepad_statics, IActivationFactory_iface ); +} + +static inline struct gamepad_statics *impl_from_IGamepadStatics( IGamepadStatics *iface ) +{ + return CONTAINING_RECORD( iface, struct gamepad_statics, IGamepadStatics_iface ); +} + +static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID iid, void **out ) +{ + struct gamepad_statics *impl = impl_from_IActivationFactory( iface ); + + 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_IActivationFactory )) + { + IUnknown_AddRef( iface ); + *out = iface; + return S_OK; + } + + if (IsEqualGUID( iid, &IID_IGamepadStatics )) + { + IUnknown_AddRef( iface ); + *out = &impl->IGamepadStatics_iface; + return S_OK; + } + + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI factory_AddRef( IActivationFactory *iface ) +{ + struct gamepad_statics *impl = impl_from_IActivationFactory( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p increasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI factory_Release( IActivationFactory *iface ) +{ + struct gamepad_statics *impl = impl_from_IActivationFactory( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static HRESULT WINAPI factory_GetIids( IActivationFactory *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 factory_GetRuntimeClassName( IActivationFactory *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI factory_GetTrustLevel( IActivationFactory *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI factory_ActivateInstance( IActivationFactory *iface, IInspectable **instance ) +{ + FIXME( "iface %p, instance %p stub!\n", iface, instance ); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl factory_vtbl = +{ + factory_QueryInterface, + factory_AddRef, + factory_Release, + /* IInspectable methods */ + factory_GetIids, + factory_GetRuntimeClassName, + factory_GetTrustLevel, + /* IActivationFactory methods */ + factory_ActivateInstance, +}; + +static HRESULT WINAPI statics_QueryInterface( IGamepadStatics *iface, REFIID iid, void **out ) +{ + struct gamepad_statics *impl = impl_from_IGamepadStatics( iface ); + return IActivationFactory_QueryInterface( &impl->IActivationFactory_iface, iid, out ); +} + +static ULONG WINAPI statics_AddRef( IGamepadStatics *iface ) +{ + struct gamepad_statics *impl = impl_from_IGamepadStatics( iface ); + return IActivationFactory_AddRef( &impl->IActivationFactory_iface ); +} + +static ULONG WINAPI statics_Release( IGamepadStatics *iface ) +{ + struct gamepad_statics *impl = impl_from_IGamepadStatics( iface ); + return IActivationFactory_Release( &impl->IActivationFactory_iface ); +} + +static HRESULT WINAPI statics_GetIids( IGamepadStatics *iface, ULONG *iid_count, IID **iids ) +{ + struct gamepad_statics *impl = impl_from_IGamepadStatics( iface ); + return IActivationFactory_Release( &impl->IActivationFactory_iface ); +} + +static HRESULT WINAPI statics_GetRuntimeClassName( IGamepadStatics *iface, HSTRING *class_name ) +{ + struct gamepad_statics *impl = impl_from_IGamepadStatics( iface ); + return IActivationFactory_Release( &impl->IActivationFactory_iface ); +} + +static HRESULT WINAPI statics_GetTrustLevel( IGamepadStatics *iface, TrustLevel *trust_level ) +{ + struct gamepad_statics *impl = impl_from_IGamepadStatics( iface ); + return IActivationFactory_Release( &impl->IActivationFactory_iface ); +} + +static HRESULT WINAPI statics_add_GamepadAdded( IGamepadStatics *iface, IEventHandler_Gamepad *value, + EventRegistrationToken *token ) +{ + FIXME( "iface %p, value %p, token %p stub!\n", iface, value, token ); + if (!value) return E_INVALIDARG; + token->value = 0; + return S_OK; +} + +static HRESULT WINAPI statics_remove_GamepadAdded( IGamepadStatics *iface, EventRegistrationToken token ) +{ + FIXME( "iface %p, token %#I64x stub!\n", iface, token.value ); + return S_OK; +} + +static HRESULT WINAPI statics_add_GamepadRemoved( IGamepadStatics *iface, IEventHandler_Gamepad *value, + EventRegistrationToken *token ) +{ + FIXME( "iface %p, value %p, token %p stub!\n", iface, value, token ); + if (!value) return E_INVALIDARG; + token->value = 0; + return S_OK; +} + +static HRESULT WINAPI statics_remove_GamepadRemoved( IGamepadStatics *iface, EventRegistrationToken token ) +{ + FIXME( "iface %p, token %#I64x stub!\n", iface, token.value ); + return S_OK; +} + +static HRESULT WINAPI statics_get_Gamepads( IGamepadStatics *iface, IVectorView_Gamepad **value ) +{ + TRACE( "iface %p, value %p.\n", iface, value ); + *value = &gamepads.IVectorView_Gamepad_iface; + IVectorView_Gamepad_AddRef( *value ); + return S_OK; +} + +static const struct IGamepadStaticsVtbl statics_vtbl = +{ + statics_QueryInterface, + statics_AddRef, + statics_Release, + /* IInspectable methods */ + statics_GetIids, + statics_GetRuntimeClassName, + statics_GetTrustLevel, + /* IGamepadStatics methods */ + statics_add_GamepadAdded, + statics_remove_GamepadAdded, + statics_add_GamepadRemoved, + statics_remove_GamepadRemoved, + statics_get_Gamepads, +}; + +static struct gamepad_statics gamepad_statics = +{ + {&factory_vtbl}, + {&statics_vtbl}, + 1, +}; + +IActivationFactory *gamepad_factory = &gamepad_statics.IActivationFactory_iface; diff --git a/dlls/windows.gaming.input/main.c b/dlls/windows.gaming.input/main.c index 4c407884115..aac21a0c33c 100644 --- a/dlls/windows.gaming.input/main.c +++ b/dlls/windows.gaming.input/main.c @@ -31,345 +31,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 STDMETHODCALLTYPE vector_view_gamepad_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 STDMETHODCALLTYPE vector_view_gamepad_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 STDMETHODCALLTYPE vector_view_gamepad_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 STDMETHODCALLTYPE vector_view_gamepad_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 STDMETHODCALLTYPE vector_view_gamepad_GetRuntimeClassName( - IVectorView_Gamepad *iface, HSTRING *class_name) -{ - FIXME("iface %p, class_name %p stub!\n", iface, class_name); - return E_NOTIMPL; -} - -static HRESULT STDMETHODCALLTYPE vector_view_gamepad_GetTrustLevel( - IVectorView_Gamepad *iface, TrustLevel *trust_level) -{ - FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); - return E_NOTIMPL; -} - -static HRESULT STDMETHODCALLTYPE vector_view_gamepad_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 STDMETHODCALLTYPE vector_view_gamepad_get_Size( - IVectorView_Gamepad *iface, UINT32 *value) -{ - FIXME("iface %p, value %p stub!\n", iface, value); - *value = 0; - return S_OK; -} - -static HRESULT STDMETHODCALLTYPE vector_view_gamepad_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 STDMETHODCALLTYPE vector_view_gamepad_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 vector_view_gamepad_vtbl = -{ - vector_view_gamepad_QueryInterface, - vector_view_gamepad_AddRef, - vector_view_gamepad_Release, - /* IInspectable methods */ - vector_view_gamepad_GetIids, - vector_view_gamepad_GetRuntimeClassName, - vector_view_gamepad_GetTrustLevel, - /* IVectorView<VoiceInformation> methods */ - vector_view_gamepad_GetAt, - vector_view_gamepad_get_Size, - vector_view_gamepad_IndexOf, - vector_view_gamepad_GetMany, -}; - -static struct gamepad_vector gamepads = -{ - {&vector_view_gamepad_vtbl}, - 0 -}; - -struct windows_gaming_input -{ - IActivationFactory IActivationFactory_iface; - IGamepadStatics IGamepadStatics_iface; - LONG ref; -}; - -static inline struct windows_gaming_input *impl_from_IActivationFactory(IActivationFactory *iface) -{ - return CONTAINING_RECORD(iface, struct windows_gaming_input, IActivationFactory_iface); -} - -static inline struct windows_gaming_input *impl_from_IGamepadStatics(IGamepadStatics *iface) -{ - return CONTAINING_RECORD(iface, struct windows_gaming_input, IGamepadStatics_iface); -} - -static HRESULT STDMETHODCALLTYPE windows_gaming_input_QueryInterface( - IActivationFactory *iface, REFIID iid, void **out) -{ - struct windows_gaming_input *impl = impl_from_IActivationFactory(iface); - - 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_IActivationFactory)) - { - IUnknown_AddRef(iface); - *out = iface; - return S_OK; - } - - if (IsEqualGUID(iid, &IID_IGamepadStatics)) - { - IUnknown_AddRef(iface); - *out = &impl->IGamepadStatics_iface; - return S_OK; - } - - FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); - *out = NULL; - return E_NOINTERFACE; -} - -static ULONG STDMETHODCALLTYPE windows_gaming_input_AddRef( - IActivationFactory *iface) -{ - struct windows_gaming_input *impl = impl_from_IActivationFactory(iface); - ULONG ref = InterlockedIncrement(&impl->ref); - TRACE("iface %p increasing refcount to %lu.\n", iface, ref); - return ref; -} - -static ULONG STDMETHODCALLTYPE windows_gaming_input_Release( - IActivationFactory *iface) -{ - struct windows_gaming_input *impl = impl_from_IActivationFactory(iface); - ULONG ref = InterlockedDecrement(&impl->ref); - TRACE("iface %p decreasing refcount to %lu.\n", iface, ref); - return ref; -} - -static HRESULT STDMETHODCALLTYPE windows_gaming_input_GetIids( - IActivationFactory *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 STDMETHODCALLTYPE windows_gaming_input_GetRuntimeClassName( - IActivationFactory *iface, HSTRING *class_name) -{ - FIXME("iface %p, class_name %p stub!\n", iface, class_name); - return E_NOTIMPL; -} - -static HRESULT STDMETHODCALLTYPE windows_gaming_input_GetTrustLevel( - IActivationFactory *iface, TrustLevel *trust_level) -{ - FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); - return E_NOTIMPL; -} - -static HRESULT STDMETHODCALLTYPE windows_gaming_input_ActivateInstance( - IActivationFactory *iface, IInspectable **instance) -{ - FIXME("iface %p, instance %p stub!\n", iface, instance); - return E_NOTIMPL; -} - -static const struct IActivationFactoryVtbl activation_factory_vtbl = -{ - windows_gaming_input_QueryInterface, - windows_gaming_input_AddRef, - windows_gaming_input_Release, - /* IInspectable methods */ - windows_gaming_input_GetIids, - windows_gaming_input_GetRuntimeClassName, - windows_gaming_input_GetTrustLevel, - /* IActivationFactory methods */ - windows_gaming_input_ActivateInstance, -}; - -static HRESULT STDMETHODCALLTYPE gamepad_statics_QueryInterface( - IGamepadStatics *iface, REFIID iid, void **out) -{ - struct windows_gaming_input *impl = impl_from_IGamepadStatics(iface); - return windows_gaming_input_QueryInterface(&impl->IActivationFactory_iface, iid, out); -} - -static ULONG STDMETHODCALLTYPE gamepad_statics_AddRef( - IGamepadStatics *iface) -{ - struct windows_gaming_input *impl = impl_from_IGamepadStatics(iface); - return windows_gaming_input_AddRef(&impl->IActivationFactory_iface); -} - -static ULONG STDMETHODCALLTYPE gamepad_statics_Release( - IGamepadStatics *iface) -{ - struct windows_gaming_input *impl = impl_from_IGamepadStatics(iface); - return windows_gaming_input_Release(&impl->IActivationFactory_iface); -} - -static HRESULT STDMETHODCALLTYPE gamepad_statics_GetIids( - IGamepadStatics *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 STDMETHODCALLTYPE gamepad_statics_GetRuntimeClassName( - IGamepadStatics *iface, HSTRING *class_name) -{ - FIXME("iface %p, class_name %p stub!\n", iface, class_name); - return E_NOTIMPL; -} - -static HRESULT STDMETHODCALLTYPE gamepad_statics_GetTrustLevel( - IGamepadStatics *iface, TrustLevel *trust_level) -{ - FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); - return E_NOTIMPL; -} - -static HRESULT STDMETHODCALLTYPE gamepad_statics_add_GamepadAdded( - IGamepadStatics *iface, IEventHandler_Gamepad *value, EventRegistrationToken* token) -{ - FIXME("iface %p, value %p, token %p stub!\n", iface, value, token); - if (!value) return E_INVALIDARG; - token->value = 0; - return S_OK; -} - -static HRESULT STDMETHODCALLTYPE gamepad_statics_remove_GamepadAdded( - IGamepadStatics *iface, EventRegistrationToken token) -{ - FIXME("iface %p, token %#I64x stub!\n", iface, token.value); - return S_OK; -} - -static HRESULT STDMETHODCALLTYPE gamepad_statics_add_GamepadRemoved( - IGamepadStatics *iface, IEventHandler_Gamepad *value, EventRegistrationToken* token) -{ - FIXME("iface %p, value %p, token %p stub!\n", iface, value, token); - if (!value) return E_INVALIDARG; - token->value = 0; - return S_OK; -} - -static HRESULT STDMETHODCALLTYPE gamepad_statics_remove_GamepadRemoved( - IGamepadStatics *iface, EventRegistrationToken token) -{ - FIXME("iface %p, token %#I64x stub!\n", iface, token.value); - return S_OK; -} - -static HRESULT STDMETHODCALLTYPE gamepad_statics_get_Gamepads( - IGamepadStatics *iface, IVectorView_Gamepad **value) -{ - TRACE("iface %p, value %p.\n", iface, value); - *value = &gamepads.IVectorView_Gamepad_iface; - IVectorView_Gamepad_AddRef(*value); - return S_OK; -} - -static const struct IGamepadStaticsVtbl gamepad_statics_vtbl = -{ - gamepad_statics_QueryInterface, - gamepad_statics_AddRef, - gamepad_statics_Release, - /* IInspectable methods */ - gamepad_statics_GetIids, - gamepad_statics_GetRuntimeClassName, - gamepad_statics_GetTrustLevel, - /* IGamepadStatics methods */ - gamepad_statics_add_GamepadAdded, - gamepad_statics_remove_GamepadAdded, - gamepad_statics_add_GamepadRemoved, - gamepad_statics_remove_GamepadRemoved, - gamepad_statics_get_Gamepads, -}; - -static struct windows_gaming_input windows_gaming_input = -{ - {&activation_factory_vtbl}, - {&gamepad_statics_vtbl}, - 1 -}; - HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) { FIXME("clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); @@ -387,7 +48,7 @@ HRESULT WINAPI DllGetActivationFactory( HSTRING class_str, IActivationFactory ** if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_RawGameController )) IActivationFactory_AddRef( (*factory = controller_factory) ); if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_Gamepad )) - IActivationFactory_AddRef( (*factory = &windows_gaming_input.IActivationFactory_iface) ); + IActivationFactory_AddRef( (*factory = gamepad_factory) ); if (*factory) return S_OK; return REGDB_E_CLASSNOTREG; diff --git a/dlls/windows.gaming.input/private.h b/dlls/windows.gaming.input/private.h index 69983effd5a..f711132dc98 100644 --- a/dlls/windows.gaming.input/private.h +++ b/dlls/windows.gaming.input/private.h @@ -35,3 +35,4 @@ #include "windows.gaming.input.h" extern IActivationFactory *controller_factory; +extern IActivationFactory *gamepad_factory; -- 2.34.1
And use it to factor all the IVectorView<T> stubs. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.gaming.input/Makefile.in | 3 +- dlls/windows.gaming.input/controller.c | 134 +------ dlls/windows.gaming.input/gamepad.c | 133 +------ dlls/windows.gaming.input/private.h | 2 + dlls/windows.gaming.input/vector.c | 464 +++++++++++++++++++++++++ include/windows.foundation.idl | 2 + include/windows.gaming.input.idl | 2 + 7 files changed, 498 insertions(+), 242 deletions(-) create mode 100644 dlls/windows.gaming.input/vector.c diff --git a/dlls/windows.gaming.input/Makefile.in b/dlls/windows.gaming.input/Makefile.in index 251d3e81be5..5031e72f08d 100644 --- a/dlls/windows.gaming.input/Makefile.in +++ b/dlls/windows.gaming.input/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = combase uuid C_SRCS = \ controller.c \ gamepad.c \ - main.c + main.c \ + vector.c IDL_SRCS = classes.idl diff --git a/dlls/windows.gaming.input/controller.c b/dlls/windows.gaming.input/controller.c index c1964916600..00ab9c5d91c 100644 --- a/dlls/windows.gaming.input/controller.c +++ b/dlls/windows.gaming.input/controller.c @@ -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, diff --git a/dlls/windows.gaming.input/gamepad.c b/dlls/windows.gaming.input/gamepad.c index fe985e089fa..e69568e2fb1 100644 --- a/dlls/windows.gaming.input/gamepad.c +++ b/dlls/windows.gaming.input/gamepad.c @@ -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 = diff --git a/dlls/windows.gaming.input/private.h b/dlls/windows.gaming.input/private.h index f711132dc98..612d11135f4 100644 --- a/dlls/windows.gaming.input/private.h +++ b/dlls/windows.gaming.input/private.h @@ -36,3 +36,5 @@ extern IActivationFactory *controller_factory; extern IActivationFactory *gamepad_factory; + +extern HRESULT vector_create( REFIID iid, REFIID view_iid, void **out ); diff --git a/dlls/windows.gaming.input/vector.c b/dlls/windows.gaming.input/vector.c new file mode 100644 index 00000000000..918262af8e1 --- /dev/null +++ b/dlls/windows.gaming.input/vector.c @@ -0,0 +1,464 @@ +/* WinRT Windows.Gaming.Input implementation + * + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(combase); + +struct vector_view +{ + IVectorView_IInspectable IVectorView_IInspectable_iface; + const GUID *iid; + LONG ref; + + UINT32 size; + IInspectable *elements[1]; +}; + +static inline struct vector_view *impl_from_IVectorView_IInspectable( IVectorView_IInspectable *iface ) +{ + return CONTAINING_RECORD( iface, struct vector_view, IVectorView_IInspectable_iface ); +} + +static HRESULT WINAPI vector_view_QueryInterface( IVectorView_IInspectable *iface, REFIID iid, void **out ) +{ + struct vector_view *impl = impl_from_IVectorView_IInspectable( iface ); + + 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, impl->iid )) + { + 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 vector_view_AddRef( IVectorView_IInspectable *iface ) +{ + struct vector_view *impl = impl_from_IVectorView_IInspectable( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p increasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI vector_view_Release( IVectorView_IInspectable *iface ) +{ + struct vector_view *impl = impl_from_IVectorView_IInspectable( iface ); + ULONG i, ref = InterlockedDecrement( &impl->ref ); + + TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); + + if (!ref) + { + for (i = 0; i < impl->size; ++i) IInspectable_Release( impl->elements[i] ); + free( impl ); + } + + return ref; +} + +static HRESULT WINAPI vector_view_GetIids( IVectorView_IInspectable *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 vector_view_GetRuntimeClassName( IVectorView_IInspectable *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_view_GetTrustLevel( IVectorView_IInspectable *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_view_GetAt( IVectorView_IInspectable *iface, UINT32 index, IInspectable **value ) +{ + struct vector_view *impl = impl_from_IVectorView_IInspectable( iface ); + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + *value = NULL; + if (index >= impl->size) return E_BOUNDS; + + IInspectable_AddRef( (*value = impl->elements[index]) ); + return S_OK; +} + +static HRESULT WINAPI vector_view_get_Size( IVectorView_IInspectable *iface, UINT32 *value ) +{ + struct vector_view *impl = impl_from_IVectorView_IInspectable( iface ); + + TRACE( "iface %p, value %p.\n", iface, value ); + + *value = impl->size; + return S_OK; +} + +static HRESULT WINAPI vector_view_IndexOf( IVectorView_IInspectable *iface, IInspectable *element, + UINT32 *index, BOOLEAN *found ) +{ + struct vector_view *impl = impl_from_IVectorView_IInspectable( iface ); + ULONG i; + + TRACE( "iface %p, element %p, index %p, found %p.\n", iface, element, index, found ); + + for (i = 0; i < impl->size; ++i) if (impl->elements[i] == element) break; + if ((*found = (i < impl->size))) *index = i; + else *index = 0; + + return S_OK; +} + +static HRESULT WINAPI vector_view_GetMany( IVectorView_IInspectable *iface, UINT32 start_index, + UINT32 items_size, IInspectable **items, UINT *count ) +{ + struct vector_view *impl = impl_from_IVectorView_IInspectable( iface ); + UINT32 i; + + TRACE( "iface %p, start_index %u, items_size %u, items %p, count %p.\n", + iface, start_index, items_size, items, count ); + + if (start_index >= impl->size) return E_BOUNDS; + + for (i = start_index; i < impl->size; ++i) + { + if (i - start_index >= items_size) break; + IInspectable_AddRef( (items[i - start_index] = impl->elements[i]) ); + } + *count = i - start_index; + + return S_OK; +} + +static const struct IVectorView_IInspectableVtbl vector_view_vtbl = +{ + vector_view_QueryInterface, + vector_view_AddRef, + vector_view_Release, + /* IInspectable methods */ + vector_view_GetIids, + vector_view_GetRuntimeClassName, + vector_view_GetTrustLevel, + /* IVectorView<IInspectable*> methods */ + vector_view_GetAt, + vector_view_get_Size, + vector_view_IndexOf, + vector_view_GetMany, +}; + +struct vector +{ + IVector_IInspectable IVector_IInspectable_iface; + const GUID *iid; + const GUID *view_iid; + LONG ref; + + UINT32 size; + UINT32 capacity; + IInspectable **elements; +}; + +static inline struct vector *impl_from_IVector_IInspectable( IVector_IInspectable *iface ) +{ + return CONTAINING_RECORD( iface, struct vector, IVector_IInspectable_iface ); +} + +static HRESULT WINAPI vector_QueryInterface( IVector_IInspectable *iface, REFIID iid, void **out ) +{ + struct vector *impl = impl_from_IVector_IInspectable( iface ); + + 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, impl->iid )) + { + 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 vector_AddRef( IVector_IInspectable *iface ) +{ + struct vector *impl = impl_from_IVector_IInspectable( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p increasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI vector_Release( IVector_IInspectable *iface ) +{ + struct vector *impl = impl_from_IVector_IInspectable( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + + TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); + + if (!ref) + { + IVector_IInspectable_Clear( iface ); + free( impl ); + } + + return ref; +} + +static HRESULT WINAPI vector_GetIids( IVector_IInspectable *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 vector_GetRuntimeClassName( IVector_IInspectable *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_GetTrustLevel( IVector_IInspectable *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_GetAt( IVector_IInspectable *iface, UINT32 index, IInspectable **value ) +{ + struct vector *impl = impl_from_IVector_IInspectable( iface ); + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + *value = NULL; + if (index >= impl->size) return E_BOUNDS; + + IInspectable_AddRef( (*value = impl->elements[index]) ); + return S_OK; +} + +static HRESULT WINAPI vector_get_Size( IVector_IInspectable *iface, UINT32 *value ) +{ + struct vector *impl = impl_from_IVector_IInspectable( iface ); + TRACE( "iface %p, value %p.\n", iface, value ); + *value = impl->size; + return S_OK; +} + +static HRESULT WINAPI vector_GetView( IVector_IInspectable *iface, IVectorView_IInspectable **value ) +{ + struct vector *impl = impl_from_IVector_IInspectable( iface ); + struct vector_view *view; + ULONG i; + + TRACE( "iface %p, value %p.\n", iface, value ); + + if (!(view = calloc( 1, offsetof( struct vector_view, elements[impl->size] ) ))) return E_OUTOFMEMORY; + view->IVectorView_IInspectable_iface.lpVtbl = &vector_view_vtbl; + view->iid = impl->view_iid; + view->ref = 1; + + for (i = 0; i < impl->size; ++i) IInspectable_AddRef( (view->elements[view->size++] = impl->elements[i]) ); + + *value = &view->IVectorView_IInspectable_iface; + return S_OK; +} + +static HRESULT WINAPI vector_IndexOf( IVector_IInspectable *iface, IInspectable *element, UINT32 *index, BOOLEAN *found ) +{ + struct vector *impl = impl_from_IVector_IInspectable( iface ); + ULONG i; + + TRACE( "iface %p, element %p, index %p, found %p.\n", iface, element, index, found ); + + for (i = 0; i < impl->size; ++i) if (impl->elements[i] == element) break; + if ((*found = (i < impl->size))) *index = i; + else *index = 0; + + return S_OK; +} + +static HRESULT WINAPI vector_SetAt( IVector_IInspectable *iface, UINT32 index, IInspectable *value ) +{ + struct vector *impl = impl_from_IVector_IInspectable( iface ); + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + if (index >= impl->size) return E_BOUNDS; + IInspectable_Release( impl->elements[index] ); + IInspectable_AddRef( (impl->elements[index] = value) ); + return S_OK; +} + +static HRESULT WINAPI vector_InsertAt( IVector_IInspectable *iface, UINT32 index, IInspectable *value ) +{ + struct vector *impl = impl_from_IVector_IInspectable( iface ); + IInspectable **tmp = impl->elements; + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + if (impl->size == impl->capacity) + { + impl->capacity = max( 32, impl->capacity * 3 / 2 ); + if (!(impl->elements = realloc( impl->elements, impl->capacity * sizeof(*impl->elements) ))) + { + impl->elements = tmp; + return E_OUTOFMEMORY; + } + } + + memmove( impl->elements + index + 1, impl->elements + index, impl->size++ * sizeof(*impl->elements) ); + IInspectable_AddRef( (impl->elements[index] = value) ); + return S_OK; +} + +static HRESULT WINAPI vector_RemoveAt( IVector_IInspectable *iface, UINT32 index ) +{ + struct vector *impl = impl_from_IVector_IInspectable( iface ); + + TRACE( "iface %p, index %u.\n", iface, index ); + + if (index >= impl->size) return E_BOUNDS; + IInspectable_Release( impl->elements[index] ); + memmove( impl->elements + index, impl->elements + index + 1, --impl->size * sizeof(*impl->elements) ); + return S_OK; +} + +static HRESULT WINAPI vector_Append( IVector_IInspectable *iface, IInspectable *value ) +{ + struct vector *impl = impl_from_IVector_IInspectable( iface ); + + TRACE( "iface %p, value %p.\n", iface, value ); + + return IVector_IInspectable_InsertAt( iface, impl->size, value ); +} + +static HRESULT WINAPI vector_RemoveAtEnd( IVector_IInspectable *iface ) +{ + struct vector *impl = impl_from_IVector_IInspectable( iface ); + + TRACE( "iface %p.\n", iface ); + + if (impl->size) IInspectable_Release( impl->elements[--impl->size] ); + return S_OK; +} + +static HRESULT WINAPI vector_Clear( IVector_IInspectable *iface ) +{ + struct vector *impl = impl_from_IVector_IInspectable( iface ); + + TRACE( "iface %p.\n", iface ); + + while (impl->size) IVector_IInspectable_RemoveAtEnd( iface ); + free( impl->elements ); + impl->capacity = 0; + impl->elements = NULL; + + return S_OK; +} + +static HRESULT WINAPI vector_GetMany( IVector_IInspectable *iface, UINT32 start_index, + UINT32 items_size, IInspectable **items, UINT *count ) +{ + struct vector *impl = impl_from_IVector_IInspectable( iface ); + UINT32 i; + + TRACE( "iface %p, start_index %u, items_size %u, items %p, count %p.\n", + iface, start_index, items_size, items, count ); + + if (start_index >= impl->size) return E_BOUNDS; + + for (i = start_index; i < impl->size; ++i) + { + if (i - start_index >= items_size) break; + IInspectable_AddRef( (items[i - start_index] = impl->elements[i]) ); + } + *count = i - start_index; + + return S_OK; +} + +static HRESULT WINAPI vector_ReplaceAll( IVector_IInspectable *iface, UINT32 count, IInspectable **items ) +{ + HRESULT hr; + ULONG i; + + TRACE( "iface %p, count %u, items %p.\n", iface, count, items ); + + hr = IVector_IInspectable_Clear( iface ); + for (i = 0; i < count && SUCCEEDED(hr); ++i) hr = IVector_IInspectable_Append( iface, items[i] ); + return hr; +} + +static const struct IVector_IInspectableVtbl vector_vtbl = +{ + vector_QueryInterface, + vector_AddRef, + vector_Release, + /* IInspectable methods */ + vector_GetIids, + vector_GetRuntimeClassName, + vector_GetTrustLevel, + /* IVector<IInspectable*> methods */ + vector_GetAt, + vector_get_Size, + vector_GetView, + vector_IndexOf, + vector_SetAt, + vector_InsertAt, + vector_RemoveAt, + vector_Append, + vector_RemoveAtEnd, + vector_Clear, + vector_GetMany, + vector_ReplaceAll, +}; + +HRESULT vector_create( REFIID iid, REFIID view_iid, void **out ) +{ + struct vector *impl; + + TRACE( "iid %s, out %p.\n", debugstr_guid( iid ), out ); + + if (!(impl = calloc( 1, sizeof(*impl) ))) return E_OUTOFMEMORY; + impl->IVector_IInspectable_iface.lpVtbl = &vector_vtbl; + impl->iid = iid; + impl->view_iid = view_iid; + impl->ref = 1; + + *out = &impl->IVector_IInspectable_iface; + TRACE( "created %p", *out ); + return S_OK; +} diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index 8abb3275fa7..50e134d3900 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -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>; diff --git a/include/windows.gaming.input.idl b/include/windows.gaming.input.idl index 82b810ddbdd..a7d5e71381d 100644 --- a/include/windows.gaming.input.idl +++ b/include/windows.gaming.input.idl @@ -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 *>; } [ -- 2.34.1
participants (1)
-
Rémi Bernon