fix gamepad key injection

Valkirie · Nov 3, 2022 · 9382283 · 9382283
1 parent 50d3a20
commit 9382283
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 17 deletions.
diff --git a/ControllerCommon/Utils/EnumUtils.cs b/ControllerCommon/Utils/EnumUtils.cs
@@ -47,15 +47,5 @@ public static T GetEnumValueFromDescription<T>(string description)
                                 .Description == description).SingleOrDefault();
             return field == null ? default(T) : (T)field.Field.GetRawConstantValue();
         }
-
-        public static void AddFlag(byte main, byte flag)
-        {
-            main |= flag;
-        }
-
-        public static void RemoveFlag(byte main, byte flag)
-        {
-            main &= flag;
-        }
     }
 }
diff --git a/ControllerService/Targets/DualShock4Target.cs b/ControllerService/Targets/DualShock4Target.cs
@@ -183,7 +183,7 @@ public override unsafe void UpdateReport(Gamepad Gamepad)
                 else if (Buttons.HasFlag(GamepadButtonFlagsExt.DPadLeft))
                     tempDPad = DualShock4DPadDirection.West;
 
-                if ((sState.wButtons & 0x0400) == 0x0400)
+                if (sState.wButtons.HasFlag(XInputStateButtons.Xbox))
                     tempSpecial |= DualShock4SpecialButton.Ps.Value;
                 if (Touch.OutputClickButton)
                     tempSpecial |= DualShock4SpecialButton.Touchpad.Value;

diff --git a/ControllerService/Targets/ViGEmTarget.cs b/ControllerService/Targets/ViGEmTarget.cs
@@ -14,11 +14,17 @@ namespace ControllerService.Targets
     public abstract class ViGEmTarget : IDisposable
     {
         #region imports
+        protected enum XInputStateButtons : ushort
+        {
+            None = 0,
+            Xbox = 1024
+        }
+
         [StructLayout(LayoutKind.Sequential)]
         protected struct XInputStateSecret
         {
             public uint eventCount;
-            public ushort wButtons;
+            public XInputStateButtons wButtons;
             public byte bLeftTrigger;
             public byte bRightTrigger;
             public short sThumbLX;
@@ -108,13 +114,13 @@ public void InjectReport(GamepadButtonFlagsExt buttons, ushort sButtons, bool Is
         {
             if(IsKeyDown)
             {
-                ButtonsInjector |= Buttons;
-                sStateInjector.wButtons += sButtons;
+                ButtonsInjector |= buttons;
+                sStateInjector.wButtons |= (XInputStateButtons)sButtons;
             }
             else if (IsKeyUp)
             {
-                ButtonsInjector &= Buttons;
-                sStateInjector.wButtons -= sButtons;
+                ButtonsInjector &= ~buttons;
+                sStateInjector.wButtons &= ~(XInputStateButtons)sButtons;
             }
         }
 

diff --git a/ControllerService/Targets/Xbox360Target.cs b/ControllerService/Targets/Xbox360Target.cs
@@ -110,7 +110,7 @@ public override unsafe void UpdateReport(Gamepad Gamepad)
                 virtualController.SetButtonState(button, Buttons.HasFlag(value));
             }
 
-            virtualController.SetButtonState(Xbox360Button.Guide, (sState.wButtons & 0x0400) == 0x0400);
+            virtualController.SetButtonState(Xbox360Button.Guide, sState.wButtons.HasFlag(XInputStateButtons.Xbox));
 
             virtualController.SetSliderValue(Xbox360Slider.LeftTrigger, Gamepad.LeftTrigger);
             virtualController.SetSliderValue(Xbox360Slider.RightTrigger, Gamepad.RightTrigger);