GameInput implementation updates for for GAMEINPUT_API_VERSION = 2 (#336)

walbourn · web-flow · commit 09508a676d42 · 2025-07-09T13:49:39.000-07:00
diff --git a/Inc/GamePad.h b/Inc/GamePad.h
@@ -331,15 +331,16 @@ namespace DirectX
         DIRECTX_TOOLKIT_API void __cdecl RegisterEvents(void* ctrlChanged) noexcept;
 
         // Underlying device access
+    #if defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION == 1)
+        using GameInputDevice_t = GameInput::v1::IGameInputDevice;
+    #elif defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION == 2)
+        using GameInputDevice_t = GameInput::v2::IGameInputDevice;
+    #else
+        using GameInputDevice_t = ::IGameInputDevice;
+    #endif
+
         _Success_(return)
-            DIRECTX_TOOLKIT_API
-            bool __cdecl GetDevice(int player,
-            #if defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION == 1)
-                _Outptr_ GameInput::v1::IGameInputDevice * *device
-            #else
-                _Outptr_ IGameInputDevice * *device
-            #endif
-            ) noexcept;
+            DIRECTX_TOOLKIT_API bool __cdecl GetDevice(int player, _Outptr_ GameInputDevice_t * *device) noexcept;
     #elif defined(USING_WINDOWS_GAMING_INPUT) || defined(_XBOX_ONE)
         DIRECTX_TOOLKIT_API void __cdecl RegisterEvents(void* ctrlChanged, void* userChanged) noexcept;
     #endif
diff --git a/Src/GamePad.cpp b/Src/GamePad.cpp
@@ -86,6 +86,8 @@ namespace
 
 #if defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION == 1)
 using namespace GameInput::v1;
+#elif defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION == 2)
+using namespace GameInput::v2;
 #endif
 
 //======================================================================================
@@ -145,11 +147,11 @@ class GamePad::Impl
         {
             if (mGameInput)
             {
-            #if defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION == 1)
+            #if defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION >= 1)
                 if (!mGameInput->UnregisterCallback(mDeviceToken))
-                #else
+            #else
                 if (!mGameInput->UnregisterCallback(mDeviceToken, UINT64_MAX))
-                #endif
+            #endif
                 {
                     DebugTrace("ERROR: GameInput::UnregisterCallback [gamepad] failed");
                 }
@@ -197,7 +199,7 @@ class GamePad::Impl
             if (reading->GetGamepadState(&pad))
             {
                 state.connected = true;
-            #if defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION == 1)
+            #if defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION >= 1)
                 state.packet = reading->GetTimestamp();
             #else
                 state.packet = reading->GetSequenceNumber(GameInputKindGamepad);
@@ -245,7 +247,7 @@ class GamePad::Impl
             {
                 if (device->GetDeviceStatus() & GameInputDeviceConnected)
                 {
-                #if defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION == 1)
+                #if defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION >= 1)
                     const GameInputDeviceInfo* deviceInfo = nullptr;
                     device->GetDeviceInfo(&deviceInfo);
                 #else
@@ -425,7 +427,7 @@ void GamePad::RegisterEvents(HANDLE ctrlChanged) noexcept
 }
 
 _Success_(return)
-bool GamePad::GetDevice(int player, _Outptr_ IGameInputDevice * *device) noexcept
+bool GamePad::GetDevice(int player, _Outptr_ GameInputDevice_t * *device) noexcept
 {
     return pImpl->GetDevice(player, device);
 }
diff --git a/Src/Keyboard.cpp b/Src/Keyboard.cpp
@@ -55,6 +55,8 @@ namespace
 
 #if defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION == 1)
 using namespace GameInput::v1;
+#elif defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION == 2)
+using namespace GameInput::v2;
 #endif
 
 
@@ -116,11 +118,11 @@ class Keyboard::Impl
         {
             if (mGameInput)
             {
-            #if defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION == 1)
+            #if defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION >= 1)
                 if (!mGameInput->UnregisterCallback(mDeviceToken))
-                #else
+            #else
                 if (!mGameInput->UnregisterCallback(mDeviceToken, UINT64_MAX))
-                #endif
+            #endif
                 {
                     DebugTrace("ERROR: GameInput::UnregisterCallback [keyboard] failed");
                 }
diff --git a/Src/Mouse.cpp b/Src/Mouse.cpp
@@ -23,6 +23,8 @@ using Microsoft::WRL::ComPtr;
 
 #if defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION == 1)
 using namespace GameInput::v1;
+#elif defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION == 2)
+using namespace GameInput::v2;
 #endif
 
 //======================================================================================
@@ -125,11 +127,11 @@ class Mouse::Impl
         {
             if (mGameInput)
             {
-            #if defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION == 1)
+            #if defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION >= 1)
                 if (!mGameInput->UnregisterCallback(mDeviceToken))
-                #else
+            #else
                 if (!mGameInput->UnregisterCallback(mDeviceToken, UINT64_MAX))
-                #endif
+            #endif
                 {
                     DebugTrace("ERROR: GameInput::UnregisterCallback [mouse] failed");
                 }

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,8 @@ namespace`
`86`	`86`
`87`	`87`	`#if defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION == 1)`
`88`	`88`	`using namespace GameInput::v1;`
	`89`	`+#elif defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION == 2)`
	`90`	`+using namespace GameInput::v2;`
`89`	`91`	`#endif`
`90`	`92`
`91`	`93`	`//======================================================================================`
`@@ -145,11 +147,11 @@ class GamePad::Impl`
`145`	`147`	`{`
`146`	`148`	`if (mGameInput)`
`147`	`149`	`{`
`148`		`- #if defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION == 1)`
	`150`	`+ #if defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION >= 1)`
`149`	`151`	`if (!mGameInput->UnregisterCallback(mDeviceToken))`
`150`		`- #else`
	`152`	`+ #else`
`151`	`153`	`if (!mGameInput->UnregisterCallback(mDeviceToken, UINT64_MAX))`
`152`		`- #endif`
	`154`	`+ #endif`
`153`	`155`	`{`
`154`	`156`	`DebugTrace("ERROR: GameInput::UnregisterCallback [gamepad] failed");`
`155`	`157`	`}`
`@@ -197,7 +199,7 @@ class GamePad::Impl`
`197`	`199`	`if (reading->GetGamepadState(&pad))`
`198`	`200`	`{`
`199`	`201`	`state.connected = true;`
`200`		`- #if defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION == 1)`
	`202`	`+ #if defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION >= 1)`
`201`	`203`	`state.packet = reading->GetTimestamp();`
`202`	`204`	`#else`
`203`	`205`	`state.packet = reading->GetSequenceNumber(GameInputKindGamepad);`
`@@ -245,7 +247,7 @@ class GamePad::Impl`
`245`	`247`	`{`
`246`	`248`	`if (device->GetDeviceStatus() & GameInputDeviceConnected)`
`247`	`249`	`{`
`248`		`- #if defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION == 1)`
	`250`	`+ #if defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION >= 1)`
`249`	`251`	`const GameInputDeviceInfo* deviceInfo = nullptr;`
`250`	`252`	`device->GetDeviceInfo(&deviceInfo);`
`251`	`253`	`#else`
`@@ -425,7 +427,7 @@ void GamePad::RegisterEvents(HANDLE ctrlChanged) noexcept`
`425`	`427`	`}`
`426`	`428`
`427`	`429`	`_Success_(return)`
`428`		`-bool GamePad::GetDevice(int player, _Outptr_ IGameInputDevice * *device) noexcept`
	`430`	`+bool GamePad::GetDevice(int player, _Outptr_ GameInputDevice_t * *device) noexcept`
`429`	`431`	`{`
`430`	`432`	`return pImpl->GetDevice(player, device);`
`431`	`433`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,8 @@ namespace`
`55`	`55`
`56`	`56`	`#if defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION == 1)`
`57`	`57`	`using namespace GameInput::v1;`
	`58`	`+#elif defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION == 2)`
	`59`	`+using namespace GameInput::v2;`
`58`	`60`	`#endif`
`59`	`61`
`60`	`62`
`@@ -116,11 +118,11 @@ class Keyboard::Impl`
`116`	`118`	`{`
`117`	`119`	`if (mGameInput)`
`118`	`120`	`{`
`119`		`- #if defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION == 1)`
	`121`	`+ #if defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION >= 1)`
`120`	`122`	`if (!mGameInput->UnregisterCallback(mDeviceToken))`
`121`		`- #else`
	`123`	`+ #else`
`122`	`124`	`if (!mGameInput->UnregisterCallback(mDeviceToken, UINT64_MAX))`
`123`		`- #endif`
	`125`	`+ #endif`
`124`	`126`	`{`
`125`	`127`	`DebugTrace("ERROR: GameInput::UnregisterCallback [keyboard] failed");`
`126`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,8 @@ using Microsoft::WRL::ComPtr;`
`23`	`23`
`24`	`24`	`#if defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION == 1)`
`25`	`25`	`using namespace GameInput::v1;`
	`26`	`+#elif defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION == 2)`
	`27`	`+using namespace GameInput::v2;`
`26`	`28`	`#endif`
`27`	`29`
`28`	`30`	`//======================================================================================`
`@@ -125,11 +127,11 @@ class Mouse::Impl`
`125`	`127`	`{`
`126`	`128`	`if (mGameInput)`
`127`	`129`	`{`
`128`		`- #if defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION == 1)`
	`130`	`+ #if defined(GAMEINPUT_API_VERSION) && (GAMEINPUT_API_VERSION >= 1)`
`129`	`131`	`if (!mGameInput->UnregisterCallback(mDeviceToken))`
`130`		`- #else`
	`132`	`+ #else`
`131`	`133`	`if (!mGameInput->UnregisterCallback(mDeviceToken, UINT64_MAX))`
`132`		`- #endif`
	`134`	`+ #endif`
`133`	`135`	`{`
`134`	`136`	`DebugTrace("ERROR: GameInput::UnregisterCallback [mouse] failed");`
`135`	`137`	`}`