Merge pull request #126 from maimedleech/AddKeyUpFix

Gh0stWalk3r · web-flow · commit c6bcae4fd080 · 2022-01-04T15:23:11.000+01:00
Make AddKeyUp handle VirtualKeyCode.NUMPAD_RETURN correctly.
diff --git a/src/GregsStack.InputSimulatorStandard/InputBuilder.cs b/src/GregsStack.InputSimulatorStandard/InputBuilder.cs
@@ -129,6 +129,7 @@ public InputBuilder AddKeyDown(VirtualKeyCode keyCode)
         /// <returns>This <see cref="InputBuilder"/> instance.</returns>
         public InputBuilder AddKeyUp(VirtualKeyCode keyCode)
         {
+            var code = (ushort)((int)keyCode & 0xFFFF);
             var up =
                 new Input
                 {
@@ -138,8 +139,8 @@ public InputBuilder AddKeyUp(VirtualKeyCode keyCode)
                                 Keyboard =
                                     new KeyboardInput
                                         {
-                                            KeyCode = (ushort) keyCode,
-                                            Scan = (ushort)(NativeMethods.MapVirtualKey((uint)keyCode, 0) & 0xFFU),
+                                            KeyCode = (ushort) code,
+                                            Scan = (ushort)(NativeMethods.MapVirtualKey((uint)code, 0) & 0xFFU),
                                             Flags = (uint) (IsExtendedKey(keyCode)
                                                                   ? KeyboardFlag.KeyUp | KeyboardFlag.ExtendedKey
                                                                   : KeyboardFlag.KeyUp),

Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,7 @@ public InputBuilder AddKeyDown(VirtualKeyCode keyCode)`
`129`	`129`	`/// <returns>This <see cref="InputBuilder"/> instance.</returns>`
`130`	`130`	`public InputBuilder AddKeyUp(VirtualKeyCode keyCode)`
`131`	`131`	`{`
	`132`	`+ var code = (ushort)((int)keyCode & 0xFFFF);`
`132`	`133`	`var up =`
`133`	`134`	`new Input`
`134`	`135`	`{`
`@@ -138,8 +139,8 @@ public InputBuilder AddKeyUp(VirtualKeyCode keyCode)`
`138`	`139`	`Keyboard =`
`139`	`140`	`new KeyboardInput`
`140`	`141`	`{`
`141`		`- KeyCode = (ushort) keyCode,`
`142`		`- Scan = (ushort)(NativeMethods.MapVirtualKey((uint)keyCode, 0) & 0xFFU),`
	`142`	`+ KeyCode = (ushort) code,`
	`143`	`+ Scan = (ushort)(NativeMethods.MapVirtualKey((uint)code, 0) & 0xFFU),`
`143`	`144`	`Flags = (uint) (IsExtendedKey(keyCode)`
`144`	`145`	`? KeyboardFlag.KeyUp \| KeyboardFlag.ExtendedKey`
`145`	`146`	`: KeyboardFlag.KeyUp),`