WM_DEVICECHANGE fix

.github/workflows/msvc_x86.yml

@@ -35,8 +35,8 @@ env:
   VERINC: ${{ github.event.inputs.version_increment || 'patch' }}
 
 concurrency:
-  group: ${{ github.ref }}
-  cancel-in-progress: true
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name != 'workflow_dispatch' }}
 
 permissions:
   contents: write
@@ -55,7 +55,7 @@ jobs:
       uses: microsoft/setup-msbuild@main
 
     - name: Auto Increment Version
-      uses: MCKanpolat/auto-semver-action@v1
+      uses: MCKanpolat/auto-semver-action@v2
       id: versioning
       with:
         releaseType: ${{ env.VERINC }}

data/plugins/MaxPayne3.FusionFix.ini

@@ -5,6 +5,7 @@ DisableGlobalLeaderboards = 1     // Fixes Hoboken Alleys map crash in coop
 OutlinesSizeMultiplier = 1.0f
 BorderlessWindowed = 1
 LightSyncRGB = 1                  // Only Logitech hardware is supported, requires Logitech G HUB app
+DisableDeviceChangeEvent = 1      // Fixes an issue when the game randomly enters pause menu
 GamepadIcons = 0
 ; 0 - Xbox 360
 ; 1 - Xbox One

readme.md

@@ -32,7 +32,7 @@ This projects aims to add new features and fix some issues in Max Payne 3. Also
 ### New menu options
 
 - **BorderlessWindowed**, scroll through **SETTINGS -> GRAPHICS -> FULLSCREEN** to switch between windowed and borderless modes
-- **GamepadIcons**, scroll through **SETTINGS -> CONTROLS -> GAMEPAD -> CONFIGURATION** to select various controller icon styles (Xbox 360, Xbox One, PS3, PS4, PS5, Nintendo Switch, Steam Deck)
+- **GamepadIcons**, scroll through **SETTINGS -> CONTROLS -> GAMEPAD -> CONFIGURATION** to select various controller icon styles (Xbox 360, Xbox One, PS3, PS4, PS5, Nintendo Switch, Steam Deck, Steam Controller)
 
 ### New options
 

source/devicechange.ixx

@@ -0,0 +1,37 @@
+module;
+
+#include <common.hxx>
+
+export module devicechange;
+
+import common;
+import settings;
+
+class DeviceChange
+{
+public:
+    DeviceChange()
+    {
+        FusionFix::onInitEvent() += []()
+        {
+            // Disable WM_DEVICECHANGE message handler, since it happens randomly for some reason
+            auto pattern = hook::pattern("74 63 83 E8 18 0F 85 ? ? ? ? E8 ? ? ? ? 84 C0");
+            static raw_mem pDeviceChangeCheck(pattern.get_first(0), { 0x90, 0x90 }); // nop
+
+            static auto DeviceChangeCB = []()
+            {
+                if (FusionFixSettings.GetInt("PREF_DEVICECHANGE"))
+                    pDeviceChangeCheck.Write();
+                else
+                    pDeviceChangeCheck.Restore();
+            };
+
+            DeviceChangeCB();
+
+            FusionFix::onIniFileChange() += []()
+            {
+                DeviceChangeCB();
+            };
+        };
+    }
+} DeviceChange;

source/settings.ixx

@@ -25,6 +25,7 @@ public:
         mFusionPrefs["PREF_BORDERLESS"] = std::clamp(iniReader.ReadInteger("MAIN", "BorderlessWindowed", 1), 0, 1);
         mFusionPrefs["PREF_LEDILLUMINATION"] = std::clamp(iniReader.ReadInteger("MAIN", "LightSyncRGB", 1), 0, 1);
         mFusionPrefs["PREF_BUTTONS"] = std::clamp(iniReader.ReadInteger("MAIN", "GamepadIcons", 0), 0, gLastControllerTextureIndex);
+        mFusionPrefs["PREF_DEVICECHANGE"] = std::clamp(iniReader.ReadInteger("MAIN", "DisableDeviceChangeEvent", 1), 0, 1);
 
         static std::once_flag flag;
         std::call_once(flag, [&]()