diff --git a/reactos/bootdata/hivesys.inf b/reactos/bootdata/hivesys.inf
index cc9977b3e74..9e41f174017 100644
--- a/reactos/bootdata/hivesys.inf
+++ b/reactos/bootdata/hivesys.inf
@@ -54,6 +54,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000419","Layout File",0
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000419","Layout Text",0x00000000,"Russian"
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout File",0x00000000,"kbdse.dll"
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout Text",0x00000000,"SE"
+HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000422","Layout File",0x00000000,"kbdur.dll"
+HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000422","Layout Text",0x00000000,"Ukrainian"
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000809","Layout File",0x00000000,"kbduk.dll"
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000809","Layout Text",0x00000000,"UK"
HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000807","Layout File",0x00000000,"kbdsg.dll"
diff --git a/reactos/bootdata/txtsetup.sif b/reactos/bootdata/txtsetup.sif
index 737ab0631f1..263d8947345 100644
--- a/reactos/bootdata/txtsetup.sif
+++ b/reactos/bootdata/txtsetup.sif
@@ -98,6 +98,7 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)"
0000041D = "Swedish (Sweden)"
00000807 = "German (Swiss)"
00000408 = "Greek"
+00000422 = "Ukrainian"
00010408 = "Greek 220"
[Files.KeyboardLayout]
@@ -110,6 +111,7 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)"
0000040E = kbdhu.dll
00000419 = kbdru.dll
0000041D = kbdse.dll
+00000422 = kbdur.dll
00000809 = kbduk.dll
00000807 = kbdsg.dll
00000813 = kbdbe.dll
diff --git a/reactos/lib/keyboard/directory.xml b/reactos/lib/keyboard/directory.xml
index 391de1ab092..cf546693637 100644
--- a/reactos/lib/keyboard/directory.xml
+++ b/reactos/lib/keyboard/directory.xml
@@ -41,4 +41,7 @@
+
+
+
diff --git a/reactos/lib/keyboard/kbdur/kbdur.c b/reactos/lib/keyboard/kbdur/kbdur.c
new file mode 100644
index 00000000000..d8891b23913
--- /dev/null
+++ b/reactos/lib/keyboard/kbdur/kbdur.c
@@ -0,0 +1,407 @@
+/*
+ * ReactOS Ukrainian ASCII Keyboard layout
+ * Copyright (C) 2005 ReactOS
+ * Author: Artem Reznikov
+ * License: LGPL, see: LGPL.txt
+ *
+ * Thanks to: http://www.barcodeman.com/altek/mule/scandoc.php
+ * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html
+ */
+
+#include
+#include
+
+#ifdef _M_IA64
+#define ROSDATA static __declspec(allocate(".data"))
+#else
+#ifdef _MSC_VER
+#pragma data_seg(".data")
+#define ROSDATA static
+#else
+#define ROSDATA static __attribute__((section(".data")))
+#endif
+#endif
+
+#define VK_EMPTY 0xff /* The non-existent VK */
+#define KSHIFT 0x001 /* Shift modifier */
+#define KCTRL 0x002 /* Ctrl modifier */
+#define KALT 0x004 /* Alt modifier */
+#define KEXT 0x100 /* Extended key code */
+#define KMULTI 0x200 /* Multi-key */
+#define KSPEC 0x400 /* Special key */
+#define KNUMP 0x800 /* Number-pad */
+#define KNUMS 0xc00 /* Special + number pad */
+#define KMEXT 0x300 /* Multi + ext */
+
+#define SHFT_INVALID 0x0F
+
+ROSDATA USHORT scancode_to_vk[] = {
+ /* Numbers Row */
+ /* - 00 - */
+ /* 1 ... 2 ... 3 ... 4 ... */
+ VK_EMPTY, VK_ESCAPE, '1', '2',
+ '3', '4', '5', '6',
+ '7', '8', '9', '0',
+ VK_OEM_MINUS, VK_OEM_PLUS, VK_BACK,
+ /* - 0f - */
+ /* First Letters Row */
+ VK_TAB, 'Q', 'W', 'E',
+ 'R', 'T', 'Y', 'U',
+ 'I', 'O', 'P',
+ VK_OEM_4, VK_OEM_6, VK_RETURN,
+ /* - 1d - */
+ /* Second Letters Row */
+ VK_LCONTROL,
+ 'A', 'S', 'D', 'F',
+ 'G', 'H', 'J', 'K',
+ 'L', VK_OEM_1, VK_OEM_7, VK_OEM_3,
+ VK_LSHIFT, VK_OEM_5,
+ /* - 2c - */
+ /* Third letters row */
+ 'Z', 'X', 'C', 'V',
+ 'B', 'N', 'M', VK_OEM_COMMA,
+ VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT | KEXT,
+ /* - 37 - */
+ /* Bottom Row */
+ 0x26a, VK_LMENU, VK_SPACE, VK_CAPITAL,
+
+ /* - 3b - */
+ /* F-Keys */
+ VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6,
+ VK_F7, VK_F8, VK_F9, VK_F10,
+ /* - 45 - */
+ /* Locks */
+ VK_NUMLOCK | KMEXT,
+ VK_SCROLL | KMULTI,
+ /* - 47 - */
+ /* Number-Pad */
+ VK_HOME | KNUMS, VK_UP | KNUMS, VK_PRIOR | KNUMS, VK_SUBTRACT,
+ VK_LEFT | KNUMS, VK_CLEAR | KNUMS, VK_RIGHT | KNUMS, VK_ADD,
+ VK_END | KNUMS, VK_DOWN | KNUMS, VK_NEXT | KNUMS,
+ VK_INSERT | KNUMS, VK_DELETE | KNUMS,
+ /* - 54 - */
+ /* Presumably PrtSc */
+ VK_SNAPSHOT,
+ /* - 55 - */
+ /* Oddities, and the remaining standard F-Keys */
+ VK_EMPTY, VK_OEM_102, VK_F11, VK_F12,
+ /* - 59 - */
+ VK_CLEAR, VK_OEM_WSCTRL,VK_OEM_FINISH,VK_OEM_JUMP, VK_EREOF, /* EREOF */
+ VK_OEM_BACKTAB, VK_OEM_AUTO, VK_EMPTY, VK_ZOOM, /* ZOOM */
+ VK_HELP,
+ /* - 64 - */
+ /* Even more F-Keys (for example, NCR keyboards from the early 90's) */
+ VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20,
+ VK_F21, VK_F22, VK_F23,
+ /* - 6f - */
+ /* Not sure who uses these codes */
+ VK_OEM_PA3, VK_EMPTY, VK_OEM_RESET,
+ /* - 72 - */
+ VK_EMPTY, 0xc1, VK_EMPTY, VK_EMPTY,
+ /* - 76 - */
+ /* One more f-key */
+ VK_F24,
+ /* - 77 - */
+ VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
+ VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
+ 0,
+ /* - 80 - */
+ 0
+};
+
+ROSDATA VSC_VK extcode0_to_vk[] = {
+ { 0x10, VK_MEDIA_PREV_TRACK | KEXT },
+ { 0x19, VK_MEDIA_NEXT_TRACK | KEXT },
+ { 0x1D, VK_RCONTROL | KEXT },
+ { 0x20, VK_VOLUME_MUTE | KEXT },
+ { 0x21, VK_LAUNCH_APP2 | KEXT },
+ { 0x22, VK_MEDIA_PLAY_PAUSE | KEXT },
+ { 0x24, VK_MEDIA_STOP | KEXT },
+ { 0x2E, VK_VOLUME_DOWN | KEXT },
+ { 0x30, VK_VOLUME_UP | KEXT },
+ { 0x32, VK_BROWSER_HOME | KEXT },
+ { 0x35, VK_DIVIDE | KEXT },
+ { 0x37, VK_SNAPSHOT | KEXT },
+ { 0x38, VK_RMENU | KEXT },
+ { 0x47, VK_HOME | KEXT },
+ { 0x48, VK_UP | KEXT },
+ { 0x49, VK_PRIOR | KEXT },
+ { 0x4B, VK_LEFT | KEXT },
+ { 0x4D, VK_RIGHT | KEXT },
+ { 0x4F, VK_END | KEXT },
+ { 0x50, VK_DOWN | KEXT },
+ { 0x51, VK_NEXT | KEXT },
+ { 0x52, VK_INSERT | KEXT },
+ { 0x53, VK_DELETE | KEXT },
+ { 0x5B, VK_LWIN | KEXT },
+ { 0x5C, VK_RWIN | KEXT },
+ { 0x5D, VK_APPS | KEXT },
+ { 0x5F, VK_SLEEP | KEXT },
+ { 0x65, VK_BROWSER_SEARCH | KEXT },
+ { 0x66, VK_BROWSER_FAVORITES | KEXT },
+ { 0x67, VK_BROWSER_REFRESH | KEXT },
+ { 0x68, VK_BROWSER_STOP | KEXT },
+ { 0x69, VK_BROWSER_FORWARD | KEXT },
+ { 0x6A, VK_BROWSER_BACK | KEXT },
+ { 0x6B, VK_LAUNCH_APP1 | KEXT },
+ { 0x6C, VK_LAUNCH_MAIL | KEXT },
+ { 0x6D, VK_LAUNCH_MEDIA_SELECT | KEXT },
+ { 0x1C, VK_RETURN | KEXT },
+ { 0x46, VK_CANCEL | KEXT },
+ { 0, 0 },
+};
+
+ROSDATA VSC_VK extcode1_to_vk[] = {
+ { 0x1d, VK_PAUSE},
+ { 0, 0 },
+};
+
+ROSDATA VK_TO_BIT modifier_keys[] = {
+ { VK_SHIFT, KSHIFT },
+ { VK_CONTROL, KCTRL },
+ { VK_MENU, KALT },
+ { 0, 0 }
+};
+
+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 */
+};
+
+#define NOCAPS 0
+#define CAPS KSHIFT /* Caps -> shift */
+
+ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = {
+ {VK_OEM_3, CAPS, {0x451, 0x401} },
+ { '1', NOCAPS, {'1', '!'} },
+ { '3', NOCAPS, {'3', 0x2116} },
+ { '4', NOCAPS, {'4', ';'} },
+ { '5', NOCAPS, {'5', '%'} },
+ { '7', NOCAPS, {'7', '?'} },
+ { '8', NOCAPS, {'8', '*'} },
+ { '9', NOCAPS, {'9', '('} },
+ { '0', NOCAPS, {'0', ')'} },
+ { VK_OEM_PLUS, NOCAPS, {'=', '+'} },
+
+ /* First letter row */
+ { 'Q', CAPS, {0x439, 0x419} },
+ { 'W', CAPS, {0x446, 0x426} },
+ { 'E', CAPS, {0x443, 0x423} },
+ { 'R', CAPS, {0x43a, 0x41a} },
+ { 'T', CAPS, {0x435, 0x415} },
+ { 'Y', CAPS, {0x43d, 0x41d} },
+ { 'U', CAPS, {0x433, 0x413} },
+ { 'I', CAPS, {0x448, 0x428} },
+ { 'O', CAPS, {0x449, 0x429} },
+ { 'P', CAPS, {0x437, 0x417} },
+ { VK_OEM_4, CAPS, {0x445, 0x425} },
+ { VK_OEM_6, CAPS, {0x457, 0x407} },
+
+ /* Second letter row */
+ { 'A', CAPS, {0x444, 0x424} },
+ { 'S', CAPS, {0x456, 0x406} },
+ { 'D', CAPS, {0x432, 0x412} },
+ { 'F', CAPS, {0x430, 0x410} },
+ { 'G', CAPS, {0x43f, 0x41f} },
+ { 'H', CAPS, {0x440, 0x420} },
+ { 'J', CAPS, {0x43e, 0x41e} },
+ { 'K', CAPS, {0x43b, 0x41b} },
+ { 'L', CAPS, {0x434, 0x414} },
+ { VK_OEM_1, CAPS, {0x436, 0x416} },
+ { VK_OEM_7, CAPS, {0x454, 0x404} },
+
+ /* Third letter row */
+ { 'Z', CAPS, {0x44f, 0x42f} },
+ { 'X', CAPS, {0x447, 0x427} },
+ { 'C', CAPS, {0x441, 0x421} },
+ { 'V', CAPS, {0x43c, 0x41c} },
+ { 'B', CAPS, {0x438, 0x418} },
+ { 'N', CAPS, {0x442, 0x422} },
+ { 'M', CAPS, {0x44c, 0x42c} },
+ { VK_OEM_COMMA,CAPS, {0x431, 0x411} },
+ { VK_OEM_PERIOD,CAPS, {0x44e, 0x42e} },
+ { VK_OEM_2, NOCAPS, {'.', ','} },
+
+ /* Specials */
+ { 0x6e, NOCAPS, {',', ','} },
+ { VK_TAB, NOCAPS, {9, 9} },
+ { VK_ADD, NOCAPS, {'+', '+'} },
+ { VK_DIVIDE, NOCAPS, {'/', '/'} },
+ { VK_MULTIPLY, NOCAPS, {'*', '*'} },
+ { VK_SUBTRACT, NOCAPS, {'-', '-'} },
+ { 0, 0 }
+};
+
+ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = {
+ /* Normal, Shifted, Ctrl */
+ /* Legacy (telnet-style) ascii escapes */
+ { VK_OEM_5, NOCAPS, {0x5c, 0x2f, 0x1c} },
+ { VK_OEM_102, NOCAPS, {0x5c, 0x2f, 0x1c} },
+ { VK_BACK, NOCAPS, {0x8, 0x8, 0x7f} },
+ { VK_ESCAPE, NOCAPS, {0x1b, 0x1b, 0x1b} },
+ { VK_RETURN, NOCAPS, {'\r', '\r', '\n'} },
+ { VK_SPACE, NOCAPS, {' ', ' ', ' '} },
+ { VK_CANCEL, NOCAPS, {0x03, 0x03, 0x03} },
+ { 0,0 }
+};
+
+ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = {
+ /* Normal, Shifted, Ctrl, Ctrl-Alt */
+ /* Legacy Ascii generators */
+ { '2', NOCAPS, {'2', '\"', WCH_NONE, 0} },
+ { '6', NOCAPS, {'6', ':', WCH_NONE, 0x001e} },
+ { 'U', CAPS, {0x433, 0x413, 0x0491, 0x0490} },
+ { VK_OEM_MINUS, NOCAPS, {0x2d, '_', WCH_NONE, 0x001f} }, // different '-'
+ { 0, 0 }
+};
+
+ROSDATA VK_TO_WCHARS1 keypad_numbers[] = {
+ { VK_NUMPAD0, 0, {'0'} },
+ { VK_NUMPAD1, 0, {'1'} },
+ { VK_NUMPAD2, 0, {'2'} },
+ { VK_NUMPAD3, 0, {'3'} },
+ { VK_NUMPAD4, 0, {'4'} },
+ { VK_NUMPAD5, 0, {'5'} },
+ { VK_NUMPAD6, 0, {'6'} },
+ { VK_NUMPAD7, 0, {'7'} },
+ { VK_NUMPAD8, 0, {'8'} },
+ { VK_NUMPAD9, 0, {'9'} },
+ { 0,0 }
+};
+
+#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) }
+
+ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = {
+ vk_master(3,key_to_chars_3mod),
+ vk_master(4,key_to_chars_4mod),
+ vk_master(2,key_to_chars_2mod),
+ vk_master(1,keypad_numbers),
+ { 0,0,0 }
+};
+
+ROSDATA VSC_LPWSTR key_names[] = {
+ { 0x01, L"Esc" },
+ { 0x0e, L"Backspace" },
+ { 0x0f, L"Tab" },
+ { 0x1c, L"Enter" },
+ { 0x1d, L"Ctrl" },
+ { 0x2a, L"Shift" },
+ { 0x36, L"Right Shift" },
+ { 0x37, L"Num *" },
+ { 0x38, L"Alt" },
+ { 0x39, L"Space" },
+ { 0x3a, L"Caps Lock" },
+ { 0x3b, L"F1" },
+ { 0x3c, L"F2" },
+ { 0x3d, L"F3" },
+ { 0x3e, L"F4" },
+ { 0x3f, L"F5" },
+ { 0x40, L"F6" },
+ { 0x41, L"F7" },
+ { 0x42, L"F8" },
+ { 0x43, L"F9" },
+ { 0x44, L"F10" },
+ { 0x45, L"Pause" },
+ { 0x46, L"Scroll Lock" },
+ { 0x47, L"Num 7" },
+ { 0x48, L"Num 8" },
+ { 0x49, L"Num 9" },
+ { 0x4a, L"Num -" },
+ { 0x4b, L"Num 4" },
+ { 0x4c, L"Num 5" },
+ { 0x4d, L"Num 6" },
+ { 0x4e, L"Num +" },
+ { 0x4f, L"Num 1" },
+ { 0x50, L"Num 2" },
+ { 0x51, L"Num 3" },
+ { 0x52, L"Num 0" },
+ { 0x53, L"Num Del" },
+ { 0x54, L"Sys Req" },
+ { 0x57, L"F11" },
+ { 0x58, L"F12" },
+ { 0x7c, L"F13" },
+ { 0x7d, L"F14" },
+ { 0x7e, L"F15" },
+ { 0x7f, L"F16" },
+ { 0x80, L"F17" },
+ { 0x81, L"F18" },
+ { 0x82, L"F19" },
+ { 0x83, L"F20" },
+ { 0x84, L"F21" },
+ { 0x85, L"F22" },
+ { 0x86, L"F23" },
+ { 0x87, L"F24" },
+ { 0, NULL }
+};
+
+ROSDATA VSC_LPWSTR extended_key_names[] = {
+ { 0x1c, L"Num Enter" },
+ { 0x1d, L"Right Control" },
+ { 0x35, L"Num /" },
+ { 0x37, L"Prnt Scrn" },
+ { 0x38, L"Right Alt" },
+ { 0x45, L"Num Lock" },
+ { 0x46, L"Break" },
+ { 0x47, L"Home" },
+ { 0x48, L"Up" },
+ { 0x49, L"Page Up" },
+ { 0x4b, L"Left" },
+//{ 0x4c, L"Center" },
+ { 0x4d, L"Right" },
+ { 0x4f, L"End" },
+ { 0x50, L"Down" },
+ { 0x51, L"Page Down" },
+ { 0x52, L"Insert" },
+ { 0x53, L"Delete" },
+ { 0x54, L"" },
+ { 0x56, L"Help" },
+ { 0x5b, L"Left " },
+ { 0x5c, L"Right " },
+ { 0x5d, L"Application" },
+ { 0, NULL }
+};
+
+/* Finally, the master table */
+ROSDATA KBDTABLES keyboard_layout_table = {
+ /* modifier assignments */
+ &modifier_bits,
+
+ /* character from vk tables */
+ vk_to_wchar_master_table,
+
+ /* diacritical marks */
+ NULL,
+
+ /* Key names */
+ (VSC_LPWSTR *)key_names,
+ (VSC_LPWSTR *)extended_key_names,
+ NULL, /* Dead key names */
+
+ /* scan code to virtual key maps */
+ scancode_to_vk,
+ sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+ extcode0_to_vk,
+ extcode1_to_vk,
+
+ MAKELONG(0,1), /* Version 1.0 */
+
+ /* Ligatures -- Ukrainian doesn't have any */
+ 0,
+ 0,
+ NULL
+};
+
+PKBDTABLES STDCALL KbdLayerDescriptor() {
+ return &keyboard_layout_table;
+}
+
+INT STDCALL
+DllMain(
+ PVOID hinstDll,
+ ULONG dwReason,
+ PVOID reserved)
+{
+ return 1;
+}
+
diff --git a/reactos/lib/keyboard/kbdur/kbdur.def b/reactos/lib/keyboard/kbdur/kbdur.def
new file mode 100644
index 00000000000..717b43c4bb0
--- /dev/null
+++ b/reactos/lib/keyboard/kbdur/kbdur.def
@@ -0,0 +1,8 @@
+;
+; ReactOS Operating System
+;
+LIBRARY kbdur.dll
+
+EXPORTS
+KbdLayerDescriptor@0
+;EOF
diff --git a/reactos/lib/keyboard/kbdur/kbdur.rc b/reactos/lib/keyboard/kbdur/kbdur.rc
new file mode 100644
index 00000000000..4a60694c89d
--- /dev/null
+++ b/reactos/lib/keyboard/kbdur/kbdur.rc
@@ -0,0 +1,5 @@
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Ukrainian Keyboard Layout\0"
+#define REACTOS_STR_INTERNAL_NAME "kbdur\0"
+#define REACTOS_STR_ORIGINAL_FILENAME "kbdur.dll\0"
+#include
diff --git a/reactos/lib/keyboard/kbdur/kbdur.xml b/reactos/lib/keyboard/kbdur/kbdur.xml
new file mode 100644
index 00000000000..704e5c1a997
--- /dev/null
+++ b/reactos/lib/keyboard/kbdur/kbdur.xml
@@ -0,0 +1,9 @@
+
+
+ include
+
+
+ 0x0500
+ kbdur.c
+ kbdur.rc
+