From 0c04f704b28df1019600ae118234e358e7d9ae69 Mon Sep 17 00:00:00 2001
From: Mike Deem <mike@maimedleech.com>
Date: Sat, 1 Jan 2022 21:14:46 -0800
Subject: [PATCH 1/2] Made AddKeyUp handle VirtualKeyCode.NUMPAD_RETURN
 correctly.

---
 .../InputBuilder.cs                           | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/GregsStack.InputSimulatorStandard/InputBuilder.cs b/src/GregsStack.InputSimulatorStandard/InputBuilder.cs
index 7a9fe66..71311f9 100644
--- a/src/GregsStack.InputSimulatorStandard/InputBuilder.cs
+++ b/src/GregsStack.InputSimulatorStandard/InputBuilder.cs
@@ -106,15 +106,15 @@ public InputBuilder AddKeyDown(VirtualKeyCode keyCode)
                     Type = (uint)InputType.Keyboard,
                     Data =
                             {
-                                Keyboard =
-                                    new KeyboardInput
-                                        {
-                                            KeyCode = (ushort) code ,
-                                            Scan = (ushort)(NativeMethods.MapVirtualKey((uint)code, 0) & 0xFFU),
-                                            Flags = IsExtendedKey(keyCode) ? (uint) KeyboardFlag.ExtendedKey : 0,
-                                            Time = 0,
-                                            ExtraInfo = IntPtr.Zero
-                                        }
+                            Keyboard =
+                                new KeyboardInput
+                                    {
+                                        KeyCode = (ushort) code ,
+                                        Scan = (ushort)(NativeMethods.MapVirtualKey((uint)code, 0) & 0xFFU),
+                                        Flags = IsExtendedKey(keyCode) ? (uint) KeyboardFlag.ExtendedKey : 0,
+                                        Time = 0,
+                                        ExtraInfo = IntPtr.Zero
+                                    }
                             }
                 };
 
@@ -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),

From 6dbecd44fbb8aa34596d6bf6f890ce2883ab95bc Mon Sep 17 00:00:00 2001
From: Mike Deem <mike@maimedleech.com>
Date: Sat, 1 Jan 2022 22:31:47 -0800
Subject: [PATCH 2/2] Fixed unintended indent change in AddKeyDown.

---
 .../InputBuilder.cs                            | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/GregsStack.InputSimulatorStandard/InputBuilder.cs b/src/GregsStack.InputSimulatorStandard/InputBuilder.cs
index 71311f9..aea7a86 100644
--- a/src/GregsStack.InputSimulatorStandard/InputBuilder.cs
+++ b/src/GregsStack.InputSimulatorStandard/InputBuilder.cs
@@ -106,15 +106,15 @@ public InputBuilder AddKeyDown(VirtualKeyCode keyCode)
                     Type = (uint)InputType.Keyboard,
                     Data =
                             {
-                            Keyboard =
-                                new KeyboardInput
-                                    {
-                                        KeyCode = (ushort) code ,
-                                        Scan = (ushort)(NativeMethods.MapVirtualKey((uint)code, 0) & 0xFFU),
-                                        Flags = IsExtendedKey(keyCode) ? (uint) KeyboardFlag.ExtendedKey : 0,
-                                        Time = 0,
-                                        ExtraInfo = IntPtr.Zero
-                                    }
+                                Keyboard =
+                                    new KeyboardInput
+                                        {
+                                            KeyCode = (ushort) code ,
+                                            Scan = (ushort)(NativeMethods.MapVirtualKey((uint)code, 0) & 0xFFU),
+                                            Flags = IsExtendedKey(keyCode) ? (uint) KeyboardFlag.ExtendedKey : 0,
+                                            Time = 0,
+                                            ExtraInfo = IntPtr.Zero
+                                        }
                             }
                 };