[cfinck] 34547: Fix build, broken in r34546 Reminder: Never apply patches twice (and test the latest changes before committing) :-)
Author: cfinck Date: Wed Jul 16 09:33:47 2008 New Revision: 34547
URL: http://svn.reactos.org/svn/reactos?rev=34547&view=rev Log: Fix build, broken in r34546 Reminder: Never apply patches twice (and test the latest changes before committing) :-)
Modified: trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.c trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.def trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.rc
Modified: trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.c [iso-8859-1] Wed Jul 16 09:33:47 2008 @@ -464,471 +464,3 @@ PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { return &keyboard_layout_table; } - -/* - * ReactOS Slovak (QWERTY) Keyboard layout - * Copyright (C) 2008 ReactOS - * License: LGPL, see: LGPL.txt - * - * Created by Mario Kacmar (kario@szm.sk) - * Special thanks to Milan Margus (malin23@atlas.sk) - */ - -#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 */ - -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_3, VK_OEM_8, - VK_LSHIFT, VK_OEM_7, - /* - 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 */ - VK_MULTIPLY, VK_MENU, 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_5, VK_F11, VK_F12, - /* - 59 - */ - VK_CLEAR, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* EREOF */ - VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* ZOOM */ - VK_HELP, - /* - 64 - */ - /* Even more F-Keys (for example, NCR keyboards from the early 90's) */ - VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20, - VK_F21, VK_F22, VK_F23, - /* - 6f - */ - /* Not sure who uses these codes */ - VK_EMPTY, VK_EMPTY, VK_EMPTY, - /* - 72 - */ - VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, - /* - 76 - */ - /* One more f-key */ - VK_F24, - /* - 77 - */ - VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, - VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */ - VK_EMPTY, - /* - 80 - */ - 0 -}; - -ROSDATA VSC_VK extcode0_to_vk[] = { - { 0x10, VK_MEDIA_PREV_TRACK | KEXT }, - { 0x19, VK_MEDIA_NEXT_TRACK | KEXT }, - { 0x1D, VK_RCONTROL | KEXT }, - { 0x20, VK_VOLUME_MUTE | KEXT }, - { 0x21, VK_LAUNCH_APP2 | KEXT }, - { 0x22, VK_MEDIA_PLAY_PAUSE | KEXT }, - { 0x24, VK_MEDIA_STOP | KEXT }, - { 0x2E, VK_VOLUME_DOWN | KEXT }, - { 0x30, VK_VOLUME_UP | KEXT }, - { 0x32, VK_BROWSER_HOME | KEXT }, - { 0x35, VK_DIVIDE | KEXT }, - { 0x37, VK_SNAPSHOT | KEXT }, - { 0x38, VK_RMENU | KEXT }, - { 0x47, VK_HOME | KEXT }, - { 0x48, VK_UP | KEXT }, - { 0x49, VK_PRIOR | KEXT }, - { 0x4B, VK_LEFT | KEXT }, - { 0x4D, VK_RIGHT | KEXT }, - { 0x4F, VK_END | KEXT }, - { 0x50, VK_DOWN | KEXT }, - { 0x51, VK_NEXT | KEXT }, - { 0x52, VK_INSERT | KEXT }, - { 0x53, VK_DELETE | KEXT }, - { 0x5B, VK_LWIN | KEXT }, - { 0x5C, VK_RWIN | KEXT }, - { 0x5D, VK_APPS | KEXT }, - { 0x5F, VK_SLEEP | KEXT }, - { 0x65, VK_BROWSER_SEARCH | KEXT }, - { 0x66, VK_BROWSER_FAVORITES | KEXT }, - { 0x67, VK_BROWSER_REFRESH | KEXT }, - { 0x68, VK_BROWSER_STOP | KEXT }, - { 0x69, VK_BROWSER_FORWARD | KEXT }, - { 0x6A, VK_BROWSER_BACK | KEXT }, - { 0x6B, VK_LAUNCH_APP1 | KEXT }, - { 0x6C, VK_LAUNCH_MAIL | KEXT }, - { 0x6D, VK_LAUNCH_MEDIA_SELECT | KEXT }, - { 0x1C, VK_RETURN | KEXT }, - { 0x46, VK_CANCEL | KEXT }, - { 0, 0 }, -}; - -ROSDATA VSC_VK extcode1_to_vk[] = { - { 0, 0 }, -}; - -ROSDATA VK_TO_BIT modifier_keys[] = { - { VK_SHIFT, KSHIFT }, - { VK_CONTROL, KCTRL }, - { VK_MENU, KALT }, - { 0, 0 } -}; - -ROSDATA MODIFIERS modifier_bits = { - modifier_keys, - 7, - { 0, 1, 2, 0 ,0, 0,3,0} /* Modifier bit order, NONE, SHIFT, CTRL, SHIFT+CTRL,ALT(not used),SHIFT-ALT (not used), CTR+ALT, SHIFT-CTRL-ALT*/ -}; - -#define NOCAPS 0 -#define CAPS KSHIFT /* Caps -> shift */ - -ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { - /* Normal vs Shifted */ - { VK_OEM_8, NOCAPS, {';', WCH_DEAD} }, // degree sign - { VK_EMPTY, 0, {WCH_NONE, 0x00b0} }, // VK_OEM_8 death - - /* Keys that do not have shift states */ - { VK_TAB, NOCAPS, {'\t','\t'} }, - { VK_ADD, NOCAPS, {'+', '+'} }, - { VK_SUBTRACT, NOCAPS, {'-', '-'} }, - { VK_MULTIPLY, NOCAPS, {'*', '*'} }, - { VK_DIVIDE, NOCAPS, {'/', '/'} }, - { VK_ESCAPE, NOCAPS, {'\x1b','\x1b'} }, - { VK_SPACE, NOCAPS, {' ', ' '} }, - { 0, 0 } -}; - -ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { - /* Normal, Shifted, Ctrl */ - /* Legacy (telnet-style) ascii escapes */ - { VK_RETURN, 0, {'\r', '\r', '\n'} }, - { 0, 0 } -}; - -ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { - /* Normal, Shifted, Ctrl, Ctrl+Alt */ - - /* The numbers */ - { '1', NOCAPS, {'+', '1', WCH_NONE, '~'} }, - { '2', NOCAPS, {0x013e, '2', WCH_NONE, WCH_DEAD} }, // l with caron - { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x02c7} }, // 2 death - { '3', NOCAPS, {0x0161, '3', WCH_NONE, WCH_DEAD} }, // s with caron - { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x005e} }, // 3 death - { '4', NOCAPS, {0x010d, '4', WCH_NONE, WCH_DEAD} }, // c with caron - { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x02d8} }, // 4 death - { '5', NOCAPS, {0x0165, '5', WCH_NONE, WCH_DEAD} }, // t with caron - { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x00b0} }, // 5 death - { '6', NOCAPS, {0x017e, '6', WCH_NONE, WCH_DEAD} }, // z with caron - { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x02db} }, // 6 death - { '7', NOCAPS, {0x00fd, '7', WCH_NONE, '`'} }, // y with acute - { '8', NOCAPS, {0x00e1, '8', WCH_NONE, WCH_DEAD} }, // a with acute - { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x02d9} }, // 8 death - { '9', NOCAPS, {0x00ed, '9', WCH_NONE, WCH_DEAD} }, // i with acute - { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x00b4} }, // 9 death - { '0', NOCAPS, {0x00e9, '0', WCH_NONE, WCH_DEAD} }, // e with acute - { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x02dd} }, // 0 death - { VK_OEM_MINUS, NOCAPS, {'=', '%', WCH_NONE, WCH_DEAD} }, - { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x00a8} }, // = death - { VK_OEM_PLUS, NOCAPS, {WCH_DEAD, WCH_DEAD, WCH_NONE, WCH_DEAD} }, // dead letters - acute, caron - { VK_EMPTY, 0, {0x00b4, 0x02c7, WCH_NONE, 0x00b8} }, // dead letters death :) - - { VK_OEM_1, NOCAPS, {0x00f4, '"', WCH_NONE, '$'} }, // o with circumflex - { VK_OEM_2, NOCAPS, {'-', '_', WCH_NONE, '*'} }, - { VK_OEM_3, NOCAPS, {0x00a7, '!', WCH_NONE, 0x00df} }, // section sign - { VK_OEM_4, NOCAPS, {0x00fa, '/', WCH_NONE, 0x00f7} }, // u with acute - { VK_OEM_5, NOCAPS, {'&', '*', WCH_NONE, '<'} }, - { VK_OEM_6, NOCAPS, {0x00E4, '(', WCH_NONE, 0x00d7} }, // a with diaeresis - { VK_OEM_7, NOCAPS, {0x0148, ')', WCH_NONE, 0x00a4} }, // n with caron - { VK_OEM_COMMA, NOCAPS, {',', '?', WCH_NONE, '<'} }, - { VK_OEM_PERIOD, NOCAPS, {'.', ':', WCH_NONE, '>'} }, - - /* The alphabet */ - { 'A', CAPS, {'a', 'A', 0x01, WCH_NONE} }, - { 'B', CAPS, {'b', 'B', 0x02, '{'} }, - { 'C', CAPS, {'c', 'C', 0x03, '&'} }, - { 'D', CAPS, {'d', 'D', 0x04, 0x0110} }, - { 'E', CAPS, {'e', 'E', 0x05, 0x20ac} }, - { 'F', CAPS, {'f', 'F', 0x06, '['} }, - { 'G', CAPS, {'g', 'G', 0x07, ']'} }, - { 'H', CAPS, {'h', 'H', 0x08, WCH_NONE} }, - { 'I', CAPS, {'i', 'I', 0x09, WCH_NONE} }, - { 'J', CAPS, {'j', 'J', 0x0a, WCH_NONE} }, - { 'K', CAPS, {'k', 'K', 0x0b, 0x0142} }, - { 'L', CAPS, {'l', 'L', 0x0c, 0x0141} }, - { 'M', CAPS, {'m', 'M', 0x0d, WCH_NONE} }, - { 'N', CAPS, {'n', 'N', 0x0e, '}'} }, - { 'O', CAPS, {'o', 'O', 0x0f, WCH_NONE} }, - { 'P', CAPS, {'p', 'P', 0x10, '''} }, - { 'Q', CAPS, {'q', 'Q', 0x11, '\'} }, - { 'R', CAPS, {'r', 'R', 0x12, WCH_NONE} }, - { 'S', CAPS, {'s', 'S', 0x13, 0x0111} }, - { 'T', CAPS, {'t', 'T', 0x14, WCH_NONE} }, - { 'U', CAPS, {'u', 'U', 0x15, WCH_NONE} }, - { 'V', CAPS, {'v', 'V', 0x16, '@'} }, - { 'W', CAPS, {'w', 'W', 0x17, '|'} }, - { 'X', CAPS, {'x', 'X', 0x18, '#'} }, - { 'Y', CAPS, {'y', 'Y', 0x19, WCH_NONE} }, // qwertY - { 'Z', CAPS, {'z', 'Z', 0x1a, '>'} }, - { 0, 0 } -}; - -ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { - { VK_DECIMAL, 0, {','} }, - { VK_NUMPAD0, 0, {'0'} }, - { VK_NUMPAD1, 0, {'1'} }, - { VK_NUMPAD2, 0, {'2'} }, - { VK_NUMPAD3, 0, {'3'} }, - { VK_NUMPAD4, 0, {'4'} }, - { VK_NUMPAD5, 0, {'5'} }, - { VK_NUMPAD6, 0, {'6'} }, - { VK_NUMPAD7, 0, {'7'} }, - { VK_NUMPAD8, 0, {'8'} }, - { VK_NUMPAD9, 0, {'9'} }, - { VK_BACK, 0, {'\010'} }, - { 0, 0 } -}; - -#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } - -ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { - vk_master(1,keypad_numbers), - vk_master(2,key_to_chars_2mod), - vk_master(3,key_to_chars_3mod), - vk_master(4,key_to_chars_4mod), - { 0,0,0 } -}; - -ROSDATA VSC_LPWSTR key_names[] = { - { 0x00, L"" }, - { 0x01, L"Esc" }, - { 0x0e, L"Backspace" }, - { 0x0f, L"Tab" }, - { 0x1c, L"Enter" }, - { 0x1d, L"Ctrl" }, - { 0x2a, L"Shift" }, - { 0x36, L"Right Shift" }, - { 0x37, L"Num *" }, - { 0x38, L"Alt" }, - { 0x39, L"Space" }, - { 0x3a, L"Caps Lock" }, - { 0x3b, L"F1" }, - { 0x3c, L"F2" }, - { 0x3d, L"F3" }, - { 0x3e, L"F4" }, - { 0x3f, L"F5" }, - { 0x40, L"F6" }, - { 0x41, L"F7" }, - { 0x42, L"F8" }, - { 0x43, L"F9" }, - { 0x44, L"F10" }, - { 0x45, L"Pause" }, - { 0x46, L"Scroll Lock" }, - { 0x47, L"Num 7" }, - { 0x48, L"Num 8" }, - { 0x49, L"Num 9" }, - { 0x4a, L"Num -" }, - { 0x4b, L"Num 4" }, - { 0x4c, L"Num 5" }, - { 0x4d, L"Num 6" }, - { 0x4e, L"Num +" }, - { 0x4f, L"Num 1" }, - { 0x50, L"Num 2" }, - { 0x51, L"Num 3" }, - { 0x52, L"Num 0" }, - { 0x53, L"Num Del" }, - { 0x54, L"Sys Req" }, - { 0x57, L"F11" }, - { 0x58, L"F12" }, - { 0x7c, L"F13" }, - { 0x7d, L"F14" }, - { 0x7e, L"F15" }, - { 0x7f, L"F16" }, - { 0x80, L"F17" }, - { 0x81, L"F18" }, - { 0x82, L"F19" }, - { 0x83, L"F20" }, - { 0x84, L"F21" }, - { 0x85, L"F22" }, - { 0x86, L"F23" }, - { 0x87, L"F24" }, - { 0, NULL }, -}; - -ROSDATA VSC_LPWSTR extended_key_names[] = { - { 0x1c, L"Num Enter" }, - { 0x1d, L"Right Ctrl" }, - { 0x35, L"Num /" }, - { 0x37, L"Prnt Scrn" }, - { 0x38, L"Right Alt" }, - { 0x45, L"Num Lock" }, - { 0x46, L"Break" }, - { 0x47, L"Home" }, - { 0x48, L"Up" }, - { 0x49, L"Page Up" }, - { 0x4a, L"Left" }, - { 0x4c, L"Center" }, - { 0x4d, L"Right" }, - { 0x4f, L"End" }, - { 0x50, L"Down" }, - { 0x51, L"Page Down" }, - { 0x52, L"Insert" }, - { 0x53, L"Delete" }, - { 0x54, L"<ReactOS>" }, - { 0x55, L"Help" }, - { 0x56, L"Left Windows" }, - { 0x5b, L"Right Windows" }, - { 0, NULL }, -}; - -#define DEADTRANS(ch, accent, comp, flags) MAKELONG(ch, accent), comp, flags - -ROSDATA DEADKEY dead_key[] = { - { DEADTRANS(0x0043, 0x02c7, 0x010c, 0x0000) }, // C with caron - { DEADTRANS(0x0063, 0x02c7, 0x010d, 0x0000) }, // c with caron - { DEADTRANS(0x0044, 0x02c7, 0x010e, 0x0000) }, // D with caron - { DEADTRANS(0x0064, 0x02c7, 0x010f, 0x0000) }, // d with caron - { DEADTRANS(0x004c, 0x02c7, 0x013d, 0x0000) }, // L with caron - { DEADTRANS(0x006c, 0x02c7, 0x013e, 0x0000) }, // l with caron - { DEADTRANS(0x004e, 0x02c7, 0x0147, 0x0000) }, // N with caron - { DEADTRANS(0x006e, 0x02c7, 0x0148, 0x0000) }, // n with caron - { DEADTRANS(0x0053, 0x02c7, 0x0160, 0x0000) }, // S with caron - { DEADTRANS(0x0073, 0x02c7, 0x0161, 0x0000) }, // s with caron - { DEADTRANS(0x0054, 0x02c7, 0x0164, 0x0000) }, // T with caron - { DEADTRANS(0x0074, 0x02c7, 0x0165, 0x0000) }, // t with caron - { DEADTRANS(0x005a, 0x02c7, 0x017d, 0x0000) }, // Z with caron - { DEADTRANS(0x007a, 0x02c7, 0x017e, 0x0000) }, // z with caron - { DEADTRANS(0x0020, 0x02c7, 0x02c7, 0x0000) }, // space > caron - - { DEADTRANS(0x0041, 0x00b4, 0x00c1, 0x0000) }, // A with acute - { DEADTRANS(0x0061, 0x00b4, 0x00e1, 0x0000) }, // a with acute - { DEADTRANS(0x0045, 0x00b4, 0x00c9, 0x0000) }, // E with acute - { DEADTRANS(0x0065, 0x00b4, 0x00e9, 0x0000) }, // e with acute - { DEADTRANS(0x0049, 0x00b4, 0x00cd, 0x0000) }, // I with acute - { DEADTRANS(0x0069, 0x00b4, 0x00ed, 0x0000) }, // i with acute - { DEADTRANS(0x004c, 0x00b4, 0x0139, 0x0000) }, // L with acute - { DEADTRANS(0x006c, 0x00b4, 0x013a, 0x0000) }, // l with acute - { DEADTRANS(0x004f, 0x00b4, 0x00d3, 0x0000) }, // O with acute - { DEADTRANS(0x006f, 0x00b4, 0x00f3, 0x0000) }, // o with acute - { DEADTRANS(0x0052, 0x00b4, 0x0154, 0x0000) }, // R with acute - { DEADTRANS(0x0072, 0x00b4, 0x0155, 0x0000) }, // r with acute - { DEADTRANS(0x0055, 0x00b4, 0x00da, 0x0000) }, // U with acute - { DEADTRANS(0x0075, 0x00b4, 0x00fa, 0x0000) }, // u with acute - { DEADTRANS(0x0059, 0x00b4, 0x00dd, 0x0000) }, // Y with acute - { DEADTRANS(0x0079, 0x00b4, 0x00fd, 0x0000) }, // y with acute - { DEADTRANS(0x0020, 0x00b4, 0x00b4, 0x0000) }, // space > acute - - { DEADTRANS(0x004f, 0x005e, 0x00d4, 0x0000) }, // O with circumflex - { DEADTRANS(0x006f, 0x005e, 0x00f4, 0x0000) }, // o with circumflex - { DEADTRANS(0x0020, 0x005e, 0x005e, 0x0000) }, // space > circumflex - - { DEADTRANS(0x0041, 0x00a8, 0x00c4, 0x0000) }, // A with diaeresis - { DEADTRANS(0x0061, 0x00a8, 0x00e4, 0x0000) }, // a with diaeresis - { DEADTRANS(0x0045, 0x00a8, 0x00cb, 0x0000) }, // E with diaeresis - { DEADTRANS(0x0065, 0x00a8, 0x00eb, 0x0000) }, // e with diaeresis - { DEADTRANS(0x004f, 0x00a8, 0x00d6, 0x0000) }, // O with diaeresis - { DEADTRANS(0x006f, 0x00a8, 0x00f6, 0x0000) }, // o with diaeresis - { DEADTRANS(0x0055, 0x00a8, 0x00dc, 0x0000) }, // U with diaeresis - { DEADTRANS(0x0075, 0x00a8, 0x00fc, 0x0000) }, // u with diaeresis - { DEADTRANS(0x0020, 0x00a8, 0x00a8, 0x0000) }, // space > diaeresis - - { DEADTRANS(0x0055, 0x00b0, 0x016e, 0x0000) }, // U with round - { DEADTRANS(0x0075, 0x00b0, 0x016f, 0x0000) }, // u with round - { DEADTRANS(0x0020, 0x00b0, 0x00b0, 0x0000) }, // space > degree - { 0, 0, 0 }, -}; - -ROSDATA DEADKEY_LPWSTR dead_key_names[] = { - L"\x02c7" L"\x004D\x00E4\x006B\x010D\x0065\x0148", // mäkÄeÅ - caron - L"\x00b4" L"\x0044\x013A\x017E\x0065\x0148", // dĺžeÅ - acute - L"\x005e" L"\x0056\x006F\x006B\x00E1\x0148", // vokáŠ- circumflex - 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 -- */ - 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 -- Slovak doesn't have any */ - 0, - 0, - NULL -}; - -PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { - return &keyboard_layout_table; -} -
Modified: trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.def [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.def [iso-8859-1] Wed Jul 16 09:33:47 2008 @@ -6,11 +6,3 @@ EXPORTS KbdLayerDescriptor@0 ;EOF -; -; ReactOS Operating System -; -LIBRARY kbdsk1.dll - -EXPORTS -KbdLayerDescriptor@0 -;EOF
Modified: trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild [iso-8859-1] Wed Jul 16 09:33:47 2008 @@ -8,13 +8,3 @@ <file>kbdsk1.c</file> <file>kbdsk1.rc</file> </module> -<?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdsk1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdsk1.dll" allowwarnings="true"> - <importlibrary definition="kbdsk1.def" /> - <include base="ntoskrnl">include</include> - <define name="_DISABLE_TIDENTS" /> - <define name="_WIN32_WINNT">0x0500</define> - <file>kbdsk1.c</file> - <file>kbdsk1.rc</file> -</module>
Modified: trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.... ============================================================================== --- trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.rc [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.rc [iso-8859-1] Wed Jul 16 09:33:47 2008 @@ -3,8 +3,3 @@ #define REACTOS_STR_INTERNAL_NAME "kbdsk1\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdsk1.dll\0" #include <reactos/version.rc> -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Slovak (QWERTY) Keyboard Layout\0" -#define REACTOS_STR_INTERNAL_NAME "kbdsk1\0" -#define REACTOS_STR_ORIGINAL_FILENAME "kbdsk1.dll\0" -#include <reactos/version.rc>
-
cfinck＠svn.reactos.org