[Win32, Keyboard] Fix AltGr's forged ControlLeft (flutter#31848)

dkwingsmt · web-flow · commit fe3ecd7bc13d · 2022-03-08T18:20:03.000-08:00
diff --git a/shell/platform/windows/keyboard_manager_win32.cc b/shell/platform/windows/keyboard_manager_win32.cc
@@ -176,7 +176,7 @@ void KeyboardManagerWin32::OnKey(std::unique_ptr<PendingEvent> event,
           (1 /* repeat_count */ << 0) | (ctrl_left_scancode << 16) |
           (0 /* extended */ << 24) | (1 /* prev_state */ << 30) |
           (1 /* transition */ << 31);
-      window_delegate_->Win32DispatchMessage(WM_KEYUP, VK_LCONTROL, lParam);
+      window_delegate_->Win32DispatchMessage(WM_KEYUP, VK_CONTROL, lParam);
     }
   }
 
diff --git a/shell/platform/windows/keyboard_win32_unittests.cc b/shell/platform/windows/keyboard_win32_unittests.cc
@@ -1203,7 +1203,7 @@ TEST(KeyboardTest, AltGrModifiedKey) {
   tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
       KeyStateChange{VK_LCONTROL, false, true},
       ExpectForgedMessage{
-          WmKeyUpInfo{VK_LCONTROL, kScanCodeControl, kNotExtended}.Build(
+          WmKeyUpInfo{VK_CONTROL, kScanCodeControl, kNotExtended}.Build(
               kWmResultZero)},
       KeyStateChange{VK_RMENU, false, true},
       WmSysKeyUpInfo{VK_MENU, kScanCodeAlt, kExtended}.Build(
@@ -1243,7 +1243,7 @@ TEST(KeyboardTest, AltGrTwice) {
   // AltLeft) down.
   tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
       KeyStateChange{VK_LCONTROL, true, true},
-      WmKeyDownInfo{VK_LCONTROL, kScanCodeControl, kNotExtended, kWasUp}.Build(
+      WmKeyDownInfo{VK_CONTROL, kScanCodeControl, kNotExtended, kWasUp}.Build(
           kWmResultZero),
       KeyStateChange{VK_RMENU, true, true},
       WmKeyDownInfo{VK_MENU, kScanCodeAlt, kExtended, kWasUp}.Build(
@@ -1265,7 +1265,7 @@ TEST(KeyboardTest, AltGrTwice) {
   tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
       KeyStateChange{VK_LCONTROL, false, true},
       ExpectForgedMessage{
-          WmKeyUpInfo{VK_LCONTROL, kScanCodeControl, kNotExtended}.Build(
+          WmKeyUpInfo{VK_CONTROL, kScanCodeControl, kNotExtended}.Build(
               kWmResultZero)},
       KeyStateChange{VK_RMENU, false, true},
       WmSysKeyUpInfo{VK_MENU, kScanCodeAlt, kExtended}.Build(
@@ -1284,7 +1284,7 @@ TEST(KeyboardTest, AltGrTwice) {
 
   tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
       KeyStateChange{VK_LCONTROL, true, false},
-      WmKeyDownInfo{VK_LCONTROL, kScanCodeControl, kNotExtended, kWasUp}.Build(
+      WmKeyDownInfo{VK_CONTROL, kScanCodeControl, kNotExtended, kWasUp}.Build(
           kWmResultZero),
       KeyStateChange{VK_RMENU, true, true},
       WmKeyDownInfo{VK_MENU, kScanCodeAlt, kExtended, kWasUp}.Build(
@@ -1306,7 +1306,7 @@ TEST(KeyboardTest, AltGrTwice) {
   tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
       KeyStateChange{VK_LCONTROL, false, false},
       ExpectForgedMessage{
-          WmKeyUpInfo{VK_LCONTROL, kScanCodeControl, kNotExtended}.Build(
+          WmKeyUpInfo{VK_CONTROL, kScanCodeControl, kNotExtended}.Build(
               kWmResultZero)},
       KeyStateChange{VK_RMENU, false, false},
       WmSysKeyUpInfo{VK_MENU, kScanCodeAlt, kExtended}.Build(
@@ -1323,7 +1323,7 @@ TEST(KeyboardTest, AltGrTwice) {
 
   // 5. For key sequence 2: a real ControlLeft up.
   tester.InjectKeyboardChanges(std::vector<KeyboardChange>{
-      WmKeyUpInfo{VK_LCONTROL, kScanCodeControl, kNotExtended}.Build(
+      WmKeyUpInfo{VK_CONTROL, kScanCodeControl, kNotExtended}.Build(
           kWmResultZero)});
   EXPECT_EQ(key_calls.size(), 1);
   EXPECT_CALL_IS_EVENT(key_calls[0], kFlutterKeyEventTypeDown, 0, 0, "",

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ void KeyboardManagerWin32::OnKey(std::unique_ptr<PendingEvent> event,`
`176`	`176`	`(1 /* repeat_count */ << 0) \| (ctrl_left_scancode << 16) \|`
`177`	`177`	`(0 /* extended / << 24) \| (1 / prev_state */ << 30) \|`
`178`	`178`	`(1 /* transition */ << 31);`
`179`		`- window_delegate_->Win32DispatchMessage(WM_KEYUP, VK_LCONTROL, lParam);`
	`179`	`+ window_delegate_->Win32DispatchMessage(WM_KEYUP, VK_CONTROL, lParam);`
`180`	`180`	`}`
`181`	`181`	`}`
`182`	`182`