- Fix "Turkish Q" keyboard layout (thanks to user mergulcu from the forum).

- Change AltGr behavior for several keyboard layouts (bug #3887).
- Change file description for some keyboard layouts.
- Other minor changes.

svn path=/trunk/; revision=38710

diff --git a/reactos/dll/keyboard/kbda2/kbda2.c b/reactos/dll/keyboard/kbda2/kbda2.c
index 83bf90e..a4e9082 100644 (file)
--- a/reactos/dll/keyboard/kbda2/kbda2.c
+++ b/reactos/dll/keyboard/kbda2/kbda2.c
@@ -395,7 +395,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures */
   2,

diff --git a/reactos/dll/keyboard/kbda3/kbda3.c b/reactos/dll/keyboard/kbda3/kbda3.c
index efe38d2..1e50a84 100644 (file)
--- a/reactos/dll/keyboard/kbda3/kbda3.c
+++ b/reactos/dll/keyboard/kbda3/kbda3.c
@@ -395,7 +395,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures */
   2,

diff --git a/reactos/dll/keyboard/kbdal/kbdal.c b/reactos/dll/keyboard/kbdal/kbdal.c
index 45518b2..480e8e1 100644 (file)
--- a/reactos/dll/keyboard/kbdal/kbdal.c
+++ b/reactos/dll/keyboard/kbdal/kbdal.c
@@ -392,9 +392,9 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
-  /* Ligatures -- Russian doesn't have any */
+  /* Ligatures -- Albanian doesn't have any */
   0,
   0,
   NULL

diff --git a/reactos/dll/keyboard/kbdarme/kbdarme.c b/reactos/dll/keyboard/kbdarme/kbdarme.c
index 8d4cd1b..05cb1d0 100644 (file)
--- a/reactos/dll/keyboard/kbdarme/kbdarme.c
+++ b/reactos/dll/keyboard/kbdarme/kbdarme.c
@@ -367,7 +367,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   MAKELONG(0,1), /* Version 1.0 */
 
-  /* Ligatures -- Russian doesn't have any */
+  /* Ligatures -- Armenian doesn't have any */
   0,
   0,
   NULL

diff --git a/reactos/dll/keyboard/kbdarmw/kbdarmw.c b/reactos/dll/keyboard/kbdarmw/kbdarmw.c
index 6040fda..82f583d 100644 (file)
--- a/reactos/dll/keyboard/kbdarmw/kbdarmw.c
+++ b/reactos/dll/keyboard/kbdarmw/kbdarmw.c
@@ -355,7 +355,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   MAKELONG(0,1), /* Version 1.0 */
 
-  /* Ligatures -- Russian doesn't have any */
+  /* Ligatures -- Armenian doesn't have any */
   0,
   0,
   NULL

diff --git a/reactos/dll/keyboard/kbdbga/kbdbga.c b/reactos/dll/keyboard/kbdbga/kbdbga.c
index b3df9ea..2ddf3dc 100644 (file)
--- a/reactos/dll/keyboard/kbdbga/kbdbga.c
+++ b/reactos/dll/keyboard/kbdbga/kbdbga.c
@@ -1,4 +1,5 @@
 /*
+ * Arda - Bulgarian keyboard layout
  * Àðäà -Áúëãàðñêà êëàâèàòóðíà ïîäðåäáà '÷øåðòú' çà ÐåàêòÎÑ
  * Copyright (C) 2007 ReactOS
  * License: LGPL, see: LGPL.txt
@@ -165,7 +166,7 @@ ROSDATA VK_TO_BIT modifier_keys[] = {
 ROSDATA MODIFIERS modifier_bits = {
   modifier_keys,
   3,
-  { 0, 1, 2, 3, 0, 0, 0xC0 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */
+  { 0, 1, 2, 3 }
 };
 
 #define NOCAPS 0
@@ -396,7 +397,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   MAKELONG(0,1), /* Version 1.0 */
 
-  /* Ligatures --  */
+  /* Ligatures -- Bulgarian doesn't have any */
   0,
   0,
   NULL

diff --git a/reactos/dll/keyboard/kbdbgm/kbdbgm.c b/reactos/dll/keyboard/kbdbgm/kbdbgm.c
index c15ae11..02473d2 100644 (file)
--- a/reactos/dll/keyboard/kbdbgm/kbdbgm.c
+++ b/reactos/dll/keyboard/kbdbgm/kbdbgm.c
@@ -1,4 +1,5 @@
 /*
+ * Maritsa - Bulgarian keyboard layout
  * Ìàðèöà - Áúëãàðñêà êëàâèàòóðíà ïîäðåäáà ïî ÁÄÑ 5237-78 çà ÐåàêòÎÑ
  * Copyright (C) 2007 ReactOS
  * License: LGPL, see: LGPL.txt
@@ -165,7 +166,7 @@ ROSDATA VK_TO_BIT modifier_keys[] = {
 ROSDATA MODIFIERS modifier_bits = {
   modifier_keys,
   3,
-  { 0, 1, 2, 3, 0, 0, 0xC0 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */
+  { 0, 1, 2, 3 }
 };
 
 #define NOCAPS 0
@@ -397,7 +398,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   MAKELONG(0,1), /* Version 1.0 */
 
-  /* Ligatures -- Russian doesn't have any */
+  /* Ligatures -- Bulgarian doesn't have any */
   0,
   0,
   NULL

diff --git a/reactos/dll/keyboard/kbdbgt/kbdbgt.c b/reactos/dll/keyboard/kbdbgt/kbdbgt.c
index 65f4ca3..aa966eb 100644 (file)
--- a/reactos/dll/keyboard/kbdbgt/kbdbgt.c
+++ b/reactos/dll/keyboard/kbdbgt/kbdbgt.c
@@ -1,4 +1,5 @@
 /*
+ * Tundzha - Bulgarian keyboard layout
  * Òóíäæà - Áúëãàðñêà êëàâèàòóðíà ïîçâóêîâà ïîäðåäáà 'ÿâåðòú' çà ÐåàêòÎÑ
  * Copyright (C) 2007 ReactOS
  * License: LGPL, see: LGPL.txt
@@ -405,7 +406,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   /* Key names */
   (VSC_LPWSTR *)key_names,
   (VSC_LPWSTR *)extended_key_names,
-//  dead_key_names, /* Dead key names */
+  // dead_key_names, /* Dead key names */
   NULL, /* Dead key names */
 
   /* scan code to virtual key maps */
@@ -414,9 +415,9 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
-  /* Ligatures --  */
+  /* Ligatures -- Bulgarian doesn't have any */
   0,
   0,
   NULL

diff --git a/reactos/dll/keyboard/kbdbr/kbdbr.c b/reactos/dll/keyboard/kbdbr/kbdbr.c
index 61bbe9e..5f4caa9 100644 (file)
--- a/reactos/dll/keyboard/kbdbr/kbdbr.c
+++ b/reactos/dll/keyboard/kbdbr/kbdbr.c
@@ -453,7 +453,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures */
   0,

diff --git a/reactos/dll/keyboard/kbdbur/kbdbur.c b/reactos/dll/keyboard/kbdbur/kbdbur.c
index c7aa667..18661a6 100644 (file)
--- a/reactos/dll/keyboard/kbdbur/kbdbur.c
+++ b/reactos/dll/keyboard/kbdbur/kbdbur.c
@@ -372,7 +372,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures */
   0,

diff --git a/reactos/dll/keyboard/kbdcan/kbdcan.c b/reactos/dll/keyboard/kbdcan/kbdcan.c
index 57b7c67..65cc0b4 100644 (file)
--- a/reactos/dll/keyboard/kbdcan/kbdcan.c
+++ b/reactos/dll/keyboard/kbdcan/kbdcan.c
@@ -586,7 +586,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   0,
   0,

diff --git a/reactos/dll/keyboard/kbdcr/kbdcr.c b/reactos/dll/keyboard/kbdcr/kbdcr.c
index b9c91cf..b140744 100644 (file)
--- a/reactos/dll/keyboard/kbdcr/kbdcr.c
+++ b/reactos/dll/keyboard/kbdcr/kbdcr.c
@@ -500,9 +500,9 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
-  /* Ligatures -- Russian doesn't have any */
+  /* Ligatures -- Croatian doesn't have any */
   0,
   0,
   NULL

diff --git a/reactos/dll/keyboard/kbdcz1/kbdcz1.c b/reactos/dll/keyboard/kbdcz1/kbdcz1.c
index 481b23a..246a8e2 100644 (file)
--- a/reactos/dll/keyboard/kbdcz1/kbdcz1.c
+++ b/reactos/dll/keyboard/kbdcz1/kbdcz1.c
@@ -32,6 +32,8 @@
 #define KNUMS    0xc00  /* Special + number pad */
 #define KMEXT    0x300  /* Multi + ext */
 
+#define SHFT_INVALID 0x0F
+
 ROSDATA USHORT scancode_to_vk[] = {
   /* Numbers Row */
   /* - 00 - */
@@ -124,7 +126,8 @@ ROSDATA VK_TO_BIT modifier_keys[] = {
 ROSDATA MODIFIERS modifier_bits = {
   modifier_keys,
   7,
-  { 0, 1, 2, 0,0, 0,3,0} /* Modifier bit order, NONE, SHIFT, CTRL, SHIFT+CTRL,ALT(not used),SHIFT-ALT (not used), CTR+ALT, SHIFT-CTRL-ALT*/
+  { 0, 1, 2, 0, 0, 0, 3, 0 }
+  /* Modifier bit order: NONE, SHIFT, CTRL, SHIFT-CTRL, ALT (not used), SHIFT-ALT (not used), CTRL-ALT, SHIFT-CTRL-ALT */
 };
 
 #define NOCAPS 0
@@ -405,7 +408,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode1_to_vk,
 
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures -- Czech keyboard doesn't have any */
   0,

diff --git a/reactos/dll/keyboard/kbdda/kbdda.rc b/reactos/dll/keyboard/kbdda/kbdda.rc
index 2f19fe1..6402bf6 100644 (file)
--- a/reactos/dll/keyboard/kbdda/kbdda.rc
+++ b/reactos/dll/keyboard/kbdda/kbdda.rc
@@ -1,5 +1,5 @@
 #define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS DAAscii Keyboard Layout\0"
+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS Danish Keyboard Layout\0"
 #define REACTOS_STR_INTERNAL_NAME      "kbdda\0"
 #define REACTOS_STR_ORIGINAL_FILENAME  "kbdda.dll\0"
 #include <reactos/version.rc>

diff --git a/reactos/dll/keyboard/kbddv/kbddv.c b/reactos/dll/keyboard/kbddv/kbddv.c
index 2521f9b..8de249c 100644 (file)
--- a/reactos/dll/keyboard/kbddv/kbddv.c
+++ b/reactos/dll/keyboard/kbddv/kbddv.c
@@ -1,5 +1,5 @@
 /*
- * ReactOS USASCII Keyboard layout
+ * ReactOS US Dvorak keyboard layout
  * Copyright (C) 2003 ReactOS
  * License: LGPL, see: LGPL.txt
  *

diff --git a/reactos/dll/keyboard/kbdes/kbdes.c b/reactos/dll/keyboard/kbdes/kbdes.c
index bfb323b..6c41795 100644 (file)
--- a/reactos/dll/keyboard/kbdes/kbdes.c
+++ b/reactos/dll/keyboard/kbdes/kbdes.c
@@ -1,5 +1,5 @@
 /*
- * ReactOS ESASCII Keyboard layout
+ * ReactOS Spanish Keyboard Layout
  * Copyright (C) 2003 ReactOS
  * License: LGPL, see: LGPL.txt
  * Created by HUMA2000 from kbdus, kbdgr, kbdda and kbdfr
@@ -524,7 +524,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures -- Spanish doesn't have any  */
   0,

diff --git a/reactos/dll/keyboard/kbdest/kbdest.c b/reactos/dll/keyboard/kbdest/kbdest.c
index 5ceae60..1795573 100644 (file)
--- a/reactos/dll/keyboard/kbdest/kbdest.c
+++ b/reactos/dll/keyboard/kbdest/kbdest.c
@@ -447,7 +447,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   0,
   0,

diff --git a/reactos/dll/keyboard/kbdfc/kbdfc.c b/reactos/dll/keyboard/kbdfc/kbdfc.c
index 6f49cec..26737d9 100644 (file)
--- a/reactos/dll/keyboard/kbdfc/kbdfc.c
+++ b/reactos/dll/keyboard/kbdfc/kbdfc.c
@@ -464,7 +464,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   0,
   0,

diff --git a/reactos/dll/keyboard/kbdfi/kbdfi.c b/reactos/dll/keyboard/kbdfi/kbdfi.c
index 7f8198c..3912846 100644 (file)
--- a/reactos/dll/keyboard/kbdfi/kbdfi.c
+++ b/reactos/dll/keyboard/kbdfi/kbdfi.c
@@ -463,7 +463,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0, 1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures */
   0,

diff --git a/reactos/dll/keyboard/kbdfr/kbdfr.c b/reactos/dll/keyboard/kbdfr/kbdfr.c
index 45b72ba..214a5d6 100644 (file)
--- a/reactos/dll/keyboard/kbdfr/kbdfr.c
+++ b/reactos/dll/keyboard/kbdfr/kbdfr.c
@@ -1,9 +1,9 @@
 /*
- * ReactOS FRASCII Keyboard layout
+ * ReactOS French keyboard layout
  * Copyright (C) 2003 ReactOS
  * License: LGPL, see: LGPL.txt
- * autor: Jean-Michel Gay 2003
- *        Pierre Schweitzer 2007
+ * Autors: Jean-Michel Gay, 2003
+ *         Pierre Schweitzer, 2007
  *
  */
 
@@ -32,6 +32,8 @@
 #define KNUMS    0xc00  /* Special + number pad */
 #define KMEXT    0x300  /* Multi + ext */
 
+#define SHFT_INVALID 0x0F
+
 /**
  * FIXME : - VK_DIVIDE produces ! instead of /
  *         - VK_SNAPSHOT produces *
@@ -167,9 +169,8 @@ ROSDATA VK_TO_BIT modifier_keys[] = {
 ROSDATA MODIFIERS modifier_bits = {
   modifier_keys,
   6,
-  { 0, 1, 2, 4,15,15,3 }
-  /* new: Modifier bit order, NONE, SHIFT, CTRL, ALT , ? ,? , shift+control*/
-  /* old: Modifier bit order, NONE, SHIFT, CTRL, ALT */
+  { 0, 1, 2, 4, SHFT_INVALID, SHFT_INVALID, 3 }
+  /* Modifier bit order: NONE, SHIFT, CTRL, ALT, ?, ?, SHIFT-CTRL */
 };
 
 #define NOCAPS 0
@@ -462,7 +463,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures -- French doesn't have any */
   0,

diff --git a/reactos/dll/keyboard/kbdfr/kbdfr.rc b/reactos/dll/keyboard/kbdfr/kbdfr.rc
index d0974ec..44d60f6 100644 (file)
--- a/reactos/dll/keyboard/kbdfr/kbdfr.rc
+++ b/reactos/dll/keyboard/kbdfr/kbdfr.rc
@@ -1,5 +1,5 @@
 #define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS FRAscii Keyboard Layout\0"
+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS French Keyboard Layout\0"
 #define REACTOS_STR_INTERNAL_NAME      "kbdfr\0"
 #define REACTOS_STR_ORIGINAL_FILENAME  "kbdfr.dll\0"
 #include <reactos/version.rc>

diff --git a/reactos/dll/keyboard/kbdgeo/kbdgeo.c b/reactos/dll/keyboard/kbdgeo/kbdgeo.c
index 5f49467..ec5dcec 100644 (file)
--- a/reactos/dll/keyboard/kbdgeo/kbdgeo.c
+++ b/reactos/dll/keyboard/kbdgeo/kbdgeo.c
@@ -370,9 +370,9 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
-  /* Ligatures -- Russian doesn't have any */
+  /* Ligatures -- Georgian doesn't have any */
   0,
   0,
   NULL

diff --git a/reactos/dll/keyboard/kbdhe/kbdhe.c b/reactos/dll/keyboard/kbdhe/kbdhe.c
index d4d0e32..74427c2 100644 (file)
--- a/reactos/dll/keyboard/kbdhe/kbdhe.c
+++ b/reactos/dll/keyboard/kbdhe/kbdhe.c
@@ -361,8 +361,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   vk_to_wchar_master_table,
 
   /* diacritical marks -- currently implemented by wine code */
-  /* English doesn't have any, anyway */
-   deadkey,
+  deadkey,
 
   /* Key names */
   (VSC_LPWSTR *)key_names,

diff --git a/reactos/dll/keyboard/kbdhe/kbdhe.rc b/reactos/dll/keyboard/kbdhe/kbdhe.rc
index 485bf34..bb93400 100644 (file)
--- a/reactos/dll/keyboard/kbdhe/kbdhe.rc
+++ b/reactos/dll/keyboard/kbdhe/kbdhe.rc
@@ -1,5 +1,5 @@
 #define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS Greek Ascii Keyboard Layout\0"
+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS Greek Keyboard Layout\0"
 #define REACTOS_STR_INTERNAL_NAME      "kbdhe\0"
 #define REACTOS_STR_ORIGINAL_FILENAME  "kbdhe.dll\0"
 #include <reactos/version.rc>

diff --git a/reactos/dll/keyboard/kbdheb/kbdheb.c b/reactos/dll/keyboard/kbdheb/kbdheb.c
index 9dadff5..93dba69 100644 (file)
--- a/reactos/dll/keyboard/kbdheb/kbdheb.c
+++ b/reactos/dll/keyboard/kbdheb/kbdheb.c
@@ -448,7 +448,6 @@ ROSDATA KBDTABLES keyboard_layout_table =
   vk_to_wchar_master_table,
 
   /* diacritical marks -- currently implemented by wine code */
-  /* English doesn't have any, anyway */
   NULL,
 
   /* Key names */
@@ -464,7 +463,7 @@ ROSDATA KBDTABLES keyboard_layout_table =
 
   MAKELONG(0,1), /* Version 1.0 */
 
-  /* Ligatures -- does Hebrew have any? */
+  /* Ligatures -- Hebrew doesn't have any */
   0,
   0,
   NULL

diff --git a/reactos/dll/keyboard/kbdheb/kbdheb.rc b/reactos/dll/keyboard/kbdheb/kbdheb.rc
index 198d78c..a96df25 100644 (file)
--- a/reactos/dll/keyboard/kbdheb/kbdheb.rc
+++ b/reactos/dll/keyboard/kbdheb/kbdheb.rc
@@ -1,5 +1,5 @@
 #define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS Hebrew Ascii Keyboard Layout\0"
+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS Hebrew Keyboard Layout\0"
 #define REACTOS_STR_INTERNAL_NAME      "kbdheb\0"
 #define REACTOS_STR_ORIGINAL_FILENAME  "kbdheb.dll\0"
 #include <reactos/version.rc>

diff --git a/reactos/dll/keyboard/kbdhu/kbdhu.c b/reactos/dll/keyboard/kbdhu/kbdhu.c
index ec32e1a..554bc8d 100644 (file)
--- a/reactos/dll/keyboard/kbdhu/kbdhu.c
+++ b/reactos/dll/keyboard/kbdhu/kbdhu.c
@@ -1,5 +1,5 @@
 /*
- * ReactOS HUASCII Keyboard layout
+ * ReactOS Hungarian keyboard layout
  * Copyright (C) 2003 ReactOS
  * License: LGPL, see: LGPL.txt
  *
@@ -329,7 +329,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   vk_to_wchar_master_table,
 
   /* diacritical marks -- currently implemented by wine code */
-  /* English doesn't have any, anyway */
   NULL,
 
   /* Key names */
@@ -345,7 +344,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   MAKELONG(0,1), /* Version 1.0 */
 
-  /* Ligatures -- English doesn't have any */
+  /* Ligatures -- Hungarian doesn't have any */
   0,
   0,
   NULL

diff --git a/reactos/dll/keyboard/kbdhu/kbdhu.rc b/reactos/dll/keyboard/kbdhu/kbdhu.rc
index 58a8e0d..6e087dc 100644 (file)
--- a/reactos/dll/keyboard/kbdhu/kbdhu.rc
+++ b/reactos/dll/keyboard/kbdhu/kbdhu.rc
@@ -1,5 +1,5 @@
 #define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS HUAscii Keyboard Layout\0"
+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS Hungarian Keyboard Layout\0"
 #define REACTOS_STR_INTERNAL_NAME      "kbdhu\0"
 #define REACTOS_STR_ORIGINAL_FILENAME  "kbdhu.dll\0"
 #include <reactos/version.rc>

diff --git a/reactos/dll/keyboard/kbdic/kbdic.c b/reactos/dll/keyboard/kbdic/kbdic.c
index d96fdd9..34c58a1 100644 (file)
--- a/reactos/dll/keyboard/kbdic/kbdic.c
+++ b/reactos/dll/keyboard/kbdic/kbdic.c
@@ -454,9 +454,9 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
-  /* Ligatures -- Russian doesn't have any */
+  /* Ligatures -- Icelandic doesn't have any */
   0,
   0,
   NULL

diff --git a/reactos/dll/keyboard/kbdinasa/kbdinasa.c b/reactos/dll/keyboard/kbdinasa/kbdinasa.c
index 11badc0..ee1f066 100644 (file)
--- a/reactos/dll/keyboard/kbdinasa/kbdinasa.c
+++ b/reactos/dll/keyboard/kbdinasa/kbdinasa.c
@@ -391,7 +391,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures */
   3,

diff --git a/reactos/dll/keyboard/kbdinben/kbdinben.c b/reactos/dll/keyboard/kbdinben/kbdinben.c
index d41b75c..38adf7a 100644 (file)
--- a/reactos/dll/keyboard/kbdinben/kbdinben.c
+++ b/reactos/dll/keyboard/kbdinben/kbdinben.c
@@ -386,7 +386,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures */
   3,

diff --git a/reactos/dll/keyboard/kbdindev/kbdindev.c b/reactos/dll/keyboard/kbdindev/kbdindev.c
index d23d2f2..a52cde3 100644 (file)
--- a/reactos/dll/keyboard/kbdindev/kbdindev.c
+++ b/reactos/dll/keyboard/kbdindev/kbdindev.c
@@ -391,7 +391,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures */
   3,

diff --git a/reactos/dll/keyboard/kbdinguj/kbdinguj.c b/reactos/dll/keyboard/kbdinguj/kbdinguj.c
index 5e86e04..56e21c3 100644 (file)
--- a/reactos/dll/keyboard/kbdinguj/kbdinguj.c
+++ b/reactos/dll/keyboard/kbdinguj/kbdinguj.c
@@ -391,7 +391,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures */
   3,

diff --git a/reactos/dll/keyboard/kbdinmal/kbdinmal.c b/reactos/dll/keyboard/kbdinmal/kbdinmal.c
index 2c0f8f2..a435720 100644 (file)
--- a/reactos/dll/keyboard/kbdinmal/kbdinmal.c
+++ b/reactos/dll/keyboard/kbdinmal/kbdinmal.c
@@ -387,7 +387,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures */
   3,

diff --git a/reactos/dll/keyboard/kbdir/kbdir.c b/reactos/dll/keyboard/kbdir/kbdir.c
index d4ea542..cadef78 100644 (file)
--- a/reactos/dll/keyboard/kbdir/kbdir.c
+++ b/reactos/dll/keyboard/kbdir/kbdir.c
@@ -419,7 +419,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures */
   0,

diff --git a/reactos/dll/keyboard/kbdit/kbdit.c b/reactos/dll/keyboard/kbdit/kbdit.c
index 33dbd7c..99ebdaf 100644 (file)
--- a/reactos/dll/keyboard/kbdit/kbdit.c
+++ b/reactos/dll/keyboard/kbdit/kbdit.c
@@ -183,7 +183,7 @@ ROSDATA VK_TO_BIT modifier_keys[] = {
 ROSDATA MODIFIERS modifier_bits = {
   modifier_keys,
   6,
-  {   0,     1,    2,          4,   SHFT_INVALID, SHFT_INVALID, 3  }
+  { 0, 1, 2, 4, SHFT_INVALID, SHFT_INVALID, 3 }
 };
 
 #define NOCAPS 0
@@ -403,7 +403,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures */
   0,

diff --git a/reactos/dll/keyboard/kbdja/kbdja.c b/reactos/dll/keyboard/kbdja/kbdja.c
index 19a3367..5c45a84 100644 (file)
--- a/reactos/dll/keyboard/kbdja/kbdja.c
+++ b/reactos/dll/keyboard/kbdja/kbdja.c
@@ -1,5 +1,5 @@
 /*
- * ReactOS USASCII Keyboard layout
+ * ReactOS Japanese (JIS 106) keyboard layout
  * Copyright (C) 2003 ReactOS
  * License: LGPL, see: LGPL.txt
  *
@@ -343,7 +343,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   vk_to_wchar_master_table,
 
   /* diacritical marks -- currently implemented by wine code */
-  /* English doesn't have any, anyway */
   NULL,
 
   /* Key names */
@@ -359,7 +358,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   MAKELONG(0,1), /* Version 1.0 */
 
-  /* Ligatures -- English doesn't have any */
+  /* Ligatures -- Japanese doesn't have any */
   0,
   0,
   NULL
@@ -369,4 +368,3 @@ PKBDTABLES WINAPI KbdLayerDescriptor() {
   return &keyboard_layout_table;
 }
 
-

diff --git a/reactos/dll/keyboard/kbdkaz/kbdkaz.c b/reactos/dll/keyboard/kbdkaz/kbdkaz.c
index 2820143..c625209 100644 (file)
--- a/reactos/dll/keyboard/kbdkaz/kbdkaz.c
+++ b/reactos/dll/keyboard/kbdkaz/kbdkaz.c
@@ -1,5 +1,5 @@
 /*
- * ReactOS Kazak (Cyrillic) Keyboard layout
+ * ReactOS Kazakh (Cyrillic) Keyboard layout
  * Copyright (C) 2008 ReactOS
  * Author: Dmitry Chapyshev
  * License: LGPL, see: LGPL.txt

diff --git a/reactos/dll/keyboard/kbdkaz/kbdkaz.rc b/reactos/dll/keyboard/kbdkaz/kbdkaz.rc
index 30b67be..16a9d97 100644 (file)
--- a/reactos/dll/keyboard/kbdkaz/kbdkaz.rc
+++ b/reactos/dll/keyboard/kbdkaz/kbdkaz.rc
@@ -1,5 +1,5 @@
 #define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS Kazak (Cyrillic) Keyboard Layout\0"
+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS Kazakh (Cyrillic) Keyboard Layout\0"
 #define REACTOS_STR_INTERNAL_NAME      "kbdkaz\0"
 #define REACTOS_STR_ORIGINAL_FILENAME  "kbdkaz.dll\0"
 #include <reactos/version.rc>

diff --git a/reactos/dll/keyboard/kbdko/kbdko.c b/reactos/dll/keyboard/kbdko/kbdko.c
index a45da0e..a6859ad 100644 (file)
--- a/reactos/dll/keyboard/kbdko/kbdko.c
+++ b/reactos/dll/keyboard/kbdko/kbdko.c
@@ -9,7 +9,7 @@
 
 /* 
  * Important Note / TODO:
- * This file is a copy of kbdus.c and needs to adapt to korean 
+ * This file is a copy of kbdus.c and needs to adapt to Korean 
  * keyboard layout!
  */
 
@@ -336,7 +336,6 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   vk_to_wchar_master_table,
 
   /* diacritical marks -- currently implemented by wine code */
-  /* English doesn't have any, anyway */
   NULL,
 
   /* Key names */
@@ -352,7 +351,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   MAKELONG(0,1), /* Version 1.0 */
 
-  /* Ligatures -- English doesn't have any */
+  /* Ligatures -- Korean doesn't have any */
   0,
   0,
   NULL

diff --git a/reactos/dll/keyboard/kbdla/kbdla.c b/reactos/dll/keyboard/kbdla/kbdla.c
index 5ac7fc6..60cc74d 100644 (file)
--- a/reactos/dll/keyboard/kbdla/kbdla.c
+++ b/reactos/dll/keyboard/kbdla/kbdla.c
@@ -440,7 +440,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures */
   0,

diff --git a/reactos/dll/keyboard/kbdlt/kbdlt.c b/reactos/dll/keyboard/kbdlt/kbdlt.c
index c412f38..a716e48 100644 (file)
--- a/reactos/dll/keyboard/kbdlt/kbdlt.c
+++ b/reactos/dll/keyboard/kbdlt/kbdlt.c
@@ -381,7 +381,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures -- Lithuanian doesn't have any */
   0,

diff --git a/reactos/dll/keyboard/kbdlv/kbdlv.c b/reactos/dll/keyboard/kbdlv/kbdlv.c
index 1cd894f..d2befa1 100644 (file)
--- a/reactos/dll/keyboard/kbdlv/kbdlv.c
+++ b/reactos/dll/keyboard/kbdlv/kbdlv.c
@@ -431,7 +431,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures */
   0,

diff --git a/reactos/dll/keyboard/kbdmac/kbdmac.c b/reactos/dll/keyboard/kbdmac/kbdmac.c
index 6812d5e..321bd48 100644 (file)
--- a/reactos/dll/keyboard/kbdmac/kbdmac.c
+++ b/reactos/dll/keyboard/kbdmac/kbdmac.c
@@ -376,7 +376,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures */
   0,

diff --git a/reactos/dll/keyboard/kbdne/kbdne.c b/reactos/dll/keyboard/kbdne/kbdne.c
index d739b4b..f6def18 100644 (file)
--- a/reactos/dll/keyboard/kbdne/kbdne.c
+++ b/reactos/dll/keyboard/kbdne/kbdne.c
@@ -458,7 +458,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures */
   0,

diff --git a/reactos/dll/keyboard/kbdno/kbdno.rc b/reactos/dll/keyboard/kbdno/kbdno.rc
index eecf153..f51539c 100644 (file)
--- a/reactos/dll/keyboard/kbdno/kbdno.rc
+++ b/reactos/dll/keyboard/kbdno/kbdno.rc
@@ -1,5 +1,5 @@
 #define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS NOAscii Keyboard Layout\0"
+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS Norwegian Keyboard Layout\0"
 #define REACTOS_STR_INTERNAL_NAME      "kbdno\0"
 #define REACTOS_STR_ORIGINAL_FILENAME  "kbdno.dll\0"
 #include <reactos/version.rc>

diff --git a/reactos/dll/keyboard/kbdpo/kbdpo.c b/reactos/dll/keyboard/kbdpo/kbdpo.c
index 3339f90..3e078f1 100644 (file)
--- a/reactos/dll/keyboard/kbdpo/kbdpo.c
+++ b/reactos/dll/keyboard/kbdpo/kbdpo.c
@@ -1,5 +1,5 @@
 /*
- * ReactOS POASCII Keyboard layout
+ * ReactOS Portuguese keyboard layout
  * Copyright (C) 2006 ReactOS
  * License: LGPL, see: LGPL.txt
  * Based on kbdes, skbdda and skbdfr
@@ -10,7 +10,7 @@
  * http://keytouch.sourceforge.net/howto_keyboard/node4.html (Very Good)
  * http://www.microsoft.com/globaldev/tools/msklc.mspx (Keyboard layout file from MS)
  *
- *TODO
+ * TODO
  *     Correct DEADKEYS
  *     Correct DIVIDE and PrtScr
  */
@@ -223,10 +223,6 @@ ROSDATA VSC_VK extcode1_to_vk[] = {
 };
 
 
-
-
-
-
 #define        TIDLE_CIRC              VK_OEM_2
 #define        ACUTE_GRAVE             VK_OEM_1
 #define        ORDERN_SUPERSCRIPT      VK_OEM_7
@@ -237,7 +233,6 @@ ROSDATA VSC_VK extcode1_to_vk[] = {
 #define        MATH_RELATE             VK_OEM_102
 
 
-
 #define        ACUTE_CHAR      0xB4
 #define        GRAVE_CHAR      0x60
 #define        CIRC_CHAR       0x5E
@@ -258,14 +253,10 @@ ROSDATA MODIFIERS modifier_bits = {
   modifier_keys,
   6,
   {     0,  1<<0, 1<<1, 1<<2, SHFT_INVALID, SHFT_INVALID,             3  }
- /*  NONE, SHIFT, CTRL,  ALT,         MENU, SHIFT + MENU, SHIFT+CONTROL  */
+  /* NONE, SHIFT, CTRL,  ALT,         MENU, SHIFT + MENU, SHIFT+CONTROL */
 };
 
 
-
-
-
-
 #define NOCAPS 0
 #define CAPS   KSHIFT /* Caps -> shift */
 
@@ -381,12 +372,6 @@ ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = {
 };
 
 
-
-
-
-
-
-
 #define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) }
 
 ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = {
@@ -398,15 +383,6 @@ ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = {
 };
 
 
-
-
-
-
-
-
-
-
-
 #define DEADTRANS(ch, accent, comp, flags) MAKELONG(ch, accent), comp, flags
 
 ROSDATA DEADKEY  deadkey[] =
@@ -478,10 +454,6 @@ ROSDATA DEADKEY  deadkey[] =
 };
 
 
-
-
-
-
 ROSDATA VSC_LPWSTR key_names[] = {
   { 0x01, L"Escape" },
   { 0x0e, L"BackSpace" },
@@ -579,10 +551,6 @@ ROSDATA DEADKEY_LPWSTR dead_key_names[] = {
 };
 
 
-
-
-
-
 /* Finally, the master table */
 ROSDATA KBDTABLES keyboard_layout_table = {
 
@@ -608,7 +576,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures -- Portuguese doesn't have any, that i'm aware  */
   0,

diff --git a/reactos/dll/keyboard/kbdro/kbdro.c b/reactos/dll/keyboard/kbdro/kbdro.c
index bf66f66..d3f316d 100644 (file)
--- a/reactos/dll/keyboard/kbdro/kbdro.c
+++ b/reactos/dll/keyboard/kbdro/kbdro.c
@@ -375,7 +375,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures */
   0,

diff --git a/reactos/dll/keyboard/kbdru/kbdru.c b/reactos/dll/keyboard/kbdru/kbdru.c
index e17a763..47ecab7 100644 (file)
--- a/reactos/dll/keyboard/kbdru/kbdru.c
+++ b/reactos/dll/keyboard/kbdru/kbdru.c
@@ -166,7 +166,7 @@ ROSDATA VK_TO_BIT modifier_keys[] = {
 ROSDATA MODIFIERS modifier_bits = {
   modifier_keys,
   3,
-  { 0, 1, 2, 3, 0, 0, 0xC0 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */
+  { 0, 1, 2, 3 }
 };
 
 #define NOCAPS 0

diff --git a/reactos/dll/keyboard/kbdsk/kbdsk.c b/reactos/dll/keyboard/kbdsk/kbdsk.c
index db8ecec..5cfa336 100644 (file)
--- a/reactos/dll/keyboard/kbdsk/kbdsk.c
+++ b/reactos/dll/keyboard/kbdsk/kbdsk.c
@@ -32,6 +32,8 @@
 #define KNUMS    0xc00  /* Special + number pad */
 #define KMEXT    0x300  /* Multi + ext */
 
+#define SHFT_INVALID 0x0F
+
 ROSDATA USHORT scancode_to_vk[] = {
   /* Numbers Row */
   /* - 00 - */
@@ -162,7 +164,8 @@ ROSDATA VK_TO_BIT modifier_keys[] = {
 ROSDATA MODIFIERS modifier_bits = {
   modifier_keys,
   7,
-  { 0, 1, 2, 0 ,0, 0,3,0} /* Modifier bit order, NONE, SHIFT, CTRL, SHIFT+CTRL,ALT(not used),SHIFT-ALT (not used), CTR+ALT, SHIFT-CTRL-ALT*/
+  { 0, 1, 2, 0, 0, 0, 3, 0 }
+  /* Modifier bit order: NONE, SHIFT, CTRL, SHIFT-CTRL, ALT (not used), SHIFT-ALT (not used), CTRL-ALT, SHIFT-CTRL-ALT */
 };
 
 #define NOCAPS 0
@@ -455,7 +458,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode1_to_vk,
 
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures -- Slovak doesn't have any */
   0,

diff --git a/reactos/dll/keyboard/kbdsk1/kbdsk1.c b/reactos/dll/keyboard/kbdsk1/kbdsk1.c
index 614eb1c..a8d1038 100644 (file)
--- a/reactos/dll/keyboard/kbdsk1/kbdsk1.c
+++ b/reactos/dll/keyboard/kbdsk1/kbdsk1.c
@@ -32,6 +32,8 @@
 #define KNUMS    0xc00  /* Special + number pad */
 #define KMEXT    0x300  /* Multi + ext */
 
+#define SHFT_INVALID 0x0F
+
 ROSDATA USHORT scancode_to_vk[] = {
   /* Numbers Row */
   /* - 00 - */
@@ -162,7 +164,8 @@ ROSDATA VK_TO_BIT modifier_keys[] = {
 ROSDATA MODIFIERS modifier_bits = {
   modifier_keys,
   7,
-  { 0, 1, 2, 0 ,0, 0,3,0} /* Modifier bit order, NONE, SHIFT, CTRL, SHIFT+CTRL,ALT(not used),SHIFT-ALT (not used), CTR+ALT, SHIFT-CTRL-ALT*/
+  { 0, 1, 2, 0, 0, 0, 3, 0 }
+  /* Modifier bit order: NONE, SHIFT, CTRL, SHIFT-CTRL, ALT (not used), SHIFT-ALT (not used), CTRL-ALT, SHIFT-CTRL-ALT */
 };
 
 #define NOCAPS 0
@@ -455,7 +458,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode1_to_vk,
 
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures -- Slovak doesn't have any */
   0,

diff --git a/reactos/dll/keyboard/kbdsw/kbdsw.c b/reactos/dll/keyboard/kbdsw/kbdsw.c
index 0e68f6b..02c7b42 100644 (file)
--- a/reactos/dll/keyboard/kbdsw/kbdsw.c
+++ b/reactos/dll/keyboard/kbdsw/kbdsw.c
@@ -470,7 +470,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   MAKELONG(1,1), /* Version 1.0 */
 
-  /* Ligatures -- German doesn't have any */
+  /* Ligatures -- Swedish doesn't have any */
   0,
   0,
   NULL

diff --git a/reactos/dll/keyboard/kbdsw/kbdsw.rc b/reactos/dll/keyboard/kbdsw/kbdsw.rc
index b596422..eaae77d 100644 (file)
--- a/reactos/dll/keyboard/kbdsw/kbdsw.rc
+++ b/reactos/dll/keyboard/kbdsw/kbdsw.rc
@@ -1,5 +1,5 @@
 #define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS SEAscii Keyboard Layout\0"
+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS Swedish Keyboard Layout\0"
 #define REACTOS_STR_INTERNAL_NAME      "kbdsw\0"
 #define REACTOS_STR_ORIGINAL_FILENAME  "kbdsw.dll\0"
 #include <reactos/version.rc>

diff --git a/reactos/dll/keyboard/kbdtat/kbdtat.c b/reactos/dll/keyboard/kbdtat/kbdtat.c
index fd08234..267858b 100644 (file)
--- a/reactos/dll/keyboard/kbdtat/kbdtat.c
+++ b/reactos/dll/keyboard/kbdtat/kbdtat.c
@@ -380,9 +380,9 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
-  /* Ligatures -- Russian doesn't have any */
+  /* Ligatures -- Tatar doesn't have any */
   0,
   0,
   NULL

diff --git a/reactos/dll/keyboard/kbdth0/kbdth0.c b/reactos/dll/keyboard/kbdth0/kbdth0.c
index 7c67dd4..27f404d 100644 (file)
--- a/reactos/dll/keyboard/kbdth0/kbdth0.c
+++ b/reactos/dll/keyboard/kbdth0/kbdth0.c
@@ -372,7 +372,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   MAKELONG(0,1), /* Version 1.0 */
 
-  /* Ligatures -- Russian doesn't have any */
+  /* Ligatures -- Thai doesn't have any */
   0,
   0,
   NULL

diff --git a/reactos/dll/keyboard/kbdth1/kbdth1.c b/reactos/dll/keyboard/kbdth1/kbdth1.c
index 4fee15e..6784286 100644 (file)
--- a/reactos/dll/keyboard/kbdth1/kbdth1.c
+++ b/reactos/dll/keyboard/kbdth1/kbdth1.c
@@ -372,7 +372,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   MAKELONG(0,1), /* Version 1.0 */
 
-  /* Ligatures -- Russian doesn't have any */
+  /* Ligatures -- Thai doesn't have any */
   0,
   0,
   NULL

diff --git a/reactos/dll/keyboard/kbdth2/kbdth2.c b/reactos/dll/keyboard/kbdth2/kbdth2.c
index 8c2c5e6..6ed7998 100644 (file)
--- a/reactos/dll/keyboard/kbdth2/kbdth2.c
+++ b/reactos/dll/keyboard/kbdth2/kbdth2.c
@@ -1,5 +1,5 @@
 /*
- * ReactOS Thai keyboard layout (traditional)
+ * ReactOS Thai Kedmanee (non-ShiftLock) Keyboard layout
  * Copyright (C) 2007 ReactOS
  * License: LGPL, see: LGPL.txt
  *

diff --git a/reactos/dll/keyboard/kbdth2/kbdth2.rc b/reactos/dll/keyboard/kbdth2/kbdth2.rc
index 8dde0c9..bbd90c9 100644 (file)
--- a/reactos/dll/keyboard/kbdth2/kbdth2.rc
+++ b/reactos/dll/keyboard/kbdth2/kbdth2.rc
@@ -1,5 +1,5 @@
 #define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS Thai Keyboard Layout (traditional)\0"
+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS Thai Kedmanee (non-ShiftLock) Keyboard Layout\0"
 #define REACTOS_STR_INTERNAL_NAME      "kbdth2\0"
 #define REACTOS_STR_ORIGINAL_FILENAME  "kbdth2.dll\0"
 #include <reactos/version.rc>

diff --git a/reactos/dll/keyboard/kbdth3/kbdth3.c b/reactos/dll/keyboard/kbdth3/kbdth3.c
index 49e3db3..3d9b6d8 100644 (file)
--- a/reactos/dll/keyboard/kbdth3/kbdth3.c
+++ b/reactos/dll/keyboard/kbdth3/kbdth3.c
@@ -372,7 +372,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   MAKELONG(0,1), /* Version 1.0 */
 
-  /* Ligatures -- Russian doesn't have any */
+  /* Ligatures -- Thai doesn't have any */
   0,
   0,
   NULL

diff --git a/reactos/dll/keyboard/kbdtuf/kbdtuf.c b/reactos/dll/keyboard/kbdtuf/kbdtuf.c
index c18cba4..6eec926 100644 (file)
--- a/reactos/dll/keyboard/kbdtuf/kbdtuf.c
+++ b/reactos/dll/keyboard/kbdtuf/kbdtuf.c
@@ -465,7 +465,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures */
   0,

diff --git a/reactos/dll/keyboard/kbdtuq/kbdtuq.c b/reactos/dll/keyboard/kbdtuq/kbdtuq.c
index 152b1e6..f57e694 100644 (file)
--- a/reactos/dll/keyboard/kbdtuq/kbdtuq.c
+++ b/reactos/dll/keyboard/kbdtuq/kbdtuq.c
@@ -195,11 +195,11 @@ ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = {
   { 'B',           CAPS,   {'b',    'B'   } },
   { 'N',           CAPS,   {'n',    'N'   } },
   { 'M',           CAPS,   {'m',    'M'   } },
-  { VK_OEM_2,      CAPS,   {0x00f6, 0x00d6} },
-  { VK_OEM_5,      CAPS,   {0x00e7, 0x00c7} },
-  { VK_OEM_PERIOD, NOCAPS, {'.',    ':'   } },
+  { VK_OEM_COMMA,  CAPS,   {0x00f6, 0x00d6} },
+  { VK_OEM_PERIOD, CAPS,   {0x00e7, 0x00c7} },
+  { VK_OEM_2,      NOCAPS, {'.',    ':'   } },
   { VK_DECIMAL,    NOCAPS, {',',    ','   } },
-  { VK_TAB,        NOCAPS, {'\t'     ,'\t'} },
+  { VK_TAB,        NOCAPS, {'\t',   '\t'  } },
   { VK_ADD,        NOCAPS, {'+',    '+'   } },
   { VK_DIVIDE,     NOCAPS, {'/',    '/'   } },
   { VK_MULTIPLY,   NOCAPS, {'*',    '*'   } },
@@ -232,7 +232,7 @@ ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = {
   { 0xff,         NOCAPS, {WCH_NONE, WCH_NONE, 0x00a8,   WCH_NONE} },
   { VK_OEM_6,     CAPS,   {0x00fc,   0x00dc,   WCH_DEAD, 0x001d  } },
   { 0xff,         NOCAPS, {WCH_NONE, WCH_NONE, '~',      WCH_NONE} },
-  { VK_OEM_COMMA, NOCAPS, {',',      ';',      WCH_DEAD, 0x001c  } },
+  { VK_OEM_5,     NOCAPS, {',',      ';',      WCH_DEAD, 0x001c  } },
   { 0xff,         NOCAPS, {WCH_NONE, WCH_NONE, '`',      WCH_NONE} },
   { VK_OEM_102,   NOCAPS, {'<',      '>',      '|',      0x001c  } },
   { VK_BACK,      NOCAPS, {'\b',     '\b',     WCH_NONE, 0x007f  } },
@@ -465,7 +465,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures */
   0,

diff --git a/reactos/dll/keyboard/kbduk/kbduk.c b/reactos/dll/keyboard/kbduk/kbduk.c
index c09b52a..692c25d 100644 (file)
--- a/reactos/dll/keyboard/kbduk/kbduk.c
+++ b/reactos/dll/keyboard/kbduk/kbduk.c
@@ -1,5 +1,5 @@
 /*
- * ReactOS USASCII Keyboard layout
+ * ReactOS United Kingdom keyboard layout
  * Copyright (C) 2003 ReactOS
  * License: LGPL, see: LGPL.txt
  *
@@ -32,6 +32,8 @@
 #define KNUMS    0xc00  /* Special + number pad */
 #define KMEXT    0x300  /* Multi + ext */
 
+#define SHFT_INVALID 0x0F
+
 ROSDATA USHORT scancode_to_vk[] = {
   /* Numbers Row */
   /* - 00 - */
@@ -128,7 +130,8 @@ ROSDATA VK_TO_BIT modifier_keys[] = {
 ROSDATA MODIFIERS modifier_bits = {
   modifier_keys,
   7,
-  { 0, 1, 2, 3 ,0, 0,4,5} /* Modifier bit order, NONE, SHIFT, CTRL, SHIFT+CTRL,ALT(not used),SHIFT-ALT (not used), CTR+ALT, SHIFT-CTRL-ALT*/
+  { 0, 1, 2, 3, 0, 0, 4, 5 }
+  /* Modifier bit order: NONE, SHIFT, CTRL, SHIFT-CTRL, ALT (not used), SHIFT-ALT (not used), CTRL-ALT, SHIFT-CTRL-ALT */
 };
 
 #define NOCAPS 0
@@ -361,7 +364,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode1_to_vk,
 
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures -- English doesn't have any */
   0,

diff --git a/reactos/dll/keyboard/kbduk/kbduk.rc b/reactos/dll/keyboard/kbduk/kbduk.rc
index d962f9d..f833a36 100644 (file)
--- a/reactos/dll/keyboard/kbduk/kbduk.rc
+++ b/reactos/dll/keyboard/kbduk/kbduk.rc
@@ -1,5 +1,5 @@
 #define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS UKAscii Keyboard Layout\0"
+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS United Kingdom Keyboard Layout\0"
 #define REACTOS_STR_INTERNAL_NAME      "kbduk\0"
 #define REACTOS_STR_ORIGINAL_FILENAME  "kbduk.dll\0"
 #include <reactos/version.rc>

diff --git a/reactos/dll/keyboard/kbdur/kbdur.c b/reactos/dll/keyboard/kbdur/kbdur.c
index 8b85d3a..7488151 100644 (file)
--- a/reactos/dll/keyboard/kbdur/kbdur.c
+++ b/reactos/dll/keyboard/kbdur/kbdur.c
@@ -166,7 +166,7 @@ ROSDATA VK_TO_BIT modifier_keys[] = {
 ROSDATA MODIFIERS modifier_bits = {
   modifier_keys,
   3,
-  { 0, 1, 2, 3, 0, 0, 0xC0 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */
+  { 0, 1, 2, 3 }
 };
 
 #define NOCAPS 0

diff --git a/reactos/dll/keyboard/kbdurs/kbdurs.c b/reactos/dll/keyboard/kbdurs/kbdurs.c
index d3b179e..bd69750 100644 (file)
--- a/reactos/dll/keyboard/kbdurs/kbdurs.c
+++ b/reactos/dll/keyboard/kbdurs/kbdurs.c
@@ -166,7 +166,8 @@ ROSDATA VK_TO_BIT modifier_keys[] = {
 ROSDATA MODIFIERS modifier_bits = {
   modifier_keys,
   7,
-  { 0, 1, 4, 5, SHFT_INVALID, SHFT_INVALID, 2, 3 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */
+  { 0, 1, 4, 5, SHFT_INVALID, SHFT_INVALID, 2, 3 }
+  /* Modifier bit order: NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */
 };
 
 #define NOCAPS 0
@@ -375,7 +376,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures */
   0,

diff --git a/reactos/dll/keyboard/kbdus/kbdus.rc b/reactos/dll/keyboard/kbdus/kbdus.rc
index ed21210..907e32b 100644 (file)
--- a/reactos/dll/keyboard/kbdus/kbdus.rc
+++ b/reactos/dll/keyboard/kbdus/kbdus.rc
@@ -1,5 +1,5 @@
 #define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS USAscii Keyboard Layout\0"
+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS United States Keyboard Layout\0"
 #define REACTOS_STR_INTERNAL_NAME      "kbdus\0"
 #define REACTOS_STR_ORIGINAL_FILENAME  "kbdus.dll\0"
 #include <reactos/version.rc>

diff --git a/reactos/dll/keyboard/kbdusa/kbdusa.c b/reactos/dll/keyboard/kbdusa/kbdusa.c
index 9e385e6..052e8f5 100644 (file)
--- a/reactos/dll/keyboard/kbdusa/kbdusa.c
+++ b/reactos/dll/keyboard/kbdusa/kbdusa.c
@@ -377,7 +377,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   MAKELONG(0,1), /* Version 1.0 */
 
-  /* Ligatures -- Russian doesn't have any */
+  /* Ligatures */
   0,
   0,
   NULL

diff --git a/reactos/dll/keyboard/kbdusl/kbdusl.c b/reactos/dll/keyboard/kbdusl/kbdusl.c
index 842afce..7470325 100644 (file)
--- a/reactos/dll/keyboard/kbdusl/kbdusl.c
+++ b/reactos/dll/keyboard/kbdusl/kbdusl.c
@@ -372,7 +372,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   MAKELONG(0,1), /* Version 1.0 */
 
-  /* Ligatures -- Russian doesn't have any */
+  /* Ligatures -- English doesn't have any */
   0,
   0,
   NULL

diff --git a/reactos/dll/keyboard/kbdusr/kbdusr.c b/reactos/dll/keyboard/kbdusr/kbdusr.c
index edb0e52..bbb153e 100644 (file)
--- a/reactos/dll/keyboard/kbdusr/kbdusr.c
+++ b/reactos/dll/keyboard/kbdusr/kbdusr.c
@@ -372,7 +372,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   MAKELONG(0,1), /* Version 1.0 */
 
-  /* Ligatures -- Russian doesn't have any */
+  /* Ligatures -- English doesn't have any */
   0,
   0,
   NULL

diff --git a/reactos/dll/keyboard/kbdusx/kbdusx.c b/reactos/dll/keyboard/kbdusx/kbdusx.c
index 055a51d..f582f6f 100644 (file)
--- a/reactos/dll/keyboard/kbdusx/kbdusx.c
+++ b/reactos/dll/keyboard/kbdusx/kbdusx.c
@@ -461,7 +461,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   MAKELONG(1,1), /* Version 1.0 */
 
-  /* Ligatures -- Russian doesn't have any */
+  /* Ligatures */
   0,
   0,
   NULL

diff --git a/reactos/dll/keyboard/kbdvntc/kbdvntc.c b/reactos/dll/keyboard/kbdvntc/kbdvntc.c
index a595178..5c99f4f 100644 (file)
--- a/reactos/dll/keyboard/kbdvntc/kbdvntc.c
+++ b/reactos/dll/keyboard/kbdvntc/kbdvntc.c
@@ -375,7 +375,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures */
   0,

diff --git a/reactos/dll/keyboard/kbdycc/kbdycc.c b/reactos/dll/keyboard/kbdycc/kbdycc.c
index 16feb1c..b2a4748 100644 (file)
--- a/reactos/dll/keyboard/kbdycc/kbdycc.c
+++ b/reactos/dll/keyboard/kbdycc/kbdycc.c
@@ -391,7 +391,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures */
   0,

diff --git a/reactos/dll/keyboard/kbdycl/kbdycl.c b/reactos/dll/keyboard/kbdycl/kbdycl.c
index 68de865..fb3778f 100644 (file)
--- a/reactos/dll/keyboard/kbdycl/kbdycl.c
+++ b/reactos/dll/keyboard/kbdycl/kbdycl.c
@@ -511,7 +511,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
   extcode0_to_vk,
   extcode1_to_vk,
 
-  MAKELONG(0,1), /* Version 1.0 */
+  MAKELONG(1,1), /* Version 1.0 */
 
   /* Ligatures */
   2,