Ros-diffs December 2007

ros-diffs@reactos.org

22 participants
605 discussions

[janderwald] 31210: - part of 2/2 of bulgarian translation update See issue #2886 for more details.
by janderwald＠svn.reactos.org 14 Dec '07

14 Dec '07

Author: janderwald Date: Fri Dec 14 14:12:57 2007 New Revision: 31210 URL: http://svn.reactos.org/svn/reactos?rev=31210&view=rev Log: - part of 2/2 of bulgarian translation update See issue #2886 for more details. Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Fri Dec 14 14:12:57 2007 @@ -38,6 +38,12 @@ HKLM,"SYSTEM\CurrentControlSet\Control\IDConfigDB\Hardware Profiles\0000","FriendlyName",0x00000000,"New Hardware Profile" ; Keyboard Layouts +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00040402","Layout File",0x00000000,"kbdbgm.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00040402","Layout Text",0x00000000,"Bulgarian BDS 5237-1978" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00020402","Layout File",0x00000000,"kbdbgt.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00020402","Layout Text",0x00000000,"Bulgarian phonetic classic" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00030402","Layout File",0x00000000,"kbdbga.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00030402","Layout Text",0x00000000,"Bulgarian phonetic BDS 5237-2006 " HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000406","Layout File",0x00000000,"kbdda.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000406","Layout Text",0x00000000,"Danish" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000407","Layout File",0x00000000,"kbdgr.dll" 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 (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Fri Dec 14 14:12:57 2007 @@ -130,6 +130,9 @@ dll\directx\wine\d3d9\d3d9.dll 1 dll\directx\devenum\devenum.dll 1 +dll\keyboard\kbdbgm\kbdbgm.dll 1 +dll\keyboard\kbdbgt\kbdbgt.dll 1 +dll\keyboard\kbdbga\kbdbga.dll 1 dll\keyboard\kbdbe\kbdbe.dll 1 dll\keyboard\kbdbur\kbdbur.dll 1 dll\keyboard\kbdcz1\kbdcz1.dll 1 @@ -549,4 +552,4 @@ modules\wallpaper\lake.bmp 4 optional ; Native libraries -modules\windows\mfc42.dll 1 optional +modules\windows\mfc42.dll 1 optional Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif Fri Dec 14 14:12:57 2007 @@ -102,6 +102,9 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)" [KeyboardLayout] +00040402 = "Bulgarian BDS 5237-1978" +00020402 = "Bulgarian phonetic classic" +00030402 = "Bulgarian phonetic BDS 5237-2006" 00000455 = "Burmese" 00000405 = "Czech (QWERTY)" 00000406 = "Danish (Denmark)" @@ -132,6 +135,9 @@ 00000422 = "Ukrainian" [Files.KeyboardLayout] +00040402 = kbdbgm.dll +00020402 = kbdbgt.dll +00030402 = kbdbga.dll 0000080C = kbdbe.dll 00000813 = kbdbe.dll 00000455 = kbdbur.dll

1 0

[hpoussin] 31209: Add missing forward declaration. Thanks Fireball to debug this issue!
by hpoussin＠svn.reactos.org 14 Dec '07

14 Dec '07

Author: hpoussin Date: Fri Dec 14 14:12:55 2007 New Revision: 31209 URL: http://svn.reactos.org/svn/reactos?rev=31209&view=rev Log: Add missing forward declaration. Thanks Fireball to debug this issue! Modified: trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Fri Dec 14 14:12:55 2007 @@ -143,6 +143,7 @@ struct _SCATTER_GATHER_LIST; struct _DRIVE_LAYOUT_INFORMATION; struct _DRIVE_LAYOUT_INFORMATION_EX; +struct _LOADER_PARAMETER_BLOCK; #ifndef _SECURITY_ATTRIBUTES_ #define _SECURITY_ATTRIBUTES_

1 0

[janderwald] 31208: - part of 1/2 of bulgarian translation update See issue #2886 for more details.
by janderwald＠svn.reactos.org 14 Dec '07

14 Dec '07

Author: janderwald Date: Fri Dec 14 14:11:44 2007 New Revision: 31208 URL: http://svn.reactos.org/svn/reactos?rev=31208&view=rev Log: - part of 1/2 of bulgarian translation update See issue #2886 for more details. Added: trunk/reactos/dll/keyboard/kbdbga/ trunk/reactos/dll/keyboard/kbdbga/kbdbga.c (with props) trunk/reactos/dll/keyboard/kbdbga/kbdbga.def (with props) trunk/reactos/dll/keyboard/kbdbga/kbdbga.rbuild (with props) trunk/reactos/dll/keyboard/kbdbga/kbdbga.rc (with props) trunk/reactos/dll/keyboard/kbdbgm/ trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.c (with props) trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.def (with props) trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.rbuild (with props) trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.rc (with props) trunk/reactos/dll/keyboard/kbdbgt/ trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.c (with props) trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.def (with props) trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.rbuild (with props) trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.rc (with props) Modified: trunk/reactos/dll/keyboard/keyboard.rbuild Added: trunk/reactos/dll/keyboard/kbdbga/kbdbga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbga/kbdbga… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbga/kbdbga.c (added) +++ trunk/reactos/dll/keyboard/kbdbga/kbdbga.c Fri Dec 14 14:11:44 2007 @@ -1,0 +1,407 @@ +/* + * Àðäà -Áúëãàðñêà êëàâèàòóðíà ïîäðåäáà '÷øåðòú' çà ÐåàêòÎÑ + * Copyright (C) 2007 ReactOS + * 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, 0, 0, 0xC0 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ +}; + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + + +/* Öèôðîâ ðåä */ +/* VK_OEM_3 = ÷× */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + {VK_OEM_3, CAPS, {0x44e, 0x42e} }, //þÞ + { '1', NOCAPS, {'1', '!'} }, + { '2', NOCAPS, {'2', '@'} }, + { '3', NOCAPS, {'3', 0x2116} }, //3¹ + { '4', NOCAPS, {'4', '$'} }, + { '5', NOCAPS, {'5', '%'} }, + { '6', NOCAPS, {'6', 0x20AC} }, //6 + { '7', NOCAPS, {'7', 0xA7} }, //7 + { '8', NOCAPS, {'8', '*'} }, + { '9', NOCAPS, {'9', '('} }, + { '0', NOCAPS, {'0', ')'} }, + { VK_OEM_PLUS, NOCAPS, {'=', '+'} }, + + /* First letter row Ïúðâè ðåä áóêâè ÿâåðòúóèîïøù*/ + { 'Q', CAPS, {0x447, 0x427} }, //÷× + { 'W', CAPS, {0x448, 0x428} }, //øØ + { 'E', CAPS, {0x435, 0x415} }, //åÅ + { 'R', CAPS, {0x440, 0x420} }, //ðÐ + { 'T', CAPS, {0x442, 0x422} }, //òÒ + { 'Y', CAPS, {0x44a, 0x42a} }, //úÚ + { 'U', CAPS, {0x443, 0x423} }, //óÓ + { 'I', CAPS, {0x438, 0x418} }, //èÈ + { 'O', CAPS, {0x43e, 0x41e} }, //îÎ + { 'P', CAPS, {0x43f, 0x41f} }, //ïÏ + { VK_OEM_4, CAPS, {0x44f, 0x42f} }, //ÿß + { VK_OEM_6, CAPS, {0x449, 0x429} }, //ùÙ + + /* Second letter row Âòîðè ðåä áóêâè àñäôãõéêë ;:'" */ + { 'A', CAPS, {0x430, 0x410} }, //àÀ + { 'S', CAPS, {0x441, 0x421} }, //ñÑ + { 'D', CAPS, {0x434, 0x414} }, //äÄ + { 'F', CAPS, {0x444, 0x424} }, //ôÔ + { 'G', CAPS, {0x433, 0x413} }, //ãÃ + { 'H', CAPS, {0x445, 0x425} }, //õÕ + { 'J', CAPS, {0x439, 0x419} }, //éÉ + { 'K', CAPS, {0x43a, 0x41a} }, //êÊ + { 'L', CAPS, {0x43b, 0x41b} }, //ëË + { VK_OEM_1, NOCAPS, {';', ':'} }, + { VK_OEM_7, NOCAPS, {'\'','\"'} }, + + + /* Third letter row Òðåòè ðåä áóêâè */ + { 'Z', CAPS, {0x437, 0x417} }, //çÇ + { 'X', CAPS, {0x436, 0x416} }, //æÆ + { 'C', CAPS, {0x446, 0x426} }, //öÖ + { 'V', CAPS, {0x432, 0x412} }, //âÂ + { 'B', CAPS, {0x431, 0x411} }, //áÁ + { 'N', CAPS, {0x43d, 0x41d} }, //íÍ + { 'M', CAPS, {0x43c, 0x41c} }, //ìÌ +/* { VK_OEM_COMMA,CAPS, {0x431, 0x411} }, */ + { VK_OEM_COMMA, NOCAPS, {',', 0x84} }, //, +/* { VK_OEM_PERIOD,CAPS, {0x44e, 0x42e} }, */ + { VK_OEM_PERIOD, NOCAPS, {'.', 0x94} }, //. +/* { VK_OEM_2, NOCAPS, {'.', ','} }, */ + { VK_OEM_2, NOCAPS, {'/', '?'} }, + + /* Specials */ + { 0x6e, NOCAPS, {',', ','} }, + { VK_TAB, NOCAPS, {9, 9} }, + { VK_ADD, NOCAPS, {'+', '+'} }, + { VK_DIVIDE, NOCAPS, {'/', '/'} }, + { VK_MULTIPLY, NOCAPS, {'*', '*'} }, + { VK_SUBTRACT, NOCAPS, {'-', '-'} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + /* Normal, Shifted, Ctrl */ + /* Legacy (telnet-style) ascii escapes */ +/* { VK_OEM_5, NOCAPS, {0x5c, 0x2f, 0x1c} }, */ + { VK_OEM_5, CAPS, {0x44c, 0x42c} }, //üÜ + { VK_OEM_102, NOCAPS, {0x5c, 0x7c} }, + { VK_BACK, NOCAPS, {0x8, 0x8, 0x7f} }, + { VK_ESCAPE, NOCAPS, {0x1b, 0x1b, 0x1b} }, + { VK_RETURN, NOCAPS, {'\r', '\r', '\n'} }, + { VK_SPACE, NOCAPS, {' ', ' ', ' '} }, + { VK_CANCEL, NOCAPS, {0x03, 0x03, 0x03} }, + { 0,0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + /* Normal, Shifted, Ctrl, Ctrl-Alt */ + /* Legacy Ascii generators */ + /* { '2', NOCAPS, {'2', '\"', WCH_NONE, 0} }, */ +/* { '6', NOCAPS, {'6', ':', WCH_NONE, 0x001e} }, */ +/* { VK_OEM_MINUS, NOCAPS, {0x2d, '_', WCH_NONE, 0x001f} }, // different '-' */ + { VK_OEM_MINUS, NOCAPS, {'-', '_'} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { + { VK_NUMPAD0, 0, {'0'} }, + { VK_NUMPAD1, 0, {'1'} }, + { VK_NUMPAD2, 0, {'2'} }, + { VK_NUMPAD3, 0, {'3'} }, + { VK_NUMPAD4, 0, {'4'} }, + { VK_NUMPAD5, 0, {'5'} }, + { VK_NUMPAD6, 0, {'6'} }, + { VK_NUMPAD7, 0, {'7'} }, + { VK_NUMPAD8, 0, {'8'} }, + { VK_NUMPAD9, 0, {'9'} }, + { 0,0 } +}; + +#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } + +ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { + vk_master(3,key_to_chars_3mod), + vk_master(4,key_to_chars_4mod), + vk_master(2,key_to_chars_2mod), + vk_master(1,keypad_numbers), + { 0,0,0 } +}; + +ROSDATA VSC_LPWSTR key_names[] = { + { 0x01, L"Esc" }, + { 0x0e, L"Backspace" }, + { 0x0f, L"Tab" }, + { 0x1c, L"Enter" }, + { 0x1d, L"Ctrl" }, + { 0x2a, L"Shift" }, + { 0x36, L"Right Shift" }, + { 0x37, L"Num *" }, + { 0x38, L"Alt" }, + { 0x39, L"Space" }, + { 0x3a, L"Caps Lock" }, + { 0x3b, L"F1" }, + { 0x3c, L"F2" }, + { 0x3d, L"F3" }, + { 0x3e, L"F4" }, + { 0x3f, L"F5" }, + { 0x40, L"F6" }, + { 0x41, L"F7" }, + { 0x42, L"F8" }, + { 0x43, L"F9" }, + { 0x44, L"F10" }, + { 0x45, L"Pause" }, + { 0x46, L"Scroll Lock" }, + { 0x47, L"Num 7" }, + { 0x48, L"Num 8" }, + { 0x49, L"Num 9" }, + { 0x4a, L"Num -" }, + { 0x4b, L"Num 4" }, + { 0x4c, L"Num 5" }, + { 0x4d, L"Num 6" }, + { 0x4e, L"Num +" }, + { 0x4f, L"Num 1" }, + { 0x50, L"Num 2" }, + { 0x51, L"Num 3" }, + { 0x52, L"Num 0" }, + { 0x53, L"Num Del" }, + { 0x54, L"Sys Req" }, + { 0x57, L"F11" }, + { 0x58, L"F12" }, + { 0x7c, L"F13" }, + { 0x7d, L"F14" }, + { 0x7e, L"F15" }, + { 0x7f, L"F16" }, + { 0x80, L"F17" }, + { 0x81, L"F18" }, + { 0x82, L"F19" }, + { 0x83, L"F20" }, + { 0x84, L"F21" }, + { 0x85, L"F22" }, + { 0x86, L"F23" }, + { 0x87, L"F24" }, + { 0, NULL } +}; + +ROSDATA VSC_LPWSTR extended_key_names[] = { + { 0x1c, L"Num Enter" }, + { 0x1d, L"Right Control" }, + { 0x35, L"Num /" }, + { 0x37, L"Prnt Scrn" }, + { 0x38, L"Right Alt" }, + { 0x45, L"Num Lock" }, + { 0x46, L"Break" }, + { 0x47, L"Home" }, + { 0x48, L"Up" }, + { 0x49, L"Page Up" }, + { 0x4b, L"Left" }, +//{ 0x4c, L"Center" }, + { 0x4d, L"Right" }, + { 0x4f, L"End" }, + { 0x50, L"Down" }, + { 0x51, L"Page Down" }, + { 0x52, L"Insert" }, + { 0x53, L"Delete" }, + { 0x54, L"<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; +} Propchange: trunk/reactos/dll/keyboard/kbdbga/kbdbga.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdbga/kbdbga.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbga/kbdbga… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbga/kbdbga.def (added) +++ trunk/reactos/dll/keyboard/kbdbga/kbdbga.def Fri Dec 14 14:11:44 2007 @@ -1,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdbga.dll + +EXPORTS +KbdLayerDescriptor +;EOF Propchange: trunk/reactos/dll/keyboard/kbdbga/kbdbga.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdbga/kbdbga.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbga/kbdbga… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbga/kbdbga.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdbga/kbdbga.rbuild Fri Dec 14 14:11:44 2007 @@ -1,0 +1,9 @@ +<module name="kbdbga" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdbga.dll" allowwarnings="true"> + <importlibrary definition="kbdbga.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdbga.c</file> + <file>kbdbga.rc</file> +</module> Propchange: trunk/reactos/dll/keyboard/kbdbga/kbdbga.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdbga/kbdbga.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbga/kbdbga… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbga/kbdbga.rc (added) +++ trunk/reactos/dll/keyboard/kbdbga/kbdbga.rc Fri Dec 14 14:11:44 2007 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Àðäà -Áúëãàðñêà êëàâèàòóðíà ïîäðåäáà '÷øåðòú' çà ÐåàêòÎÑ\0" +#define REACTOS_STR_INTERNAL_NAME "kbdbga\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdbga.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/keyboard/kbdbga/kbdbga.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbgm/kbdbgm… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.c (added) +++ trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.c Fri Dec 14 14:11:44 2007 @@ -1,0 +1,417 @@ +/* + * Ìàðèöà - Áúëãàðñêà êëàâèàòóðíà ïîäðåäáà ïî ÁÄÑ 5237-78 çà ÐåàêòÎÑ + * Copyright (C) 2007 ReactOS + * 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, 0, 0, 0xC0 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ +}; + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + + +/* Öèôðîâ ðåä */ +/* VK_OEM_3 = ÷× */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + {VK_OEM_3, CAPS, {0x60, 0x7e} }, /* `~ */ + { '1', NOCAPS, {'1', '!'} }, + { '2', NOCAPS, {'2', '?'} }, + { '3', NOCAPS, {'3', '+'} }, + { '4', NOCAPS, {'4', '"'} }, + { '5', NOCAPS, {'5', '%'} }, + { '6', NOCAPS, {'6', '='} }, + { '7', NOCAPS, {'7', ':'} }, + { '8', NOCAPS, {'8', '/'} }, + { '9', NOCAPS, {'9', '_'} }, + { '0', NOCAPS, {'0', 0x2116} }, /* ¹ */ +/* Çà ñëåäâàùîòî êîï÷å òúðñè (-|) òúðñè VK_OEM_MINUS */ + { VK_OEM_PLUS, NOCAPS, {'=', '+'} }, + + /* First letter row Ïúðâè ðåä áóêâè ,ûóÓåÅèÈøØùÙêÊñÑäÄçÇöÖ;§ íåäîâúðøåí*/ + { 'Q', NOCAPS, {0x2c, 0x44b} }, + { 'W', CAPS, {0x443, 0x423} }, + { 'E', CAPS, {0x435, 0x415} }, + { 'R', CAPS, {0x438, 0x418} }, + { 'T', CAPS, {0x448, 0x428} }, + { 'Y', CAPS, {0x449, 0x429} }, + { 'U', CAPS, {0x43a, 0x41a} }, + { 'I', CAPS, {0x441, 0x421} }, + { 'O', CAPS, {0x434, 0x414} }, + { 'P', CAPS, {0x437, 0x417} }, + { VK_OEM_4, CAPS, {0x446, 0x426} }, + { VK_OEM_6, CAPS, {0x3b, 0xa7} }, + + /* Second letter row Âòîðè ðåä áóêâè üÜÿßàÀîÎæÆãÃòÒíÍâÂìÌ÷× */ + { 'A', CAPS, {0x44c, 0x42c} }, + { 'S', CAPS, {0x44f, 0x42f} }, + { 'D', CAPS, {0x430, 0x410} }, + { 'F', CAPS, {0x43e, 0x41e} }, + { 'G', CAPS, {0x436, 0x416} }, + { 'H', CAPS, {0x433, 0x413} }, + { 'J', CAPS, {0x442, 0x422} }, + { 'K', CAPS, {0x43d, 0x41d} }, + { 'L', CAPS, {0x432, 0x412} }, + { VK_OEM_1, NOCAPS, {0x43c, 0x41c} }, + { VK_OEM_7, NOCAPS, {0x447, 0x427} }, + + + /* Third letter row Òðåòè ðåä áóêâè þÞéÉúÚýÝôÔõÕïÏðÐëË */ + { 'Z', CAPS, {0x44e, 0x42e} }, + { 'X', CAPS, {0x439, 0x419} }, + { 'C', CAPS, {0x44a, 0x42a} }, + { 'V', CAPS, {0x436, 0x416} }, + { 'B', CAPS, {0x44d, 0x42d} }, + { 'N', CAPS, {0x444, 0x424} }, + { 'M', CAPS, {0x445, 0x425} }, +/* { VK_OEM_COMMA,CAPS, {0x431, 0x411} }, */ + { VK_OEM_COMMA, NOCAPS, {0x43f, 0x41f} }, +/* { VK_OEM_PERIOD,CAPS, {0x44e, 0x42e} }, */ + { VK_OEM_PERIOD, NOCAPS, {0x440, 0x420} }, +/* { VK_OEM_2, NOCAPS, {'.', ','} }, */ + { VK_OEM_2, NOCAPS, {0x43b, 0x41b} }, + + /* Specials */ + { 0x6e, NOCAPS, {',', ','} }, + { VK_TAB, NOCAPS, {9, 9} }, + { VK_ADD, NOCAPS, {'+', '+'} }, + { VK_DIVIDE, NOCAPS, {'/', '/'} }, + { VK_MULTIPLY, NOCAPS, {'*', '*'} }, + { VK_SUBTRACT, NOCAPS, {'-', '-'} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + /* Normal, Shifted, Ctrl */ + /* Legacy (telnet-style) ascii escapes */ +/* { VK_OEM_5, NOCAPS, {0x5c, 0x2f, 0x1c} }, Ñòàðàòà ñòîéíîñò, íàäÿâàì ñå òóê äà å áÁ */ + { VK_OEM_5, CAPS, {0x431, 0x411} }, + { VK_OEM_102, NOCAPS, {0x5c, 0x2f, 0x1c} }, /* Òóê îñâåí äà å äîïúëíèòåëíîòî êîï÷å äî ëÿâàòà ñìÿíà */ + { VK_BACK, NOCAPS, {0x8, 0x8, 0x7f} }, + { VK_ESCAPE, NOCAPS, {0x1b, 0x1b, 0x1b} }, + { VK_RETURN, NOCAPS, {'\r', '\r', '\n'} }, + { VK_SPACE, NOCAPS, {' ', ' ', ' '} }, + { VK_CANCEL, NOCAPS, {0x03, 0x03, 0x03} }, + { 0,0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + /* Normal, Shifted, Ctrl, Ctrl-Alt */ + /* Legacy Ascii generators */ + /* { '2', NOCAPS, {'2', '\"', WCH_NONE, 0} }, */ +/* { '6', NOCAPS, {'6', ':', WCH_NONE, 0x001e} }, */ +/* { VK_OEM_MINUS, NOCAPS, {0x2d, '_', WCH_NONE, 0x001f} }, // different '-' */ + { VK_OEM_MINUS, NOCAPS, {'-', '|'} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { + { VK_NUMPAD0, 0, {'0'} }, + { VK_NUMPAD1, 0, {'1'} }, + { VK_NUMPAD2, 0, {'2'} }, + { VK_NUMPAD3, 0, {'3'} }, + { VK_NUMPAD4, 0, {'4'} }, + { VK_NUMPAD5, 0, {'5'} }, + { VK_NUMPAD6, 0, {'6'} }, + { VK_NUMPAD7, 0, {'7'} }, + { VK_NUMPAD8, 0, {'8'} }, + { VK_NUMPAD9, 0, {'9'} }, + { 0,0 } +}; + +#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } + +ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { + vk_master(3,key_to_chars_3mod), + vk_master(4,key_to_chars_4mod), + vk_master(2,key_to_chars_2mod), + vk_master(1,keypad_numbers), + { 0,0,0 } +}; + +ROSDATA VSC_LPWSTR key_names[] = { + { 0x01, L"Esc" }, + { 0x0e, L"Backspace" }, + { 0x0f, L"Tab" }, + { 0x1c, L"Enter" }, + { 0x1d, L"Ctrl" }, + { 0x2a, L"Shift" }, + { 0x36, L"Right Shift" }, + { 0x37, L"Num *" }, + { 0x38, L"Alt" }, + { 0x39, L"Space" }, + { 0x3a, L"Caps Lock" }, + { 0x3b, L"F1" }, + { 0x3c, L"F2" }, + { 0x3d, L"F3" }, + { 0x3e, L"F4" }, + { 0x3f, L"F5" }, + { 0x40, L"F6" }, + { 0x41, L"F7" }, + { 0x42, L"F8" }, + { 0x43, L"F9" }, + { 0x44, L"F10" }, + { 0x45, L"Pause" }, + { 0x46, L"Scroll Lock" }, + { 0x47, L"Num 7" }, + { 0x48, L"Num 8" }, + { 0x49, L"Num 9" }, + { 0x4a, L"Num -" }, + { 0x4b, L"Num 4" }, + { 0x4c, L"Num 5" }, + { 0x4d, L"Num 6" }, + { 0x4e, L"Num +" }, + { 0x4f, L"Num 1" }, + { 0x50, L"Num 2" }, + { 0x51, L"Num 3" }, + { 0x52, L"Num 0" }, + { 0x53, L"Num Del" }, + { 0x54, L"Sys Req" }, + { 0x57, L"F11" }, + { 0x58, L"F12" }, + { 0x7c, L"F13" }, + { 0x7d, L"F14" }, + { 0x7e, L"F15" }, + { 0x7f, L"F16" }, + { 0x80, L"F17" }, + { 0x81, L"F18" }, + { 0x82, L"F19" }, + { 0x83, L"F20" }, + { 0x84, L"F21" }, + { 0x85, L"F22" }, + { 0x86, L"F23" }, + { 0x87, L"F24" }, + { 0, NULL } +}; + +ROSDATA VSC_LPWSTR extended_key_names[] = { + { 0x1c, L"Num Enter" }, + { 0x1d, L"Right Control" }, + { 0x35, L"Num /" }, + { 0x37, L"Prnt Scrn" }, + { 0x38, L"Right Alt" }, + { 0x45, L"Num Lock" }, + { 0x46, L"Break" }, + { 0x47, L"Home" }, + { 0x48, L"Up" }, + { 0x49, L"Page Up" }, + { 0x4b, L"Left" }, +//{ 0x4c, L"Center" }, + { 0x4d, L"Right" }, + { 0x4f, L"End" }, + { 0x50, L"Down" }, + { 0x51, L"Page Down" }, + { 0x52, L"Insert" }, + { 0x53, L"Delete" }, + { 0x54, L"<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 -- Russian doesn't have any */ + 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/kbdbgm/kbdbgm.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbgm/kbdbgm… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.def (added) +++ trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.def Fri Dec 14 14:11:44 2007 @@ -1,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdbgm.dll + +EXPORTS +KbdLayerDescriptor +;EOF Propchange: trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbgm/kbdbgm… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.rbuild Fri Dec 14 14:11:44 2007 @@ -1,0 +1,9 @@ +<module name="kbdbgm" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdbgm.dll" allowwarnings="true"> + <importlibrary definition="kbdbgm.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdbgm.c</file> + <file>kbdbgm.rc</file> +</module> Propchange: trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbgm/kbdbgm… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.rc (added) +++ trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.rc Fri Dec 14 14:11:44 2007 @@ -1,0 +1,6 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Ìàðèöà - Áúëãàðñêà êëàâèàòóðíà ïîäðåäáà ïî ÁÄÑ 5237-78 çà ÐåàêòÎÑ\0" +#define REACTOS_STR_INTERNAL_NAME "kbdbgm\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdbgm.dll\0" +#include <reactos/version.rc> + Propchange: trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbgt/kbdbgt… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.c (added) +++ trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.c Fri Dec 14 14:11:44 2007 @@ -1,0 +1,436 @@ +/* + * Òóíäæà - Áúëãàðñêà êëàâèàòóðíà ïîçâóêîâà ïîäðåäáà 'ÿâåðòú' çà ÐåàêòÎÑ + * Copyright (C) 2007 ReactOS + * 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, + 6, + { 0, 1, 2, 4, SHFT_INVALID, SHFT_INVALID, 3 } +}; + + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + + +/* Öèôðîâ ðåä */ +/* VK_OEM_3 = ÷× */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + {VK_OEM_3, CAPS, {0x447, 0x427} }, + { '1', NOCAPS, {'1', '!'} }, + { '2', NOCAPS, {'2', '@'} }, +// { '3', NOCAPS, {'3', '#'} }, + { '4', NOCAPS, {'4', '$'} }, + { '5', NOCAPS, {'5', '%'} }, +// { '6', NOCAPS, {'6', '^'} }, +// { '7', NOCAPS, {'7', '&'} }, + { '8', NOCAPS, {'8', '*'} }, + { '9', NOCAPS, {'9', '('} }, + { '0', NOCAPS, {'0', ')'} }, + { VK_OEM_PLUS, NOCAPS, {'=', '+'} }, + + /* First letter row Ïúðâè ðåä áóêâè ÿâåðòúóèîïøù*/ + { 'Q', CAPS, {0x44f, 0x42f} }, + { 'W', CAPS, {0x432, 0x412} }, +// { 'E', CAPS, {0x435, 0x415} }, + { 'R', CAPS, {0x440, 0x420} }, + { 'T', CAPS, {0x442, 0x422} }, + { 'Y', CAPS, {0x44a, 0x42a} }, + { 'U', CAPS, {0x443, 0x423} }, +// { 'I', CAPS, {0x438, 0x418} }, +// { 'O', CAPS, {0x43e, 0x41e} }, + { 'P', CAPS, {0x43f, 0x41f} }, + { VK_OEM_4, CAPS, {0x448, 0x428} }, + { VK_OEM_6, CAPS, {0x449, 0x429} }, + + /* Second letter row Âòîðè ðåä áóêâè àñäôãõéêë ;:'" */ + { 'A', CAPS, {0x430, 0x410} }, + { 'S', CAPS, {0x441, 0x421} }, + { 'D', CAPS, {0x434, 0x414} }, + { 'F', CAPS, {0x444, 0x424} }, + { 'G', CAPS, {0x433, 0x413} }, + { 'H', CAPS, {0x445, 0x425} }, +// { 'J', CAPS, {0x439, 0x419} }, + { 'K', CAPS, {0x43a, 0x41a} }, + { 'L', CAPS, {0x43b, 0x41b} }, + { VK_OEM_1, NOCAPS, {';', ':'} }, +// { VK_OEM_7, NOCAPS, {'\'','\"'} }, + + + /* Third letter row Òðåòè ðåä áóêâè */ + { 'Z', CAPS, {0x437, 0x417} }, + { 'X', CAPS, {0x44c, 0x42c} }, + { 'C', CAPS, {0x446, 0x426} }, + { 'V', CAPS, {0x436, 0x416} }, + { 'B', CAPS, {0x431, 0x411} }, + { 'N', CAPS, {0x43d, 0x41d} }, + { 'M', CAPS, {0x43c, 0x41c} }, +/* { VK_OEM_COMMA,CAPS, {0x431, 0x411} }, */ + { VK_OEM_COMMA, NOCAPS, {',', '<'} }, +/* { VK_OEM_PERIOD,CAPS, {0x44e, 0x42e} }, */ + { VK_OEM_PERIOD, NOCAPS, {'.', '>'} }, +/* { VK_OEM_2, NOCAPS, {'.', ','} }, */ + { VK_OEM_2, NOCAPS, {'/', '?'} }, + + /* Specials */ + { 0x6e, NOCAPS, {',', ','} }, + { VK_TAB, NOCAPS, {9, 9} }, + { VK_ADD, NOCAPS, {'+', '+'} }, + { VK_DIVIDE, NOCAPS, {'/', '/'} }, + { VK_MULTIPLY, NOCAPS, {'*', '*'} }, + { VK_SUBTRACT, NOCAPS, {'-', '-'} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + /* Normal, Shifted, Ctrl */ + /* Legacy (telnet-style) ascii escapes */ + { VK_OEM_5, CAPS, {0x44e, 0x42e} }, //þÞ + { VK_OEM_102, NOCAPS, {0x5c, 0x7c} }, // \| Òîçè êëàâèø ëèïñâà íà ìíîãî êëàâèàòóðè + { VK_BACK, NOCAPS, {0x8, 0x8, 0x7f} }, + { VK_ESCAPE, NOCAPS, {0x1b, 0x1b, 0x1b} }, + { VK_RETURN, NOCAPS, {'\r', '\r', '\n'} }, + { VK_SPACE, NOCAPS, {' ', ' ', ' '} }, + { VK_CANCEL, NOCAPS, {0x03, 0x03, 0x03} }, + { 0,0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + /* Normal, Shifted, Ctrl, Ctrl-Alt */ +/*×èñò, Øèôò, Êòðë, Êòðë+ Øèôò */ + /* Legacy Ascii generators */ + { VK_OEM_MINUS, NOCAPS, {'-', '_', WCH_NONE, 0x2014} }, //-_ +// { '3', NOCAPS, {'3', '#', WCH_NONE, 0x2116} }, +// { '6', NOCAPS, {'6', '^', WCH_NONE, 0x20AC} }, +// { '7', NOCAPS, {'7', '&', WCH_NONE, 0xA7} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { + /* Normal, Shifted, Ctrl, Ctrl+Alt, Ctrl+Shift */ + { 'E', CAPS, {0x435, 0x415, WCH_NONE, 0x44d, 0x42d} }, //eEýÝ + { 'I', CAPS, {0x438, 0x418, WCH_NONE, 0x44b, 0x42b} }, //èÈûÛ + { 'O', CAPS, {0x43e, 0x41e, WCH_NONE, 0x451, 0x401} }, //oO¸¨ + { 'J', CAPS, {0x439, 0x419, WCH_NONE, 0x45d, 0x40d} }, //éÉ ìàëêî è ãëàâíî è ñ óäàðåíèå +//Ñëåäâàùèòå ðåäîâå ìîãàò äà ñà è â ROSDATA VK_TO_WCHARS4, +//êàòî ïîñëåäíîòî èì ïîïúëíåíèå òðÿáâà äà ñå ìàõíå + { '3', NOCAPS, {'3', '#', WCH_NONE, 0x2116, 0x2116} }, //3#¹¹ + { '6', NOCAPS, {'6', '^', WCH_NONE, 0x20AC,0x20AC } }, //6^ + { '7', NOCAPS, {'7', '&', WCH_NONE, 0xA7, 0xA7} }, //7&§§ + { VK_OEM_7, NOCAPS, {'\'','\"', WCH_NONE, 0x201e, 0x201d } }, //'" + { 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(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 } +}; + +/* 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, +// dead_key_names, /* Dead 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/kbdbgt/kbdbgt.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbgt/kbdbgt… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.def (added) +++ trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.def Fri Dec 14 14:11:44 2007 @@ -1,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdbgt.dll + +EXPORTS +KbdLayerDescriptor +;EOF Propchange: trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbgt/kbdbgt… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.rbuild Fri Dec 14 14:11:44 2007 @@ -1,0 +1,9 @@ +<module name="kbdbgt" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdbgt.dll" allowwarnings="true"> + <importlibrary definition="kbdbgt.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdbgt.c</file> + <file>kbdbgt.rc</file> +</module> Propchange: trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbgt/kbdbgt… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.rc (added) +++ trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.rc Fri Dec 14 14:11:44 2007 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Òóíäæà - Áúëãàðñêà êëàâèàòóðíà ïîçâóêîâà ïîäðåäáà 'ÿâåðòú' çà ÐåàêòÎÑ\0" +#define REACTOS_STR_INTERNAL_NAME "kbdbgt\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdbgt.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.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 (original) +++ trunk/reactos/dll/keyboard/keyboard.rbuild Fri Dec 14 14:11:44 2007 @@ -3,6 +3,15 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <directory name="kbdbe"> <xi:include href="kbdbe/kbdbe.rbuild" /> + </directory> + <directory name="kbdbga"> + <xi:include href="kbdbga/kbdbga.rbuild" /> + </directory> + <directory name="kbdbgm"> + <xi:include href="kbdbgm/kbdbgm.rbuild" /> + </directory> + <directory name="kbdbgt"> + <xi:include href="kbdbgt/kbdbgt.rbuild" /> </directory> <directory name="kbdbur"> <xi:include href="kbdbur/kbdbur.rbuild" />

1 0

[hpoussin] 31207: Remove HALP_HOOKS structure Revert r31198 and part of r31194, and replace them by compile-time define in pci.c Don't use one rbuild file per hal, but merge them into one Share halinit.c between UP and MP versions
by hpoussin＠svn.reactos.org 14 Dec '07

14 Dec '07

Author: hpoussin Date: Fri Dec 14 11:53:56 2007 New Revision: 31207 URL: http://svn.reactos.org/svn/reactos?rev=31207&view=rev Log: Remove HALP_HOOKS structure Revert r31198 and part of r31194, and replace them by compile-time define in pci.c Don't use one rbuild file per hal, but merge them into one Share halinit.c between UP and MP versions Removed: trunk/reactos/hal/halx86/mp/halinit.c trunk/reactos/hal/halx86/mp/halmp.rbuild trunk/reactos/hal/halx86/up/halup.rbuild trunk/reactos/hal/halx86/xbox/halxbox.rbuild trunk/reactos/hal/halx86/xbox/pci_xbox.c Modified: trunk/reactos/hal/halx86/directory.rbuild trunk/reactos/hal/halx86/generic/bus.c trunk/reactos/hal/halx86/generic/generic.rbuild trunk/reactos/hal/halx86/generic/halinit.c trunk/reactos/hal/halx86/generic/pci.c trunk/reactos/hal/halx86/include/halp.h trunk/reactos/hal/halx86/mp/halinit_mp.c trunk/reactos/hal/halx86/xbox/halinit_xbox.c trunk/reactos/hal/halx86/xbox/part_xbox.c Modified: trunk/reactos/hal/halx86/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/directory.rbuil… ============================================================================== --- trunk/reactos/hal/halx86/directory.rbuild (original) +++ trunk/reactos/hal/halx86/directory.rbuild Fri Dec 14 11:53:56 2007 @@ -4,13 +4,66 @@ <directory name="generic"> <xi:include href="generic/generic.rbuild" /> </directory> - <directory name="up"> - <xi:include href="up/halup.rbuild" /> - </directory> - <directory name="mp"> - <xi:include href="mp/halmp.rbuild" /> - </directory> - <directory name="xbox"> - <xi:include href="xbox/halxbox.rbuild" /> - </directory> + + <module name="halup" type="kernelmodedll" entrypoint="0"> + <importlibrary definition="../hal/hal.def" /> + <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_NTHAL_" /> + <library>hal_generic</library> + <library>hal_generic_up</library> + <library>hal_generic_pc</library> + <library>ntoskrnl</library> + <directory name="up"> + <file>halinit_up.c</file> + <file>halup.rc</file> + </directory> + </module> + <module name="halmp" type="kernelmodedll" entrypoint="0"> + <importlibrary definition="../hal/hal.def" /> + <bootstrap installbase="$(CDOUTPUT)" /> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="CONFIG_SMP" /> + <define name="_NTHAL_" /> + <library>hal_generic</library> + <library>hal_generic_pc</library> + <library>ntoskrnl</library> + <directory name="mp"> + <file>apic.c</file> + <file>halinit_mp.c</file> + <file>ioapic.c</file> + <file>ipi_mp.c</file> + <file>mpconfig.c</file> + <file>mps.S</file> + <file>mpsboot.asm</file> + <file>mpsirql.c</file> + <file>processor_mp.c</file> + <file>spinlock.c</file> + <file>halmp.rc</file> + </directory> + </module> + <module name="halxbox" type="kernelmodedll" entrypoint="0" allowwarnings="true"> + <importlibrary definition="../hal/hal.def" /> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_NTHAL_" /> + <define name="SARCH_XBOX" /> + <library>hal_generic</library> + <library>hal_generic_up</library> + <library>ntoskrnl</library> + <directory name="generic"> + <file>pci.c</file> + </directory> + <directory name="xbox"> + <file>halinit_xbox.c</file> + <file>part_xbox.c</file> + <file>halxbox.rc</file> + <pch>halxbox.h</pch> + </directory> + </module> </group> Modified: trunk/reactos/hal/halx86/generic/bus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bus.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/bus.c (original) +++ trunk/reactos/hal/halx86/generic/bus.c Fri Dec 14 11:53:56 2007 @@ -56,14 +56,14 @@ BusHandler.BusNumber = BusNumber; /* Call the PCI function */ - return BusHandler.AssignSlotResources(&BusHandler, - &BusHandler, - RegistryPath, - DriverClassName, - DriverObject, - DeviceObject, - SlotNumber, - AllocatedResources); + return HalpAssignPCISlotResources(&BusHandler, + &BusHandler, + RegistryPath, + DriverClassName, + DriverObject, + DeviceObject, + SlotNumber, + AllocatedResources); } BOOLEAN @@ -233,12 +233,12 @@ BusHandler.BusNumber = BusNumber; /* Call PCI function */ - return BusHandler.GetBusData(&BusHandler, - &BusHandler, - *(PPCI_SLOT_NUMBER)&SlotNumber, - Buffer, - Offset, - Length); + return HalpGetPCIData(&BusHandler, + &BusHandler, + *(PPCI_SLOT_NUMBER)&SlotNumber, + Buffer, + Offset, + Length); } /* Invalid bus */ @@ -312,12 +312,12 @@ BusHandler.BusNumber = BusNumber; /* Call PCI function */ - return BusHandler.SetBusData(&BusHandler, - &BusHandler, - *(PPCI_SLOT_NUMBER)&SlotNumber, - Buffer, - Offset, - Length); + return HalpSetPCIData(&BusHandler, + &BusHandler, + *(PPCI_SLOT_NUMBER)&SlotNumber, + Buffer, + Offset, + Length); } /* Invalid bus */ Modified: trunk/reactos/hal/halx86/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/generic… ============================================================================== --- trunk/reactos/hal/halx86/generic/generic.rbuild (original) +++ trunk/reactos/hal/halx86/generic/generic.rbuild Fri Dec 14 11:53:56 2007 @@ -12,8 +12,8 @@ <file>dma.c</file> <file>drive.c</file> <file>display.c</file> + <file>halinit.c</file> <file>misc.c</file> - <file>pci.c</file> <file>portio.c</file> <file>profil.c</file> <file>reboot.c</file> @@ -28,8 +28,14 @@ <define name="_DISABLE_TIDENTS" /> <define name="_NTHAL_" /> <file>irq.S</file> - <file>halinit.c</file> <file>processor.c</file> <file>spinlock.c</file> </module> + <module name="hal_generic_pc" type="objectlibrary"> + <include base="hal_generic_pc">../include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_NTHAL_" /> + <file>pci.c</file> + </module> </group> Modified: trunk/reactos/hal/halx86/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit… ============================================================================== --- trunk/reactos/hal/halx86/generic/halinit.c (original) +++ trunk/reactos/hal/halx86/generic/halinit.c Fri Dec 14 11:53:56 2007 @@ -14,7 +14,6 @@ /* GLOBALS *******************************************************************/ -HALP_HOOKS HalpHooks; BOOLEAN HalpPciLockSettings; /* PRIVATE FUNCTIONS *********************************************************/ Modified: trunk/reactos/hal/halx86/generic/pci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/pci.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/pci.c (original) +++ trunk/reactos/hal/halx86/generic/pci.c Fri Dec 14 11:53:56 2007 @@ -346,6 +346,26 @@ PPCI_COMMON_CONFIG PciConfig = (PPCI_COMMON_CONFIG)PciBuffer; ULONG Len = 0; +#ifdef SARCH_XBOX + /* Trying to get PCI config data from devices 0:0:1 and 0:0:2 will completely + * hang the Xbox. Also, the device number doesn't seem to be decoded for the + * video card, so it appears to be present on 1:0:0 - 1:31:0. + * We hack around these problems by indicating "device not present" for devices + * 0:0:1, 0:0:2, 1:1:0, 1:2:0, 1:3:0, ...., 1:31:0 */ + if ((0 == BusHandler->BusNumber && 0 == Slot.u.bits.DeviceNumber && + (1 == Slot.u.bits.FunctionNumber || 2 == Slot.u.bits.FunctionNumber)) || + (1 == BusHandler->BusNumber && 0 != Slot.u.bits.DeviceNumber)) + { + DPRINT("Blacklisted PCI slot\n"); + if (0 == Offset && 2 <= Length) + { + *(PUSHORT)Buffer = PCI_INVALID_VENDORID; + return 2; + } + return 0; + } +#endif + /* Normalize the length */ if (Length > sizeof(PCI_COMMON_CONFIG)) Length = sizeof(PCI_COMMON_CONFIG); @@ -416,6 +436,21 @@ UCHAR PciBuffer[PCI_COMMON_HDR_LENGTH]; PPCI_COMMON_CONFIG PciConfig = (PPCI_COMMON_CONFIG)PciBuffer; ULONG Len = 0; + +#ifdef SARCH_XBOX + /* Trying to get PCI config data from devices 0:0:1 and 0:0:2 will completely + * hang the Xbox. Also, the device number doesn't seem to be decoded for the + * video card, so it appears to be present on 1:0:0 - 1:31:0. + * We hack around these problems by indicating "device not present" for devices + * 0:0:1, 0:0:2, 1:1:0, 1:2:0, 1:3:0, ...., 1:31:0 */ + if ((0 == BusHandler->BusNumber && 0 == Slot.u.bits.DeviceNumber && + (1 == Slot.u.bits.FunctionNumber || 2 == Slot.u.bits.FunctionNumber)) || + (1 == BusHandler->BusNumber && 0 != Slot.u.bits.DeviceNumber)) + { + DPRINT1("Trying to set data on blacklisted PCI slot\n"); + return 0; + } +#endif /* Normalize the length */ if (Length > sizeof(PCI_COMMON_CONFIG)) Length = sizeof(PCI_COMMON_CONFIG); @@ -893,9 +928,6 @@ NTAPI HalpInitializePciBus(VOID) { - /* Initialize the hooks */ - if (HalpHooks.InitPciBus) HalpHooks.InitPciBus(&HalpFakePciBusHandler); - /* Initialize the stubs */ HalpInitializePciStubs(); Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h (original) +++ trunk/reactos/hal/halx86/include/halp.h Fri Dec 14 11:53:56 2007 @@ -115,12 +115,6 @@ IN OUT PVOID Buffer ); -typedef struct tagHALP_HOOKS -{ - void (*InitPciBus)(PBUS_HANDLER BusHandler); -} HALP_HOOKS, *PHALP_HOOKS; - -extern HALP_HOOKS HalpHooks; extern KSPIN_LOCK HalpSystemHardwareLock; #endif /* __INTERNAL_HAL_HAL_H */ Removed: trunk/reactos/hal/halx86/mp/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/halinit.c?re… ============================================================================== --- trunk/reactos/hal/halx86/mp/halinit.c (original) +++ trunk/reactos/hal/halx86/mp/halinit.c (removed) @@ -1,153 +1,0 @@ -/* - * PROJECT: ReactOS HAL - * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/generic/halinit.c - * PURPOSE: HAL Entrypoint and Initialization - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - -/* GLOBALS *******************************************************************/ - -HALP_HOOKS HalpHooks; -BOOLEAN HalpPciLockSettings; - -/* PRIVATE FUNCTIONS *********************************************************/ - -VOID -NTAPI -HalpGetParameters(IN PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - PCHAR CommandLine; - - /* Make sure we have a loader block and command line */ - if ((LoaderBlock) && (LoaderBlock->LoadOptions)) - { - /* Read the command line */ - CommandLine = LoaderBlock->LoadOptions; - - /* Check if PCI is locked */ - if (strstr(CommandLine, "PCILOCK")) HalpPciLockSettings = TRUE; - - /* Check for initial breakpoint */ - if (strstr(CommandLine, "BREAK")) DbgBreakPoint(); - } -} - -/* FUNCTIONS *****************************************************************/ - -/* - * @implemented - */ -BOOLEAN -NTAPI -HalInitSystem(IN ULONG BootPhase, - IN PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - PKPRCB Prcb = KeGetCurrentPrcb(); - - /* Check the boot phase */ - if (!BootPhase) - { - /* Phase 0... save bus type */ - HalpBusType = LoaderBlock->u.I386.MachineType & 0xFF; - - /* Get command-line parameters */ - HalpGetParameters(LoaderBlock); - - /* Checked HAL requires checked kernel */ -#if DBG - if (!(Prcb->BuildType & PRCB_BUILD_DEBUG)) - { - /* No match, bugcheck */ - KeBugCheckEx(MISMATCHED_HAL, 2, Prcb->BuildType, 1, 0); - } -#else - /* Release build requires release HAL */ - if (Prcb->BuildType & PRCB_BUILD_DEBUG) - { - /* No match, bugcheck */ - KeBugCheckEx(MISMATCHED_HAL, 2, Prcb->BuildType, 0, 0); - } -#endif - -#ifdef CONFIG_SMP - /* SMP HAL requires SMP kernel */ - if (Prcb->BuildType & PRCB_BUILD_UNIPROCESSOR) - { - /* No match, bugcheck */ - KeBugCheckEx(MISMATCHED_HAL, 2, Prcb->BuildType, 0, 0); - } -#endif - - /* Validate the PRCB */ - if (Prcb->MajorVersion != PRCB_MAJOR_VERSION) - { - /* Validation failed, bugcheck */ - KeBugCheckEx(MISMATCHED_HAL, 1, Prcb->MajorVersion, 1, 0); - } - - /* Initialize the PICs */ - //HalpInitPICs(); - - /* Force initial PIC state */ - KfRaiseIrql(KeGetCurrentIrql()); - - /* Initialize the clock */ - HalpInitializeClock(); - - /* Setup busy waiting */ - //HalpCalibrateStallExecution(); - - /* Fill out the dispatch tables */ - HalQuerySystemInformation = HaliQuerySystemInformation; - HalSetSystemInformation = HaliSetSystemInformation; - HalInitPnpDriver = NULL; // FIXME: TODO - HalGetDmaAdapter = HalpGetDmaAdapter; - HalGetInterruptTranslator = NULL; // FIXME: TODO - - /* Initialize the hardware lock (CMOS) */ - KeInitializeSpinLock(&HalpSystemHardwareLock); - } - else if (BootPhase == 1) - { - /* Initialize the default HAL stubs for bus handling functions */ - HalpInitNonBusHandler(); - - /* Enable the clock interrupt */ - ((PKIPCR)KeGetPcr())->IDT[0x30].ExtendedOffset = - (USHORT)(((ULONG_PTR)HalpClockInterrupt >> 16) & 0xFFFF); - ((PKIPCR)KeGetPcr())->IDT[0x30].Offset = - (ULONG_PTR)HalpClockInterrupt; - HalEnableSystemInterrupt(0x30, CLOCK2_LEVEL, Latched); - - /* Initialize DMA. NT does this in Phase 0 */ - HalpInitDma(); - } - - /* All done, return */ - return TRUE; -} - -/* - * @unimplemented - */ -VOID -NTAPI -HalReportResourceUsage(VOID) -{ - /* Initialize PCI bus. */ - HalpInitializePciBus(); - - /* FIXME: This is done in ReactOS MP HAL only*/ - //HaliReconfigurePciInterrupts(); - - /* FIXME: Report HAL Usage to kernel */ -} - -/* EOF */ Modified: trunk/reactos/hal/halx86/mp/halinit_mp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/halinit_mp.c… ============================================================================== --- trunk/reactos/hal/halx86/mp/halinit_mp.c (original) +++ trunk/reactos/hal/halx86/mp/halinit_mp.c Fri Dec 14 11:53:56 2007 @@ -21,6 +21,12 @@ ULONG_PTR KernelBase; /***************************************************************************/ + +VOID NTAPI HalpInitPICs(VOID) +{ + UNIMPLEMENTED; +} + VOID HalpInitPhase0(PLOADER_PARAMETER_BLOCK LoaderBlock) Removed: trunk/reactos/hal/halx86/mp/halmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/halmp.rbuild… ============================================================================== --- trunk/reactos/hal/halx86/mp/halmp.rbuild (original) +++ trunk/reactos/hal/halx86/mp/halmp.rbuild (removed) @@ -1,25 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="halmp" type="kernelmodedll" entrypoint="0"> - <importlibrary definition="../../hal/hal.def" /> - <bootstrap installbase="$(CDOUTPUT)" /> - <include base="hal_generic">../include</include> - <include base="ntoskrnl">include</include> - <define name="_DISABLE_TIDENTS" /> - <define name="CONFIG_SMP" /> - <define name="_NTHAL_" /> - <library>hal_generic</library> - <library>ntoskrnl</library> - <file>apic.c</file> - <file>halinit.c</file> - <file>halinit_mp.c</file> - <file>ioapic.c</file> - <file>ipi_mp.c</file> - <file>mpconfig.c</file> - <file>mps.S</file> - <file>mpsboot.asm</file> - <file>mpsirql.c</file> - <file>processor_mp.c</file> - <file>spinlock.c</file> - <file>halmp.rc</file> -</module> Removed: trunk/reactos/hal/halx86/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/halup.rbuild… ============================================================================== --- trunk/reactos/hal/halx86/up/halup.rbuild (original) +++ trunk/reactos/hal/halx86/up/halup.rbuild (removed) @@ -1,16 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="halup" type="kernelmodedll" entrypoint="0"> - <importlibrary definition="../../hal/hal.def" /> - <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> - <include base="hal_generic">../include</include> - <include base="ntoskrnl">include</include> - <define name="_DISABLE_TIDENTS" /> - <define name="_NTHAL_" /> - <linkerflag>-enable-stdcall-fixup</linkerflag> - <library>hal_generic</library> - <library>hal_generic_up</library> - <library>ntoskrnl</library> - <file>halinit_up.c</file> - <file>halup.rc</file> -</module> Modified: trunk/reactos/hal/halx86/xbox/halinit_xbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/xbox/halinit_xb… ============================================================================== --- trunk/reactos/hal/halx86/xbox/halinit_xbox.c (original) +++ trunk/reactos/hal/halx86/xbox/halinit_xbox.c Fri Dec 14 11:53:56 2007 @@ -11,7 +11,7 @@ /* INCLUDES *****************************************************************/ -#include <halxbox.h> +#include "halxbox.h" #define NDEBUG #include <debug.h> @@ -21,8 +21,6 @@ VOID HalpInitPhase0(PLOADER_PARAMETER_BLOCK LoaderBlock) { - HalpHooks.InitPciBus = HalpXboxInitPciBus; - HalpXboxInitPartIo(); } Removed: trunk/reactos/hal/halx86/xbox/halxbox.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/xbox/halxbox.rb… ============================================================================== --- trunk/reactos/hal/halx86/xbox/halxbox.rbuild (original) +++ trunk/reactos/hal/halx86/xbox/halxbox.rbuild (removed) @@ -1,19 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="halxbox" type="kernelmodedll" entrypoint="0" allowwarnings="true"> - <importlibrary definition="../../hal/hal.def" /> - <include base="hal_generic">../include</include> - <include base="halxbox">.</include> - <include base="ntoskrnl">include</include> - <define name="_DISABLE_TIDENTS" /> - <define name="UP" /> - <define name="_NTHAL_" /> - <library>hal_generic</library> - <library>hal_generic_up</library> - <library>ntoskrnl</library> - <file>halinit_xbox.c</file> - <file>part_xbox.c</file> - <file>pci_xbox.c</file> - <file>halxbox.rc</file> - <pch>halxbox.h</pch> -</module> Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/xbox/part_xbox.… ============================================================================== --- trunk/reactos/hal/halx86/xbox/part_xbox.c (original) +++ trunk/reactos/hal/halx86/xbox/part_xbox.c Fri Dec 14 11:53:56 2007 @@ -11,7 +11,7 @@ /* INCLUDES *****************************************************************/ -#include <halxbox.h> +#include "halxbox.h" #define NDEBUG #include <debug.h> Removed: trunk/reactos/hal/halx86/xbox/pci_xbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/xbox/pci_xbox.c… ============================================================================== --- trunk/reactos/hal/halx86/xbox/pci_xbox.c (original) +++ trunk/reactos/hal/halx86/xbox/pci_xbox.c (removed) @@ -1,100 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: hal/halx86/xbox/pci_xbox.c - * PURPOSE: Xbox specific handling of PCI cards - * PROGRAMMER: Ge van Geldorp (gvg(a)reactos.com) - * UPDATE HISTORY: - * 2004/12/04: Created - * - * Trying to get PCI config data from devices 0:0:1 and 0:0:2 will completely - * hang the Xbox. Also, the device number doesn't seem to be decoded for the - * video card, so it appears to be present on 1:0:0 - 1:31:0. - * We hack around these problems by indicating "device not present" for devices - * 0:0:1, 0:0:2, 1:1:0, 1:2:0, 1:3:0, ...., 1:31:0 - */ - -/* INCLUDES *****************************************************************/ - -#include <halxbox.h> - -#define NDEBUG -#include <debug.h> - -/* VARIABLES ***************************************************************/ - -static pGetSetBusData GenericGetPciData; -static pGetSetBusData GenericSetPciData; - -/* FUNCTIONS ***************************************************************/ - -static ULONG NTAPI -HalpXboxGetPciData(IN PBUS_HANDLER BusHandler, - IN PBUS_HANDLER RootHandler, - IN PCI_SLOT_NUMBER SlotNumber, - OUT PUCHAR Buffer, - IN ULONG Offset, - IN ULONG Length) -{ - ULONG BusNumber = BusHandler->BusNumber; - - DPRINT("HalpXboxGetPciData() called.\n"); - DPRINT(" BusNumber %lu\n", BusNumber); - DPRINT(" SlotNumber %lu\n", SlotNumber); - DPRINT(" Offset 0x%lx\n", Offset); - DPRINT(" Length 0x%lx\n", Length); - - if ((0 == BusNumber && 0 == SlotNumber.u.bits.DeviceNumber && - (1 == SlotNumber.u.bits.FunctionNumber || 2 == SlotNumber.u.bits.FunctionNumber)) || - (1 == BusNumber && 0 != SlotNumber.u.bits.DeviceNumber)) - { - DPRINT("Blacklisted PCI slot\n"); - if (0 == Offset && 2 <= Length) - { - *(PUSHORT)Buffer = PCI_INVALID_VENDORID; - return 2; - } - return 0; - } - - return GenericGetPciData(BusHandler, RootHandler, SlotNumber, Buffer, Offset, Length); -} - -static ULONG NTAPI -HalpXboxSetPciData(IN PBUS_HANDLER BusHandler, - IN PBUS_HANDLER RootHandler, - IN PCI_SLOT_NUMBER SlotNumber, - IN PUCHAR Buffer, - IN ULONG Offset, - IN ULONG Length) -{ - ULONG BusNumber = BusHandler->BusNumber; - - DPRINT("HalpXboxSetPciData() called.\n"); - DPRINT(" BusNumber %lu\n", BusNumber); - DPRINT(" SlotNumber %lu\n", SlotNumber); - DPRINT(" Offset 0x%lx\n", Offset); - DPRINT(" Length 0x%lx\n", Length); - - if ((0 == BusNumber && 0 == SlotNumber.u.bits.DeviceNumber && - (1 == SlotNumber.u.bits.FunctionNumber || 2 == SlotNumber.u.bits.FunctionNumber)) || - (1 == BusNumber && 0 != SlotNumber.u.bits.DeviceNumber)) - { - DPRINT1("Trying to set data on blacklisted PCI slot\n"); - return 0; - } - - return GenericSetPciData(BusHandler, RootHandler, SlotNumber, Buffer, Offset, Length); -} - -VOID -HalpXboxInitPciBus(PBUS_HANDLER BusHandler) -{ - /* Use our own handlers to prevent a freeze */ - GenericGetPciData = BusHandler->GetBusData; - BusHandler->GetBusData = HalpXboxGetPciData; - GenericSetPciData = BusHandler->SetBusData; - BusHandler->SetBusData = HalpXboxSetPciData; -} - -/* EOF */

1 0

[gbrunmar] 31206: * Added helper function to read Direct3D registry properties * Started implementing Direct3DCreate9
by gbrunmar＠svn.reactos.org 14 Dec '07

14 Dec '07

Author: gbrunmar Date: Fri Dec 14 10:13:21 2007 New Revision: 31206 URL: http://svn.reactos.org/svn/reactos?rev=31206&view=rev Log: * Added helper function to read Direct3D registry properties * Started implementing Direct3DCreate9 Added: trunk/reactos/dll/directx/d3d9/d3d9_helpers.c (with props) trunk/reactos/dll/directx/d3d9/d3d9_helpers.h (with props) Modified: trunk/reactos/dll/directx/d3d9/d3d9.c trunk/reactos/dll/directx/d3d9/d3d9.rbuild trunk/reactos/dll/directx/d3d9/d3d9_private.h Modified: trunk/reactos/dll/directx/d3d9/d3d9.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.c?re… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.c Fri Dec 14 10:13:21 2007 @@ -1,5 +1,15 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ReactX + * FILE: dll/directx/d3d9/d3d9.c + * PURPOSE: d3d9.dll implementation + * PROGRAMERS: Magnus Olsen <greatlrd (at) reactos (dot) org> + * Gregor Brunmar <gregor (dot) brunmar (at) home (dot) se> + */ + #include <windows.h> #include "d3d9_private.h" +#include "d3d9_helpers.h" #include <debug.h> @@ -41,8 +51,31 @@ DLLAPI IDirect3D9* WINAPI Direct3DCreate9(UINT SDKVersion) { + HINSTANCE hDebugDll; + DWORD LoadDebugDll; + DWORD LoadDebugDllSize; + LPDIRECT3D9 D3D9Obj = 0; + LPDIRECT3DCREATE9 DebugDirect3DCreate9 = 0; + UNIMPLEMENTED - return 0; + + LoadDebugDllSize = sizeof(LoadDebugDll); + if (ReadRegistryValue(REG_DWORD, "LoadDebugRuntime", (LPBYTE)&LoadDebugDll, &LoadDebugDllSize)) + { + if (0 != LoadDebugDll) + { + hDebugDll = LoadLibrary("d3d9d.dll"); + + if (0 != hDebugDll) + { + DebugDirect3DCreate9 = (LPDIRECT3DCREATE9)GetProcAddress(hDebugDll, "Direct3DCreate9"); + + D3D9Obj = DebugDirect3DCreate9(SDKVersion); + } + } + } + + return D3D9Obj; } BOOL APIENTRY DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) Modified: trunk/reactos/dll/directx/d3d9/d3d9.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.rbui… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.rbuild (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.rbuild Fri Dec 14 10:13:21 2007 @@ -2,6 +2,11 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="d3d9" type="win32dll" entrypoint="0" installbase="system32" installname="d3d9.dll"> <importlibrary definition="d3d9.def" /> + + <library>advapi32</library> + <library>kernel32</library> + <file>d3d9.c</file> + <file>d3d9_helpers.c</file> <file>d3d9.rc</file> </module> Added: trunk/reactos/dll/directx/d3d9/d3d9_helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.c (added) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.c Fri Dec 14 10:13:21 2007 @@ -1,0 +1,34 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ReactX + * FILE: dll/directx/d3d9/d3d9_helpers.c + * PURPOSE: d3d9.dll helper functions + * PROGRAMERS: Gregor Brunmar <gregor (dot) brunmar (at) home (dot) se> + */ + +#include "d3d9_helpers.h" + + +static LPCSTR D3dDebugRegPath = "Software\\Microsoft\\Direct3D"; + +BOOL ReadRegistryValue(IN DWORD ValueType, IN LPCSTR ValueName, OUT LPBYTE DataBuffer, IN OUT LPDWORD DataBufferSize) +{ + HKEY hKey; + DWORD Type; + LONG Ret; + + if (ERROR_SUCCESS != RegOpenKeyEx(HKEY_LOCAL_MACHINE, D3dDebugRegPath, 0, KEY_QUERY_VALUE, &hKey)) + return FALSE; + + Ret = RegQueryValueEx(hKey, ValueName, 0, &Type, DataBuffer, DataBufferSize); + + RegCloseKey(hKey); + + if (ERROR_SUCCESS != Ret) + return FALSE; + + if (Type != ValueType) + return FALSE; + + return TRUE; +} Propchange: trunk/reactos/dll/directx/d3d9/d3d9_helpers.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/d3d9/d3d9_helpers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.h (added) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.h Fri Dec 14 10:13:21 2007 @@ -1,0 +1,11 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ReactX + * FILE: dll/directx/d3d9/d3d9_helpers.h + * PURPOSE: d3d9.dll helper functions + * PROGRAMERS: Gregor Brunmar <gregor (dot) brunmar (at) home (dot) se> + */ + +#include <windows.h> + +BOOL ReadRegistryValue(IN DWORD ValueType, IN LPCSTR ValueName, OUT LPBYTE DataBuffer, IN OUT LPDWORD DataBufferSize); Propchange: trunk/reactos/dll/directx/d3d9/d3d9_helpers.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_private.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h Fri Dec 14 10:13:21 2007 @@ -1,7 +1,17 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ReactX + * FILE: dll/directx/d3d9/d3d9_helpers.c + * PURPOSE: d3d9.dll helper functions + * PROGRAMERS: Gregor Brunmar <gregor (dot) brunmar (at) home (dot) se> + */ + #include <windows.h> #include <d3d9.h> #define DLLAPI __declspec(dllexport) + +typedef IDirect3D9* WINAPI (*LPDIRECT3DCREATE9)(UINT); struct _tagDIRECTD3D9_INT_ { @@ -11,7 +21,7 @@ /* 0x0020 */ DWORD dwProcessId; /* 0x0024 */ struct _tagDIRECTD3D9_INT_ * lpInt; /* 0x0028 */ DWORD dwIntRefCnt; /* Increases and decreases by AddRef() and Release() */ -/* 0x002c */ DWORD unknown000011; /* 0x00000001 - Probably AdapterIndex */ +/* 0x002c */ DWORD unknown000011; /* 0x00000001 - Probably AdapterIndex */ /* 0x0030 */ GUID DisplayGuid; /*? Always {67685559-3106-11D0-B971-00AA00342F9F} ? */ /* 0x0040 */ CHAR DeviceName[16]; /* 0x0050 */ DWORD unknown000020;

1 0

[janderwald] 31205: - fix a bug showing the same dialog twice in rev 31173 See issue #2888 for more details.
by janderwald＠svn.reactos.org 13 Dec '07

13 Dec '07

Author: janderwald Date: Fri Dec 14 02:11:24 2007 New Revision: 31205 URL: http://svn.reactos.org/svn/reactos?rev=31205&view=rev Log: - fix a bug showing the same dialog twice in rev 31173 See issue #2888 for more details. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/en-US.h Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Fri Dec 14 02:11:24 2007 @@ -729,7 +729,7 @@ static PAGE_NUMBER IntroPage(PINPUT_RECORD Ir) { - MUIDisplayPage(INTRO_PAGE); + MUIDisplayPage(START_PAGE); if (IsUnattendedSetup) { @@ -833,7 +833,7 @@ static PAGE_NUMBER InstallIntroPage(PINPUT_RECORD Ir) { - MUIDisplayPage(INTRO_PAGE); + MUIDisplayPage(INSTALL_INTRO_PAGE); if (RepairUpdateFlag) { Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Fri Dec 14 02:11:24 2007 @@ -680,7 +680,7 @@ deDEWelcomePageEntries }, { - INTRO_PAGE, + INSTALL_INTRO_PAGE, deDEIntroPageEntries }, { Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Fri Dec 14 02:11:24 2007 @@ -707,7 +707,7 @@ enUSWelcomePageEntries }, { - INTRO_PAGE, + INSTALL_INTRO_PAGE, enUSIntroPageEntries }, {

1 0

[jimtabor] 31204: Up the handle count to 0x10000, reset adjustment to support change. Add device capabilities to handle table.
by jimtabor＠svn.reactos.org 13 Dec '07

13 Dec '07

Author: jimtabor Date: Thu Dec 13 23:27:28 2007 New Revision: 31204 URL: http://svn.reactos.org/svn/reactos?rev=31204&view=rev Log: Up the handle count to 0x10000, reset adjustment to support change. Add device capabilities to handle table. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/subsystems/win32/win32k/include/gdiobj.h trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Thu Dec 13 23:27:28 2007 @@ -18,8 +18,8 @@ /* Base address where the handle table is mapped to */ #define GDI_HANDLE_TABLE_BASE_ADDRESS (0x400000) -/* GDI handle table can hold 0x4000 handles */ -#define GDI_HANDLE_COUNT 0x4000 +/* GDI handle table can hold 0x10000 handles */ +#define GDI_HANDLE_COUNT 0x10000 #define GDI_GLOBAL_PROCESS (0x0) /* Handle Masks and shifts */ Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/gdiobj.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdiobj.h Thu Dec 13 23:27:28 2007 @@ -11,10 +11,14 @@ typedef struct _GDI_HANDLE_TABLE { - /* the table must be located at the beginning of this structure so it can be - properly mapped! */ +/* The table must be located at the beginning of this structure so it can be + * properly mapped! + */ +////////////////////////////////////////////////////////////////////////////// GDI_TABLE_ENTRY Entries[GDI_HANDLE_COUNT]; - + DEVCAPS DevCaps; // Device Capabilities + // Font data +////////////////////////////////////////////////////////////////////////////// PPAGED_LOOKASIDE_LIST LookasideLists; SLIST_HEADER FreeEntriesHead; Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Thu Dec 13 23:27:28 2007 @@ -238,7 +238,7 @@ DPRINT1("reporting gdi handle abusers:\n"); /* step through GDI handle table and find out who our culprit is... */ - for ( i = RESERVE_ENTRIES_COUNT; i < GDI_HANDLE_COUNT; i++ ) + for ( i = RESERVE_ENTRIES_COUNT; i < GDI_HANDLE_COUNT-1; i++ ) { for ( j = 0; j < n; j++ ) { @@ -787,7 +787,7 @@ HandleUpper = GDI_HANDLE_GET_UPPER(hObj); /* Check that the handle index is valid. */ - if (HandleIndex >= GDI_HANDLE_COUNT) + if (HandleIndex >= GDI_HANDLE_COUNT-1) return NULL; Entry = &HandleTable->Entries[HandleIndex]; @@ -935,7 +935,7 @@ HandleUpper = GDI_HANDLE_GET_UPPER(hObj); /* Check that the handle index is valid. */ - if (HandleIndex >= GDI_HANDLE_COUNT) + if (HandleIndex >= GDI_HANDLE_COUNT-1) return NULL; /* Check if we have the requested type */

1 0

[jimtabor] 31203: Thanks Timo! I have updated the information too.
by jimtabor＠svn.reactos.org 13 Dec '07

13 Dec '07

Author: jimtabor Date: Thu Dec 13 21:34:46 2007 New Revision: 31203 URL: http://svn.reactos.org/svn/reactos?rev=31203&view=rev Log: Thanks Timo! I have updated the information too. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Thu Dec 13 21:34:46 2007 @@ -1509,12 +1509,21 @@ IN ULONG ulType ) { -// INT Index; -// PGDI_TABLE_ENTRY Entry; - HANDLE handle = GDIOBJ_AllocObj(GdiHandleTable, GDI_OBJECT_TAG_CLIOBJ); +// ATM we use DC object for KernelData. I think it should be at a minimum GDIOBJEMPTYHDR. +// The UserData is set in user mode, so it is always NULL. +// + INT Index; + PGDI_TABLE_ENTRY Entry; + HANDLE handle = GDIOBJ_AllocObj(GdiHandleTable, GDI_OBJECT_TYPE_CLIOBJ); // Need to change handle type based on ulType. -// Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)handle); -// Entry = &GdiHandleTable->Entries[Index]; + Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)handle); + Entry = &GdiHandleTable->Entries[Index]; +// mask out lower half and set the type by ulType. + Entry->Type &= GDI_HANDLE_UPPER_MASK; + Entry->Type |= ulType >> GDI_ENTRY_UPPER_SHIFT; +// mask out handle type than set it by ulType. + handle = (HANDLE)(((ULONG_PTR)(handle)) & (GDI_HANDLE_REUSE_MASK|GDI_HANDLE_STOCK_MASK|0x0ffff)); + handle = (HANDLE)(((ULONG_PTR)(handle)) | ulType); return handle; } @@ -1525,7 +1534,7 @@ IN HANDLE h ) { - return GDIOBJ_FreeObj(GdiHandleTable, h, GDI_OBJECT_TAG_CLIOBJ); + return GDIOBJ_FreeObj(GdiHandleTable, h, GDI_OBJECT_TYPE_CLIOBJ); } /* EOF */

1 0

[hpoussin] 31202: [FORMATTING] Fix formatting, no code change
by hpoussin＠svn.reactos.org 13 Dec '07

13 Dec '07

Author: hpoussin Date: Thu Dec 13 20:23:03 2007 New Revision: 31202 URL: http://svn.reactos.org/svn/reactos?rev=31202&view=rev Log: [FORMATTING] Fix formatting, no code change Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/xbox/part_xbox.… ============================================================================== --- trunk/reactos/hal/halx86/xbox/part_xbox.c (original) +++ trunk/reactos/hal/halx86/xbox/part_xbox.c Thu Dec 13 20:23:03 2007 @@ -29,17 +29,17 @@ static struct { - ULONG SectorStart; - ULONG SectorCount; - CHAR PartitionType; + ULONG SectorStart; + ULONG SectorCount; + CHAR PartitionType; } XboxPartitions[] = { - /* This is in the \Device\Harddisk0\Partition.. order used by the Xbox kernel */ - { 0x0055F400, 0x0098f800, PARTITION_FAT32 }, /* Store, E: */ - { 0x00465400, 0x000FA000, PARTITION_FAT_16 }, /* System, C: */ - { 0x00000400, 0x00177000, PARTITION_FAT_16 }, /* Cache1, X: */ - { 0x00177400, 0x00177000, PARTITION_FAT_16 }, /* Cache2, Y: */ - { 0x002EE400, 0x00177000, PARTITION_FAT_16 } /* Cache3, Z: */ + /* This is in the \Device\Harddisk0\Partition.. order used by the Xbox kernel */ + { 0x0055F400, 0x0098f800, PARTITION_FAT32 }, /* Store, E: */ + { 0x00465400, 0x000FA000, PARTITION_FAT_16 }, /* System, C: */ + { 0x00000400, 0x00177000, PARTITION_FAT_16 }, /* Cache1, X: */ + { 0x00177400, 0x00177000, PARTITION_FAT_16 }, /* Cache2, Y: */ + { 0x002EE400, 0x00177000, PARTITION_FAT_16 } /* Cache3, Z: */ }; #define XBOX_PARTITION_COUNT (sizeof(XboxPartitions) / sizeof(XboxPartitions[0])) @@ -51,88 +51,87 @@ HalpXboxReadSector(IN PDEVICE_OBJECT DeviceObject, IN ULONG SectorSize, IN PLARGE_INTEGER SectorOffset, - IN PVOID Sector) -{ - IO_STATUS_BLOCK StatusBlock; - KEVENT Event; - PIRP Irp; + OUT PVOID Sector) +{ + IO_STATUS_BLOCK StatusBlock; + KEVENT Event; + PIRP Irp; + NTSTATUS Status; + + DPRINT("HalpXboxReadSector(%p %lu 0x%08x%08x %p)\n", + DeviceObject, SectorSize, SectorOffset->u.HighPart, SectorOffset->u.LowPart, Sector); + + ASSERT(DeviceObject); + ASSERT(Sector); + + KeInitializeEvent(&Event, + NotificationEvent, + FALSE); + + /* Read the sector */ + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ, + DeviceObject, + Sector, + SectorSize, + SectorOffset, + &Event, + &StatusBlock); + + Status = IoCallDriver(DeviceObject, + Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = StatusBlock.Status; + } + + if (!NT_SUCCESS(Status)) + { + DPRINT("Reading sector failed (Status 0x%08lx)\n", Status); + return Status; + } + + return Status; +} + +static NTSTATUS FASTCALL +HalpXboxDeviceHasXboxPartitioning(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + OUT BOOLEAN *HasXboxPartitioning) +{ + PVOID SectorData; + LARGE_INTEGER Offset; NTSTATUS Status; - DPRINT("HalpXboxReadSector(%p %lu 0x%08x%08x %p)\n", - DeviceObject, SectorSize, SectorOffset->u.HighPart, SectorOffset->u.LowPart, Sector); - - ASSERT(DeviceObject); - ASSERT(Sector); - - KeInitializeEvent(&Event, - NotificationEvent, - FALSE); - - /* Read the sector */ - Irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ, - DeviceObject, - Sector, - SectorSize, - SectorOffset, - &Event, - &StatusBlock); - - Status = IoCallDriver(DeviceObject, - Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, - Executive, - KernelMode, - FALSE, - NULL); - Status = StatusBlock.Status; - } - - if (!NT_SUCCESS(Status)) - { - DPRINT("Reading sector failed (Status 0x%08lx)\n", - Status); - return Status; - } - - return Status; -} - -static NTSTATUS FASTCALL -HalpXboxDeviceHasXboxPartitioning(PDEVICE_OBJECT DeviceObject, - ULONG SectorSize, - BOOLEAN *HasXboxPartitioning) -{ - PVOID SectorData; - LARGE_INTEGER Offset; - NTSTATUS Status; - - DPRINT("HalpXboxDeviceHasXboxPartitioning(%p %lu %p)\n", - DeviceObject, - SectorSize, - HasXboxPartitioning); - - SectorData = ExAllocatePool(PagedPool, SectorSize); - if (NULL == SectorData) - { - return STATUS_NO_MEMORY; - } - - Offset.QuadPart = XBOX_SIGNATURE_SECTOR * SectorSize; - Status = HalpXboxReadSector(DeviceObject, SectorSize, &Offset, SectorData); - if (! NT_SUCCESS(Status)) - { - return Status; - } - - DPRINT("Signature 0x%02x 0x%02x 0x%02x 0x%02x\n", - *((UCHAR *) SectorData), *((UCHAR *) SectorData + 1), *((UCHAR *) SectorData + 2), *((UCHAR *) SectorData + 3)); - *HasXboxPartitioning = (XBOX_SIGNATURE == *((ULONG *) SectorData)); - ExFreePool(SectorData); - DPRINT("%s partitioning found\n", *HasXboxPartitioning ? "Xbox" : "MBR"); - - return STATUS_SUCCESS; + DPRINT("HalpXboxDeviceHasXboxPartitioning(%p %lu %p)\n", + DeviceObject, + SectorSize, + HasXboxPartitioning); + + SectorData = ExAllocatePool(PagedPool, SectorSize); + if (!SectorData) + { + return STATUS_NO_MEMORY; + } + + Offset.QuadPart = XBOX_SIGNATURE_SECTOR * SectorSize; + Status = HalpXboxReadSector(DeviceObject, SectorSize, &Offset, SectorData); + if (! NT_SUCCESS(Status)) + { + return Status; + } + + DPRINT("Signature 0x%02x 0x%02x 0x%02x 0x%02x\n", + *((UCHAR *) SectorData), *((UCHAR *) SectorData + 1), *((UCHAR *) SectorData + 2), *((UCHAR *) SectorData + 3)); + *HasXboxPartitioning = (XBOX_SIGNATURE == *((ULONG *) SectorData)); + ExFreePool(SectorData); + DPRINT("%s partitioning found\n", *HasXboxPartitioning ? "Xbox" : "MBR"); + + return STATUS_SUCCESS; } static VOID FASTCALL @@ -141,98 +140,98 @@ IN ULONG MBRTypeIdentifier, OUT PVOID *Buffer) { - BOOLEAN HasXboxPartitioning; - NTSTATUS Status; - - DPRINT("HalpXboxExamineMBR(%p %lu %lx %p)\n", - DeviceObject, - SectorSize, - MBRTypeIdentifier, - Buffer); - - *Buffer = NULL; - - Status = HalpXboxDeviceHasXboxPartitioning(DeviceObject, SectorSize, &HasXboxPartitioning); - if (! NT_SUCCESS(Status)) - { - return; - } - - if (! HasXboxPartitioning) - { - DPRINT("Delegating to standard MBR code\n"); - NtoskrnlExamineMBR(DeviceObject, SectorSize, MBRTypeIdentifier, Buffer); - return; - } - - /* Buffer already set to NULL */ - return; + BOOLEAN HasXboxPartitioning; + NTSTATUS Status; + + DPRINT("HalpXboxExamineMBR(%p %lu %lx %p)\n", + DeviceObject, + SectorSize, + MBRTypeIdentifier, + Buffer); + + *Buffer = NULL; + + Status = HalpXboxDeviceHasXboxPartitioning(DeviceObject, SectorSize, &HasXboxPartitioning); + if (! NT_SUCCESS(Status)) + { + return; + } + + if (! HasXboxPartitioning) + { + DPRINT("Delegating to standard MBR code\n"); + NtoskrnlExamineMBR(DeviceObject, SectorSize, MBRTypeIdentifier, Buffer); + return; + } + + /* Buffer already set to NULL */ + return; } static NTSTATUS FASTCALL -HalpXboxIoReadPartitionTable(PDEVICE_OBJECT DeviceObject, - ULONG SectorSize, - BOOLEAN ReturnRecognizedPartitions, - PDRIVE_LAYOUT_INFORMATION *PartitionBuffer) -{ - BOOLEAN HasXboxPartitioning; - NTSTATUS Status; - unsigned Part; - PPARTITION_INFORMATION PartInfo; - - DPRINT("HalpXboxIoReadPartitionTable(%p %lu %x %p)\n", - DeviceObject, - SectorSize, - ReturnRecognizedPartitions, - PartitionBuffer); - - Status = HalpXboxDeviceHasXboxPartitioning(DeviceObject, SectorSize, &HasXboxPartitioning); - if (! NT_SUCCESS(Status)) - { - return Status; - } - - if (! HasXboxPartitioning) - { - DPRINT("Delegating to standard MBR code\n"); - return NtoskrnlIoReadPartitionTable(DeviceObject, SectorSize, - ReturnRecognizedPartitions, PartitionBuffer); - } - - *PartitionBuffer = (PDRIVE_LAYOUT_INFORMATION) - ExAllocatePool(PagedPool, - sizeof(DRIVE_LAYOUT_INFORMATION) + - XBOX_PARTITION_COUNT * sizeof(PARTITION_INFORMATION)); - if (NULL == *PartitionBuffer) - { - return STATUS_NO_MEMORY; - } - (*PartitionBuffer)->PartitionCount = XBOX_PARTITION_COUNT; - (*PartitionBuffer)->Signature = PARTITION_SIGNATURE; - for (Part = 0; Part < XBOX_PARTITION_COUNT; Part++) - { - PartInfo = (*PartitionBuffer)->PartitionEntry + Part; - PartInfo->StartingOffset.QuadPart = (ULONGLONG) XboxPartitions[Part].SectorStart * - (ULONGLONG) SectorSize; - PartInfo->PartitionLength.QuadPart = (ULONGLONG) XboxPartitions[Part].SectorCount * - (ULONGLONG) SectorSize; - PartInfo->HiddenSectors = 0; - PartInfo->PartitionNumber = Part + 1; - PartInfo->PartitionType = XboxPartitions[Part].PartitionType; - PartInfo->BootIndicator = FALSE; - PartInfo->RecognizedPartition = TRUE; - PartInfo->RewritePartition = FALSE; - DPRINT(" %ld: nr: %d boot: %1x type: %x start: 0x%I64x count: 0x%I64x rec: %d\n", - Part, - PartInfo->PartitionNumber, - PartInfo->BootIndicator, - PartInfo->PartitionType, - PartInfo->StartingOffset.QuadPart, - PartInfo->PartitionLength.QuadPart, - PartInfo->RecognizedPartition); - } - - return STATUS_SUCCESS; +HalpXboxIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN BOOLEAN ReturnRecognizedPartitions, + OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer) +{ + BOOLEAN HasXboxPartitioning; + NTSTATUS Status; + ULONG Part; + PPARTITION_INFORMATION PartInfo; + + DPRINT("HalpXboxIoReadPartitionTable(%p %lu %x %p)\n", + DeviceObject, + SectorSize, + ReturnRecognizedPartitions, + PartitionBuffer); + + Status = HalpXboxDeviceHasXboxPartitioning(DeviceObject, SectorSize, &HasXboxPartitioning); + if (! NT_SUCCESS(Status)) + { + return Status; + } + + if (! HasXboxPartitioning) + { + DPRINT("Delegating to standard MBR code\n"); + return NtoskrnlIoReadPartitionTable(DeviceObject, SectorSize, + ReturnRecognizedPartitions, PartitionBuffer); + } + + *PartitionBuffer = (PDRIVE_LAYOUT_INFORMATION) + ExAllocatePool(PagedPool, + sizeof(DRIVE_LAYOUT_INFORMATION) + + XBOX_PARTITION_COUNT * sizeof(PARTITION_INFORMATION)); + if (NULL == *PartitionBuffer) + { + return STATUS_NO_MEMORY; + } + (*PartitionBuffer)->PartitionCount = XBOX_PARTITION_COUNT; + (*PartitionBuffer)->Signature = PARTITION_SIGNATURE; + for (Part = 0; Part < XBOX_PARTITION_COUNT; Part++) + { + PartInfo = (*PartitionBuffer)->PartitionEntry + Part; + PartInfo->StartingOffset.QuadPart = (ULONGLONG) XboxPartitions[Part].SectorStart * + (ULONGLONG) SectorSize; + PartInfo->PartitionLength.QuadPart = (ULONGLONG) XboxPartitions[Part].SectorCount * + (ULONGLONG) SectorSize; + PartInfo->HiddenSectors = 0; + PartInfo->PartitionNumber = Part + 1; + PartInfo->PartitionType = XboxPartitions[Part].PartitionType; + PartInfo->BootIndicator = FALSE; + PartInfo->RecognizedPartition = TRUE; + PartInfo->RewritePartition = FALSE; + DPRINT(" %ld: nr: %d boot: %1x type: %x start: 0x%I64x count: 0x%I64x rec: %d\n", + Part, + PartInfo->PartitionNumber, + PartInfo->BootIndicator, + PartInfo->PartitionType, + PartInfo->StartingOffset.QuadPart, + PartInfo->PartitionLength.QuadPart, + PartInfo->RecognizedPartition); + } + + return STATUS_SUCCESS; } static NTSTATUS FASTCALL @@ -241,31 +240,31 @@ IN ULONG PartitionNumber, IN ULONG PartitionType) { - BOOLEAN HasXboxPartitioning; - NTSTATUS Status; - - DPRINT("HalpXboxIoSetPartitionInformation(%p %lu %lu %lu)\n", - DeviceObject, - SectorSize, - PartitionNumber, - PartitionType); - - Status = HalpXboxDeviceHasXboxPartitioning(DeviceObject, SectorSize, &HasXboxPartitioning); - if (! NT_SUCCESS(Status)) - { - return Status; - } - - if (! HasXboxPartitioning) - { - DPRINT("Delegating to standard MBR code\n"); - return NtoskrnlIoSetPartitionInformation(DeviceObject, SectorSize, - PartitionNumber, PartitionType); - } - - /* Can't change the partitioning */ - DPRINT1("Xbox partitions are fixed, can't change them\n"); - return STATUS_ACCESS_DENIED; + BOOLEAN HasXboxPartitioning; + NTSTATUS Status; + + DPRINT("HalpXboxIoSetPartitionInformation(%p %lu %lu %lu)\n", + DeviceObject, + SectorSize, + PartitionNumber, + PartitionType); + + Status = HalpXboxDeviceHasXboxPartitioning(DeviceObject, SectorSize, &HasXboxPartitioning); + if (! NT_SUCCESS(Status)) + { + return Status; + } + + if (!HasXboxPartitioning) + { + DPRINT("Delegating to standard MBR code\n"); + return NtoskrnlIoSetPartitionInformation(DeviceObject, SectorSize, + PartitionNumber, PartitionType); + } + + /* Can't change the partitioning */ + DPRINT1("Xbox partitions are fixed, can't change them\n"); + return STATUS_ACCESS_DENIED; } static NTSTATUS FASTCALL @@ -275,33 +274,33 @@ IN ULONG NumberOfHeads, IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer) { - BOOLEAN HasXboxPartitioning; - NTSTATUS Status; - - DPRINT("HalpXboxIoWritePartitionTable(%p %lu %lu %lu %p)\n", - DeviceObject, - SectorSize, - SectorsPerTrack, - NumberOfHeads, - PartitionBuffer); - - Status = HalpXboxDeviceHasXboxPartitioning(DeviceObject, SectorSize, &HasXboxPartitioning); - if (! NT_SUCCESS(Status)) - { - return Status; - } - - if (! HasXboxPartitioning) - { - DPRINT("Delegating to standard MBR code\n"); - return NtoskrnlIoWritePartitionTable(DeviceObject, SectorSize, - SectorsPerTrack, NumberOfHeads, - PartitionBuffer); - } - - /* Can't change the partitioning */ - DPRINT1("Xbox partitions are fixed, can't change them\n"); - return STATUS_ACCESS_DENIED; + BOOLEAN HasXboxPartitioning; + NTSTATUS Status; + + DPRINT("HalpXboxIoWritePartitionTable(%p %lu %lu %lu %p)\n", + DeviceObject, + SectorSize, + SectorsPerTrack, + NumberOfHeads, + PartitionBuffer); + + Status = HalpXboxDeviceHasXboxPartitioning(DeviceObject, SectorSize, &HasXboxPartitioning); + if (! NT_SUCCESS(Status)) + { + return Status; + } + + if (!HasXboxPartitioning) + { + DPRINT("Delegating to standard MBR code\n"); + return NtoskrnlIoWritePartitionTable(DeviceObject, SectorSize, + SectorsPerTrack, NumberOfHeads, + PartitionBuffer); + } + + /* Can't change the partitioning */ + DPRINT1("Xbox partitions are fixed, can't change them\n"); + return STATUS_ACCESS_DENIED; } #define HalExamineMBR HALDISPATCH->HalExamineMBR @@ -309,14 +308,14 @@ void HalpXboxInitPartIo(void) { - NtoskrnlExamineMBR = HalExamineMBR; - HalExamineMBR = HalpXboxExamineMBR; - NtoskrnlIoReadPartitionTable = HalIoReadPartitionTable; - HalIoReadPartitionTable = HalpXboxIoReadPartitionTable; - NtoskrnlIoSetPartitionInformation = HalIoSetPartitionInformation; - HalIoSetPartitionInformation = HalpXboxIoSetPartitionInformation; - NtoskrnlIoWritePartitionTable = HalIoWritePartitionTable; - HalIoWritePartitionTable = HalpXboxIoWritePartitionTable; + NtoskrnlExamineMBR = HalExamineMBR; + HalExamineMBR = HalpXboxExamineMBR; + NtoskrnlIoReadPartitionTable = HalIoReadPartitionTable; + HalIoReadPartitionTable = HalpXboxIoReadPartitionTable; + NtoskrnlIoSetPartitionInformation = HalIoSetPartitionInformation; + HalIoSetPartitionInformation = HalpXboxIoSetPartitionInformation; + NtoskrnlIoWritePartitionTable = HalIoWritePartitionTable; + HalIoWritePartitionTable = HalpXboxIoWritePartitionTable; } /* EOF */

1 0

[dreimer] 31201: OK, this has no right to be in here... "as developed primarily through reverse-engineering of the original MS bios and its boot process." A diff will be provided in the future.
by dreimer＠svn.reactos.org 13 Dec '07

13 Dec '07

Author: dreimer Date: Thu Dec 13 20:03:01 2007 New Revision: 31201 URL: http://svn.reactos.org/svn/reactos?rev=31201&view=rev Log: OK, this has no right to be in here... "as developed primarily through reverse-engineering of the original MS bios and its boot process." A diff will be provided in the future. Removed: trunk/reactos/tools/xbox/

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
61
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 December 2007