[ros-diffs] [reactos] 01/01: [KEYBOARD] Fix problems in our keyboard layouts

[Stanislav Motylkov]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cdf907074d607a2025d4e…

commit cdf907074d607a2025d4e099bc823286e24c8be4
Author:     Stanislav Motylkov <x86corez(a)gmail.com>
AuthorDate: Wed Oct 5 20:08:07 2022 +0300
Commit:     Stanislav Motylkov <x86corez(a)gmail.com>
CommitDate: Wed Oct 5 21:28:15 2022 +0300

    [KEYBOARD] Fix problems in our keyboard layouts
    
    - Fix failing API tests added in 6aacfa93 and c1c12793:
      'KbdLayout' test: All failures fixed now
      'VirtualKey' test: One of two failures fixed
    
    - This also should fix related problems with "F17" shortcut key
      in the menu items of some programs.
    
    CORE-17906 CORE-3903
---
 dll/keyboard/kbda1/kbda1.c       | 8 +++-----
 dll/keyboard/kbda2/kbda2.c       | 8 +++-----
 dll/keyboard/kbda3/kbda3.c       | 8 +++-----
 dll/keyboard/kbdal/kbdal.c       | 8 +++-----
 dll/keyboard/kbdarme/kbdarme.c   | 8 +++-----
 dll/keyboard/kbdarmw/kbdarmw.c   | 8 +++-----
 dll/keyboard/kbdaze/kbdaze.c     | 8 +++-----
 dll/keyboard/kbdazel/kbdazel.c   | 8 +++-----
 dll/keyboard/kbdbe/kbdbe.c       | 5 +----
 dll/keyboard/kbdbga/kbdbga.c     | 8 +++-----
 dll/keyboard/kbdbgt/kbdbgt.c     | 8 +++-----
 dll/keyboard/kbdblr/kbdblr.c     | 8 +++-----
 dll/keyboard/kbdbr/kbdbr.c       | 8 +++-----
 dll/keyboard/kbdbu/kbdbu.c       | 8 +++-----
 dll/keyboard/kbdbur/kbdbur.c     | 8 +++-----
 dll/keyboard/kbdcan/kbdcan.c     | 8 +++-----
 dll/keyboard/kbdcr/kbdcr.c       | 8 +++-----
 dll/keyboard/kbdcz/kbdcz.c       | 5 +----
 dll/keyboard/kbdcz1/kbdcz1.c     | 5 +----
 dll/keyboard/kbdda/kbdda.c       | 5 +----
 dll/keyboard/kbddv/kbddv.c       | 5 +----
 dll/keyboard/kbdeo/kbdeo.c       | 5 +----
 dll/keyboard/kbdest/kbdest.c     | 5 +----
 dll/keyboard/kbdfc/kbdfc.c       | 8 +++-----
 dll/keyboard/kbdfi/kbdfi.c       | 5 +----
 dll/keyboard/kbdfr/kbdfr.c       | 5 +----
 dll/keyboard/kbdgeo/kbdgeo.c     | 8 +++-----
 dll/keyboard/kbdgerg/kbdgerg.c   | 5 +----
 dll/keyboard/kbdgneo/kbdgneo.c   | 5 +----
 dll/keyboard/kbdgr/kbdgr.c       | 5 +----
 dll/keyboard/kbdgr1/kbdgr1.c     | 5 +----
 dll/keyboard/kbdhe/kbdhe.c       | 5 +----
 dll/keyboard/kbdheb/kbdheb.c     | 5 +----
 dll/keyboard/kbdhu/kbdhu.c       | 5 +----
 dll/keyboard/kbdic/kbdic.c       | 8 +++-----
 dll/keyboard/kbdinasa/kbdinasa.c | 8 +++-----
 dll/keyboard/kbdinben/kbdinben.c | 8 +++-----
 dll/keyboard/kbdindev/kbdindev.c | 8 +++-----
 dll/keyboard/kbdinguj/kbdinguj.c | 8 +++-----
 dll/keyboard/kbdinmal/kbdinmal.c | 8 +++-----
 dll/keyboard/kbdir/kbdir.c       | 8 +++-----
 dll/keyboard/kbdit/kbdit.c       | 5 +----
 dll/keyboard/kbdjpn/kbdjpn.c     | 5 +----
 dll/keyboard/kbdkaz/kbdkaz.c     | 8 +++-----
 dll/keyboard/kbdkor/kbdkor.c     | 5 +----
 dll/keyboard/kbdla/kbdla.c       | 8 +++-----
 dll/keyboard/kbdlt1/kbdlt1.c     | 5 +----
 dll/keyboard/kbdlv/kbdlv.c       | 5 +----
 dll/keyboard/kbdmac/kbdmac.c     | 8 +++-----
 dll/keyboard/kbdne/kbdne.c       | 8 +++-----
 dll/keyboard/kbdno/kbdno.c       | 5 +----
 dll/keyboard/kbdpl/kbdpl.c       | 5 +----
 dll/keyboard/kbdpl1/kbdpl1.c     | 5 +----
 dll/keyboard/kbdpo/kbdpo.c       | 5 +----
 dll/keyboard/kbdro/kbdro.c       | 8 +++-----
 dll/keyboard/kbdrost/kbdrost.c   | 6 +-----
 dll/keyboard/kbdru/kbdru.c       | 8 +++-----
 dll/keyboard/kbdru1/kbdru1.c     | 8 +++-----
 dll/keyboard/kbdsf/kbdsf.c       | 5 +----
 dll/keyboard/kbdsg/kbdsg.c       | 5 +----
 dll/keyboard/kbdsl/kbdsl.c       | 5 +----
 dll/keyboard/kbdsl1/kbdsl1.c     | 5 +----
 dll/keyboard/kbdsp/kbdsp.c       | 5 +----
 dll/keyboard/kbdsw/kbdsw.c       | 5 +----
 dll/keyboard/kbdtat/kbdtat.c     | 8 +++-----
 dll/keyboard/kbdth0/kbdth0.c     | 8 +++-----
 dll/keyboard/kbdth1/kbdth1.c     | 8 +++-----
 dll/keyboard/kbdth2/kbdth2.c     | 8 +++-----
 dll/keyboard/kbdth3/kbdth3.c     | 8 +++-----
 dll/keyboard/kbdtuf/kbdtuf.c     | 8 +++-----
 dll/keyboard/kbdtuq/kbdtuq.c     | 8 +++-----
 dll/keyboard/kbduk/kbduk.c       | 5 +----
 dll/keyboard/kbdur/kbdur.c       | 8 +++-----
 dll/keyboard/kbdurs/kbdurs.c     | 8 +++-----
 dll/keyboard/kbdus/kbdus.c       | 5 +----
 dll/keyboard/kbdusa/kbdusa.c     | 8 +++-----
 dll/keyboard/kbdusl/kbdusl.c     | 8 +++-----
 dll/keyboard/kbdusr/kbdusr.c     | 8 +++-----
 dll/keyboard/kbdusx/kbdusx.c     | 8 +++-----
 dll/keyboard/kbduzb/kbduzb.c     | 8 +++-----
 dll/keyboard/kbdvntc/kbdvntc.c   | 8 +++-----
 dll/keyboard/kbdycc/kbdycc.c     | 8 +++-----
 dll/keyboard/kbdycl/kbdycl.c     | 8 +++-----
 83 files changed, 181 insertions(+), 382 deletions(-)

diff --git a/dll/keyboard/kbda1/kbda1.c b/dll/keyboard/kbda1/kbda1.c
index e85d0eaf3d3..bdb99f86767 100644
--- a/dll/keyboard/kbda1/kbda1.c
+++ b/dll/keyboard/kbda1/kbda1.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -366,7 +364,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbda2/kbda2.c b/dll/keyboard/kbda2/kbda2.c
index 3ad64ea40cf..946a8bb2d34 100644
--- a/dll/keyboard/kbda2/kbda2.c
+++ b/dll/keyboard/kbda2/kbda2.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -383,7 +381,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbda3/kbda3.c b/dll/keyboard/kbda3/kbda3.c
index 888330a2944..1677325420d 100644
--- a/dll/keyboard/kbda3/kbda3.c
+++ b/dll/keyboard/kbda3/kbda3.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -383,7 +381,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdal/kbdal.c b/dll/keyboard/kbdal/kbdal.c
index 6c8af804acb..b11b47cb291 100644
--- a/dll/keyboard/kbdal/kbdal.c
+++ b/dll/keyboard/kbdal/kbdal.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -380,7 +378,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdarme/kbdarme.c b/dll/keyboard/kbdarme/kbdarme.c
index e2b9bb8aded..cf24dc820ff 100644
--- a/dll/keyboard/kbdarme/kbdarme.c
+++ b/dll/keyboard/kbdarme/kbdarme.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -353,7 +351,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdarmw/kbdarmw.c b/dll/keyboard/kbdarmw/kbdarmw.c
index 2be08a89688..82674455a81 100644
--- a/dll/keyboard/kbdarmw/kbdarmw.c
+++ b/dll/keyboard/kbdarmw/kbdarmw.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -341,7 +339,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdaze/kbdaze.c b/dll/keyboard/kbdaze/kbdaze.c
index 5124ba87dcd..1cde6284754 100644
--- a/dll/keyboard/kbdaze/kbdaze.c
+++ b/dll/keyboard/kbdaze/kbdaze.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -358,7 +356,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdazel/kbdazel.c b/dll/keyboard/kbdazel/kbdazel.c
index f337d165a2c..143acc9daf0 100644
--- a/dll/keyboard/kbdazel/kbdazel.c
+++ b/dll/keyboard/kbdazel/kbdazel.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -353,7 +351,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdbe/kbdbe.c b/dll/keyboard/kbdbe/kbdbe.c
index 7e5d6657a60..f9a25ae1a17 100644
--- a/dll/keyboard/kbdbe/kbdbe.c
+++ b/dll/keyboard/kbdbe/kbdbe.c
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -460,7 +457,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdbga/kbdbga.c b/dll/keyboard/kbdbga/kbdbga.c
index 0d1c27ed56c..db7cdfaccb9 100644
--- a/dll/keyboard/kbdbga/kbdbga.c
+++ b/dll/keyboard/kbdbga/kbdbga.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -381,7 +379,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdbgt/kbdbgt.c b/dll/keyboard/kbdbgt/kbdbgt.c
index 80b4b011d42..46b63f81746 100644
--- a/dll/keyboard/kbdbgt/kbdbgt.c
+++ b/dll/keyboard/kbdbgt/kbdbgt.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -398,7 +396,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdblr/kbdblr.c b/dll/keyboard/kbdblr/kbdblr.c
index 0c049085f6f..6257b3d5926 100644
--- a/dll/keyboard/kbdblr/kbdblr.c
+++ b/dll/keyboard/kbdblr/kbdblr.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -358,7 +356,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdbr/kbdbr.c b/dll/keyboard/kbdbr/kbdbr.c
index 7719c044721..cc546ff580d 100644
--- a/dll/keyboard/kbdbr/kbdbr.c
+++ b/dll/keyboard/kbdbr/kbdbr.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -441,7 +439,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdbu/kbdbu.c b/dll/keyboard/kbdbu/kbdbu.c
index 902061c04a5..364ee56592a 100644
--- a/dll/keyboard/kbdbu/kbdbu.c
+++ b/dll/keyboard/kbdbu/kbdbu.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -382,7 +380,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdbur/kbdbur.c b/dll/keyboard/kbdbur/kbdbur.c
index 078ffe7dfe2..201ad1afe25 100644
--- a/dll/keyboard/kbdbur/kbdbur.c
+++ b/dll/keyboard/kbdbur/kbdbur.c
@@ -95,10 +95,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -360,7 +358,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdcan/kbdcan.c b/dll/keyboard/kbdcan/kbdcan.c
index c2099e5f121..dcc6040f68e 100644
--- a/dll/keyboard/kbdcan/kbdcan.c
+++ b/dll/keyboard/kbdcan/kbdcan.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -574,7 +572,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdcr/kbdcr.c b/dll/keyboard/kbdcr/kbdcr.c
index 64f26976dc7..3a5d112ccb1 100644
--- a/dll/keyboard/kbdcr/kbdcr.c
+++ b/dll/keyboard/kbdcr/kbdcr.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -488,7 +486,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdcz/kbdcz.c b/dll/keyboard/kbdcz/kbdcz.c
index 41dfd088be1..157f24cc8a4 100644
--- a/dll/keyboard/kbdcz/kbdcz.c
+++ b/dll/keyboard/kbdcz/kbdcz.c
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -458,7 +455,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdcz1/kbdcz1.c b/dll/keyboard/kbdcz1/kbdcz1.c
index e71f2f9fcad..be5b932e154 100644
--- a/dll/keyboard/kbdcz1/kbdcz1.c
+++ b/dll/keyboard/kbdcz1/kbdcz1.c
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -451,7 +448,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdda/kbdda.c b/dll/keyboard/kbdda/kbdda.c
index 1d68d3c2d00..971917b033e 100644
--- a/dll/keyboard/kbdda/kbdda.c
+++ b/dll/keyboard/kbdda/kbdda.c
@@ -93,9 +93,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -460,7 +457,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbddv/kbddv.c b/dll/keyboard/kbddv/kbddv.c
index b3100b7116b..9243ad2cbc0 100644
--- a/dll/keyboard/kbddv/kbddv.c
+++ b/dll/keyboard/kbddv/kbddv.c
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -371,7 +368,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdeo/kbdeo.c b/dll/keyboard/kbdeo/kbdeo.c
index 7346f5808d2..19a4e538133 100644
--- a/dll/keyboard/kbdeo/kbdeo.c
+++ b/dll/keyboard/kbdeo/kbdeo.c
@@ -100,9 +100,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -393,7 +390,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdest/kbdest.c b/dll/keyboard/kbdest/kbdest.c
index 43b344ee3a0..c83498edc9e 100644
--- a/dll/keyboard/kbdest/kbdest.c
+++ b/dll/keyboard/kbdest/kbdest.c
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -372,7 +369,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdfc/kbdfc.c b/dll/keyboard/kbdfc/kbdfc.c
index 016869cd110..cfa1f101ab7 100644
--- a/dll/keyboard/kbdfc/kbdfc.c
+++ b/dll/keyboard/kbdfc/kbdfc.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -452,7 +450,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdfi/kbdfi.c b/dll/keyboard/kbdfi/kbdfi.c
index a321dda808b..1ab690dba94 100644
--- a/dll/keyboard/kbdfi/kbdfi.c
+++ b/dll/keyboard/kbdfi/kbdfi.c
@@ -96,9 +96,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -451,7 +448,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdfr/kbdfr.c b/dll/keyboard/kbdfr/kbdfr.c
index e2d315e160b..661a2ee1171 100644
--- a/dll/keyboard/kbdfr/kbdfr.c
+++ b/dll/keyboard/kbdfr/kbdfr.c
@@ -103,9 +103,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -451,7 +448,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdgeo/kbdgeo.c b/dll/keyboard/kbdgeo/kbdgeo.c
index 44eee7e5bdb..e566b9ce41a 100644
--- a/dll/keyboard/kbdgeo/kbdgeo.c
+++ b/dll/keyboard/kbdgeo/kbdgeo.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -358,7 +356,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdgerg/kbdgerg.c b/dll/keyboard/kbdgerg/kbdgerg.c
index 249d579a940..8386aa4e42c 100644
--- a/dll/keyboard/kbdgerg/kbdgerg.c
+++ b/dll/keyboard/kbdgerg/kbdgerg.c
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -430,7 +427,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdgneo/kbdgneo.c b/dll/keyboard/kbdgneo/kbdgneo.c
index 34300170c60..44cbcce942e 100644
--- a/dll/keyboard/kbdgneo/kbdgneo.c
+++ b/dll/keyboard/kbdgneo/kbdgneo.c
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -430,7 +427,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdgr/kbdgr.c b/dll/keyboard/kbdgr/kbdgr.c
index ff83647b878..b0c09714e11 100644
--- a/dll/keyboard/kbdgr/kbdgr.c
+++ b/dll/keyboard/kbdgr/kbdgr.c
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -430,7 +427,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdgr1/kbdgr1.c b/dll/keyboard/kbdgr1/kbdgr1.c
index a9dbbff43db..da42ac88bdb 100644
--- a/dll/keyboard/kbdgr1/kbdgr1.c
+++ b/dll/keyboard/kbdgr1/kbdgr1.c
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -430,7 +427,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdhe/kbdhe.c b/dll/keyboard/kbdhe/kbdhe.c
index e01af950fc7..70d3f2bb6a2 100644
--- a/dll/keyboard/kbdhe/kbdhe.c
+++ b/dll/keyboard/kbdhe/kbdhe.c
@@ -99,9 +99,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -402,7 +399,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdheb/kbdheb.c b/dll/keyboard/kbdheb/kbdheb.c
index daf1d0c130b..c0e530cccff 100644
--- a/dll/keyboard/kbdheb/kbdheb.c
+++ b/dll/keyboard/kbdheb/kbdheb.c
@@ -214,9 +214,6 @@ ROSDATA USHORT scancode_to_vk[] =
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -494,7 +491,7 @@ ROSDATA KBDTABLES keyboard_layout_table =
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdhu/kbdhu.c b/dll/keyboard/kbdhu/kbdhu.c
index e300fbd2f6f..d51086d90a4 100644
--- a/dll/keyboard/kbdhu/kbdhu.c
+++ b/dll/keyboard/kbdhu/kbdhu.c
@@ -99,9 +99,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -377,7 +374,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdic/kbdic.c b/dll/keyboard/kbdic/kbdic.c
index ec14a97250d..12000d95cc2 100644
--- a/dll/keyboard/kbdic/kbdic.c
+++ b/dll/keyboard/kbdic/kbdic.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -442,7 +440,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdinasa/kbdinasa.c b/dll/keyboard/kbdinasa/kbdinasa.c
index 32e39764f69..2aab04bdca4 100644
--- a/dll/keyboard/kbdinasa/kbdinasa.c
+++ b/dll/keyboard/kbdinasa/kbdinasa.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -379,7 +377,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdinben/kbdinben.c b/dll/keyboard/kbdinben/kbdinben.c
index ad7c1db9b57..65cc9f0c43b 100644
--- a/dll/keyboard/kbdinben/kbdinben.c
+++ b/dll/keyboard/kbdinben/kbdinben.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -374,7 +372,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdindev/kbdindev.c b/dll/keyboard/kbdindev/kbdindev.c
index 966c0be19fb..efa9f55b7fd 100644
--- a/dll/keyboard/kbdindev/kbdindev.c
+++ b/dll/keyboard/kbdindev/kbdindev.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -379,7 +377,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdinguj/kbdinguj.c b/dll/keyboard/kbdinguj/kbdinguj.c
index 90a1dcf93ac..10ae88c08c3 100644
--- a/dll/keyboard/kbdinguj/kbdinguj.c
+++ b/dll/keyboard/kbdinguj/kbdinguj.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -379,7 +377,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdinmal/kbdinmal.c b/dll/keyboard/kbdinmal/kbdinmal.c
index 904c4f22679..87069ccbe85 100644
--- a/dll/keyboard/kbdinmal/kbdinmal.c
+++ b/dll/keyboard/kbdinmal/kbdinmal.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -375,7 +373,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdir/kbdir.c b/dll/keyboard/kbdir/kbdir.c
index 8f8377271e8..2cd21d6eb39 100644
--- a/dll/keyboard/kbdir/kbdir.c
+++ b/dll/keyboard/kbdir/kbdir.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -407,7 +405,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdit/kbdit.c b/dll/keyboard/kbdit/kbdit.c
index 9c841421df5..e1793f5feb1 100644
--- a/dll/keyboard/kbdit/kbdit.c
+++ b/dll/keyboard/kbdit/kbdit.c
@@ -155,9 +155,6 @@ ROSDATA USHORT scancode_to_vk[] = {
 /* 7c */  VK_EMPTY,
 /* 7d */  VK_EMPTY,
 /* 7e */  VK_EMPTY,
-/* 7f */  VK_EMPTY,
-/* 80 */  VK_EMPTY,
-/* 00 */  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -432,7 +429,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdjpn/kbdjpn.c b/dll/keyboard/kbdjpn/kbdjpn.c
index eb09fe6d211..85363620428 100644
--- a/dll/keyboard/kbdjpn/kbdjpn.c
+++ b/dll/keyboard/kbdjpn/kbdjpn.c
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_CONVERT | KBDSPECIAL, VK_EMPTY,
   VK_NONCONVERT | KBDSPECIAL, VK_EMPTY, VK_OEM_5, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -378,7 +375,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdkaz/kbdkaz.c b/dll/keyboard/kbdkaz/kbdkaz.c
index 60121f69a6a..4b336343586 100644
--- a/dll/keyboard/kbdkaz/kbdkaz.c
+++ b/dll/keyboard/kbdkaz/kbdkaz.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -358,7 +356,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdkor/kbdkor.c b/dll/keyboard/kbdkor/kbdkor.c
index e3553a9342d..9d4591b9fa0 100644
--- a/dll/keyboard/kbdkor/kbdkor.c
+++ b/dll/keyboard/kbdkor/kbdkor.c
@@ -104,9 +104,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -377,7 +374,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdla/kbdla.c b/dll/keyboard/kbdla/kbdla.c
index 488cfeaf204..11bdddb4834 100644
--- a/dll/keyboard/kbdla/kbdla.c
+++ b/dll/keyboard/kbdla/kbdla.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -428,7 +426,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdlt1/kbdlt1.c b/dll/keyboard/kbdlt1/kbdlt1.c
index b5781ca5304..2b0fbae235f 100644
--- a/dll/keyboard/kbdlt1/kbdlt1.c
+++ b/dll/keyboard/kbdlt1/kbdlt1.c
@@ -100,9 +100,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -369,7 +366,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdlv/kbdlv.c b/dll/keyboard/kbdlv/kbdlv.c
index 2d75ebf4b5e..a81170fdcc6 100644
--- a/dll/keyboard/kbdlv/kbdlv.c
+++ b/dll/keyboard/kbdlv/kbdlv.c
@@ -99,9 +99,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -373,7 +370,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdmac/kbdmac.c b/dll/keyboard/kbdmac/kbdmac.c
index 8a77a449aea..8bca30bf2ba 100644
--- a/dll/keyboard/kbdmac/kbdmac.c
+++ b/dll/keyboard/kbdmac/kbdmac.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -364,7 +362,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdne/kbdne.c b/dll/keyboard/kbdne/kbdne.c
index f58e7ae36d2..090ef00602b 100644
--- a/dll/keyboard/kbdne/kbdne.c
+++ b/dll/keyboard/kbdne/kbdne.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -446,7 +444,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdno/kbdno.c b/dll/keyboard/kbdno/kbdno.c
index c9b19bc3729..021e5317429 100644
--- a/dll/keyboard/kbdno/kbdno.c
+++ b/dll/keyboard/kbdno/kbdno.c
@@ -93,9 +93,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -460,7 +457,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdpl/kbdpl.c b/dll/keyboard/kbdpl/kbdpl.c
index b2557bf34a6..919186abaf3 100644
--- a/dll/keyboard/kbdpl/kbdpl.c
+++ b/dll/keyboard/kbdpl/kbdpl.c
@@ -99,9 +99,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -397,7 +394,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdpl1/kbdpl1.c b/dll/keyboard/kbdpl1/kbdpl1.c
index bd20e8c8ab5..c0c6ff8d15e 100644
--- a/dll/keyboard/kbdpl1/kbdpl1.c
+++ b/dll/keyboard/kbdpl1/kbdpl1.c
@@ -99,9 +99,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -413,7 +410,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdpo/kbdpo.c b/dll/keyboard/kbdpo/kbdpo.c
index a6fb89072a4..7bf501c08e3 100644
--- a/dll/keyboard/kbdpo/kbdpo.c
+++ b/dll/keyboard/kbdpo/kbdpo.c
@@ -165,9 +165,6 @@ ROSDATA USHORT scancode_to_vk[] = {
 /* 7c */  VK_EMPTY,
 /* 7d */  VK_EMPTY,
 /* 7e */  VK_EMPTY,
-/* 7f */  VK_EMPTY,
-/* 80 */  VK_EMPTY,
-/* 00 */  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -553,7 +550,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdro/kbdro.c b/dll/keyboard/kbdro/kbdro.c
index 8363139d366..ce0df72cec7 100644
--- a/dll/keyboard/kbdro/kbdro.c
+++ b/dll/keyboard/kbdro/kbdro.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -363,7 +361,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdrost/kbdrost.c b/dll/keyboard/kbdrost/kbdrost.c
index 7b06638cf9d..f3358a65d2a 100644
--- a/dll/keyboard/kbdrost/kbdrost.c
+++ b/dll/keyboard/kbdrost/kbdrost.c
@@ -134,10 +134,6 @@ ROSDATA USHORT scancode_to_vk[] =
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] =
@@ -461,7 +457,7 @@ ROSDATA KBDTABLES keyboard_layout_table =
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdru/kbdru.c b/dll/keyboard/kbdru/kbdru.c
index 092ed570957..09c71f256e8 100644
--- a/dll/keyboard/kbdru/kbdru.c
+++ b/dll/keyboard/kbdru/kbdru.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -371,7 +369,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdru1/kbdru1.c b/dll/keyboard/kbdru1/kbdru1.c
index b3419c76a8a..f9a46eb0908 100644
--- a/dll/keyboard/kbdru1/kbdru1.c
+++ b/dll/keyboard/kbdru1/kbdru1.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -371,7 +369,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdsf/kbdsf.c b/dll/keyboard/kbdsf/kbdsf.c
index f7b11f643c1..5bebb745e44 100644
--- a/dll/keyboard/kbdsf/kbdsf.c
+++ b/dll/keyboard/kbdsf/kbdsf.c
@@ -99,9 +99,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -461,7 +458,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdsg/kbdsg.c b/dll/keyboard/kbdsg/kbdsg.c
index b7985437731..89f1768ad1f 100644
--- a/dll/keyboard/kbdsg/kbdsg.c
+++ b/dll/keyboard/kbdsg/kbdsg.c
@@ -99,9 +99,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -458,7 +455,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdsl/kbdsl.c b/dll/keyboard/kbdsl/kbdsl.c
index e01e6521482..edd62aad63b 100644
--- a/dll/keyboard/kbdsl/kbdsl.c
+++ b/dll/keyboard/kbdsl/kbdsl.c
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -445,7 +442,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdsl1/kbdsl1.c b/dll/keyboard/kbdsl1/kbdsl1.c
index 7f505a4bd25..ef7f42eceb7 100644
--- a/dll/keyboard/kbdsl1/kbdsl1.c
+++ b/dll/keyboard/kbdsl1/kbdsl1.c
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -445,7 +442,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdsp/kbdsp.c b/dll/keyboard/kbdsp/kbdsp.c
index bfee723463a..ee515860bd9 100644
--- a/dll/keyboard/kbdsp/kbdsp.c
+++ b/dll/keyboard/kbdsp/kbdsp.c
@@ -165,9 +165,6 @@ ROSDATA USHORT scancode_to_vk[] =
   /* 7c */  VK_EMPTY,
   /* 7d */  VK_EMPTY,
   /* 7e */  VK_EMPTY,
-  /* 7f */  VK_EMPTY,
-  /* 80 */  VK_EMPTY,
-  /* 00 */  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] =
@@ -534,7 +531,7 @@ ROSDATA KBDTABLES keyboard_layout_table =
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdsw/kbdsw.c b/dll/keyboard/kbdsw/kbdsw.c
index 66d8fa32791..da6415d20dd 100644
--- a/dll/keyboard/kbdsw/kbdsw.c
+++ b/dll/keyboard/kbdsw/kbdsw.c
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -456,7 +453,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdtat/kbdtat.c b/dll/keyboard/kbdtat/kbdtat.c
index 4f04ba193a7..2755b853679 100644
--- a/dll/keyboard/kbdtat/kbdtat.c
+++ b/dll/keyboard/kbdtat/kbdtat.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -368,7 +366,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdth0/kbdth0.c b/dll/keyboard/kbdth0/kbdth0.c
index 7085975b853..85b62a356fe 100644
--- a/dll/keyboard/kbdth0/kbdth0.c
+++ b/dll/keyboard/kbdth0/kbdth0.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -358,7 +356,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdth1/kbdth1.c b/dll/keyboard/kbdth1/kbdth1.c
index d30fd373f5a..927825a3530 100644
--- a/dll/keyboard/kbdth1/kbdth1.c
+++ b/dll/keyboard/kbdth1/kbdth1.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -358,7 +356,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdth2/kbdth2.c b/dll/keyboard/kbdth2/kbdth2.c
index 3779699ab5a..9196403ce5b 100644
--- a/dll/keyboard/kbdth2/kbdth2.c
+++ b/dll/keyboard/kbdth2/kbdth2.c
@@ -95,10 +95,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -359,7 +357,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdth3/kbdth3.c b/dll/keyboard/kbdth3/kbdth3.c
index c98c7c0ab98..03f1a3f2ccf 100644
--- a/dll/keyboard/kbdth3/kbdth3.c
+++ b/dll/keyboard/kbdth3/kbdth3.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -358,7 +356,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdtuf/kbdtuf.c b/dll/keyboard/kbdtuf/kbdtuf.c
index 03cdb1d2b31..980739a8f23 100644
--- a/dll/keyboard/kbdtuf/kbdtuf.c
+++ b/dll/keyboard/kbdtuf/kbdtuf.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -453,7 +451,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdtuq/kbdtuq.c b/dll/keyboard/kbdtuq/kbdtuq.c
index f2393d034a5..42a5cbe5efc 100644
--- a/dll/keyboard/kbdtuq/kbdtuq.c
+++ b/dll/keyboard/kbdtuq/kbdtuq.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -453,7 +451,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbduk/kbduk.c b/dll/keyboard/kbduk/kbduk.c
index 23feb4a492d..54d7c81ca98 100644
--- a/dll/keyboard/kbduk/kbduk.c
+++ b/dll/keyboard/kbduk/kbduk.c
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -383,7 +380,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdur/kbdur.c b/dll/keyboard/kbdur/kbdur.c
index b101be5c6ed..d8446214e2d 100644
--- a/dll/keyboard/kbdur/kbdur.c
+++ b/dll/keyboard/kbdur/kbdur.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -372,7 +370,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdurs/kbdurs.c b/dll/keyboard/kbdurs/kbdurs.c
index 320f1dae9f8..ae2165e77d8 100644
--- a/dll/keyboard/kbdurs/kbdurs.c
+++ b/dll/keyboard/kbdurs/kbdurs.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -364,7 +362,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdus/kbdus.c b/dll/keyboard/kbdus/kbdus.c
index ef103cdc1b2..d3fad47efae 100644
--- a/dll/keyboard/kbdus/kbdus.c
+++ b/dll/keyboard/kbdus/kbdus.c
@@ -98,9 +98,6 @@ ROSDATA USHORT scancode_to_vk[] = {
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -378,7 +375,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdusa/kbdusa.c b/dll/keyboard/kbdusa/kbdusa.c
index 7f39d4d1c80..c83fe1b756f 100644
--- a/dll/keyboard/kbdusa/kbdusa.c
+++ b/dll/keyboard/kbdusa/kbdusa.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -363,7 +361,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdusl/kbdusl.c b/dll/keyboard/kbdusl/kbdusl.c
index 4ee85186dff..1f104db5a65 100644
--- a/dll/keyboard/kbdusl/kbdusl.c
+++ b/dll/keyboard/kbdusl/kbdusl.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -358,7 +356,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdusr/kbdusr.c b/dll/keyboard/kbdusr/kbdusr.c
index 8733483d0e1..68319893177 100644
--- a/dll/keyboard/kbdusr/kbdusr.c
+++ b/dll/keyboard/kbdusr/kbdusr.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -358,7 +356,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdusx/kbdusx.c b/dll/keyboard/kbdusx/kbdusx.c
index 0f0ae653d86..5b52adb3f69 100644
--- a/dll/keyboard/kbdusx/kbdusx.c
+++ b/dll/keyboard/kbdusx/kbdusx.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -447,7 +445,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbduzb/kbduzb.c b/dll/keyboard/kbduzb/kbduzb.c
index f48c4b28933..93aa9c12e70 100644
--- a/dll/keyboard/kbduzb/kbduzb.c
+++ b/dll/keyboard/kbduzb/kbduzb.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -358,7 +356,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdvntc/kbdvntc.c b/dll/keyboard/kbdvntc/kbdvntc.c
index 2c453c794a7..df56da7868b 100644
--- a/dll/keyboard/kbdvntc/kbdvntc.c
+++ b/dll/keyboard/kbdvntc/kbdvntc.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -363,7 +361,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdycc/kbdycc.c b/dll/keyboard/kbdycc/kbdycc.c
index 9570f49ae53..50b6f11865c 100644
--- a/dll/keyboard/kbdycc/kbdycc.c
+++ b/dll/keyboard/kbdycc/kbdycc.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -379,7 +377,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,
 
diff --git a/dll/keyboard/kbdycl/kbdycl.c b/dll/keyboard/kbdycl/kbdycl.c
index 3991436e0ae..12976a38f67 100644
--- a/dll/keyboard/kbdycl/kbdycl.c
+++ b/dll/keyboard/kbdycl/kbdycl.c
@@ -98,10 +98,8 @@ ROSDATA USHORT scancode_to_vk[] = {
   VK_F24,
   /* - 77 - */
   VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
+  VK_OEM_PA1, VK_TAB, 0xc2, VK_EMPTY, /* PA1 */
+  VK_EMPTY,
 };
 
 ROSDATA VSC_VK extcode0_to_vk[] = {
@@ -499,7 +497,7 @@ ROSDATA KBDTABLES keyboard_layout_table = {
 
   /* scan code to virtual key maps */
   scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+  RTL_NUMBER_OF(scancode_to_vk),
   extcode0_to_vk,
   extcode1_to_vk,