[PATCH 3/7] windows.gaming.input: Stub ICustomGameControllerFactory for Gamepad.

[Rémi Bernon]

Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
---
 dlls/windows.gaming.input/gamepad.c | 46 ++++++++++++++++++++++++++++-
 dlls/windows.gaming.input/main.c    |  2 +-
 dlls/windows.gaming.input/private.h |  2 +-
 3 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/dlls/windows.gaming.input/gamepad.c b/dlls/windows.gaming.input/gamepad.c
index ab95b4c8d89..3793021d22c 100644
--- a/dlls/windows.gaming.input/gamepad.c
+++ b/dlls/windows.gaming.input/gamepad.c
@@ -27,6 +27,7 @@ struct gamepad_statics
 {
     IActivationFactory IActivationFactory_iface;
     IGamepadStatics IGamepadStatics_iface;
+    ICustomGameControllerFactory ICustomGameControllerFactory_iface;
     LONG ref;
 };
 
@@ -56,6 +57,12 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID
         return S_OK;
     }
 
+    if (IsEqualGUID( iid, &IID_ICustomGameControllerFactory ))
+    {
+        IInspectable_AddRef( (*out = &impl->ICustomGameControllerFactory_iface) );
+        return S_OK;
+    }
+
     FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) );
     *out = NULL;
     return E_NOINTERFACE;
@@ -181,11 +188,48 @@ static const struct IGamepadStaticsVtbl statics_vtbl =
     statics_get_Gamepads,
 };
 
+DEFINE_IINSPECTABLE( controller_factory, ICustomGameControllerFactory, struct gamepad_statics, IActivationFactory_iface )
+
+static HRESULT WINAPI controller_factory_CreateGameController( ICustomGameControllerFactory *iface, IGameControllerProvider *provider,
+                                                               IInspectable **value )
+{
+    FIXME( "iface %p, provider %p, value %p stub!\n", iface, provider, value );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI controller_factory_OnGameControllerAdded( ICustomGameControllerFactory *iface, IGameController *value )
+{
+    FIXME( "iface %p, value %p stub!\n", iface, value );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI controller_factory_OnGameControllerRemoved( ICustomGameControllerFactory *iface, IGameController *value )
+{
+    FIXME( "iface %p, value %p stub!\n", iface, value );
+    return E_NOTIMPL;
+}
+
+static const struct ICustomGameControllerFactoryVtbl controller_factory_vtbl =
+{
+    controller_factory_QueryInterface,
+    controller_factory_AddRef,
+    controller_factory_Release,
+    /* IInspectable methods */
+    controller_factory_GetIids,
+    controller_factory_GetRuntimeClassName,
+    controller_factory_GetTrustLevel,
+    /* ICustomGameControllerFactory methods */
+    controller_factory_CreateGameController,
+    controller_factory_OnGameControllerAdded,
+    controller_factory_OnGameControllerRemoved,
+};
+
 static struct gamepad_statics gamepad_statics =
 {
     {&factory_vtbl},
     {&statics_vtbl},
+    {&controller_factory_vtbl},
     1,
 };
 
-IActivationFactory *gamepad_factory = &gamepad_statics.IActivationFactory_iface;
+ICustomGameControllerFactory *gamepad_factory = &gamepad_statics.ICustomGameControllerFactory_iface;
diff --git a/dlls/windows.gaming.input/main.c b/dlls/windows.gaming.input/main.c
index d4bfec108ef..e71043fcb0f 100644
--- a/dlls/windows.gaming.input/main.c
+++ b/dlls/windows.gaming.input/main.c
@@ -180,7 +180,7 @@ HRESULT WINAPI DllGetActivationFactory( HSTRING class_str, IActivationFactory **
     if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_RawGameController ))
         hr = ICustomGameControllerFactory_QueryInterface( controller_factory, &IID_IActivationFactory, (void **)factory );
     if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_Gamepad ))
-        IActivationFactory_AddRef( (*factory = gamepad_factory) );
+        hr = ICustomGameControllerFactory_QueryInterface( gamepad_factory, &IID_IActivationFactory, (void **)factory );
     if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_Custom_GameControllerFactoryManager ))
         IActivationFactory_AddRef( (*factory = manager_factory) );
 
diff --git a/dlls/windows.gaming.input/private.h b/dlls/windows.gaming.input/private.h
index fbec3d8189d..24d0609aa7e 100644
--- a/dlls/windows.gaming.input/private.h
+++ b/dlls/windows.gaming.input/private.h
@@ -37,7 +37,7 @@
 
 extern HINSTANCE windows_gaming_input;
 extern ICustomGameControllerFactory *controller_factory;
-extern IActivationFactory *gamepad_factory;
+extern ICustomGameControllerFactory *gamepad_factory;
 extern IActivationFactory *manager_factory;
 
 extern HRESULT vector_create( REFIID iid, REFIID view_iid, void **out );
-- 
2.34.1