diff --git a/reactos/boot/bootdata/hivesys.inf b/reactos/boot/bootdata/hivesys.inf index a21e1aa8bf9..99f171cec9a 100644 --- a/reactos/boot/bootdata/hivesys.inf +++ b/reactos/boot/bootdata/hivesys.inf @@ -86,6 +86,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041e","Layout File",0 HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041e","Layout Text",0x00000000,"Thai" 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\00000427","Layout File",0x00000000,"kbdlt.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000427","Layout Text",0x00000000,"Lithuanian" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000455","Layout File",0x00000000,"kbdbur.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000455","Layout Text",0x00000000,"Burmese" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000414","Layout File",0x00000000,"kbdno.dll" diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff index f266d280040..fb3ed67ffa2 100644 --- a/reactos/boot/bootdata/packages/reactos.dff +++ b/reactos/boot/bootdata/packages/reactos.dff @@ -84,6 +84,7 @@ base\shell\cmd\cmd.exe 1 base\shell\explorer\explorer.exe 4 base\shell\explorer\explorer-cfg-template.xml 4 base\shell\explorer\notifyhook\notifyhook.dll 1 +base\shell\explorer-new\explorer_new.exe 4 optional base\system\autochk\autochk.exe 1 base\system\format\format.exe 1 @@ -139,6 +140,7 @@ dll\keyboard\kbdheb\kbdheb.dll 1 dll\keyboard\kbdhu\kbdhu.dll 1 dll\keyboard\kbdit\kbdit.dll 1 dll\keyboard\kbdja\kbdja.dll 1 +dll\keyboard\kbdlt\kbdlt.dll 1 dll\keyboard\kbdno\kbdno.dll 1 dll\keyboard\kbdpl1\kbdpl1.dll 1 dll\keyboard\kbdpo\kbdpo.dll 1 @@ -252,7 +254,7 @@ dll\win32\ws2help\ws2help.dll 1 dll\win32\wshirda\wshirda.dll 1 dll\win32\wsock32\wsock32.dll 1 dll\win32\wtsapi32\wtsapi32.dll 1 -dll\win32\beepmidi\beepmidi.dll 1 +dll\win32\beepmidi\beepmidi.dll 1 ; Drivers diff --git a/reactos/dll/keyboard/kbdlt/kbdlt.c b/reactos/dll/keyboard/kbdlt/kbdlt.c new file mode 100644 index 00000000000..1a3f0e00696 --- /dev/null +++ b/reactos/dll/keyboard/kbdlt/kbdlt.c @@ -0,0 +1,394 @@ +/* + * ReactOS Lithuanian Keyboard layout + * Copyright (C) 2007 ReactOS + * Author: Vytis Girdžijauskas, "CMan", cman@cman.us + * License: LGPL, see: LGPL.txt + * + * http://www.microsoft.com/globaldev/tools/msklc.mspx + * http://www.likit.lt/all/stand/klaviatura/klav.htm + * http://www.microsoft.com/globaldev/reference/keyboards.mspx + */ + +#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, + /* - 37 - */ + /* Bottom Row */ + VK_MULTIPLY, 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_EMPTY, VK_F11, VK_F12, + /* - 59 - */ + VK_CLEAR, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* EREOF */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* 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_EMPTY, VK_EMPTY, VK_EMPTY, + /* - 72 - */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + /* - 76 - */ + /* One more f-key */ + VK_F24, + /* - 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[] = { + { 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, + 7, + { 0, 1, 2, SHFT_INVALID, SHFT_INVALID, SHFT_INVALID, 3, 4 } +}; + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + /* Normal vs Shifted */ + + { 'A', CAPS, {'a', 'A'} }, + { 'B', CAPS, {'b', 'B'} }, + { 'C', CAPS, {'c', 'C'} }, + { 'D', CAPS, {'d', 'D'} }, + { 'F', CAPS, {'f', 'F'} }, + { 'G', CAPS, {'g', 'G'} }, + { 'H', CAPS, {'h', 'H'} }, + { 'I', CAPS, {'i', 'I'} }, + { 'J', CAPS, {'j', 'J'} }, + { 'K', CAPS, {'k', 'K'} }, + { 'L', CAPS, {'l', 'L'} }, + { 'M', CAPS, {'m', 'M'} }, + { 'N', CAPS, {'n', 'N'} }, + { 'O', CAPS, {'o', 'O'} }, + { 'P', CAPS, {'p', 'P'} }, + { 'Q', CAPS, {'q', 'Q'} }, + { 'R', CAPS, {'r', 'R'} }, + { 'S', CAPS, {'s', 'S'} }, + { 'T', CAPS, {'t', 'T'} }, + { 'U', CAPS, {'u', 'U'} }, + { 'V', CAPS, {'v', 'V'} }, + { 'W', CAPS, {'w', 'W'} }, + { 'X', CAPS, {'x', 'X'} }, + { 'Y', CAPS, {'y', 'Y'} }, + { 'Z', CAPS, {'z', 'Z'} }, + + { VK_OEM_1, NOCAPS, {';', ':'} }, + { VK_OEM_2, NOCAPS, {'/', '?'} }, + { VK_OEM_3, NOCAPS, {'`', '~'} }, + { VK_OEM_7, NOCAPS, {'\'','\"'} }, + { VK_OEM_MINUS, NOCAPS, {'-', '_'} }, + { VK_OEM_COMMA, NOCAPS, {',', '<'} }, + { VK_OEM_PERIOD, NOCAPS, {'.', '>'} }, + + /* Keys that do not have shift states */ + { VK_TAB, NOCAPS, {'\t', '\t'} }, + { VK_ADD, NOCAPS, {'+', '+'} }, + { VK_SUBTRACT, NOCAPS, {'-', '-'} }, + { VK_MULTIPLY, NOCAPS, {'*', '*'} }, + { VK_DIVIDE, NOCAPS, {'/', '/'} }, + { VK_ESCAPE, NOCAPS, {'\x1b', '\x1b'} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + { VK_OEM_4, NOCAPS, {'[', '{', 0x1b /* ESC */} }, + { VK_OEM_6, NOCAPS, {']', '}', 0x1d /* GS */} }, + { VK_OEM_5, NOCAPS, {'\\', '|', 0x1c /* FS */} }, + { VK_SPACE, NOCAPS, {' ', ' ', ' '} }, + { VK_RETURN, NOCAPS, {'\r', '\r', '\n'} }, + { VK_OEM_102, NOCAPS, {0x5c, 0x2f, 0x1c} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + { '9', NOCAPS, {'9', '(', WCH_NONE, '9'} }, + { '0', NOCAPS, {'0', ')', WCH_NONE, '0'} }, + { 'E', CAPS, {'e', 'E', WCH_NONE, 0x20ac} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { + { '1', CAPS, {0x105, 0x104, 0x01, '1', '!'} }, + { '2', CAPS, {0x10d, 0x10c, 0x02, '2', '@'} }, + { '3', CAPS, {0x119, 0x118, 0x03, '3', '#'} }, + { '4', CAPS, {0x117, 0x116, WCH_NONE, '4', '$'} }, + { '5', CAPS, {0x12f, 0x12e, WCH_NONE, '5', '%'} }, + { '6', CAPS, {0x161, 0x160, WCH_NONE, '6', '^'} }, + { '7', CAPS, {0x173, 0x172, WCH_NONE, '7', '&'} }, + { '8', CAPS, {0x16b, 0x16a, WCH_NONE, '8', '*'} }, + { VK_OEM_PLUS, CAPS, {0x17e, 0x17d, WCH_NONE, '=', '+'} }, + { 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'} }, + { VK_DECIMAL, 0, {','} }, + { VK_BACK, 0, {'\010'} }, + { 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(5,key_to_chars_5mod), + vk_master(2,key_to_chars_2mod), + vk_master(1,keypad_numbers), + { 0, 0, 0 } +}; + +ROSDATA VSC_LPWSTR key_names[] = { + { 0x00, L"" }, + { 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 Ctrl" }, + { 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" }, + { 0x4a, 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"" }, + { 0x55, L"Help" }, + { 0x56, L"Left ReactOS" }, + { 0x5b, L"Right ReactOS" }, + { 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 -- currently implemented by wine code */ + 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 -- Lithuanian doesn't have any */ + 0, + 0, + NULL +}; + +PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { + return &keyboard_layout_table; +} diff --git a/reactos/dll/keyboard/kbdlt/kbdlt.def b/reactos/dll/keyboard/kbdlt/kbdlt.def new file mode 100644 index 00000000000..9adbc4d799d --- /dev/null +++ b/reactos/dll/keyboard/kbdlt/kbdlt.def @@ -0,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdlt.dll + +EXPORTS +KbdLayerDescriptor +;EOF diff --git a/reactos/dll/keyboard/kbdlt/kbdlt.rbuild b/reactos/dll/keyboard/kbdlt/kbdlt.rbuild new file mode 100644 index 00000000000..3a23d2441ed --- /dev/null +++ b/reactos/dll/keyboard/kbdlt/kbdlt.rbuild @@ -0,0 +1,9 @@ + + + include + + + 0x0500 + kbdlt.c + kbdlt.rc + diff --git a/reactos/dll/keyboard/kbdlt/kbdlt.rc b/reactos/dll/keyboard/kbdlt/kbdlt.rc new file mode 100644 index 00000000000..300f3e47446 --- /dev/null +++ b/reactos/dll/keyboard/kbdlt/kbdlt.rc @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS LT Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdlt\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdlt.dll\0" +#include diff --git a/reactos/dll/keyboard/keyboard.rbuild b/reactos/dll/keyboard/keyboard.rbuild index 4379274363d..f87c1f659ed 100644 --- a/reactos/dll/keyboard/keyboard.rbuild +++ b/reactos/dll/keyboard/keyboard.rbuild @@ -40,6 +40,9 @@ + + +