ControllerHotPlug: allow game to detect newly added controllers

Author: emoose

Outrun2006Tweaks.ini

@@ -156,6 +156,9 @@ FixFullPedalChecks = true
 # Hides text related to the now-defunct online service
 HideOnlineSigninText = true
 
+# Allows game to detect newly plugged in devices, rather than needing a restart
+ControllerHotPlug = true
+
 [CDTracks]
 # Defines tracks and the order they can be selected via the CDSwitcher above
 #  Tracks can be added/removed as desired, along with any custom WAV/OGG files

src/dllmain.cpp

@@ -97,6 +97,7 @@ namespace Settings
 		spdlog::info(" - FixLensFlarePath: {}", FixLensFlarePath);
 		spdlog::info(" - FixFullPedalChecks: {}", FixFullPedalChecks);
 		spdlog::info(" - HideOnlineSigninText: {}", HideOnlineSigninText);
+		spdlog::info(" - ControllerHotPlug: {}", ControllerHotPlug);
 	}
 
 	bool read(std::filesystem::path& iniPath)
@@ -172,6 +173,7 @@ namespace Settings
 		FixLensFlarePath = ini.Get("Bugfixes", "FixLensFlarePath", std::move(FixLensFlarePath));
 		FixFullPedalChecks = ini.Get("Bugfixes", "FixFullPedalChecks", std::move(FixFullPedalChecks));
 		HideOnlineSigninText = ini.Get("Bugfixes", "HideOnlineSigninText", std::move(HideOnlineSigninText));
+		ControllerHotPlug = ini.Get("Bugfixes", "ControllerHotPlug", std::move(ControllerHotPlug));
 
 		// INIReader doesn't preserve the order of the keys/values in a section
 		// Will need to try opening INI ourselves to grab cd tracks...

src/hooks_bugfixes.cpp

@@ -241,16 +241,15 @@ class HideOnlineSigninText : public Hook
 
 	bool apply() override
 	{
-		// Don't allow "sign in" action button text to show
-		Sumo_DrawActionButtonName = safetyhook::create_inline(Module::exe_ptr(Sumo_DrawActionButtonName_Addr), Sumo_DrawActionButtonName_dest);
-
 		// Hide "Not Signed In" text
 		Memory::VP::Patch(Module::exe_ptr(Sumo_PrintSignedInStatus_Addr), { 0xC3 });
 
 		// Hide box that contains the message above
 		Memory::VP::Patch(Module::exe_ptr(Sumo_DrawSignedInStatusBox_PatchAddr), { 0xEB });
 
-		// TODO: hide the F1 button prompt, doesn't seem handled by the same code as above...
+		// Don't allow "sign in" action button text to show
+		// TODO: disabled for now until we can also hide the F1 button prompt for it, doesn't seem handled by the same code as this...
+		// Sumo_DrawActionButtonName = safetyhook::create_inline(Module::exe_ptr(Sumo_DrawActionButtonName_Addr), Sumo_DrawActionButtonName_dest);
 
 		return !!Sumo_DrawActionButtonName;
 	}

src/hooks_framerate.cpp

@@ -131,6 +131,8 @@ class ReplaceGameUpdateLoop : public Hook
 			// Reset vibration if we're not in main game state
 			if (Settings::VibrationMode != 0 && CurGameState != GameState::STATE_GAME)
 				SetVibration(Settings::VibrationControllerId, 0.0f, 0.0f);
+
+			DInput_RegisterNewDevices();
 		}
 
 		for (int curUpdateIdx = 0; curUpdateIdx < numUpdates; curUpdateIdx++)

src/hooks_input.cpp

@@ -4,6 +4,8 @@
 #include <winioctl.h>
 #include <hidsdi.h>
 
+#include <queue>
+
 #include "hook_mgr.hpp"
 #include "plugin.hpp"
 #include "game_addrs.hpp"
@@ -116,3 +118,85 @@ class ImpulseVibration : public Hook
     static ImpulseVibration instance;
 };
 ImpulseVibration ImpulseVibration::instance;
+
+class ControllerHotPlug : public Hook
+{
+    const static int DInputInit_CallbackPtr_Addr = 0x3E10;
+
+public:
+    inline static std::mutex mtx;
+    inline static std::unique_ptr<std::thread> DeviceEnumerationThreadHandle;
+    inline static std::vector<GUID> KnownDevices;
+    inline static std::queue<DIDEVICEINSTANCE> NewDevices;
+
+    static BOOL __stdcall DInput_EnumJoysticksCallback(const DIDEVICEINSTANCE* pdidInstance, VOID* pContext)
+    {
+        std::lock_guard<std::mutex> lock(mtx);
+        if (std::find(KnownDevices.begin(), KnownDevices.end(), pdidInstance->guidInstance) == KnownDevices.end())
+        {
+            // GUID not found, add to the vector
+            KnownDevices.push_back(pdidInstance->guidInstance);
+
+            // Add the new device instance to the queue
+            NewDevices.push(*pdidInstance);
+        }
+
+        return DIENUM_CONTINUE;
+    }
+
+    static void DeviceEnumerationThread()
+    {
+        SetThreadDescription(GetCurrentThread(), L"DeviceEnumerationThread");
+
+        while (true)
+        {
+            if (Game::DirectInput8())
+                Game::DirectInput8()->EnumDevices(DI8DEVCLASS_GAMECTRL, DInput_EnumJoysticksCallback, nullptr, DIEDFL_ATTACHEDONLY);
+
+            std::this_thread::sleep_for(std::chrono::seconds(2)); // Poll every 2 seconds
+        }
+    }
+
+    std::string_view description() override
+    {
+        return "ControllerHotPlug";
+    }
+
+    bool validate() override
+    {
+        return Settings::ControllerHotPlug;
+    }
+
+    bool apply() override
+    {
+        // Patch game to go through our DInput_EnumJoysticksCallback func, so we can learn GUID of any already connected pads
+        Memory::VP::Patch(Module::exe_ptr(DInputInit_CallbackPtr_Addr + 1), DInput_EnumJoysticksCallback);
+
+        return true;
+    }
+
+    static ControllerHotPlug instance;
+};
+ControllerHotPlug ControllerHotPlug::instance;
+
+void DInput_RegisterNewDevices()
+{
+    if (!ControllerHotPlug::DeviceEnumerationThreadHandle)
+    {
+        ControllerHotPlug::DeviceEnumerationThreadHandle = std::make_unique<std::thread>(ControllerHotPlug::DeviceEnumerationThread);
+        ControllerHotPlug::DeviceEnumerationThreadHandle->detach();
+    }
+
+    std::lock_guard<std::mutex> lock(ControllerHotPlug::mtx);
+    while (!ControllerHotPlug::NewDevices.empty())
+    {
+        DIDEVICEINSTANCE deviceInstance = ControllerHotPlug::NewDevices.front();
+        ControllerHotPlug::NewDevices.pop();
+
+        // Tell game about it
+        Game::DInput_EnumJoysticksCallback(&deviceInstance, 0);
+
+        // Sets some kind of active-device-number to let it work
+        *Module::exe_ptr<int>(0x3398D4) = 0;
+    }
+}

src/plugin.hpp

@@ -4,6 +4,7 @@
 
 #include "game.hpp"
 
+extern void DInput_RegisterNewDevices(); // hooks_input.cpp
 extern void SetVibration(int userId, float leftMotor, float rightMotor); // hooks_forcefeedback.cpp
 extern void CDSwitcher_Draw(int numUpdates); // hooks_audio.cpp
 extern void CDSwitcher_ReadIni(const std::filesystem::path& iniPath);
@@ -89,6 +90,7 @@ namespace Settings
 	inline bool FixLensFlarePath = true;
 	inline bool FixFullPedalChecks = true;
 	inline bool HideOnlineSigninText = true;
+	inline bool ControllerHotPlug = true;
 }
 
 namespace Util