Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[dchapyshev] 33256: Add keyboard layouts: - Turkish Q - Turkish F - Ukrainian (Student) - Uzbek (Cyrillic) - Vietnamese
by dchapyshev＠svn.reactos.org 03 May '08

03 May '08

Author: dchapyshev Date: Sat May 3 10:29:25 2008 New Revision: 33256 URL: http://svn.reactos.org/svn/reactos?rev=33256&view=rev Log: Add keyboard layouts: - Turkish Q - Turkish F - Ukrainian (Student) - Uzbek (Cyrillic) - Vietnamese Added: trunk/reactos/dll/keyboard/kbdtuf/ trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.c (with props) trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.def (with props) trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.rbuild (with props) trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.rc (with props) trunk/reactos/dll/keyboard/kbdtuq/ trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.c (with props) trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.def (with props) trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.rbuild (with props) trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.rc (with props) trunk/reactos/dll/keyboard/kbdurs/ trunk/reactos/dll/keyboard/kbdurs/kbdurs.c (with props) trunk/reactos/dll/keyboard/kbdurs/kbdurs.def (with props) trunk/reactos/dll/keyboard/kbdurs/kbdurs.rbuild (with props) trunk/reactos/dll/keyboard/kbdurs/kbdurs.rc (with props) trunk/reactos/dll/keyboard/kbduzb/ trunk/reactos/dll/keyboard/kbduzb/kbduzb.c (with props) trunk/reactos/dll/keyboard/kbduzb/kbduzb.def (with props) trunk/reactos/dll/keyboard/kbduzb/kbduzb.rbuild (with props) trunk/reactos/dll/keyboard/kbduzb/kbduzb.rc (with props) trunk/reactos/dll/keyboard/kbdvntc/ trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.c (with props) trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.def (with props) trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.rbuild (with props) trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.rc (with props) Modified: trunk/reactos/dll/keyboard/keyboard.rbuild Added: trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdtuf/kbdtuf… ============================================================================== --- trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.c (added) +++ trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.c [iso-8859-1] Sat May 3 10:29:25 2008 @@ -1,0 +1,488 @@ +/* + * ReactOS Turkish F Keyboard layout + * Copyright (C) 2008 ReactOS + * Author: Dmitry Chapyshev + * 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 <windows.h> +#include <internal/kbd.h> + +#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, + 7, + { 0, 1, 3, 4, SHFT_INVALID, SHFT_INVALID, 2, 5 } +}; + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + { 'G', CAPS, {'g', 'G' } }, + { VK_OEM_1, CAPS, {0x011f, 0x011e} }, + { 'O', CAPS, {'o', 'O' } }, + { 'R', CAPS, {'r', 'R' } }, + { 'N', CAPS, {'n', 'N' } }, + { 'T', CAPS, {'t', 'T' } }, + { 'K', CAPS, {'k', 'K' } }, + { 'M', CAPS, {'m', 'M' } }, + { 'L', CAPS, {'l', 'L' } }, + { VK_OEM_7, CAPS, {0x015f, 0x015e} }, + { 'C', CAPS, {'c', 'C' } }, + { VK_OEM_2, CAPS, {0x00e7, 0x00c7} }, + { 'Z', CAPS, {'z', 'Z' } }, + { VK_DECIMAL, NOCAPS, {',', ',' } }, + { VK_TAB, NOCAPS, {'\t', '\t' } }, + { VK_ADD, NOCAPS, {'+', '+' } }, + { VK_DIVIDE, NOCAPS, {'/', '/' } }, + { VK_MULTIPLY, NOCAPS, {'*', '*' } }, + { VK_SUBTRACT, NOCAPS, {'-', '-' } }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + { VK_OEM_3, NOCAPS, {'+', '*', 0x00ac } }, + { '5', NOCAPS, {'5', '%', 0x00bd } }, + { '7', NOCAPS, {'7', '\'', '{' } }, + { '9', NOCAPS, {'9', ')', ']' } }, + { '0', NOCAPS, {'0', '=', '}' } }, + { 'F', CAPS, {'f', 'F', '@' } }, + { 'D', CAPS, {'d', 'D', 0x00a5 } }, + { 'P', CAPS, {'p', 'P', 0x00a3 } }, + { 'Q', CAPS, {'q', 'Q', WCH_DEAD} }, + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, 0x00a8 } }, + { 'W', CAPS, {'w', 'W', WCH_DEAD} }, + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, '~' } }, + { 'X', CAPS, {'x', 'X', WCH_DEAD} }, + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, '`' } }, + { 'E', CAPS, {'e', 'E', 0x20ac } }, + { 'Y', CAPS, {'y', 'Y', WCH_DEAD} }, + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, 0x00b4 } }, + { 'B', CAPS, {'b', 'B', 0x00d7 } }, + { VK_OEM_PERIOD, NOCAPS, {'.', ':', 0x00f7 } }, + { VK_OEM_COMMA, NOCAPS, {',', ';', 0x00ad } }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + { '8', NOCAPS, {'8', '(', '[', 0x001b} }, + { VK_OEM_6, CAPS, {0x00fc, 0x00dc, WCH_NONE, 0x001d} }, + { VK_BACK, NOCAPS, {'\b', '\b', WCH_NONE, 0x007f} }, + { VK_ESCAPE, NOCAPS, {0x001b, 0x001b, WCH_NONE, 0x001b} }, + { VK_RETURN, NOCAPS, {'\r', '\r', WCH_NONE, '\n' } }, + { VK_SPACE, NOCAPS, {' ', ' ', WCH_NONE, ' ' } }, + { VK_CANCEL, NOCAPS, {0x0003, 0x0003, WCH_NONE, 0x0003} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { + { '2', NOCAPS, {'2', '\"', 0x00b2, WCH_NONE, 0x0000} }, + { '6', NOCAPS, {'6', '&', 0x00be, WCH_NONE, 0x001e} }, + { VK_OEM_MINUS, NOCAPS, {'-', '_', '|', WCH_NONE, 0x001f} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS6 key_to_chars_6mod[] = { + { '1', NOCAPS, {'1', '!', 0x00b9, WCH_NONE, WCH_NONE, 0x00a1 } }, + { '3', NOCAPS, {'3', WCH_DEAD, '#', WCH_NONE, WCH_NONE, 0x00b3 } }, + { 0xff, NOCAPS, {WCH_NONE, '^', WCH_NONE, WCH_NONE, WCH_NONE, WCH_NONE} }, + { '4', NOCAPS, {'4', '$', 0x00bc, WCH_NONE, WCH_NONE, 0x00a4 } }, + { VK_OEM_PLUS, NOCAPS, {'/', '?', '\\', 0x001c, WCH_NONE, 0x00bf } }, + { 'I', CAPS, {0x0131, 'I', 0x00b6, WCH_NONE, WCH_NONE, 0x00ae } }, + { 'H', CAPS|CAPLOKALTGR,{'h', 'H', 0x00f8, WCH_NONE, WCH_NONE, 0x00d8 } }, + { 'U', CAPS, {'u', 'U', 0x00e6, WCH_NONE, WCH_NONE, 0x00c6 } }, + { VK_OEM_4, CAPS|CAPLOKALTGR,{'i', 0x0130, 0x00df, WCH_NONE, WCH_NONE, 0x00a7 } }, + { 'A', CAPS, {'a', 'A', WCH_NONE, WCH_NONE, WCH_NONE, 0x00aa } }, + { 'J', CAPS, {'j', 'J', 0x00ab, WCH_NONE, WCH_NONE, '<' } }, + { VK_OEM_5, CAPS, {0x00f6 ,0x00d6, 0x00bb, 0x001c , WCH_NONE, '>' } }, + { 'V', CAPS, {'v', 'V', 0x00a2, WCH_NONE, WCH_NONE, 0x00a9 } }, + { 'S', CAPS, {'s', 'S', 0x00b5, WCH_NONE, WCH_NONE, 0x00ba } }, + { VK_OEM_102, NOCAPS, {'<', '>', '|', WCH_NONE, WCH_NONE, 0x00a6 } }, + { 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(5,key_to_chars_5mod), + vk_master(6,key_to_chars_6mod), + 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" }, + { 0x4d, L"Right" }, + { 0x4f, L"End" }, + { 0x50, L"Down" }, + { 0x51, L"Page Down" }, + { 0x52, L"Insert" }, + { 0x53, L"Delete" }, + { 0x54, L"<ReactOS>" }, + { 0x56, L"Help" }, + { 0x5b, L"Left <ReactOS>" }, + { 0x5c, L"Right <ReactOS>" }, + { 0x5d, L"Application" }, + { 0, NULL } +}; + +ROSDATA DEADKEY_LPWSTR dead_key_names[] = { + L"\x0301" L"ACUTE", + L"\x0300" L"GRAVE", + L"\x0302" L"CIRCUMFLEX", + L"\x0308" L"UMLAUT", + L"\x0303" L"TILDE", + L"\x0327" L"CEDILLA", + NULL +}; + +#define DEADTRANS(ch, accent, comp, flags) MAKELONG(ch, accent), comp, flags + +ROSDATA DEADKEY dead_key[] = { + { DEADTRANS(L'a', 0x00a8, 0x00e4, 0x0000) }, + { DEADTRANS(L'e', 0x00a8, 0x00eb, 0x0000) }, + { DEADTRANS(L'i', 0x00a8, 0x00ef, 0x0000) }, + { DEADTRANS(0x0131, 0x00a8, 0x00ef, 0x0000) }, + { DEADTRANS(L'o', 0x00a8, 0x00f6, 0x0000) }, + { DEADTRANS(L'u', 0x00a8, 0x00fc, 0x0000) }, + { DEADTRANS(L'y', 0x00a8, 0x00ff, 0x0000) }, + { DEADTRANS(L'A', 0x00a8, 0x00c4, 0x0000) }, + { DEADTRANS(L'E', 0x00a8, 0x00cb, 0x0000) }, + { DEADTRANS(L'I', 0x00a8, 0x00cf, 0x0000) }, + { DEADTRANS(0x0130, 0x00a8, 0x00cf, 0x0000) }, + { DEADTRANS(L'O', 0x00a8, 0x00d6, 0x0000) }, + { DEADTRANS(L'U', 0x00a8, 0x00dc, 0x0000) }, + { DEADTRANS(L' ', 0x00a8, 0x00a8, 0x0000) }, + + { DEADTRANS(L'a', L'~', 0x00e3, 0x0000) }, + { DEADTRANS(L'o', L'~', 0x00f5, 0x0000) }, + { DEADTRANS(L'n', L'~', 0x00f1, 0x0000) }, + { DEADTRANS(L'A', L'~', 0x00c3, 0x0000) }, + { DEADTRANS(L'O', L'~', 0x00d5, 0x0000) }, + { DEADTRANS(L'N', L'~', 0x00d1, 0x0000) }, + { DEADTRANS(L' ', L'~', L'~' , 0x0000) }, + + { DEADTRANS(L'a', 0x00b4, 0x00e1, 0x0000) }, + { DEADTRANS(L'e', 0x00b4, 0x00e9, 0x0000) }, + { DEADTRANS(L'i', 0x00b4, 0x00ed, 0x0000) }, + { DEADTRANS(0x0131, 0x00b4, 0x00ed, 0x0000) }, + { DEADTRANS(L'o', 0x00b4, 0x00f3, 0x0000) }, + { DEADTRANS(L'u', 0x00b4, 0x00fa, 0x0000) }, + { DEADTRANS(L'A', 0x00b4, 0x00c1, 0x0000) }, + { DEADTRANS(L'E', 0x00b4, 0x00c9, 0x0000) }, + { DEADTRANS(L'I', 0x00b4, 0x00cd, 0x0000) }, + { DEADTRANS(0x0130, 0x00b4, 0x00cd, 0x0000) }, + { DEADTRANS(L'O', 0x00b4, 0x00d3, 0x0000) }, + { DEADTRANS(L'U', 0x00b4, 0x00da, 0x0000) }, + { DEADTRANS(L' ', 0x00b4, 0x00b4, 0x0000) }, + + { DEADTRANS(L'a', L'`', 0x00e0, 0x0000) }, + { DEADTRANS(L'e', L'`', 0x00e8, 0x0000) }, + { DEADTRANS(L'i', L'`', 0x00ec, 0x0000) }, + { DEADTRANS(0x0131, L'`', 0x00ec, 0x0000) }, + { DEADTRANS(L'o', L'`', 0x00f2, 0x0000) }, + { DEADTRANS(L'u', L'`', 0x00f9, 0x0000) }, + { DEADTRANS(L'A', L'`', 0x00c0, 0x0000) }, + { DEADTRANS(L'E', L'`', 0x00c8, 0x0000) }, + { DEADTRANS(L'I', L'`', 0x00cc, 0x0000) }, + { DEADTRANS(0x0130, L'`', 0x00cc, 0x0000) }, + { DEADTRANS(L'O', L'`', 0x00d2, 0x0000) }, + { DEADTRANS(L'U', L'`', 0x00d9, 0x0000) }, + { DEADTRANS(L' ', L'`', L'`' , 0x0000) }, + + { DEADTRANS(L'a', L'^', 0x00e2, 0x0000) }, + { DEADTRANS(L'e', L'^', 0x00ea, 0x0000) }, + { DEADTRANS(L'i', L'^', 0x00ee, 0x0000) }, + { DEADTRANS(0x0131, L'^', 0x00ee, 0x0000) }, + { DEADTRANS(L'o', L'^', 0x00f4, 0x0000) }, + { DEADTRANS(L'u', L'^', 0x00fb, 0x0000) }, + { DEADTRANS(L'A', L'^', 0x00c2, 0x0000) }, + { DEADTRANS(L'E', L'^', 0x00ca, 0x0000) }, + { DEADTRANS(L'I', L'^', 0x00ce, 0x0000) }, + { DEADTRANS(0x0130, L'^', 0x00ce, 0x0000) }, + { DEADTRANS(L'O', L'^', 0x00d4, 0x0000) }, + { DEADTRANS(L'U', L'^', 0x00db, 0x0000) }, + { DEADTRANS(L' ', L'^', L'^' , 0x0000) }, + { 0, 0 } +}; + +/* Finally, the master table */ +ROSDATA KBDTABLES keyboard_layout_table = { + /* modifier assignments */ + &modifier_bits, + + /* character from vk tables */ + vk_to_wchar_master_table, + + /* diacritical marks */ + dead_key, + + /* Key names */ + (VSC_LPWSTR *)key_names, + (VSC_LPWSTR *)extended_key_names, + dead_key_names, /* 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 */ + 0, + 0, + NULL +}; + +PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { + return &keyboard_layout_table; +} + +INT STDCALL +DllMain( + PVOID hinstDll, + ULONG dwReason, + PVOID reserved) +{ + return 1; +} + Propchange: trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdtuf/kbdtuf… ============================================================================== --- trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.def (added) +++ trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.def [iso-8859-1] Sat May 3 10:29:25 2008 @@ -1,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdtuf.dll + +EXPORTS +KbdLayerDescriptor@0 +;EOF Propchange: trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdtuf/kbdtuf… ============================================================================== --- trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.rbuild [iso-8859-1] Sat May 3 10:29:25 2008 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="kbdtuf" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdtuf.dll" allowwarnings="true"> + <importlibrary definition="kbdtuf.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdtuf.c</file> + <file>kbdtuf.rc</file> +</module> Propchange: trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdtuf/kbdtuf… ============================================================================== --- trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.rc (added) +++ trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.rc [iso-8859-1] Sat May 3 10:29:25 2008 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Turkish F Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdtuf\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdtuf.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdtuq/kbdtuq… ============================================================================== --- trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.c (added) +++ trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.c [iso-8859-1] Sat May 3 10:29:25 2008 @@ -1,0 +1,488 @@ +/* + * ReactOS Turkish Q Keyboard layout + * Copyright (C) 2008 ReactOS + * Author: Dmitry Chapyshev + * 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 <windows.h> +#include <internal/kbd.h> + +#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, + 7, + { 0, 1, 3, 4, SHFT_INVALID, SHFT_INVALID, 2, 5 } +}; + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + { 'W', CAPS, {'w', 'W' } }, + { 'R', CAPS, {'r', 'R' } }, + { 'T', CAPS, {'t', 'T' } }, + { 'Y', CAPS, {'y', 'Y' } }, + { 'U', CAPS, {'u', 'U' } }, + { 'O', CAPS, {'o', 'O' } }, + { 'P', CAPS, {'p', 'P' } }, + { 'D', CAPS, {'d', 'D' } }, + { 'F', CAPS, {'f', 'F' } }, + { 'G', CAPS, {'g', 'G' } }, + { 'H', CAPS, {'h', 'H' } }, + { 'J', CAPS, {'j', 'J' } }, + { 'K', CAPS, {'k', 'K' } }, + { 'L', CAPS, {'l', 'L' } }, + { VK_OEM_7, CAPS, {'i', 0x0130} }, + { 'Z', CAPS, {'z', 'Z' } }, + { 'X', CAPS, {'x', 'X' } }, + { 'C', CAPS, {'c', 'C' } }, + { 'V', CAPS, {'v', 'V' } }, + { '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_DECIMAL, NOCAPS, {',', ',' } }, + { VK_TAB, NOCAPS, {'\t' ,'\t'} }, + { VK_ADD, NOCAPS, {'+', '+' } }, + { VK_DIVIDE, NOCAPS, {'/', '/' } }, + { VK_MULTIPLY, NOCAPS, {'*', '*' } }, + { VK_SUBTRACT, NOCAPS, {'-', '-' } }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + { VK_OEM_3, NOCAPS, {'\"', 0x00e9, '<' } }, + { '1', NOCAPS, {'1', '!', '>' } }, + { '3', NOCAPS, {'3', WCH_DEAD, '#' } }, + { 0xff, NOCAPS, {WCH_NONE, '^', WCH_NONE} }, + { '4', NOCAPS, {'4', '+', '$' } }, + { '5', NOCAPS, {'5', '%', 0x00bd } }, + { '7', NOCAPS, {'7', '/', '{' } }, + { '8', NOCAPS, {'8', '(', '[' } }, + { '9', NOCAPS, {'9', ')', ']' } }, + { '0', NOCAPS, {'0', '=', '}' } }, + { VK_OEM_8, NOCAPS, {'*', '?', '\\' } }, + { 'Q', CAPS, {'q', 'Q', '@' } }, + { 'E', CAPS, {'e', 'E', 0x20ac } }, + { 'S', CAPS, {'s', 'S', 0x00df } }, + { VK_OEM_1, CAPS, {0x015f, 0x015e, WCH_DEAD} }, + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, 0x00b4 } }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + { VK_OEM_4, CAPS, {0x011f, 0x011e, WCH_DEAD, 0x001b } }, + { 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 } }, + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, '`', WCH_NONE} }, + { VK_OEM_102, NOCAPS, {'<', '>', '|', 0x001c } }, + { VK_BACK, NOCAPS, {'\b', '\b', WCH_NONE, 0x007f } }, + { VK_ESCAPE, NOCAPS, {0x001b, 0x001b, WCH_NONE, 0x001b } }, + { VK_RETURN, NOCAPS, {'\r', '\r', WCH_NONE, '\n' } }, + { VK_SPACE, NOCAPS, {' ', ' ', WCH_NONE, ' ' } }, + { VK_CANCEL, NOCAPS, {0x0003, 0x0003, WCH_NONE, 0x0003 } }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { + { '2', NOCAPS, {'2', '\'', 0x00a3, WCH_NONE, 0x0000} }, + { '6', NOCAPS, {'6', '&', WCH_NONE, WCH_NONE, 0x001e} }, + { VK_OEM_MINUS, NOCAPS, {'-', '_', '|', WCH_NONE, 0x001f} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS6 key_to_chars_6mod[] = { + { 'I', CAPS|CAPLOKALTGR, {0x0131, 'I', 'i', WCH_NONE, WCH_NONE, 0x0130} }, + { 'A', CAPS|CAPLOKALTGR, {'a', 'A', 0x00e6, WCH_NONE, WCH_NONE, 0x00c6} }, + { 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(5,key_to_chars_5mod), + vk_master(6,key_to_chars_6mod), + 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"<ReactOS>" }, + { 0x56, L"Help" }, + { 0x5b, L"Left <ReactOS>" }, + { 0x5c, L"Right <ReactOS>" }, + { 0x5d, L"Application" }, + { 0, NULL } +}; + +ROSDATA DEADKEY_LPWSTR dead_key_names[] = { + L"\x0301" L"ACUTE", + L"\x0300" L"GRAVE", + L"\x0302" L"CIRCUMFLEX", + L"\x0308" L"UMLAUT", + L"\x0303" L"TILDE", + L"\x0327" L"CEDILLA", + NULL +}; + +#define DEADTRANS(ch, accent, comp, flags) MAKELONG(ch, accent), comp, flags + +ROSDATA DEADKEY dead_key[] = { + { DEADTRANS(L'a', L'^', 0x00e2, 0x0000) }, + { DEADTRANS(L'e', L'^', 0x00ea, 0x0000) }, + { DEADTRANS(L'i', L'^', 0x00ee, 0x0000) }, + { DEADTRANS(0x0131, L'^', 0x00ee, 0x0000) }, + { DEADTRANS(L'o', L'^', 0x00f4, 0x0000) }, + { DEADTRANS(L'u', L'^', 0x00fb, 0x0000) }, + { DEADTRANS(L'A', L'^', 0x00c2, 0x0000) }, + { DEADTRANS(L'E', L'^', 0x00ca, 0x0000) }, + { DEADTRANS(L'I', L'^', 0x00ce, 0x0000) }, + { DEADTRANS(0x0130, L'^', 0x00ce, 0x0000) }, + { DEADTRANS(L'O', L'^', 0x00d4, 0x0000) }, + { DEADTRANS(L'U', L'^', 0x00db, 0x0000) }, + { DEADTRANS(L' ', L'^', L'^' , 0x0000) }, + + { DEADTRANS(L'a', 0x00b4, 0x00e1, 0x0000) }, + { DEADTRANS(L'e', 0x00b4, 0x00e9, 0x0000) }, + { DEADTRANS(L'i', 0x00b4, 0x00ed, 0x0000) }, + { DEADTRANS(0x0131, 0x00b4, 0x00ed, 0x0000) }, + { DEADTRANS(L'o', 0x00b4, 0x00f3, 0x0000) }, + { DEADTRANS(L'u', 0x00b4, 0x00fa, 0x0000) }, + { DEADTRANS(L'A', 0x00b4, 0x00c1, 0x0000) }, + { DEADTRANS(L'E', 0x00b4, 0x00c9, 0x0000) }, + { DEADTRANS(L'I', 0x00b4, 0x00cd, 0x0000) }, + { DEADTRANS(0x0130, 0x00b4, 0x00cd, 0x0000) }, + { DEADTRANS(L'O', 0x00b4, 0x00d3, 0x0000) }, + { DEADTRANS(L'U', 0x00b4, 0x00da, 0x0000) }, + { DEADTRANS(L' ', 0x00b4, 0x00b4, 0x0000) }, + + { DEADTRANS(L'a', 0x00a8, 0x00e4, 0x0000) }, + { DEADTRANS(L'e', 0x00a8, 0x00eb, 0x0000) }, + { DEADTRANS(L'i', 0x00a8, 0x00ef, 0x0000) }, + { DEADTRANS(0x0131, 0x00a8, 0x00ef, 0x0000) }, + { DEADTRANS(L'o', 0x00a8, 0x00f6, 0x0000) }, + { DEADTRANS(L'u', 0x00a8, 0x00fc, 0x0000) }, + { DEADTRANS(L'A', 0x00a8, 0x00c4, 0x0000) }, + { DEADTRANS(L'E', 0x00a8, 0x00cb, 0x0000) }, + { DEADTRANS(L'I', 0x00a8, 0x00cf, 0x0000) }, + { DEADTRANS(0x0130, 0x00a8, 0x00cf, 0x0000) }, + { DEADTRANS(L'O', 0x00a8, 0x00d6, 0x0000) }, + { DEADTRANS(L'U', 0x00a8, 0x00dc, 0x0000) }, + { DEADTRANS(L' ', 0x00a8, 0x00a8, 0x0000) }, + + { DEADTRANS(L'a', L'`', 0x00e0, 0x0000) }, + { DEADTRANS(L'e', L'`', 0x00e8, 0x0000) }, + { DEADTRANS(L'i', L'`', 0x00ec, 0x0000) }, + { DEADTRANS(0x0131, L'`', 0x00ec, 0x0000) }, + { DEADTRANS(L'o', L'`', 0x00f2, 0x0000) }, + { DEADTRANS(L'u', L'`', 0x00f9, 0x0000) }, + { DEADTRANS(L'A', L'`', 0x00c0, 0x0000) }, + { DEADTRANS(L'E', L'`', 0x00c8, 0x0000) }, + { DEADTRANS(L'I', L'`', 0x00cc, 0x0000) }, + { DEADTRANS(0x0130, L'`', 0x00cc, 0x0000) }, + { DEADTRANS(L'O', L'`', 0x00d2, 0x0000) }, + { DEADTRANS(L'U', L'`', 0x00d9, 0x0000) }, + { DEADTRANS(L' ', L'`', L'`' , 0x0000) }, + + { DEADTRANS(L'a', L'~', 0x00e3, 0x0000) }, + { DEADTRANS(L'o', L'~', 0x00f5, 0x0000) }, + { DEADTRANS(L'n', L'~', 0x00f1, 0x0000) }, + { DEADTRANS(L'A', L'~', 0x00c3, 0x0000) }, + { DEADTRANS(L'O', L'~', 0x00d5, 0x0000) }, + { DEADTRANS(L'N', L'~', 0x00d1, 0x0000) }, + { DEADTRANS(L' ', L'~', L'~' , 0x0000) }, + { 0, 0 } +}; + +/* Finally, the master table */ +ROSDATA KBDTABLES keyboard_layout_table = { + /* modifier assignments */ + &modifier_bits, + + /* character from vk tables */ + vk_to_wchar_master_table, + + /* diacritical marks */ + dead_key, + + /* Key names */ + (VSC_LPWSTR *)key_names, + (VSC_LPWSTR *)extended_key_names, + dead_key_names, /* 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 */ + 0, + 0, + NULL +}; + +PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { + return &keyboard_layout_table; +} + +INT STDCALL +DllMain( + PVOID hinstDll, + ULONG dwReason, + PVOID reserved) +{ + return 1; +} + Propchange: trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdtuq/kbdtuq… ============================================================================== --- trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.def (added) +++ trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.def [iso-8859-1] Sat May 3 10:29:25 2008 @@ -1,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdtuq.dll + +EXPORTS +KbdLayerDescriptor@0 +;EOF Propchange: trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdtuq/kbdtuq… ============================================================================== --- trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.rbuild [iso-8859-1] Sat May 3 10:29:25 2008 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="kbdtuq" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdtuq.dll" allowwarnings="true"> + <importlibrary definition="kbdtuq.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdtuq.c</file> + <file>kbdtuq.rc</file> +</module> Propchange: trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdtuq/kbdtuq… ============================================================================== --- trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.rc (added) +++ trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.rc [iso-8859-1] Sat May 3 10:29:25 2008 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Turkish Q Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdtuq\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdtuq.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdurs/kbdurs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdurs/kbdurs… ============================================================================== --- trunk/reactos/dll/keyboard/kbdurs/kbdurs.c (added) +++ trunk/reactos/dll/keyboard/kbdurs/kbdurs.c [iso-8859-1] Sat May 3 10:29:25 2008 @@ -1,0 +1,398 @@ +/* + * ReactOS Ukrainian (Student) Keyboard layout + * Copyright (C) 2008 ReactOS + * Author: Dmitry Chapyshev + * 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 <windows.h> +#include <internal/kbd.h> + +#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, + 7, + { 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 +#define CAPS KSHIFT /* Caps -> shift */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + { VK_DECIMAL, NOCAPS, {',' ,',' } }, + { VK_TAB, NOCAPS, {'\t' ,'\t'} }, + { VK_ADD, NOCAPS, {'+' ,'+' } }, + { VK_DIVIDE, NOCAPS, {'/' ,'/' } }, + { VK_MULTIPLY, NOCAPS, {'*' ,'*' } }, + { VK_SUBTRACT, NOCAPS, {'-' ,'-' } }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + { VK_OEM_3, CAPS, {0x0451, 0x0401, '`', '~'} }, + { '1', NOCAPS, {'1', 0x2116, '!', '!'} }, + { '2', NOCAPS, {'2', '!', '@', '@'} }, + { '3', NOCAPS, {'3', '$', '#', '#'} }, + { '4', NOCAPS, {'4', '\"', '$', '$'} }, + { '5', NOCAPS, {'5', '%', '%', '%'} }, + { '7', NOCAPS, {'7', 0x00ad, '&', '&'} }, + { '8', NOCAPS, {'8', '*', '*', '*'} }, + { '9', NOCAPS, {'9', '(', '(', '('} }, + { '0', NOCAPS, {'0', ')', ')', ')'} }, + { VK_OEM_PLUS, NOCAPS, {0x0439, 0x0419, '=', '+'} }, + { 'Q', CAPS, {0x0449, 0x0429, 'q', 'Q'} }, + { 'W', CAPS, {0x0448, 0x0428, 'w', 'W'} }, + { 'E', CAPS, {0x0435, 0x0415, 'e', 'E'} }, + { 'R', CAPS, {0x0440, 0x0420, 'r', 'R'} }, + { 'T', CAPS, {0x0442, 0x0422, 't', 'T'} }, + { 'Y', CAPS, {0x0443, 0x0423, 'y', 'Y'} }, + { 'U', CAPS, {0x0438, 0x0418, 'u', 'U'} }, + { 'I', CAPS, {0x0456, 0x0406, 'i', 'I'} }, + { 'O', CAPS, {0x043e, 0x041e, 'o', 'O'} }, + { 'P', CAPS, {0x043f, 0x041f, 'p', 'P'} }, + { VK_OEM_4, CAPS, {0x044f, 0x042f, '[', '{'} }, + { 'A', CAPS, {0x0430, 0x0410, 'a', 'A'} }, + { 'S', CAPS, {0x0446, 0x0426, 's', 'S'} }, + { 'D', CAPS, {0x0434, 0x0414, 'd', 'D'} }, + { 'F', CAPS, {0x0444, 0x0424, 'f', 'F'} }, + { 'G', CAPS, {0x0491, 0x0490, 'g', 'G'} }, + { 'H', CAPS, {0x0433, 0x0413, 'h', 'H'} }, + { 'J', CAPS, {0x0436, 0x0416, 'j', 'J'} }, + { 'K', CAPS, {0x043a, 0x041a, 'k', 'K'} }, + { 'L', CAPS, {0x043b, 0x041b, 'l', 'L'} }, + { VK_OEM_7, CAPS, {'\'', WCH_NONE,'\'','\"'}}, + { 'Z', CAPS, {0x0437, 0x0417, 'z', 'Z'} }, + { 'X', CAPS, {0x0445, 0x0425, 'x', 'X'} }, + { 'C', CAPS, {0x0441, 0x0421, 'c', 'C'} }, + { 'V', CAPS, {0x0412, 0x0412, 'v', 'V'} }, + { 'B', CAPS, {0x0431, 0x0411, 'b', 'B'} }, + { 'N', CAPS, {0x043d, 0x041d, 'n', 'N'} }, + { 'M', CAPS, {0x043c, 0x041c, 'm', 'M'} }, + { VK_OEM_COMMA, CAPS, {0x0447, 0x0427, ',', '<'} }, + { VK_OEM_PERIOD, CAPS, {0x044c, 0x042c, '.', '>'} }, + { VK_OEM_2, NOCAPS, {0x044d, 0x042d, '/', '?'} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { + { VK_OEM_MINUS, NOCAPS, {0x0457, 0x0407, '-', '_', 0x001f} }, + { VK_OEM_6, CAPS, {0x044e, 0x042e, ']', '}', 0x001b} }, + { VK_OEM_5, NOCAPS, {'-', '=', '\\', '|', 0x001c} }, + { VK_OEM_1, CAPS, {';', ':', ';', ':', 0x001d} }, + { VK_OEM_102, CAPS, {0x0454, 0x0404, '\\', '|', 0x001c} }, + { VK_BACK, NOCAPS, {'\b', '\b', WCH_NONE, WCH_NONE, 0x007f} }, + { VK_ESCAPE, NOCAPS, {0x001b, 0x001b, WCH_NONE, WCH_NONE, 0x001b} }, + { VK_RETURN, NOCAPS, {'\r', '\r', WCH_NONE, WCH_NONE, '\n' } }, + { VK_SPACE, NOCAPS, {' ', ' ', WCH_NONE, WCH_NONE, ' ' } }, + { VK_CANCEL, NOCAPS, {0x0003, 0x0003, WCH_NONE, WCH_NONE, 0x0003} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS6 key_to_chars_6mod[] = { + { '6', NOCAPS, {'6', '\'', '^', '^', WCH_NONE, 0x001e} }, + { 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(4,key_to_chars_4mod), + vk_master(5,key_to_chars_5mod), + vk_master(6,key_to_chars_6mod), + 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" }, + { 0x4d, L"Right" }, + { 0x4f, L"End" }, + { 0x50, L"Down" }, + { 0x51, L"Page Down" }, + { 0x52, L"Insert" }, + { 0x53, L"Delete" }, + { 0x54, L"<ReactOS>" }, + { 0x56, L"Help" }, + { 0x5b, L"Left <ReactOS>" }, + { 0x5c, L"Right <ReactOS>" }, + { 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 */ + 0, + 0, + NULL +}; + +PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { + return &keyboard_layout_table; +} + +INT STDCALL +DllMain( + PVOID hinstDll, + ULONG dwReason, + PVOID reserved) +{ + return 1; +} + Propchange: trunk/reactos/dll/keyboard/kbdurs/kbdurs.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdurs/kbdurs.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdurs/kbdurs… ============================================================================== --- trunk/reactos/dll/keyboard/kbdurs/kbdurs.def (added) +++ trunk/reactos/dll/keyboard/kbdurs/kbdurs.def [iso-8859-1] Sat May 3 10:29:25 2008 @@ -1,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdurs.dll + +EXPORTS +KbdLayerDescriptor@0 +;EOF Propchange: trunk/reactos/dll/keyboard/kbdurs/kbdurs.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdurs/kbdurs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdurs/kbdurs… ============================================================================== --- trunk/reactos/dll/keyboard/kbdurs/kbdurs.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdurs/kbdurs.rbuild [iso-8859-1] Sat May 3 10:29:25 2008 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="kbdurs" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdurs.dll" allowwarnings="true"> + <importlibrary definition="kbdurs.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdurs.c</file> + <file>kbdurs.rc</file> +</module> Propchange: trunk/reactos/dll/keyboard/kbdurs/kbdurs.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdurs/kbdurs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdurs/kbdurs… ============================================================================== --- trunk/reactos/dll/keyboard/kbdurs/kbdurs.rc (added) +++ trunk/reactos/dll/keyboard/kbdurs/kbdurs.rc [iso-8859-1] Sat May 3 10:29:25 2008 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Ukrainian (Student) Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdurs\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdurs.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/keyboard/kbdurs/kbdurs.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbduzb/kbduzb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbduzb/kbduzb… ============================================================================== --- trunk/reactos/dll/keyboard/kbduzb/kbduzb.c (added) +++ trunk/reactos/dll/keyboard/kbduzb/kbduzb.c [iso-8859-1] Sat May 3 10:29:25 2008 @@ -1,0 +1,393 @@ +/* + * ReactOS Uzbek (Cyrillic) Keyboard layout + * Copyright (C) 2008 ReactOS + * Author: Dmitry Chapyshev + * 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 <windows.h> +#include <internal/kbd.h> + +#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 } +}; + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + { VK_OEM_3, CAPS, {0x0451, 0x0401} }, + { '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, CAPS, {0x04b3, 0x04b2} }, + { 'Q', CAPS, {0x0439, 0x0419} }, + { 'W', CAPS, {0x0446, 0x0426} }, + { 'E', CAPS, {0x0443, 0x0423} }, + { 'R', CAPS, {0x043a, 0x041a} }, + { 'T', CAPS, {0x0435, 0x0415} }, + { 'Y', CAPS, {0x043d, 0x041d} }, + { 'U', CAPS, {0x0433, 0x0413} }, + { 'I', CAPS, {0x0448, 0x0428} }, + { 'O', CAPS, {0x045e, 0x040e} }, + { 'P', CAPS, {0x0437, 0x0417} }, + { VK_OEM_4, CAPS, {0x0445, 0x0425} }, + { VK_OEM_6, CAPS, {0x044a, 0x042a} }, + { 'A', CAPS, {0x0444, 0x0424} }, + { 'S', CAPS, {0x049b, 0x049a} }, + { 'D', CAPS, {0x0432, 0x0412} }, + { 'F', CAPS, {0x0430, 0x0410} }, + { 'G', CAPS, {0x043f, 0x041f} }, + { 'H', CAPS, {0x0440, 0x0420} }, + { 'J', CAPS, {0x043e, 0x041e} }, + { 'K', CAPS, {0x043b, 0x041b} }, + { 'L', CAPS, {0x0434, 0x0414} }, + { VK_OEM_1, CAPS, {0x0436, 0x0416} }, + { VK_OEM_7, CAPS, {0x044d, 0x042d} }, + { 'Z', CAPS, {0x044f, 0x042f} }, + { 'X', CAPS, {0x0447, 0x0427} }, + { 'C', CAPS, {0x0441, 0x0421} }, + { 'V', CAPS, {0x043c, 0x041c} }, + { 'B', CAPS, {0x0438, 0x0418} }, + { 'N', CAPS, {0x0442, 0x0422} }, + { 'M', CAPS, {0x044c, 0x042c} }, + { VK_OEM_COMMA, CAPS, {0x0431, 0x0411} }, + { VK_OEM_PERIOD, CAPS, {0x044e, 0x042e} }, + { VK_OEM_2, NOCAPS, {'.', ',' } }, + { VK_DECIMAL, NOCAPS, {'.', '.' } }, + { VK_TAB, NOCAPS, {'\t', '\t' } }, + { VK_ADD, NOCAPS, {'+', '+' } }, + { VK_DIVIDE, NOCAPS, {'/', '/' } }, + { VK_MULTIPLY, NOCAPS, {'*', '*' } }, + { VK_SUBTRACT, NOCAPS, {'-', '-' } }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + { VK_OEM_5, NOCAPS, {'\\', '/', 0x001c} }, + { VK_OEM_102, NOCAPS, {'\\', '/', 0x001c} }, + { VK_BACK, NOCAPS, {'\b', '\b', 0x007f} }, + { VK_ESCAPE, NOCAPS, {0x001b, 0x001b, 0x001b} }, + { VK_RETURN, NOCAPS, {'\r', '\r', '\n' } }, + { VK_SPACE, NOCAPS, {' ', ' ', ' ' } }, + { VK_CANCEL, NOCAPS, {0x0003, 0x0003, 0x0003} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + { '2', NOCAPS, {'2', '\"', WCH_NONE, 0x0000} }, + { '6', NOCAPS, {'6', ':', WCH_NONE, 0x001e} }, + { VK_OEM_MINUS, CAPS, {0x0493, 0x0492, WCH_NONE, 0x001f} }, + { 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" }, + { 0x4d, L"Right" }, + { 0x4f, L"End" }, + { 0x50, L"Down" }, + { 0x51, L"Page Down" }, + { 0x52, L"Insert" }, + { 0x53, L"Delete" }, + { 0x54, L"<ReactOS>" }, + { 0x56, L"Help" }, + { 0x5b, L"Left <ReactOS>" }, + { 0x5c, L"Right <ReactOS>" }, + { 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 */ + 0, + 0, + NULL +}; + +PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { + return &keyboard_layout_table; +} + +INT STDCALL +DllMain( + PVOID hinstDll, + ULONG dwReason, + PVOID reserved) +{ + return 1; +} + Propchange: trunk/reactos/dll/keyboard/kbduzb/kbduzb.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbduzb/kbduzb.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbduzb/kbduzb… ============================================================================== --- trunk/reactos/dll/keyboard/kbduzb/kbduzb.def (added) +++ trunk/reactos/dll/keyboard/kbduzb/kbduzb.def [iso-8859-1] Sat May 3 10:29:25 2008 @@ -1,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbduzb.dll + +EXPORTS +KbdLayerDescriptor@0 +;EOF Propchange: trunk/reactos/dll/keyboard/kbduzb/kbduzb.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbduzb/kbduzb.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbduzb/kbduzb… ============================================================================== --- trunk/reactos/dll/keyboard/kbduzb/kbduzb.rbuild (added) +++ trunk/reactos/dll/keyboard/kbduzb/kbduzb.rbuild [iso-8859-1] Sat May 3 10:29:25 2008 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="kbduzb" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbduzb.dll" allowwarnings="true"> + <importlibrary definition="kbduzb.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbduzb.c</file> + <file>kbduzb.rc</file> +</module> Propchange: trunk/reactos/dll/keyboard/kbduzb/kbduzb.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbduzb/kbduzb.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbduzb/kbduzb… ============================================================================== --- trunk/reactos/dll/keyboard/kbduzb/kbduzb.rc (added) +++ trunk/reactos/dll/keyboard/kbduzb/kbduzb.rc [iso-8859-1] Sat May 3 10:29:25 2008 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Uzbek (Cyrillic) Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbduzb\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbduzb.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/keyboard/kbduzb/kbduzb.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdvntc/kbdvn… ============================================================================== --- trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.c (added) +++ trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.c [iso-8859-1] Sat May 3 10:29:25 2008 @@ -1,0 +1,398 @@ +/* + * ReactOS Vietnamese Keyboard layout + * Copyright (C) 2008 ReactOS + * Author: Dmitry Chapyshev + * 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 <windows.h> +#include <internal/kbd.h> + +#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, + 7, + { 0, 1, 4, 5, SHFT_INVALID, SHFT_INVALID, 2, 3 } +}; + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + { VK_DECIMAL, NOCAPS, {',', ',' } }, + { VK_TAB, NOCAPS, {'\t', '\t'} }, + { VK_ADD, NOCAPS, {'+', '+' } }, + { VK_DIVIDE, NOCAPS, {'/', '/' } }, + { VK_MULTIPLY, NOCAPS, {'*', '*' } }, + { VK_SUBTRACT, NOCAPS, {'-', '-' } }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + { VK_OEM_3, NOCAPS, {'`', '~', '`', '~'} }, + { '1', CAPS, {0x0103, 0x0102, '1', '!'} }, + { '2', CAPS, {0x00e2, 0x00c2, '2', '@'} }, + { '3', CAPS, {0x00ea, 0x00ca, '3', '#'} }, + { '4', CAPS, {0x00f4, 0x00d4, '4', '$'} }, + { '5', NOCAPS, {0x0300, 0x0300, '5', '%'} }, + { '7', NOCAPS, {0x0303, 0x0303, '7', '&'} }, + { '8', CAPS, {0x0301, 0x0301, '8', '*'} }, + { '9', NOCAPS, {0x0323, 0x0323, '9', '('} }, + { '0', CAPS, {0x0111, 0x0110, '0', ')'} }, + { VK_OEM_PLUS, NOCAPS, {0x20ab, '+', '=', '+'} }, + { 'Q', CAPS, {'q', 'Q', 'q', 'Q'} }, + { 'W', CAPS, {'w', 'W', 'w', 'W'} }, + { 'E', CAPS, {'e', 'E', 'e', 'E'} }, + { 'R', CAPS, {'r', 'R', 'r', 'R'} }, + { 'T', CAPS, {'t', 'T', 't', 'T'} }, + { 'Y', CAPS, {'y', 'Y', 'y', 'Y'} }, + { 'U', CAPS, {'u', 'U', 'u', 'U'} }, + { 'I', CAPS, {'i', 'I', 'i', 'I'} }, + { 'O', CAPS, {'o', 'O', 'o', 'O'} }, + { 'P', CAPS, {'p', 'P', 'p', 'P'} }, + { 'A', CAPS, {'a', 'A', 'a', 'A'} }, + { 'S', CAPS, {'s', 'S', 's', 'S'} }, + { 'D', CAPS, {'d', 'D', 'd', 'D'} }, + { 'F', CAPS, {'f', 'F', 'f', 'F'} }, + { 'G', CAPS, {'g', 'G', 'g', 'G'} }, + { 'H', CAPS, {'h', 'H', 'h', 'H'} }, + { 'J', CAPS, {'j', 'J', 'j', 'J'} }, + { 'K', CAPS, {'k', 'K', 'k', 'K'} }, + { 'L', CAPS, {'l', 'L', 'l', 'L'} }, + { VK_OEM_1, NOCAPS, {';', ':', ';', ':'} }, + { VK_OEM_7, NOCAPS, {'\'', '\"', '\'', '\"'}}, + { 'Z', CAPS, {'z', 'Z', 'z', 'Z'} }, + { 'X', CAPS, {'x', 'X', 'x', 'X'} }, + { 'C', CAPS, {'c', 'C', 'c', 'C'} }, + { 'V', CAPS, {'v', 'V', 'v', 'V'} }, + { 'B', CAPS, {'b', 'B', 'b', 'B'} }, + { 'N', CAPS, {'n', 'N', 'n', 'N'} }, + { 'M', CAPS, {'m', 'M', 'm', 'M'} }, + { VK_OEM_COMMA, NOCAPS, {',', '<', ',', '<'} }, + { VK_OEM_PERIOD, NOCAPS, {'.', '>', '.', '>'} }, + { VK_OEM_2, NOCAPS, {'/', '?', '/', '?'} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { + { VK_OEM_4, CAPS, {0x01b0, 0x01af, '[', '{', 0x001b} }, + { VK_OEM_6, CAPS, {0x01a1, 0x01a0, ']', '}', 0x001d} }, + { VK_OEM_5, NOCAPS, {'\\', '|', '\\', '|', 0x001c} }, + { VK_OEM_102, NOCAPS, {'\\', '|', '\\', '|', 0x001c} }, + { VK_BACK, NOCAPS, {'\b', '\b', WCH_NONE, WCH_NONE, 0x007f} }, + { VK_ESCAPE, NOCAPS, {0x001b, 0x001b, WCH_NONE, WCH_NONE, 0x001b} }, + { VK_RETURN, NOCAPS, {'\r', '\r', WCH_NONE, WCH_NONE, '\n' } }, + { VK_SPACE, NOCAPS, {' ', ' ', WCH_NONE, WCH_NONE, ' ' } }, + { VK_CANCEL, NOCAPS, {0x0003, 0x0003, WCH_NONE, WCH_NONE, 0x0003} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS6 key_to_chars_6mod[] = { + { '6', NOCAPS, {0x0309, 0x0309, '6', '^', WCH_NONE, 0x001e} }, + { VK_OEM_MINUS, NOCAPS, {'-', '_', '-', '_', WCH_NONE, 0x001f} }, + { 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(4,key_to_chars_4mod), + vk_master(5,key_to_chars_5mod), + vk_master(6,key_to_chars_6mod), + 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" }, + { 0x4d, L"Right" }, + { 0x4f, L"End" }, + { 0x50, L"Down" }, + { 0x51, L"Page Down" }, + { 0x52, L"Insert" }, + { 0x53, L"Delete" }, + { 0x54, L"<ReactOS>" }, + { 0x56, L"Help" }, + { 0x5b, L"Left <ReactOS>" }, + { 0x5c, L"Right <ReactOS>" }, + { 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 */ + 0, + 0, + NULL +}; + +PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { + return &keyboard_layout_table; +} + +INT STDCALL +DllMain( + PVOID hinstDll, + ULONG dwReason, + PVOID reserved) +{ + return 1; +} + Propchange: trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdvntc/kbdvn… ============================================================================== --- trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.def (added) +++ trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.def [iso-8859-1] Sat May 3 10:29:25 2008 @@ -1,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdvntc.dll + +EXPORTS +KbdLayerDescriptor@0 +;EOF Propchange: trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdvntc/kbdvn… ============================================================================== --- trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.rbuild [iso-8859-1] Sat May 3 10:29:25 2008 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="kbdvntc" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdvntc.dll" allowwarnings="true"> + <importlibrary definition="kbdvntc.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdvntc.c</file> + <file>kbdvntc.rc</file> +</module> Propchange: trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdvntc/kbdvn… ============================================================================== --- trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.rc (added) +++ trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.rc [iso-8859-1] Sat May 3 10:29:25 2008 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Vietnamese Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdvntc\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdvntc.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/keyboard/keyboard.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/keyboard.rbui… ============================================================================== --- trunk/reactos/dll/keyboard/keyboard.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/keyboard.rbuild [iso-8859-1] Sat May 3 10:29:25 2008 @@ -124,11 +124,20 @@ <directory name="kbdth"> <xi:include href="kbdth/kbdth.rbuild" /> </directory> + <directory name="kbdtuf"> + <xi:include href="kbdtuf/kbdtuf.rbuild" /> + </directory> + <directory name="kbdtuq"> + <xi:include href="kbdtuq/kbdtuq.rbuild" /> + </directory> <directory name="kbduk"> <xi:include href="kbduk/kbduk.rbuild" /> </directory> <directory name="kbdur"> <xi:include href="kbdur/kbdur.rbuild" /> + </directory> + <directory name="kbdurs"> + <xi:include href="kbdurs/kbdurs.rbuild" /> </directory> <directory name="kbdus"> <xi:include href="kbdus/kbdus.rbuild" /> @@ -145,6 +154,12 @@ <directory name="kbdusx"> <xi:include href="kbdusx/kbdusx.rbuild" /> </directory> + <directory name="kbduzb"> + <xi:include href="kbduzb/kbduzb.rbuild" /> + </directory> + <directory name="kbdvntc"> + <xi:include href="kbdvntc/kbdvntc.rbuild" /> + </directory> <directory name="kbdycc"> <xi:include href="kbdycc/kbdycc.rbuild" /> </directory>

1 0

[greatlrd] 33255: Bugfix : DRVFN gaEngFuncs one row was wrong thx irc : Pigglesworth for notice it. start fixing prototype for DxEngDeleteDC
by greatlrd＠svn.reactos.org 03 May '08

03 May '08

Author: greatlrd Date: Sat May 3 06:46:34 2008 New Revision: 33255 URL: http://svn.reactos.org/svn/reactos?rev=33255&view=rev Log: Bugfix : DRVFN gaEngFuncs one row was wrong thx irc : Pigglesworth for notice it. start fixing prototype for DxEngDeleteDC Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] Sat May 3 06:46:34 2008 @@ -104,7 +104,7 @@ DWORD STDCALL DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3); DWORD STDCALL DxEngSpSpritesVisible(DWORD x1); HDC STDCALL DxEngGetDesktopDC(BOOLEAN CreateDesktopDc, DWORD x2, DWORD x3); -DWORD STDCALL DxEngDeleteDC(DWORD x1, DWORD x2); +DWORD STDCALL DxEngDeleteDC(HDC hdc, DWORD x2); DWORD STDCALL DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3); DWORD STDCALL DxEngSelectBitmap(DWORD x1, DWORD x2); DWORD STDCALL DxEngSetBitmapOwner(DWORD x1, DWORD x2); Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Sat May 3 06:46:34 2008 @@ -24,6 +24,7 @@ HANDLE ghDxGraphics = NULL; ULONG gdwDirectDrawContext; +#define DXDBG 1 /************************************************************************/ /* DirectX graphic/video driver enable start here */ @@ -451,6 +452,9 @@ NtGdiDdReenableDirectDrawObject(HANDLE hDirectDrawLocal, BOOL *pubNewMode) { +#if DXDBG + BOOL status = FALSE; +#endif PGD_DXDDREENABLEDIRECTDRAWOBJECT pfnDdReenableDirectDrawObject = (PGD_DXDDREENABLEDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdReenableDirectDrawObject].pfn; if (pfnDdReenableDirectDrawObject == NULL) @@ -460,7 +464,15 @@ } DPRINT1("Calling dxg.sys pfnDdReenableDirectDrawObject\n"); + +#if DXDBG + status = pfnDdReenableDirectDrawObject(hDirectDrawLocal, pubNewMode); + DPRINT1("end Calling dxg.sys pfnDdReenableDirectDrawObject\n"); + DPRINT1("return value : 0x%08x\n",status); + return status; +#else return pfnDdReenableDirectDrawObject(hDirectDrawLocal, pubNewMode); +#endif } Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Sat May 3 06:46:34 2008 @@ -43,7 +43,7 @@ {DXENG_INDEX_DxEngSetDCOwner, (PFN)DxEngSetDCOwner}, {DXENG_INDEX_DxEngLockDC, (PFN)DxEngLockDC}, {DXENG_INDEX_DxEngUnlockDC, (PFN)DxEngUnlockDC}, - {DXENG_INDEX_DxEngSetDCState, (PFN)DxEngGetDCState}, + {DXENG_INDEX_DxEngSetDCState, (PFN)DxEngSetDCState}, {DXENG_INDEX_DxEngGetDCState, (PFN)DxEngGetDCState}, {DXENG_INDEX_DxEngSelectBitmap, (PFN)DxEngSelectBitmap}, {DXENG_INDEX_DxEngSetBitmapOwner, (PFN)DxEngSetBitmapOwner}, @@ -728,8 +728,9 @@ /************************************************************************/ DWORD STDCALL -DxEngDeleteDC(DWORD x1, DWORD x2) -{ +DxEngDeleteDC(HDC hdc, DWORD x2) +{ + UNIMPLEMENTED; return FALSE; }

1 0

[greatlrd] 33254: implemented partly DxEngGetDesktopDC
by greatlrd＠svn.reactos.org 03 May '08

03 May '08

Author: greatlrd Date: Sat May 3 05:23:14 2008 New Revision: 33254 URL: http://svn.reactos.org/svn/reactos?rev=33254&view=rev Log: implemented partly DxEngGetDesktopDC Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] Sat May 3 05:23:14 2008 @@ -103,7 +103,7 @@ DWORD STDCALL DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3); DWORD STDCALL DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3); DWORD STDCALL DxEngSpSpritesVisible(DWORD x1); -DWORD STDCALL DxEngGetDesktopDC(DWORD x1, DWORD x2, DWORD x3); +HDC STDCALL DxEngGetDesktopDC(BOOLEAN CreateDesktopDc, DWORD x2, DWORD x3); DWORD STDCALL DxEngDeleteDC(DWORD x1, DWORD x2); DWORD STDCALL DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3); DWORD STDCALL DxEngSelectBitmap(DWORD x1, DWORD x2); Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Sat May 3 05:23:14 2008 @@ -703,150 +703,162 @@ /************************************************************************/ /* DxEngGetDesktopDC */ /************************************************************************/ +HDC +STDCALL +DxEngGetDesktopDC(BOOLEAN CreateDesktopDc, DWORD x2, DWORD x3) +{ + PWINDOW_OBJECT DesktopObject = 0; + HDC DesktopHDC = 0; + + if (CreateDesktopDc == FALSE) + { + DesktopObject = UserGetDesktopWindow(); + DesktopHDC = (HDC)UserGetWindowDC(DesktopObject); + } + else + { + UNIMPLEMENTED; + } + + return DesktopHDC; +} + +/************************************************************************/ +/* DxEngDeleteDC */ +/************************************************************************/ DWORD STDCALL -DxEngGetDesktopDC(DWORD x1, DWORD x2, DWORD x3) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngDeleteDC */ +DxEngDeleteDC(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngCleanDC */ +/************************************************************************/ +BOOLEAN +STDCALL +DxEngCleanDC(HDC hdc) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSetDCOwner */ +/************************************************************************/ +BOOL STDCALL DxEngSetDCOwner(HGDIOBJ hObject, DWORD OwnerMask) +{ + DPRINT1("ReactX Calling : DxEngSetDCOwner \n"); + + return IntGdiSetDCOwnerEx( hObject, OwnerMask, FALSE); +} + +/************************************************************************/ +/* DxEngSetDCState */ +/************************************************************************/ +DWORD STDCALL DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSelectBitmap */ +/************************************************************************/ +DWORD STDCALL DxEngSelectBitmap(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSetBitmapOwner */ +/************************************************************************/ +DWORD STDCALL DxEngSetBitmapOwner(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngDeleteSurface */ +/************************************************************************/ +DWORD STDCALL DxEngDeleteSurface(DWORD x1) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngGetSurfaceData */ +/************************************************************************/ +DWORD STDCALL DxEngGetSurfaceData(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngAltLockSurface */ +/************************************************************************/ +DWORD STDCALL DxEngAltLockSurface(DWORD x1) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngUploadPaletteEntryToSurface */ +/************************************************************************/ +DWORD STDCALL DxEngUploadPaletteEntryToSurface(DWORD x1, DWORD x2,DWORD x3, DWORD x4) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngMarkSurfaceAsDirectDraw */ +/************************************************************************/ +DWORD STDCALL DxEngMarkSurfaceAsDirectDraw(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSelectPaletteToSurface */ +/************************************************************************/ +DWORD STDCALL DxEngSelectPaletteToSurface(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSyncPaletteTableWithDevice */ +/************************************************************************/ +DWORD STDCALL DxEngSyncPaletteTableWithDevice(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSetPaletteState */ +/************************************************************************/ +DWORD STDCALL DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngGetRedirectionBitmap */ /************************************************************************/ DWORD STDCALL -DxEngDeleteDC(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngCleanDC */ -/************************************************************************/ -BOOLEAN -STDCALL -DxEngCleanDC(HDC hdc) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngSetDCOwner */ -/************************************************************************/ -BOOL STDCALL DxEngSetDCOwner(HGDIOBJ hObject, DWORD OwnerMask) -{ - DPRINT1("ReactX Calling : DxEngSetDCOwner \n"); - - return IntGdiSetDCOwnerEx( hObject, OwnerMask, FALSE); -} - -/************************************************************************/ -/* DxEngSetDCState */ -/************************************************************************/ -DWORD STDCALL DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngSelectBitmap */ -/************************************************************************/ -DWORD STDCALL DxEngSelectBitmap(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngSetBitmapOwner */ -/************************************************************************/ -DWORD STDCALL DxEngSetBitmapOwner(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngDeleteSurface */ -/************************************************************************/ -DWORD STDCALL DxEngDeleteSurface(DWORD x1) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngGetSurfaceData */ -/************************************************************************/ -DWORD STDCALL DxEngGetSurfaceData(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngAltLockSurface */ -/************************************************************************/ -DWORD STDCALL DxEngAltLockSurface(DWORD x1) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngUploadPaletteEntryToSurface */ -/************************************************************************/ -DWORD STDCALL DxEngUploadPaletteEntryToSurface(DWORD x1, DWORD x2,DWORD x3, DWORD x4) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngMarkSurfaceAsDirectDraw */ -/************************************************************************/ -DWORD STDCALL DxEngMarkSurfaceAsDirectDraw(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngSelectPaletteToSurface */ -/************************************************************************/ -DWORD STDCALL DxEngSelectPaletteToSurface(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngSyncPaletteTableWithDevice */ -/************************************************************************/ -DWORD STDCALL DxEngSyncPaletteTableWithDevice(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngSetPaletteState */ -/************************************************************************/ -DWORD STDCALL DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngGetRedirectionBitmap */ -/************************************************************************/ -DWORD -STDCALL DxEngGetRedirectionBitmap(DWORD x1) { return FALSE; // Normal return.

1 0

[dreimer] 33253: Finish Basic RosBE for PowerShell. Please Report Bugs
by dreimer＠svn.reactos.org 02 May '08

02 May '08

Author: dreimer Date: Fri May 2 18:54:47 2008 New Revision: 33253 URL: http://svn.reactos.org/svn/reactos?rev=33253&view=rev Log: Finish Basic RosBE for PowerShell. Please Report Bugs Added: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 (with props) trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 (with props) trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 (with props) Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Fri May 2 18:54:47 2008 @@ -52,7 +52,7 @@ # it accordingly. # if ($_ROSBE_OBJPATH -ne $null) { - if ( Test-Path "$_ROSBE_OBJPATH\.") { + if ( Test-Path "$_ROSBE_OBJPATH") { "ERROR: The path specified doesn't seem to exist." exit } else { @@ -60,7 +60,7 @@ } } if ($_ROSBE_OUTPATH -ne $null) { - if (Test-Path "$_ROSBE_OUTPATH\.") { + if (Test-Path "$_ROSBE_OUTPATH") { "ERROR: The path specified doesn't seem to exist." exit } else { @@ -120,12 +120,6 @@ function BUILDMULTI { # # Get the number of CPUs in the system so we know how many jobs to execute. - # To modify the number used alter the options used with cpucount: - # No Option - Number of CPUs. - # -x1 - Number of CPUs, plus 1. - # -x2 - Number of CPUs, doubled. - # -a - Determine the cpu count based on the inherited process affinity mask. - # $CPUCOUNT= (gwmi win32_processor).numberofcores + 1 if ($_ROSBE_SHOWTIME -eq 1) { Added: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 (added) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Fri May 2 18:54:47 2008 @@ -1,0 +1,76 @@ +# +# PROJECT: RosBE - ReactOS Build Environment for Windows +# LICENSE: GNU General Public License v2. (see LICENSE.txt) +# FILE: Root/Clean.cmd +# PURPOSE: Clean the ReactOS source directory. +# COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +# Peter Ward <dralnix(a)gmail.com> +# +# + +$host.ui.RawUI.WindowTitle = "Cleaning..." + +function remlog { + # + # Check if we have any logs to clean, if so, clean them. + # + if (Test-Path "$_ROSBE_LOGDIR") { + "Cleaning build logs..." + $null = (Remove-Item -path "$_ROSBE_LOGDIR\*.txt" -force) + "Done cleaning build logs." + } else { + "ERROR: There are no logs to clean." + } +} + +function rembin { + # + # Check if we have something to clean, if so, clean it. + # + if (Test-Path "obj-i386") { + "Cleaning ReactOS source directory..." + # + # Remove directories/makefile.auto created by the build. + # + if (Test-Path "obj-i386") { + $null = (Remove-Item "obj-i386" -recurse -force) + } + if (Test-Path "output-i386") { + $null = (Remove-Item "output-i386" -recurse -force) + } + if (Test-Path "reactos") { + $null = (Remove-Item "reactos" -recurse -force) + } + if (Test-Path "makefile.auto") { + $null = (Remove-Item "makefile.auto" -force) + } + "Done cleaning ReactOS source directory." + } else { + "ERROR: There is no compiler output to clean." + } +} + +function end { + $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" + exit +} + +if ("$args" -eq "") { + rembin + end +} +if ("$args" -eq "logs") { + remlog + end +} +if ("$args" -eq "all") { + rembin + remlog + end +} +if ("$args" -ne "") { + "Unknown parameter specified. Try ''help [COMMAND]''." + end +} + + Propchange: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 (added) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] Fri May 2 18:54:47 2008 @@ -1,0 +1,196 @@ +# +# PROJECT: RosBE - ReactOS Build Environment for Windows +# LICENSE: GNU General Public License v2. (see LICENSE.txt) +# FILE: Root/Help.ps1 +# PURPOSE: Display help for the commands included with the ReactOS Build Environment. +# COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +# +# + +# +# Check if we are displaying help on all commands, if so, display it. +# +if ("$args" -eq "") { + "" + "Available Commands:" + " make [OPTIONS] - Without options it does a standard build of" + " ReactOS. OPTIONS are the standard ReactOS build" + " options ie. ""bootcd""" + " makex [OPTIONS] - Same as 'make' but automatically determines the" + " number of CPU Cores in the system and uses -j" + " with the appropriate number." + " basedir - Switch back to the ReactOS source directory." + + if (Test-Path "$_ROSBE_BASEDIR\charch.ps1") { + " charch [OPTIONS] - Change the Architecture to build for for the" + " current RosBE session." + } + + if (Test-Path "$_ROSBE_BASEDIR\chdefdir.ps1") { + " chdefdir [OPTIONS] - Change the ReactOS source directory for the" + " current RosBE session." + } + + if (Test-Path "$_ROSBE_BASEDIR\chdefgcc.ps1") { + " chdefgcc [PATH] - Change the MinGW/GCC directory for the" + " current RosBE session." + } + + " clean [OPTIONS] - Fully clean the ReactOS source directory and/or" + " the RosBE build logs." + + if (Test-Path "$_ROSBE_BASEDIR\Config.ps1") { + " config [OPTIONS] - Configures the way, ReactOS will be built." + } + + " help [COMMAND] - Display the available commands or help on a" + " specific command." + + if (Test-Path "$_ROSBE_BASEDIR\reladdr2line.ps1") { + " raddr2line [OPTIONS] - Translates program addresses into file names and" + " line numbers to assist developers with finding" + " specific bugs in ReactOS." + } + + if (Test-Path "$_ROSBE_BASEDIR\scut.ps1") { + " scut [OPTIONS] - List, add, edit, remove, switch and default to" + " shortcutted ReactOS source directories." + } + + if (Test-Path "$_ROSBE_BASEDIR\sSVN.ps1") { + " ssvn [OPTIONS] - Create, update or clean-up your ReactOS source" + " tree or show the revision number of the local" + " and online trees." + } + + if (Test-Path "$_ROSBE_BASEDIR\options.ps1") { + " options - Starts the RosBE configurator." + } + + "" + exit +} + +# +# Now check if we are displaying help on individual commands, if so, +# display the help for that command. +# +if ("$args" -eq "make") { + " Usage: make [OPTIONS]" + " Without options it does a standard build of ReactOS. OPTIONS are the" + " standard ReactOS build options ie. ""bootcd"", ""livecd"", etc." + exit +} +if ("$args" -eq "makex") { + " Usage: makex [OPTIONS]" + " Same as 'make' but automatically determines the number of CPU Cores in" + " the system and uses ""make -j x"" with the appropriate number." + " NOTE: The number makex uses can be modified by editing Build.ps1" + " located in the RosBE directory, instructions for doing so are" + " contained within the file." + exit +} +if ("$args" -eq "basedir") { + " Usage: basedir" + " Switches back to the ReactOS source directory." + exit +} +if (Test-Path "$_ROSBE_BASEDIR\charch.ps1") { + if ("$args" -eq "charch") { + " Usage: charch [OPTIONS]" + " Change the ReactOS source directory for the current RosBE session." + " Possible Architectures are: x86, ppc, arm." + "" + exit + } +} +if (Test-Path "$_ROSBE_BASEDIR\chdefdir.ps1") { + if ("$args" -eq "chdefdir") { + " Usage: chdefdir [OPTIONS]" + " Change the ReactOS source directory for the current RosBE session." + "" + " previous - Switch to the previous ReactOS source directory." + exit + } +} +if (Test-Path "$_ROSBE_BASEDIR\chdefgcc.ps1") { + if ("$args" -eq "chdefgcc") { + " Usage: chdefgcc [PATH]" + " Change the MinGW/GCC directory for the current RosBE session." + "" + exit + } +} +if ("$args" -eq "clean") { + " Usage: clean [logs]" + " Fully clean the ReactOS source directory." + "" + " all - Removes build logs and compiler output in the RosBE-Logs directory." + " logs - Removes all build logs in the RosBE-Logs directory." + exit +} +if (Test-Path "$_ROSBE_BASEDIR\Config.ps1") { + if ("$args" -eq "config") { + " Usage: config [OPTIONS]" + " Creates a configuration file, which tells RosBE how to build the tree." + "" + " delete - Deletes the created configuration file and so sets back" + " to default settings." + " update - Deletes the old created configuration file and updates" + " it with a new, default one." + exit + } +} +if ("$args" -eq "help") { + " Usage: help [COMMAND]" + " Shows help for the specified command or lists all available commands." + exit +} +if (Test-Path "$_ROSBE_BASEDIR\reladdr2line.ps1") { + if ("$args" -eq "raddr2line") { + " Usage: raddr2line [FILE] [ADDRESS]" + " Translates program addresses into file names and line numbers to" + " assist developers with finding specific bugs in ReactOS. If" + " either of the options is not given you will be prompted for it." + "" + " FILE - This can be either a fully specified path or just the" + " file name [you can use a partial name ie. ntdll*] of" + " the executable to be analyzed. When using just a file" + " the current directory and all sub-directories are" + " searched." + " ADDRESS - The address to be translated." + "" + exit + } +} +if (Test-Path "$_ROSBE_BASEDIR\scut.ps1") { + if ("$args" -eq "scut") { + IEX "&'$_ROSBE_BASEDIR\Tools\scut.exe' --help" + exit + } +} +if (Test-Path "$_ROSBE_BASEDIR\sSVN.ps1") { + if ("$args" -eq "ssvn") { + " Usage: ssvn [OPTIONS]" + " Creates, updates or cleans up your ReactOS source tree or shows the" + " revision number of the local and online trees." + "" + " update - Updates to HEAD revision or to a specific one when" + " second parameter specifies one." + " create - Creates a new ReactOS source tree." + " cleanup - Cleans up and fixes errors in the source tree." + " status - Show the current local and online revision numbers." + exit + } +} +if (Test-Path "$_ROSBE_BASEDIR\options.ps1") { + if ("$args" -eq "options") { + " Usage: options" + " Starts the RosBE configurator." + exit + } +} +if ("$args" -ne $null) { + " Unknown command specified. No help available for $args." + exit +} Propchange: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 (added) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 [iso-8859-1] Fri May 2 18:54:47 2008 @@ -1,0 +1,43 @@ +# +# PROJECT: RosBE - ReactOS Build Environment for Windows +# LICENSE: GNU General Public License v2. (see LICENSE.txt) +# FILE: Root/MinGW.ps1 +# PURPOSE: This script provides/sets up a standard MinGW build environment. +# COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +# +# + +if ($args -ne "") { + cls + "Unknown parameter specified. Exiting." + exit +} + +(Get-Host).UI.RawUI.ForegroundColor = "Green" +(Get-Host).UI.RawUI.BackgroundColor = "Black" +cls +$ENV:PATH = "$ENV:SystemRoot\system32;$ENV:SystemRoot" +$global:0 = $myInvocation.MyCommand.Definition +$global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0) +$global:_ROSBE_MODE = "MinGW" +$global:_ROSBE_ORIGINALPATH = "$ENV:PATH" +$global:_ROSBE_MINGWPATH = "$_ROSBE_BASEDIR\4.1.3" + +"" +"" +& "$_ROSBE_BASEDIR\rosbe-gcc-env.ps1" +"" +"" + +# +# Get the number of CPUs in the system so we know how many jobs to execute. +$CPUCOUNT= (gwmi win32_processor).numberofcores + 1 + +if (Test-Path "$_ROSBE_BASEDIR\chdefgcc.ps1") { + set-alias CHDEFGCC "$_ROSBE_BASEDIR\chdefgcc.ps1" -scope Global +} +set-alias MAKE "$_ROSBE_BASEDIR\Build.ps1" -scope Global +set-alias MAKEX "$_ROSBE_BASEDIR\Build.ps1 multi" -scope Global +if (Test-Path "$_ROSBE_BASEDIR\scut.ps1") { + set-alias SCUT "$_ROSBE_BASEDIR\scut.ps1" -scope Global +} Propchange: trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Fri May 2 18:54:47 2008 @@ -38,7 +38,7 @@ # Display the banner and set up the environment for the GCC 4.x.x build # environment. # -function RosBE4 { +function RosBE { "*******************************************************************************" "* *" "* ReactOS Build Environment $_ROSBE_VERSION *" @@ -58,7 +58,10 @@ # that are not actually present. # -function LOADDOSKEYMACROS { +function LoadAliases { + function global:BASEDIR { + cd "$_ROSBE_ROSSOURCEDIR" + } if (Test-Path "$_ROSBE_BASEDIR\chdefdir.ps1") { set-alias CHDEFDIR "$_ROSBE_BASEDIR\chdefdir.ps1" -scope Global } @@ -119,7 +122,7 @@ # Check if we are using oldmode or if any unknown parameters were specified. # if ($args.count -gt 0) { - if ($args[0] = "oldmode") { + if ($args -eq "oldmode") { cls $_ROSBE_MODE = "MinGW" @@ -129,7 +132,7 @@ exit } } -RosBE4 +RosBE # # Load the base directory from srclist.txt and set it as the new source @@ -150,7 +153,7 @@ # # Load the doskey macros that serve as our commands. # -LOADDOSKEYMACROS +LoadAliases # # Look if the ReactOS source directory is empty. If so, inform the user and Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] Fri May 2 18:54:47 2008 @@ -28,7 +28,7 @@ echo basedir - Switch back to the ReactOS source directory. if exist "%_ROSBE_BASEDIR%\charch.cmd" ( - echo chdefdir [OPTIONS] - Change the Architecture to build for for the + echo charch [OPTIONS] - Change the Architecture to build for for the echo current RosBE session. )

1 0

[dreimer] 33252: Properly set Stripping ONLY if you want it. Not vice versa
by dreimer＠svn.reactos.org 02 May '08

02 May '08

Author: dreimer Date: Fri May 2 15:59:04 2008 New Revision: 33252 URL: http://svn.reactos.org/svn/reactos?rev=33252&view=rev Log: Properly set Stripping ONLY if you want it. Not vice versa Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Fri May 2 15:59:04 2008 @@ -26,7 +26,7 @@ # Check if strip or ccache are being used and set the appropriate options. # if ($_ROSBE_STRIP -ne $null) { - if ($_ROSBE_STRIP -ne 1) { + if ($_ROSBE_STRIP -eq 1) { $ENV:ROS_LEAN_AND_MEAN = "yes" } else { $ENV:ROS_LEAN_AND_MEAN = "no"

1 0

[dchapyshev] 33251: - Fix build
by dchapyshev＠svn.reactos.org 02 May '08

02 May '08

Author: dchapyshev Date: Fri May 2 15:36:07 2008 New Revision: 33251 URL: http://svn.reactos.org/svn/reactos?rev=33251&view=rev Log: - Fix build Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Fri May 2 15:36:07 2008 @@ -109,6 +109,7 @@ dll\cpl\access\access.cpl 1 dll\cpl\appwiz\appwiz.cpl 1 +dll\cpl\console\console.dll 1 dll\cpl\desk\desk.cpl 1 dll\cpl\intl\intl.cpl 1 dll\cpl\main\main.cpl 1 @@ -208,7 +209,6 @@ dll\win32\comctl32\comctl32.dll 1 dll\win32\comdlg32\comdlg32.dll 1 dll\win32\compstui\compstui.dll 1 -dll\win32\console\console.dll 1 dll\win32\crtdll\crtdll.dll 1 dll\win32\crypt32\crypt32.dll 1 dll\win32\cryptdll\cryptdll.dll 1

1 0

[dreimer] 33250: This cleans up the output of gcc warnings. Open for testing now. Let me know if you like it and if not, tell me why.
by dreimer＠svn.reactos.org 02 May '08

02 May '08

Author: dreimer Date: Fri May 2 15:35:52 2008 New Revision: 33250 URL: http://svn.reactos.org/svn/reactos?rev=33250&view=rev Log: This cleans up the output of gcc warnings. Open for testing now. Let me know if you like it and if not, tell me why. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Fri May 2 15:35:52 2008 @@ -87,6 +87,7 @@ } function BUILD { + $ErrorActionPreference = "SilentlyContinue" if ($_ROSBE_SHOWTIME -eq 1) { [System.Diagnostics.Stopwatch] $sw; $sw = New-Object System.Diagnostics.StopWatch

1 0

[greatlrd] 33249: Fixed the last regress I intdues for loading ms dxg.sys now it works loading again and we come allot futuer with our ddraw.dll. without using hacks.
by greatlrd＠svn.reactos.org 02 May '08

02 May '08

Author: greatlrd Date: Fri May 2 15:16:03 2008 New Revision: 33249 URL: http://svn.reactos.org/svn/reactos?rev=33249&view=rev Log: Fixed the last regress I intdues for loading ms dxg.sys now it works loading again and we come allot futuer with our ddraw.dll. without using hacks. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Fri May 2 15:16:03 2008 @@ -34,8 +34,8 @@ NTSTATUS Status; PEPROCESS Proc = NULL; PDC pDC = NULL; - PGDIDEVICE pDev = (PGDIDEVICE)pDC->pPDev; - PGD_DXDDENABLEDIRECTDRAW pfnDdEnableDirectDraw = (PGD_DXDDENABLEDIRECTDRAW)gpDxFuncs[DXG_INDEX_DxDdEnableDirectDraw].pfn; + PGDIDEVICE pDev = NULL; + PGD_DXDDENABLEDIRECTDRAW pfnDdEnableDirectDraw = NULL; BOOL success = FALSE; /* FIXME get the process data */ @@ -57,7 +57,9 @@ DPRINT1("Warning : Failed to lock hdc\n"); return FALSE; } - + + pDev = (PGDIDEVICE)pDC->pPDev; + /* test see if drv got a dx interface or not */ if ( ( pDev->DriverFunctions.DisableDirectDraw == NULL) || ( pDev->DriverFunctions.EnableDirectDraw == NULL)) @@ -65,17 +67,16 @@ DPRINT1("Waring : DisableDirectDraw and EnableDirectDraw are NULL, no dx driver \n"); } else - { - /* FIXME HACK : some how pEDDgpl got zero out */ - pDev->pEDDgpl = (PVOID)&edd_DdirectDraw_Global; - - /* FIXME : proper check see if it been disable */ - if (pDev->pEDDgpl->dhpdev == 0) + { + + /* CHeck see if dx have been enable or not */ + if (pDev->pEDDgpl->hDev != pDC->pPDev) { pDev->pEDDgpl->ddCallbacks.dwSize = sizeof(DD_CALLBACKS); pDev->pEDDgpl->ddSurfaceCallbacks.dwSize = sizeof(DD_SURFACECALLBACKS); pDev->pEDDgpl->ddPaletteCallbacks.dwSize = sizeof(DD_PALETTECALLBACKS); + pfnDdEnableDirectDraw = (PGD_DXDDENABLEDIRECTDRAW)gpDxFuncs[DXG_INDEX_DxDdEnableDirectDraw].pfn; if (pfnDdEnableDirectDraw == NULL) { DPRINT1("Warning: no pfnDdEnableDirectDraw\n"); Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Fri May 2 15:16:03 2008 @@ -553,7 +553,7 @@ PrimarySurface.ppdevNext = NULL; // Fixme! We need to support more than display drvs. PrimarySurface.ppdevParent = NULL; // Always NULL if primary. PrimarySurface.pGraphicsDev = NULL; // Fixme! - PrimarySurface.pEDDgpl = (PVOID)&edd_DdirectDraw_Global; // FIXME! We need to support more than display drvs. + PrimarySurface.pEDDgpl = (EDD_DIRECTDRAW_GLOBAL *)&edd_DdirectDraw_Global; // FIXME! We need to support more than display drvs. RtlZeroMemory( &edd_DdirectDraw_Global ,sizeof(EDD_DIRECTDRAW_GLOBAL)); ret = TRUE; goto cleanup;

1 0

[dreimer] 33248: If my Java Teacher would see this, he would kill me several times... NOW it works as it should. Thx to Jaykul from #powershell
by dreimer＠svn.reactos.org 02 May '08

02 May '08

Author: dreimer Date: Fri May 2 15:07:41 2008 New Revision: 33248 URL: http://svn.reactos.org/svn/reactos?rev=33248&view=rev Log: If my Java Teacher would see this, he would kill me several times... NOW it works as it should. Thx to Jaykul from #powershell Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Fri May 2 15:07:41 2008 @@ -163,12 +163,12 @@ if ($args[0] -eq "multi") { $host.ui.RawUI.WindowTitle = "makex $($args) parallel build started: $TIMERAW" } - BUILDMULTI + BUILDMULTI $args } else { if ($args.count -gt 0) { $host.ui.RawUI.WindowTitle = "make $($args) build started: $TIMERAW" } - BUILD + BUILD $args } #

1 0

[dreimer] 33247: Try to fix the bug with not parsed args.
by dreimer＠svn.reactos.org 02 May '08

02 May '08

Author: dreimer Date: Fri May 2 14:55:47 2008 New Revision: 33247 URL: http://svn.reactos.org/svn/reactos?rev=33247&view=rev Log: Try to fix the bug with not parsed args. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Fri May 2 14:55:47 2008 @@ -95,12 +95,12 @@ $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) } $sw.Start() - & "$_ROSBE_MINGWMAKE" $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" + IEX "&'$_ROSBE_MINGWMAKE' $($args)" 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" $sw.Stop() write-host "Total Build Time:" $sw.Elapsed.ToString() } else { $sw.Start() - & "$_ROSBE_MINGWMAKE" $($args) + IEX "&'$_ROSBE_MINGWMAKE' $($args)" $sw.Stop() write-host "Total Build Time:" $sw.Elapsed.ToString() } @@ -109,9 +109,9 @@ if (!(Test-Path "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt")) { $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) } - & "$_ROSBE_MINGWMAKE" $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" + IEX "&'$_ROSBE_MINGWMAKE' $($args)" 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" } else { - & "$_ROSBE_MINGWMAKE" $($args) + IEX "&'$_ROSBE_MINGWMAKE' $($args)" } } } @@ -135,12 +135,12 @@ $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) } $sw.Start() - & "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" + IEX "&'$_ROSBE_MINGWMAKE' -j $CPUCOUNT $($args)" 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" $sw.Stop() write-host "Total Build Time:" $sw.Elapsed.ToString() } else { $sw.Start() - & "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) + IEX "&'$_ROSBE_MINGWMAKE' -j $CPUCOUNT $($args)" $sw.Stop() write-host "Total Build Time:" $sw.Elapsed.ToString() } @@ -149,9 +149,9 @@ if (!(Test-Path "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt")) { $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) } - & "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" + IEX "&'$_ROSBE_MINGWMAKE' -j $CPUCOUNT $($args)" 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" } else { - & "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) + IEX "&'$_ROSBE_MINGWMAKE' -j $CPUCOUNT $($args)" } } }

1 0

← Newer
1
...
51
52
53
54
55
56
57
58
59
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2008