[ros-diffs] [reactos] 01/01: [KBDJA] Delete temporary hacks (#4506)

[Katayama Hirofumi MZ]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2038087d9e705613dc98d7...

commit 2038087d9e705613dc98d709ef1585679d6619a2
Author:     Katayama Hirofumi MZ [e-mail]
AuthorDate: Thu May 12 14:05:16 2022 +0900
Commit:     GitHub [e-mail]
CommitDate: Thu May 12 14:05:16 2022 +0900

[KBDJA] Delete temporary hacks (#4506)

Improve readability of Japanese keyboard.
    - SC_13 (0xDE) --> VK_OEM_7
    - SC_27 (0xC0) --> VK_OEM_3
    - SC_40 (0xBB) --> VK_OEM_PLUS
    - SC_41 (0xBA) --> VK_OEM_1
    CORE-11700
---
 dll/keyboard/kbdja/kbdja.c | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/dll/keyboard/kbdja/kbdja.c b/dll/keyboard/kbdja/kbdja.c
index 110333a820a..c72eccc803f 100644
--- a/dll/keyboard/kbdja/kbdja.c
+++ b/dll/keyboard/kbdja/kbdja.c
@@ -29,12 +29,6 @@
 #define KNUMS     KBDNUMPAD|KBDSPECIAL /* Special + number pad */
 #define KMEXT     KBDEXT|KBDMULTIVK    /* Multi + ext */

-/* temporary */
-#define SC_13 0xde
-#define SC_27 0xc0
-#define SC_40 0xbb
-#define SC_41 0xba
-
 ROSDATA USHORT scancode_to_vk[] = {
   /* Numbers Row */
   /* - 00 - */
@@ -42,19 +36,19 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_EMPTY,     VK_ESCAPE,    '1',          '2',
   '3',          '4',          '5',          '6',
   '7',          '8',          '9',          '0',
-  VK_OEM_MINUS, SC_13,    VK_BACK,
+  VK_OEM_MINUS, VK_OEM_7,     VK_BACK,
   /* - 0f - */
   /* First Letters Row */
   VK_TAB,       'Q',          'W',          'E',
   'R',          'T',          'Y',          'U',
   'I',          'O',          'P',
-  SC_27,     VK_OEM_4,     VK_RETURN,
+  VK_OEM_3,     VK_OEM_4,     VK_RETURN,
   /* - 1d - */
   /* Second Letters Row */
   VK_LCONTROL,
   'A',          'S',          'D',          'F',
   'G',          'H',          'J',          'K',
-  'L',          SC_40,      SC_41,     VK_PROCESSKEY,
+  'L',          VK_OEM_PLUS,  VK_OEM_1,     VK_PROCESSKEY,
   VK_LSHIFT,    VK_OEM_6,
   /* - 2c - */
   /* Third letters row */
@@ -214,10 +208,10 @@ ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = {
   { '0',         0, {'0',  0 } },

/*Japanese Keys*/
-  { SC_13,  0, { '^','~'} },
-  { SC_27,  0, { '@','`'} },
-  { SC_40,  0, { ';','+'} },
-  { SC_41,  0, { ':','*'} },
+  { VK_OEM_7,     0, { '^','~'} },
+  { VK_OEM_3,     0, { '@','`'} },
+  { VK_OEM_PLUS,  0, { ';','+'} },
+  { VK_OEM_1,     0, { ':','*'} },

/* Specials */
   /* Ctrl-_ generates US */