[PATCH v2 1/8] windows.gaming.input: Forward get_NonRoamableId to Wine provider.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/windows.gaming.input/controller.c | 6 +++---
 dlls/windows.gaming.input/provider.c   | 7 +++++++
 dlls/windows.gaming.input/provider.idl | 2 ++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/dlls/windows.gaming.input/controller.c b/dlls/windows.gaming.input/controller.c
index e1749a3032d..2276b9e947e 100644
--- a/dlls/windows.gaming.input/controller.c
+++ b/dlls/windows.gaming.input/controller.c
@@ -362,10 +362,10 @@ static HRESULT WINAPI raw_controller_2_get_SimpleHapticsControllers( IRawGameCon
     return hr;
 }

-static HRESULT WINAPI raw_controller_2_get_NonRoamableId( IRawGameController2 *iface, HSTRING* value )
+static HRESULT WINAPI raw_controller_2_get_NonRoamableId( IRawGameController2 *iface, HSTRING *value )
 {
-    FIXME( "iface %p, value %p stub!\n", iface, value );
-    return E_NOTIMPL;
+    struct controller *impl = impl_from_IRawGameController2( iface );
+    return IWineGameControllerProvider_get_NonRoamableId( impl->wine_provider, value );
 }

static HRESULT WINAPI raw_controller_2_get_DisplayName( IRawGameController2 *iface, HSTRING* value )
diff --git a/dlls/windows.gaming.input/provider.c b/dlls/windows.gaming.input/provider.c
index 6908d733a53..4bedde992a7 100644
--- a/dlls/windows.gaming.input/provider.c
+++ b/dlls/windows.gaming.input/provider.c
@@ -141,6 +141,12 @@ static HRESULT WINAPI wine_provider_GetTrustLevel( IWineGameControllerProvider *
     return E_NOTIMPL;
 }

+static HRESULT WINAPI wine_provider_get_NonRoamableId( IWineGameControllerProvider *iface, HSTRING *value )
+{
+    FIXME( "iface %p, value %p stub!\n", iface, value );
+    return E_NOTIMPL;
+}
+
 static BOOL CALLBACK count_ffb_axes( const DIDEVICEOBJECTINSTANCEW *obj, void *args )
 {
     DWORD *count = args;
@@ -354,6 +360,7 @@ static const struct IWineGameControllerProviderVtbl wine_provider_vtbl =
     wine_provider_GetRuntimeClassName,
     wine_provider_GetTrustLevel,
     /* IWineGameControllerProvider methods */
+    wine_provider_get_NonRoamableId,
     wine_provider_get_Type,
     wine_provider_get_AxisCount,
     wine_provider_get_ButtonCount,
diff --git a/dlls/windows.gaming.input/provider.idl b/dlls/windows.gaming.input/provider.idl
index 235c509b25f..54f848e51d4 100644
--- a/dlls/windows.gaming.input/provider.idl
+++ b/dlls/windows.gaming.input/provider.idl
@@ -169,6 +169,8 @@ namespace Windows.Gaming.Input.Custom {
     interface IWineGameControllerProvider : IInspectable
         requires Windows.Gaming.Input.Custom.IGameControllerProvider
     {
+        [propget] HRESULT NonRoamableId([out, retval] HSTRING *value);
+
         [propget] HRESULT Type([out, retval] WineGameControllerType *value);
         [propget] HRESULT AxisCount([out, retval] INT32 *value);
         [propget] HRESULT ButtonCount([out, retval] INT32 *value);