Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 26611: remove from build, won't compile
by tkreuzer＠svn.reactos.org 01 May '07

01 May '07

Author: tkreuzer Date: Tue May 1 17:01:10 2007 New Revision: 26611 URL: http://svn.reactos.org/svn/reactos?rev=26611&view=rev Log: remove from build, won't compile Modified: trunk/rosapps/avtest/avtest.rbuild Modified: trunk/rosapps/avtest/avtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/avtest/avtest.rbuild?rev=2… ============================================================================== --- trunk/rosapps/avtest/avtest.rbuild (original) +++ trunk/rosapps/avtest/avtest.rbuild Tue May 1 17:01:10 2007 @@ -4,5 +4,4 @@ <define name="__USE_W32API" /> <library>ks</library> <library>ntoskrnl</library> - <file>entry.c</file> </module>

1 0

[sgasiorek] 26610: change default font to DeJavu Sans (patch by preston) fixes bug #2183
by sgasiorek＠svn.reactos.org 01 May '07

01 May '07

Author: sgasiorek Date: Tue May 1 14:07:52 2007 New Revision: 26610 URL: http://svn.reactos.org/svn/reactos?rev=26610&view=rev Log: change default font to DeJavu Sans (patch by preston) fixes bug #2183 Modified: trunk/reactos/boot/bootdata/hivedef.inf Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf (original) +++ trunk/reactos/boot/bootdata/hivedef.inf Tue May 1 14:07:52 2007 @@ -92,28 +92,28 @@ ; GUI Setup HKCU, "Control Panel\Desktop\WindowMetrics","CaptionFont",0x00000001,f5,ff,ff,ff,00,00,00,\ -00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,42,00,69,00,74,00,73,00,74,\ -00,72,00,65,00,61,00,6d,00,20,00,56,00,65,00,72,00,61,00,20,00,53,00,61,00,6e,00,73,00,00,\ +00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,44,00,65,00,6a,00,61,00,56,\ +00,75,00,20,00,53,00,61,00,6e,00,73,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKCU, "Control Panel\Desktop\WindowMetrics","IconFont",0x00000001,f5,ff,ff,ff,00,00,00,00,\ -00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,42,00,69,00,74,00,73,00,74,00,\ -72,00,65,00,61,00,6d,00,20,00,56,00,65,00,72,00,61,00,20,00,53,00,61,00,6e,00,73,00,00,00,\ +00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,44,00,65,00,6a,00,61,00,56,00,\ +75,00,20,00,53,00,61,00,6e,00,73,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKCU, "Control Panel\Desktop\WindowMetrics","MenuFont",0x00000001,f5,ff,ff,ff,00,00,00,00,\ -00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,42,00,69,00,74,00,73,00,74,00,\ -72,00,65,00,61,00,6d,00,20,00,56,00,65,00,72,00,61,00,20,00,53,00,61,00,6e,00,73,00,00,00,\ +00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,44,00,65,00,6a,00,61,00,56,00,\ +75,00,20,00,53,00,61,00,6e,00,73,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKCU, "Control Panel\Desktop\WindowMetrics","MessageFont",0x00000001,f5,ff,ff,ff,00,00,00,\ -00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,42,00,69,00,74,00,73,00,74,\ -00,72,00,65,00,61,00,6d,00,20,00,56,00,65,00,72,00,61,00,20,00,53,00,61,00,6e,00,73,00,00,\ +00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,44,00,65,00,6a,00,61,00,56,\ +00,75,00,20,00,53,00,61,00,6e,00,73,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKCU, "Control Panel\Desktop\WindowMetrics","SmCaptionFont",0x00000001,f5,ff,ff,ff,00,00,\ -00,00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,42,00,69,00,74,00,73,00,\ -74,00,72,00,65,00,61,00,6d,00,20,00,56,00,65,00,72,00,61,00,20,00,53,00,61,00,6e,00,73,00,\ +00,00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,44,00,65,00,6a,00,61,00,\ +56,00,75,00,20,00,53,00,61,00,6e,00,73,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKCU, "Control Panel\Desktop\WindowMetrics","IconFont",0x00000001,f5,ff,ff,ff,00,00,00,00,\ -00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,42,00,69,00,74,00,73,00,74,00,\ -72,00,65,00,61,00,6d,00,20,00,56,00,65,00,72,00,61,00,20,00,53,00,61,00,6e,00,73,00,00,00,\ +00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,44,00,65,00,6a,00,61,00,56,00,\ +75,00,20,00,53,00,61,00,6e,00,73,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 ; EOF

1 0

[sgasiorek] 26609: implement polish keyboard layout
by sgasiorek＠svn.reactos.org 01 May '07

01 May '07

Author: sgasiorek Date: Tue May 1 13:39:57 2007 New Revision: 26609 URL: http://svn.reactos.org/svn/reactos?rev=26609&view=rev Log: implement polish keyboard layout Added: trunk/reactos/dll/keyboard/kbdpl1/ trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.c trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.def trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rc Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/dll/keyboard/keyboard.rbuild 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 Tue May 1 13:39:57 2007 @@ -56,6 +56,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040c","Layout Text",0x00000000,"French" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000410","Layout File",0x00000000,"kbdit.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000410","Layout Text",0x00000000,"Italian" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000415","Layout File",0x00000000,"kbdpl1.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000415","Layout Text",0x00000000,"Polish (programmer's)" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000419","Layout File",0x00000000,"kbdru.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000419","Layout Text",0x00000000,"Russian" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout File",0x00000000,"kbdsw.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 Tue May 1 13:39:57 2007 @@ -127,6 +127,7 @@ dll\keyboard\kbdhu\kbdhu.dll 1 dll\keyboard\kbdit\kbdit.dll 1 dll\keyboard\kbdja\kbdja.dll 1 +dll\keyboard\kbdpl1\kbdpl1.dll 1 dll\keyboard\kbdpo\kbdpo.dll 1 dll\keyboard\kbdru\kbdru.dll 1 dll\keyboard\kbdsw\kbdsw.dll 1 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 Tue May 1 13:39:57 2007 @@ -106,6 +106,7 @@ 0000040E = "Hungarian" 00000410 = "Italian" 00000411 = "Japanese" +00000415 = "Polish (programmer's)" 00000816 = "Portuguese (Portugal)" 00000419 = "Russian" 0000041B = "Slovak (QWERTZ)" @@ -123,6 +124,7 @@ 0000040C = kbdfr.dll 0000040E = kbdhu.dll 00000410 = kbdit.dll +00000415 = kbdpl1.dll 00000419 = kbdru.dll 0000041D = kbdsw.dll 0000041E = kbdth.dll Added: trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpl1/kbdpl1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.c (added) +++ trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.c Tue May 1 13:39:57 2007 @@ -1,0 +1,368 @@ +/* + * ReactOS Polish Keyboard layout + * Copyright (C) 2007 ReactOS + * License: LGPL, see: LGPL.txt + * author: Sebastian Gasiorek + * + * Thanks to: http://www.barcodeman.com/altek/mule/scandoc.php + * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html + * + * missing ~ - Tylda deadkey - + */ + +#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, + /* - 37 - */ + /* Bottom Row */ + VK_MULTIPLY, VK_LMENU, VK_SPACE, VK_CAPITAL, + + /* - 3b - */ + /* F-Keys */ + VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6, + VK_F7, VK_F8, VK_F9, VK_F10, + /* - 45 - */ + /* Locks */ + VK_NUMLOCK | KMEXT, + VK_SCROLL | KMULTI, + /* - 47 - */ + /* Number-Pad */ + VK_HOME | KNUMS, VK_UP | KNUMS, VK_PRIOR | KNUMS, VK_SUBTRACT, + VK_LEFT | KNUMS, VK_CLEAR | KNUMS, VK_RIGHT | KNUMS, VK_ADD, + VK_END | KNUMS, VK_DOWN | KNUMS, VK_NEXT | KNUMS, + VK_INSERT | KNUMS, VK_DELETE | KNUMS, + /* - 54 - */ + /* Presumably PrtSc */ + VK_SNAPSHOT, + /* - 55 - */ + /* Oddities, and the remaining standard F-Keys */ + VK_EMPTY, VK_EMPTY, VK_F11, VK_F12, + /* - 59 - */ + VK_CLEAR, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* EREOF */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* ZOOM */ + VK_HELP, + /* - 64 - */ + /* Even more F-Keys (for example, NCR keyboards from the early 90's) */ + VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20, + VK_F21, VK_F22, VK_F23, + /* - 6f - */ + /* Not sure who uses these codes */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, + /* - 72 - */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + /* - 76 - */ + /* One more f-key */ + VK_F24, + /* - 77 - */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */ + VK_EMPTY, + /* - 80 - */ + 0 +}; + +ROSDATA VSC_VK extcode0_to_vk[] = { + { 0, 0 }, +}; + +ROSDATA VSC_VK extcode1_to_vk[] = { + { 0, 0 }, +}; + +ROSDATA VK_TO_BIT modifier_keys[] = { + { VK_SHIFT, KSHIFT }, + { VK_CONTROL, KCTRL }, + { VK_MENU, KALT }, + { 0, 0 } +}; + +ROSDATA MODIFIERS modifier_bits = { + modifier_keys, + 7, + { 0, 1, 3, SHFT_INVALID, SHFT_INVALID, SHFT_INVALID, 2, 4 } +}; + + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + /* Normal vs Shifted */ + /* The numbers */ + { '1', NOCAPS, {'1', '!'} }, + /* Ctrl-2 generates NUL */ + { '3', NOCAPS, {'3', '#'} }, + { '4', NOCAPS, {'4', '$'} }, + { '5', NOCAPS, {'5', '%'} }, + /* Ctrl-6 generates RS */ + { '7', NOCAPS, {'7', '&'} }, + { '8', NOCAPS, {'8', '*'} }, + { '9', NOCAPS, {'9', '('} }, + { '0', NOCAPS, {'0', ')'} }, + + /* Specials */ + /* Ctrl-_ generates US */ + { VK_OEM_PLUS ,NOCAPS, {'=', '+'} }, + { VK_OEM_1 ,NOCAPS, {';', ':'} }, + { VK_OEM_7 ,NOCAPS, {'\'','\"'} }, + { VK_OEM_3 ,NOCAPS, {'`', '~'} }, + { VK_OEM_COMMA ,NOCAPS, {',', '<'} }, + { VK_OEM_PERIOD ,NOCAPS, {'.', '>'} }, + { VK_OEM_2 ,NOCAPS, {'/', '?'} }, + /* Keys that do not have shift states */ + { VK_TAB ,NOCAPS, {'\t','\t'} }, + { VK_ADD ,NOCAPS, {'+', '+'} }, + { VK_SUBTRACT,NOCAPS, {'-', '-'} }, + { VK_MULTIPLY,NOCAPS, {'*', '*'} }, + { VK_DIVIDE ,NOCAPS, {'/', '/'} }, + { VK_ESCAPE ,NOCAPS, {'\x1b','\x1b'} }, + { VK_SPACE ,NOCAPS, {' ', ' '} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + /* Normal, Shifted, Ctrl */ + /* Legacy (telnet-style) ascii escapes */ + { VK_OEM_4, 0, {'[', '{', 0x1b /* ESC */} }, + { VK_OEM_6, 0, {']', '}', 0x1d /* GS */} }, + { VK_OEM_5, 0, {'\\','|', 0x1c /* FS */} }, + { VK_RETURN,0, {'\r', '\r', '\n'} }, + { 0,0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + /* Normal, Shifted, Ctrl, C-S-x */ + + /* The alphabet */ + { 'B', CAPS, {'b', 'B', 0x02, 0x02} }, + { 'D', CAPS, {'d', 'D', 0x04, 0x04} }, + { 'F', CAPS, {'f', 'F', 0x06, 0x06} }, + { 'G', CAPS, {'g', 'G', 0x07, 0x07} }, + { 'H', CAPS, {'h', 'H', 0x08, 0x08} }, + { 'I', CAPS, {'i', 'I', 0x09, 0x09} }, + { 'J', CAPS, {'j', 'J', 0x0a, 0x0a} }, + { 'K', CAPS, {'k', 'K', 0x0b, 0x0b} }, + { 'M', CAPS, {'m', 'M', 0x0d, 0x0d} }, + { 'P', CAPS, {'p', 'P', 0x10, 0x10} }, + { 'Q', CAPS, {'q', 'Q', 0x11, 0x11} }, + { 'R', CAPS, {'r', 'R', 0x12, 0x12} }, + { 'T', CAPS, {'t', 'T', 0x14, 0x14} }, + { 'U', CAPS, {'u', 'U', 0x15, 0x15} }, + { 'V', CAPS, {'v', 'V', 0x16, 0x16} }, + { 'W', CAPS, {'w', 'W', 0x17, 0x17} }, + { 'Y', CAPS, {'y', 'Y', 0x19, 0x19} }, + + + /* Legacy Ascii generators */ + { '2', NOCAPS, {'2', '@', WCH_NONE, 0} }, + { '6', NOCAPS, {'6', '^', WCH_NONE, 0x1e /* RS */} }, + { VK_OEM_MINUS, NOCAPS, {'-', '_', WCH_NONE, 0x1f /* US */} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { + /* Normal, Shifted, Ctrl, C-S-x */ + { 'A', CAPS, {'a', 'A', 0x0105, 0x01, 0x0104} }, + { 'C', CAPS, {'c', 'C', 0x0107, 0x03, 0x0106} }, + { 'E', CAPS, {'e', 'E', 0x0119, 0x05, 0x0118} }, + { 'L', CAPS, {'l', 'L', 0x0142, 0x0C, 0x0141} }, + { 'N', CAPS, {'n', 'N', 0x0144, 0x0E, 0x0143} }, + { 'O', CAPS, {'o', 'O', 0xF3, 0x0F, 0xD3} }, + { 'S', CAPS, {'s', 'S', 0x015B, 0x13, 0x015A} }, + { 'X', CAPS, {'x', 'X', 0x017A, 0x18, 0x0179} }, + { 'Z', CAPS, {'z', 'Z', 0x017C, 0x1A, 0x017B} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { + { VK_NUMPAD0, 0, {'0'} }, + { VK_NUMPAD1, 0, {'1'} }, + { VK_NUMPAD2, 0, {'2'} }, + { VK_NUMPAD3, 0, {'3'} }, + { VK_NUMPAD4, 0, {'4'} }, + { VK_NUMPAD5, 0, {'5'} }, + { VK_NUMPAD6, 0, {'6'} }, + { VK_NUMPAD7, 0, {'7'} }, + { VK_NUMPAD8, 0, {'8'} }, + { VK_NUMPAD9, 0, {'9'} }, + { VK_DECIMAL, 0, {'.'} }, + { VK_BACK, 0, {'\010'} }, + { 0,0 } +}; + +#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } + +ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { + vk_master(1,keypad_numbers), + vk_master(2,key_to_chars_2mod), + vk_master(3,key_to_chars_3mod), + vk_master(4,key_to_chars_4mod), + vk_master(5,key_to_chars_5mod), + { 0,0,0 } +}; + +ROSDATA VSC_LPWSTR key_names[] = { + { 0x00, L"" }, + { 0x01, L"Esc" }, + { 0x0e, L"Backspace" }, + { 0x0f, L"Tab" }, + { 0x1c, L"Enter" }, + { 0x1d, L"Ctrl" }, + { 0x2a, L"Shift" }, + { 0x36, L"Right Shift" }, + { 0x37, L"Num *" }, + { 0x38, L"Alt" }, + { 0x39, L"Space" }, + { 0x3a, L"Caps Lock" }, + { 0x3b, L"F1" }, + { 0x3c, L"F2" }, + { 0x3d, L"F3" }, + { 0x3e, L"F4" }, + { 0x3f, L"F5" }, + { 0x40, L"F6" }, + { 0x41, L"F7" }, + { 0x42, L"F8" }, + { 0x43, L"F9" }, + { 0x44, L"F10" }, + { 0x45, L"Pause" }, + { 0x46, L"Scroll Lock" }, + { 0x47, L"Num 7" }, + { 0x48, L"Num 8" }, + { 0x49, L"Num 9" }, + { 0x4a, L"Num -" }, + { 0x4b, L"Num 4" }, + { 0x4c, L"Num 5" }, + { 0x4d, L"Num 6" }, + { 0x4e, L"Num +" }, + { 0x4f, L"Num 1" }, + { 0x50, L"Num 2" }, + { 0x51, L"Num 3" }, + { 0x52, L"Num 0" }, + { 0x53, L"Num Del" }, + { 0x54, L"Sys Req" }, + { 0x57, L"F11" }, + { 0x58, L"F12" }, + { 0x7c, L"F13" }, + { 0x7d, L"F14" }, + { 0x7e, L"F15" }, + { 0x7f, L"F16" }, + { 0x80, L"F17" }, + { 0x81, L"F18" }, + { 0x82, L"F19" }, + { 0x83, L"F20" }, + { 0x84, L"F21" }, + { 0x85, L"F22" }, + { 0x86, L"F23" }, + { 0x87, L"F24" }, + { 0, NULL }, +}; + +ROSDATA VSC_LPWSTR extended_key_names[] = { + { 0x1c, L"Num Enter" }, + { 0x1d, L"Right Ctrl" }, + { 0x35, L"Num /" }, + { 0x37, L"Prnt Scrn" }, + { 0x38, L"Right Alt" }, + { 0x45, L"Num Lock" }, + { 0x46, L"Break" }, + { 0x47, L"Home" }, + { 0x48, L"Up" }, + { 0x49, L"Page Up" }, + { 0x4a, L"Left" }, + { 0x4c, L"Center" }, + { 0x4d, L"Right" }, + { 0x4f, L"End" }, + { 0x50, L"Down" }, + { 0x51, L"Page Down" }, + { 0x52, L"Insert" }, + { 0x53, L"Delete" }, + { 0x54, L"<ReactOS>" }, + { 0x55, L"Help" }, + { 0x56, L"Left Windows" }, + { 0x5b, L"Right Windows" }, + { 0, NULL }, +}; + +/* Finally, the master table */ +ROSDATA KBDTABLES keyboard_layout_table = { + /* modifier assignments */ + &modifier_bits, + + /* character from vk tables */ + vk_to_wchar_master_table, + + /* diacritical marks -- currently implemented by wine code */ + NULL, + + /* Key names */ + (VSC_LPWSTR *)key_names, + (VSC_LPWSTR *)extended_key_names, + NULL, /* Dead key names */ + + /* scan code to virtual key maps */ + scancode_to_vk, + sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]), + extcode0_to_vk, + extcode1_to_vk, + + MAKELONG(1,1), /* Version 1.0 */ + + 0, + 0, + NULL +}; + +PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { + return &keyboard_layout_table; +} + Added: trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpl1/kbdpl1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.def (added) +++ trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.def Tue May 1 13:39:57 2007 @@ -1,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdpl1.dll + +EXPORTS +KbdLayerDescriptor +;EOF Added: trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpl1/kbdpl1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild Tue May 1 13:39:57 2007 @@ -1,0 +1,9 @@ +<module name="kbdpl1" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdpl1.dll" allowwarnings="true"> + <importlibrary definition="kbdpl1.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdpl1.c</file> + <file>kbdpl1.rc</file> +</module> Added: trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpl1/kbdpl1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rc (added) +++ trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rc Tue May 1 13:39:57 2007 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Polish Programmer's Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdpl1\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdpl1.dll\0" +#include <reactos/version.rc> 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 Tue May 1 13:39:57 2007 @@ -59,4 +59,7 @@ <directory name="kbdja"> <xi:include href="kbdja/kbdja.rbuild" /> </directory> + <directory name="kbdpl1"> + <xi:include href="kbdpl1/kbdpl1.rbuild" /> + </directory> </group>

1 0

[dgorbachev] 26608: - Fix infinite loop. - Add debug msg.
by dgorbachev＠svn.reactos.org 01 May '07

01 May '07

Author: dgorbachev Date: Tue May 1 12:52:59 2007 New Revision: 26608 URL: http://svn.reactos.org/svn/reactos?rev=26608&view=rev Log: - Fix infinite loop. - Add debug msg. Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c Tue May 1 12:52:59 2007 @@ -980,7 +980,9 @@ /* Set EIP to the User-mode Dispatcher */ TrapFrame->Eip = (ULONG)KeUserExceptionDispatcher; - _SEH_LEAVE; + + /* Dispatch exception to user-mode */ + return; } _SEH_EXCEPT(KiCopyInformation) { @@ -1000,9 +1002,6 @@ } } _SEH_END; - - /* Dispatch exception to user-mode */ - return; } /* Try second chance */ @@ -1018,6 +1017,7 @@ } /* 3rd strike, kill the process */ + DPRINT1("Kill the process\n"); ZwTerminateProcess(NtCurrentProcess(), ExceptionRecord->ExceptionCode); KeBugCheckEx(KMODE_EXCEPTION_NOT_HANDLED, ExceptionRecord->ExceptionCode,

1 0

[arty] 26607: Properly filter sections that aren't in memory.
by arty＠svn.reactos.org 01 May '07

01 May '07

Author: arty Date: Tue May 1 12:52:58 2007 New Revision: 26607 URL: http://svn.reactos.org/svn/reactos?rev=26607&view=rev Log: Properly filter sections that aren't in memory. Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Tue May 1 12:52:58 2007 @@ -454,6 +454,7 @@ for( i = 0; i < shnum; i++ ) { shdr = ELF_SECTION(i); + shdr->sh_addr = 0; /* Find the PE Header */ if (shdr->sh_type == TYPE_PEHEADER) @@ -534,8 +535,10 @@ relstart = shdr->sh_offset; relsize = shdr->sh_type == SHT_RELA ? 12 : 8; numreloc = shdr->sh_size / relsize; - targetSection = shdr->sh_info; - + targetSection = shdr->sh_info - 1; + + if (!ELF_SECTION(targetSection)->sh_addr) continue; + printf("Found reloc section %d (symbols %d target %d) with %d relocs\n", i, shdr->sh_link, shdr->sh_info, numreloc); @@ -554,8 +557,6 @@ { ULONG S,A,P; - if((j%0x1000)==0) printf("."); - /* Get the reloc */ memcpy(&reloc, RelocSection + (j * relsize), sizeof(reloc)); @@ -609,8 +610,6 @@ MmFreeMemory(SymbolSection); MmFreeMemory(RelocSection); - - printf("\n"); } MmFreeMemory(sptr);

1 0

[arty] 26606: Filter out dbg sections, handle relocs and symbols more efficiently.
by arty＠svn.reactos.org 01 May '07

01 May '07

Author: arty Date: Tue May 1 12:19:01 2007 New Revision: 26606 URL: http://svn.reactos.org/svn/reactos?rev=26606&view=rev Log: Filter out dbg sections, handle relocs and symbols more efficiently. Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c branches/powerpc/reactos/tools/ppc-build/elfpe/header.cpp branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.h Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Tue May 1 12:19:01 2007 @@ -486,20 +486,6 @@ SectionCount = SWAPW(NtHeader->FileHeader.NumberOfSections); printf("Section headers at %x\n", ((PCHAR)Section) - ((PCHAR)KernelAddr)); - - printf("-- Dumping ntoskrnl memory --\n"); - for (i = 0; i < 0x1000; i++) { - if(!(i & 0xf)) { - if(i) printf("\n"); - for (j = 0; j < 8; j++) - printf("%x", (((KernelAddr + i) << (j * 4)) >> 28) & 0xf); - printf(": "); - } - printf("%x%x ", - (*(((PCHAR)KernelMemory)+i)>>4)&0xf, - *(((PCHAR)KernelMemory)+i)&0xf); - } - printf("-- Dump done --\n"); /* Walk each section */ for (i=0; i < SectionCount; i++, Section++) @@ -532,14 +518,13 @@ printf("Total image size is %x\n", ImageSize); /* Handle relocation sections */ - for (Section = COFF_FIRST_SECTION(NtHeader), i = 0; - i < SectionCount; - i++, Section++) { + for (i = 0; i < shnum; i++) { Elf32_Rela reloc = { }; ULONG *Target32; USHORT *Target16; int numreloc, relstart, targetSection; Elf32_Sym symbol; + PCHAR RelocSection, SymbolSection; shdr = ELF_SECTION(i); /* Only relocs here */ @@ -551,25 +536,32 @@ numreloc = shdr->sh_size / relsize; targetSection = shdr->sh_info; - printf("Found reloc section %d (symbols %d target %d)\n", - i, shdr->sh_link, shdr->sh_info); + printf("Found reloc section %d (symbols %d target %d) with %d relocs\n", + i, shdr->sh_link, shdr->sh_info, numreloc); + RelocSection = MmAllocateMemory(shdr->sh_size); + FsSetFilePointer(KernelImage, relstart); + FsReadFile(KernelImage, shdr->sh_size, NULL, RelocSection); + /* Get the symbol section */ shdr = ELF_SECTION(shdr->sh_link); - + + SymbolSection = MmAllocateMemory(shdr->sh_size); + FsSetFilePointer(KernelImage, shdr->sh_offset); + FsReadFile(KernelImage, shdr->sh_size, NULL, SymbolSection); + for(j = 0; j < numreloc; j++) { ULONG S,A,P; + if((j%0x1000)==0) printf("."); /* Get the reloc */ - FsSetFilePointer(KernelImage, relstart + (numreloc * relsize)); - FsReadFile(KernelImage, sizeof(reloc), NULL, &reloc); - + memcpy(&reloc, RelocSection + (j * relsize), sizeof(reloc)); + /* Get the symbol */ - FsSetFilePointer(KernelImage, shdr->sh_offset + ELF32_R_SYM(reloc.r_info) * sizeof(Elf32_Sym)); - FsReadFile(KernelImage, sizeof(symbol), NULL, &symbol); - + memcpy(&symbol, SymbolSection + (ELF32_R_SYM(reloc.r_info) * sizeof(symbol)), sizeof(symbol)); + /* Compute addends */ S = symbol.st_value + KernelAddr + ELF_SECTION(symbol.st_shndx)->sh_addr; A = reloc.r_addend; @@ -586,6 +578,9 @@ case R_PPC_ADDR32: *Target32 = S + A; break; + case R_PPC_REL32: + *Target32 = S + A - P; + break; case R_PPC_UADDR32: /* Special: Treat as RVA */ *Target32 = S + A - KernelAddr; break; @@ -602,11 +597,23 @@ *Target16 = (S + A + 0x8000) >> 16; break; default: - printf("Unknown elf reloc type %x\n", ELF32_R_TYPE(reloc.r_info)); + printf("reloc[%d]: (type %x sym %d val %d) off %x add %x\n", + j, + ELF32_R_TYPE(reloc.r_info), + ELF32_R_SYM(reloc.r_info), + symbol.st_value, + reloc.r_offset, reloc.r_addend); break; } } - } + + MmFreeMemory(SymbolSection); + MmFreeMemory(RelocSection); + + printf("\n"); + } + + MmFreeMemory(sptr); ModuleData = &reactos_modules[LoaderBlock.ModsCount]; ModuleData->ModStart = (ULONG)KernelMemory; Modified: branches/powerpc/reactos/tools/ppc-build/elfpe/header.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/elfpe/header.cpp (original) +++ branches/powerpc/reactos/tools/ppc-build/elfpe/header.cpp Tue May 1 12:19:01 2007 @@ -135,7 +135,8 @@ for(int i = 0; i < eof->getNumSections(); i++) { { const ElfObjectFile::Section &sect = eof->getSection(i); - if(sect.getType() == SHT_PROGBITS) { + if((sect.getType() == SHT_PROGBITS) && + (sect.getFlags() & SHF_ALLOC)) { limit = roundup(start + sect.logicalSize(), sectionalign); fprintf(stderr, "rva[%02d:%s] = (%x %x %d)\n", rvas.size(), sect.getName().c_str(), &sect, start, i); Modified: branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.h (original) +++ branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.h Tue May 1 12:19:01 2007 @@ -52,6 +52,10 @@ int getInfo() const { return e32shdr->sh_info; + } + + int getFlags() const { + return e32shdr->sh_flags; } int logicalSize() const {

1 0

[arty] 26605: Don't replace linker name on that pass.
by arty＠svn.reactos.org 01 May '07

01 May '07

Author: arty Date: Tue May 1 11:25:44 2007 New Revision: 26605 URL: http://svn.reactos.org/svn/reactos?rev=26605&view=rev Log: Don't replace linker name on that pass. Modified: branches/powerpc/reactos/tools/ppc-build/elfpe/compdvr.cpp Modified: branches/powerpc/reactos/tools/ppc-build/elfpe/compdvr.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/elfpe/compdvr.cpp (original) +++ branches/powerpc/reactos/tools/ppc-build/elfpe/compdvr.cpp Tue May 1 11:25:44 2007 @@ -309,7 +309,6 @@ if( subcmd_args[0].find("collect2") != std::string::npos || subcmd_args[0].find("ld") != std::string::npos ) { - subcmd_args[0] = linker_name; if( status = run_ld( verbose, nostdlib, nostartfiles, is_dll, make_map, mingw_lib_dir, ldscript, subcmd_args ) )

1 0

[arty] 26604: Final commits for elf conversion.
by arty＠svn.reactos.org 01 May '07

01 May '07

Author: arty Date: Tue May 1 11:20:45 2007 New Revision: 26604 URL: http://svn.reactos.org/svn/reactos?rev=26604&view=rev Log: Final commits for elf conversion. Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep_vga.c branches/powerpc/reactos/tools/ppc-build/elfpe/compdvr.cpp branches/powerpc/reactos/tools/ppc-build/elfpe/header.cpp branches/powerpc/reactos/tools/ppc-build/elfpe/header.h branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.cpp branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.h branches/powerpc/reactos/tools/ppc-build/elfpe/pedef.h branches/powerpc/reactos/tools/ppc-build/elfpe/util.cpp branches/powerpc/reactos/tools/ppc-build/elfpe/util.h Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Tue May 1 11:20:45 2007 @@ -398,6 +398,9 @@ * MemLoadAddr -- Freeldr address of module * KernelAddr -- Kernel address of module *--*/ +#define ELF_SECTION(n) ((Elf32_Shdr*)(sptr + (n * shsize))) +#define COFF_FIRST_SECTION(h) ((PIMAGE_SECTION_HEADER) ((DWORD)h+FIELD_OFFSET(IMAGE_NT_HEADERS,OptionalHeader)+(SWAPW(((PIMAGE_NT_HEADERS)(h))->FileHeader.SizeOfOptionalHeader)))) + BOOLEAN NTAPI FrLdrMapModule(FILE *KernelImage, PCHAR ImageName, PCHAR MemLoadAddr, ULONG KernelAddr) @@ -410,7 +413,6 @@ INT i, j; PLOADER_MODULE ModuleData; int phsize, phnum, shsize, shnum, relsize, SectionAddr = 0; - PULONG SectionOffsets; PCHAR sptr; Elf32_Ehdr ehdr; Elf32_Shdr *shdr; @@ -441,7 +443,6 @@ shsize = ehdr.e_shentsize; shnum = ehdr.e_shnum; sptr = (PCHAR)MmAllocateMemory(shnum * shsize); - SectionOffsets = (PULONG)MmAllocateMemory(shnum * sizeof(ULONG)); /* Read section headers */ FsSetFilePointer(KernelImage, ehdr.e_shoff); @@ -452,8 +453,8 @@ /* Now we'll get the PE Header */ for( i = 0; i < shnum; i++ ) { - shdr = (Elf32_Shdr*)(sptr + (i * shsize)); - printf("Header %d: type %d flags %x\n", i, shdr->sh_type, shdr->sh_flags); + shdr = ELF_SECTION(i); + /* Find the PE Header */ if (shdr->sh_type == TYPE_PEHEADER) { @@ -462,7 +463,6 @@ ImageHeader = (PIMAGE_DOS_HEADER)KernelMemory; NtHeader = (PIMAGE_NT_HEADERS)((PCHAR)KernelMemory + SWAPD(ImageHeader->e_lfanew)); printf("NtHeader at %x\n", SWAPD(ImageHeader->e_lfanew)); - SectionOffsets[i] = 0; printf("SectionAlignment %x\n", SWAPD(NtHeader->OptionalHeader.SectionAlignment)); SectionAddr = ROUND_UP @@ -478,38 +478,46 @@ return 0; } - /* Save the Image Size */ + /* Save the Image Base */ NtHeader->OptionalHeader.ImageBase = SWAPD(KernelAddr); /* Load the file image */ - Section = IMAGE_FIRST_SECTION(NtHeader); - SectionCount = NtHeader->FileHeader.NumberOfSections - 1; + Section = COFF_FIRST_SECTION(NtHeader); + SectionCount = SWAPW(NtHeader->FileHeader.NumberOfSections); + + printf("Section headers at %x\n", ((PCHAR)Section) - ((PCHAR)KernelAddr)); + + printf("-- Dumping ntoskrnl memory --\n"); + for (i = 0; i < 0x1000; i++) { + if(!(i & 0xf)) { + if(i) printf("\n"); + for (j = 0; j < 8; j++) + printf("%x", (((KernelAddr + i) << (j * 4)) >> 28) & 0xf); + printf(": "); + } + printf("%x%x ", + (*(((PCHAR)KernelMemory)+i)>>4)&0xf, + *(((PCHAR)KernelMemory)+i)&0xf); + } + printf("-- Dump done --\n"); /* Walk each section */ for (i=0; i < SectionCount; i++, Section++) { - shdr = (Elf32_Shdr*)(sptr + (i * shsize)); - if ((shdr->sh_type != SHT_PROGBITS) && - (shdr->sh_type != SHT_NOBITS)) continue; - - SectionOffsets[i] = SectionAddr; + printf("Section %d (NT Header) is elf section %d\n", + i, SWAPD(Section->PointerToRawData)); + shdr = ELF_SECTION(SWAPD(Section->PointerToRawData)); + + shdr->sh_addr = SectionAddr = SWAPD(Section->VirtualAddress); - shdr = (Elf32_Shdr*)(sptr + (i * shsize)); - - /* Get the disk location and the memory location, and the size */ - Section->Misc.VirtualSize = SWAPD(shdr->sh_size); - Section->VirtualAddress = SWAPD(SectionAddr); - Section->SizeOfRawData = SWAPD(shdr->sh_size); - Section->PointerToRawData = SWAPD(shdr->sh_offset); - - if (shdr->sh_type == SHT_PROGBITS) + if (shdr->sh_type != SHT_NOBITS) { /* Content area */ printf("Loading section %d at %x\n", i, KernelAddr + SectionAddr); FsSetFilePointer(KernelImage, shdr->sh_offset); FsReadFile(KernelImage, shdr->sh_size, NULL, KernelMemory + SectionAddr); } - else if (shdr->sh_type == SHT_NOBITS) + else { /* Zero it out */ printf("BSS section %d at %x\n", i, KernelAddr + SectionAddr); @@ -517,18 +525,14 @@ ROUND_UP(shdr->sh_size, SWAPD(NtHeader->OptionalHeader.SectionAlignment))); } - - SectionAddr += - ROUND_UP - (shdr->sh_size, SWAPD(NtHeader->OptionalHeader.SectionAlignment)); - } - - ImageSize = SectionAddr; - NtHeader->OptionalHeader.SizeOfImage = SWAPD(ImageSize); + } + + ImageSize = SWAPD(NtHeader->OptionalHeader.SizeOfImage); + KernelEntry = SWAPD(NtHeader->OptionalHeader.AddressOfEntryPoint); printf("Total image size is %x\n", ImageSize); /* Handle relocation sections */ - for (Section = IMAGE_FIRST_SECTION(NtHeader), i = 0; + for (Section = COFF_FIRST_SECTION(NtHeader), i = 0; i < SectionCount; i++, Section++) { Elf32_Rela reloc = { }; @@ -537,7 +541,7 @@ int numreloc, relstart, targetSection; Elf32_Sym symbol; - shdr = (Elf32_Shdr*)(sptr + (i * shsize)); + shdr = ELF_SECTION(i); /* Only relocs here */ if((shdr->sh_type != SHT_REL) && (shdr->sh_type != SHT_RELA)) continue; @@ -551,12 +555,13 @@ i, shdr->sh_link, shdr->sh_info); /* Get the symbol section */ - shdr = (Elf32_Shdr*)(sptr + (shdr->sh_link * shsize)); + shdr = ELF_SECTION(shdr->sh_link); for(j = 0; j < numreloc; j++) { ULONG S,A,P; + /* Get the reloc */ FsSetFilePointer(KernelImage, relstart + (numreloc * relsize)); FsReadFile(KernelImage, sizeof(reloc), NULL, &reloc); @@ -566,12 +571,12 @@ FsReadFile(KernelImage, sizeof(symbol), NULL, &symbol); /* Compute addends */ - S = symbol.st_value + KernelAddr + SectionOffsets[symbol.st_shndx]; + S = symbol.st_value + KernelAddr + ELF_SECTION(symbol.st_shndx)->sh_addr; A = reloc.r_addend; - P = reloc.r_offset + KernelAddr + SectionOffsets[targetSection]; + P = reloc.r_offset + KernelAddr + ELF_SECTION(targetSection)->sh_addr; Target32 = - (ULONG*)(((PCHAR)KernelMemory) + SectionOffsets[targetSection]); + (ULONG*)(((PCHAR)KernelMemory) + ELF_SECTION(targetSection)->sh_addr); Target16 = (USHORT *)Target32; switch (ELF32_R_TYPE(reloc.r_info)) @@ -603,22 +608,6 @@ } } -#if 0 - printf("-- Dumping ntoskrnl memory --\n"); - for (i = 0; i < ImageSize; i++) { - if(!(i & 0xf)) { - if(i) printf("\n"); - for (j = 0; j < 8; j++) - printf("%x", (((KernelAddr + i) << (j * 4)) >> 28) & 0xf); - printf(": "); - } - printf("%x%x ", - (*(((PCHAR)KernelMemory)+i)>>4)&0xf, - *(((PCHAR)KernelMemory)+i)&0xf); - } - printf("-- Dump done --\n"); -#endif - ModuleData = &reactos_modules[LoaderBlock.ModsCount]; ModuleData->ModStart = (ULONG)KernelMemory; /* Increase the next Load Base */ Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep_vga.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep_vga.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep_vga.c Tue May 1 11:20:45 2007 @@ -1,5 +1,8 @@ #include <freeldr.h> #include "prep.h" +#include "ppcboot.h" + +extern boot_infos_t BootInfo; struct _vga_desc { char *port; @@ -20,6 +23,7 @@ print_bar( &bar_data ); if( (bar_data.data > 0x10000) || ((bar_data.data&1) == 1) ) { vga_desc->addr = (char *)(0xc0000000 + (bar_data.data & ~0x7ff)); + BootInfo.dispDeviceBase = vga_desc->addr; break; } } Modified: branches/powerpc/reactos/tools/ppc-build/elfpe/compdvr.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/elfpe/compdvr.cpp (original) +++ branches/powerpc/reactos/tools/ppc-build/elfpe/compdvr.cpp Tue May 1 11:20:45 2007 @@ -127,11 +127,12 @@ bool use_libgcc = false; std::vector<std::string> args = arg_vect; std::string real_output, - entry_point = "0x1000", + entry_point = "_main", image_base = "0x400000", subsystem = "windows", make_dll, file_align = "0x1000", section_align = "0x1000", base_file; + const ElfObjectFile::Symbol *entry_sym; std::vector<std::string>::iterator i = std::find(args.begin(),args.end(),"-lgcc"); @@ -163,8 +164,6 @@ args.insert(args.begin()+1,"-T"); args.insert(args.begin()+2,ldscript); args.insert(args.begin()+1,"-r"); - args.insert(args.begin()+1,"--start-group"); - args.push_back("--end-group"); for( size_t i = 0; i < args.size(); i++ ) { if( args[i] == "-o" && i < args.size()-1 ) { @@ -201,16 +200,19 @@ if(!eof) return 1; + entry_sym = eof.getNamedSymbol(entry_point); + ElfPeHeader header (strtoul(image_base.c_str(), 0, 0), strtoul(section_align.c_str(), 0, 0), strtoul(file_align.c_str(), 0, 0), + entry_sym, 0x10000, 0x100000, 0x10000, 0x100000, + atoi(subsystem.c_str()), is_dll, - atoi(subsystem.c_str()), &eof); eof.addSection(".peheader", header.getData(), TYPE_PEHEADER); @@ -307,7 +309,9 @@ if( subcmd_args[0].find("collect2") != std::string::npos || subcmd_args[0].find("ld") != std::string::npos ) { - if( run_ld( verbose, nostdlib, nostartfiles, is_dll, make_map, + subcmd_args[0] = linker_name; + if( status = + run_ld( verbose, nostdlib, nostartfiles, is_dll, make_map, mingw_lib_dir, ldscript, subcmd_args ) ) goto final; else @@ -317,7 +321,7 @@ if( verbose ) subcmd_args.insert(subcmd_args.begin()+1,"-v"); - if( execute_command + if( status = execute_command ( verbose, subcmd_args ) ) goto final; } else if( verbose ) @@ -326,7 +330,6 @@ goto theend; final: - status = 1; theend: if( verbose ) { fprintf( stderr, "<status>%d</status>\n", status ); Modified: branches/powerpc/reactos/tools/ppc-build/elfpe/header.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/elfpe/header.cpp (original) +++ branches/powerpc/reactos/tools/ppc-build/elfpe/header.cpp Tue May 1 11:20:45 2007 @@ -6,6 +6,7 @@ (uint32_t imagebase, uint32_t filealign, uint32_t sectionalign, + const ElfObjectFile::Symbol *entry, uint32_t stackreserve, uint32_t stackcommit, uint32_t heapreserve, @@ -20,6 +21,7 @@ heapreserve(heapreserve), heapcommit(heapcommit), subsysid(subsysid), + entry(entry), eof(eof) { data.resize(computeSize()); @@ -33,6 +35,9 @@ void ElfPeHeader::createHeaderSection() { + std::vector<section_mapping_t> sectionRvaSet; + uint32_t imageSize = getSectionRvas(sectionRvaSet); + data[0] = 'M'; data[1] = 'Z'; uint8_t *dataptr = &data[0x3c]; uint32_t coffHeaderSize, optHeaderSizeMember; @@ -40,7 +45,7 @@ dataptr = &data[0x80]; le32write_postinc(dataptr, 0x4550); le16write_postinc(dataptr, getPeArch()); - le16write_postinc(dataptr, getNumSections()); + le16write_postinc(dataptr, sectionRvaSet.size()); le32write_postinc(dataptr, time(NULL)); le32write_postinc(dataptr, 0); le32write_postinc(dataptr, 0); @@ -53,7 +58,7 @@ le32write_postinc(dataptr, 0); le32write_postinc(dataptr, 0); le32write_postinc(dataptr, 0); - le32write_postinc(dataptr, getEntryPoint()); + le32write_postinc(dataptr, getEntryPoint(sectionRvaSet, entry)); le32write_postinc(dataptr, 0); le32write_postinc(dataptr, 0); le32write_postinc(dataptr, imagebase); @@ -66,7 +71,7 @@ le16write_postinc(dataptr, 4); le16write_postinc(dataptr, 0); le32write_postinc(dataptr, 0); - le32write_postinc(dataptr, getImageSize()); + le32write_postinc(dataptr, imageSize); le32write_postinc(dataptr, computeSize()); le32write_postinc(dataptr, 0); // No checksum yet le16write_postinc(dataptr, subsysid); @@ -92,18 +97,50 @@ le16write (&data[0] + optHeaderSizeMember, (dataptr - &data[0]) - coffHeaderSize); + // Here, we store references to the sections, filling in the RVA and + // size, but leaving out the other info. We write the section name + // truncated into the name field and leave the section id in the + // physical address bit + for (int i = 0; i < sectionRvaSet.size(); i++) + { + section_mapping_t mapping = sectionRvaSet[i]; + const ElfObjectFile::Section *section = mapping.section; + std::string name = section->getName(); + uint32_t size = section->logicalSize(); + uint32_t rva = mapping.rva; + for (int j = 0; j < 8; j++) + { + *dataptr++ = j < name.size() ? name[j] : '\000'; + } + le32write_postinc(dataptr, size); + le32write_postinc(dataptr, rva); + le32write_postinc(dataptr, size); + // Note: we put the index in the offset slot so we can find the + // real offset later in the loader + le32write_postinc(dataptr, sectionRvaSet[i].index); + le32write_postinc(dataptr, 0); + le32write_postinc(dataptr, 0); + le32write_postinc(dataptr, 0); + // XXX Figure out the real flags + le32write_postinc(dataptr, IMAGE_SCN_CNT_CODE); + } } const std::vector<uint8_t> &ElfPeHeader::getData() const { return data; } -uint32_t ElfPeHeader::getImageSize() const -{ - uint32_t start = 0; - uint32_t limit = 0; +uint32_t ElfPeHeader::getSectionRvas(std::vector<section_mapping_t> &rvas) const +{ + uint32_t start = computeSize(); + uint32_t limit = start; for(int i = 0; i < eof->getNumSections(); i++) { { const ElfObjectFile::Section &sect = eof->getSection(i); - limit = roundup(start + sect.logicalSize(), sectionalign); + if(sect.getType() == SHT_PROGBITS) { + limit = roundup(start + sect.logicalSize(), sectionalign); + fprintf(stderr, "rva[%02d:%s] = (%x %x %d)\n", + rvas.size(), sect.getName().c_str(), &sect, start, i); + rvas.push_back(section_mapping_t(&sect, start, i)); + } } start = limit; } @@ -174,3 +211,15 @@ { return std::make_pair(0,0); } + +uint32_t ElfPeHeader::getEntryPoint +(const std::vector<ElfPeHeader::section_mapping_t> &secmap, + const ElfObjectFile::Symbol *entry) const +{ + if(entry == NULL) return computeSize(); + for(int i = 0; i < secmap.size(); i++) { + if(secmap[i].index == entry->section) + return secmap[i].rva + entry->offset; + } + return computeSize(); +} Modified: branches/powerpc/reactos/tools/ppc-build/elfpe/header.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/elfpe/header.h (original) +++ branches/powerpc/reactos/tools/ppc-build/elfpe/header.h Tue May 1 11:20:45 2007 @@ -13,6 +13,7 @@ (uint32_t imagebase, uint32_t imagealign, uint32_t filealign, + const ElfObjectFile::Symbol *entry, uint32_t stackreserve, uint32_t stackcommit, uint32_t heapreserve, @@ -23,8 +24,21 @@ const ElfObjectFile::secdata_t &getData() const; private: + typedef struct section_mapping_t { + const ElfObjectFile::Section *section; + uint32_t rva; + int index; + + section_mapping_t + (const ElfObjectFile::Section *sect, uint32_t rva, int index) : + section(sect), rva(rva), index(index) { } + section_mapping_t(const section_mapping_t &other) : + section(other.section), rva(other.rva), index(other.index) { } + } section_mapping_t; + void createHeaderSection(); - int getNumSections() const { return eof->getNumSections(); } + uint32_t getSectionRvas(std::vector<section_mapping_t> &rvas) const; + uint32_t getEntryPoint(const std::vector<section_mapping_t> &rvas, const ElfObjectFile::Symbol *entry) const; int computeSize() const; int getExeFlags() const { return 0; } int getDllFlags() const { return dll ? IMAGE_FILE_DLL : 0; } @@ -38,8 +52,6 @@ u32pair_t getDescrInfo() const; u32pair_t getMachInfo() const; u32pair_t getTlsInfo() const; - uint32_t getEntryPoint() const { return eof->getEntryPoint(); } - uint32_t getImageSize() const; uint16_t getPeArch() const; uint32_t saToRva(int section, uint32_t offset) const; uint32_t vaToRva(uint32_t source_addr) const; @@ -50,6 +62,7 @@ heapreserve, heapcommit; bool dll; int subsysid; + const ElfObjectFile::Symbol *entry; ElfObjectFile *eof; std::vector<uint8_t> data; static const char *mzHeader; Modified: branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.cpp (original) +++ branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.cpp Tue May 1 11:20:45 2007 @@ -1,11 +1,13 @@ #include <libelf/libelf.h> #include <fcntl.h> +#include "util.h" #include "objectfile.h" ElfObjectFile::ElfObjectFile(const std::string &filename) : fd(-1) { Elf_Scn *s = 0; Elf32_Ehdr *ehdr; + Section *sect; fd = open(filename.c_str(), O_RDWR, 0); if(fd >= 0) { if(elf_version(EV_CURRENT) == EV_NONE) { @@ -21,13 +23,17 @@ shnum = ehdr->e_shnum; phnum = ehdr->e_phnum; shstrndx = ehdr->e_shstrndx; + /* Populate section table */ for(size_t i = 0; i < shnum; i++) { s = elf_nextscn(elfHeader, s); if(!s) break; - sections.push_back(new Section(*this, s)); - fprintf(stderr, "Got section %04d %s\n", i, sections[i]->getName().c_str()); + sect = new Section(*this, s); + sections.push_back(sect); + sections_by_name.insert(std::make_pair(sect->getName(), sect)); } + + populateSymbolTable(); } } @@ -35,6 +41,32 @@ { if(elfHeader) elf_end(elfHeader); if(fd >= 0) close(fd); +} + +void ElfObjectFile::populateSymbolTable() +{ + int i = 0, j; + int type, link, flags, section; + uint32_t offset; + std::string name; + uint8_t *data, *symptr; + Elf32_Sym *sym; + Symbol *ourSym; + + for( i = 0; i < getNumSections(); i++ ) { + type = getSection(i).getType(); + link = getSection(i).getLink(); + if( (type == SHT_SYMTAB) || (type == SHT_DYNSYM) ) { + /* Read a symbol */ + sym = (Elf32_Sym*)getSection(i).getSectionData(); + for (j = 0; j < getSection(i).logicalSize() / sizeof(Elf32_Sym); j++) { + name = elf_strptr(elfHeader, link, sym[j].st_name); + ourSym = new Symbol(name, sym[j].st_value, sym[j].st_shndx, sym[j].st_info); + symbols.push_back(ourSym); + symbols_by_name.insert(std::make_pair(name, ourSym)); + } + } + } } uint32_t ElfObjectFile::getEntryPoint() const @@ -66,7 +98,7 @@ /* Finish the section */ shdr->sh_name = newstrdata->d_off; shdr->sh_type = type; - shdr->sh_flags = 0; + shdr->sh_flags = SHF_ALLOC; shdr->sh_addr = 0; shdr->sh_link = 0; shdr->sh_info = 0; @@ -76,8 +108,18 @@ const ElfObjectFile::Section *ElfObjectFile::getNamedSection(const std::string &name) const { - for(size_t i = 0; i < sections.size(); i++) { - if(sections[i]->getName() == name) return sections[i]; - } - return NULL; + std::map<std::string, const ElfObjectFile::Section *>::const_iterator i = + sections_by_name.find(name); + if(i != sections_by_name.end()) + return i->second; + else return NULL; } + +const ElfObjectFile::Symbol *ElfObjectFile::getNamedSymbol(const std::string &name) const +{ + std::map<std::string, const ElfObjectFile::Symbol *>::const_iterator i = + symbols_by_name.find(name); + if(i != symbols_by_name.end()) + return i->second; + else return NULL; +} Modified: branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.h (original) +++ branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.h Tue May 1 11:20:45 2007 @@ -3,41 +3,83 @@ #include <string> #include <vector> +#include <map> #include <libelf/libelf.h> class ElfObjectFile { public: typedef std::vector<uint8_t> secdata_t; + class Symbol { + public: + Symbol(const std::string &name, uint32_t offset, + int section, int flags) : + name(name), offset(offset), section(section), flags(flags) { } + std::string name; + uint32_t offset; + int section; + int flags; + }; + class Section { public: Section(const Section &other) : - obj(other.obj), section(other.section) { } + obj(other.obj), section(other.section), have_data(false) { + e32shdr = elf32_getshdr(section); + } Section(ElfObjectFile &obj, Elf_Scn *sechdr) : - obj(&obj), section(sechdr) { } + obj(&obj), section(sechdr), have_data(false) { + e32shdr = elf32_getshdr(section); + } Section &operator = (const Section &other) { obj = other.obj; + have_data = false; section = other.section; + e32shdr = other.e32shdr; } operator bool () { return !!section; } std::string getName() const { - Elf32_Shdr *e32shdr = elf32_getshdr(section); return obj->getString(e32shdr->sh_name); } + int getType() const { + return e32shdr->sh_type; + } + + int getLink() const { + return e32shdr->sh_link; + } + + int getInfo() const { + return e32shdr->sh_info; + } + int logicalSize() const { - Elf32_Shdr *e32shdr = elf32_getshdr(section); return e32shdr->sh_size; } uint32_t getStartRva() const { - Elf32_Shdr *e32shdr = elf32_getshdr(section); return e32shdr->sh_addr; + } + + uint32_t getFileOffset() const { + return e32shdr->sh_offset; + } + + uint8_t *getSectionData() const { + if(!have_data) { + data = *elf_getdata(section, NULL); + have_data = true; + } + return (uint8_t *)data.d_buf; } private: const ElfObjectFile *obj; Elf_Scn *section; + Elf32_Shdr *e32shdr; + mutable bool have_data; + mutable Elf_Data data; }; ElfObjectFile(const std::string &filename); @@ -54,6 +96,8 @@ (const std::string &name, const secdata_t &data, int type = SHT_PROGBITS); const Section &getSection(int sect) const { return *sections[sect]; } const Section *getNamedSection(const std::string &name) const; + const Symbol &getSymbol(int n) const { return *symbols[n]; } + const Symbol *getNamedSymbol(const std::string &symname) const; private: int fd; @@ -61,6 +105,11 @@ int shstrndx; Elf *elfHeader; std::vector<Section*> sections; + std::map<std::string, const Section *> sections_by_name; + std::vector<Symbol*> symbols; + std::map<std::string, const Symbol *> symbols_by_name; + + void populateSymbolTable(); }; #endif//COMPDVR_ELFOBJECT_H Modified: branches/powerpc/reactos/tools/ppc-build/elfpe/pedef.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/elfpe/pedef.h (original) +++ branches/powerpc/reactos/tools/ppc-build/elfpe/pedef.h Tue May 1 11:20:45 2007 @@ -29,4 +29,16 @@ #define IMAGE_FILE_UP_SYSTEM_ONLY 0x4000 #define IMAGE_FILE_BYTES_REVERSED_HI 0x8000 +#define IMAGE_SCN_CNT_CODE 0x00000020 +#define IMAGE_SCN_CNT_INITIALIZED_DATA 0x00000040 +#define IMAGE_SCN_CNT_UNINITIALIZED_DATA 0x00000080 + +#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000 +#define IMAGE_SCN_MEM_NOT_CACHED 0x04000000 +#define IMAGE_SCN_MEM_NOT_PAGED 0x08000000 +#define IMAGE_SCN_MEM_SHARED 0x10000000 +#define IMAGE_SCN_MEM_EXECUTE 0x20000000 +#define IMAGE_SCN_MEM_READ 0x40000000 +#define IMAGE_SCN_MEM_WRITE 0x80000000 + #endif//COMPDVR_PEDEF_H Modified: branches/powerpc/reactos/tools/ppc-build/elfpe/util.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/elfpe/util.cpp (original) +++ branches/powerpc/reactos/tools/ppc-build/elfpe/util.cpp Tue May 1 11:20:45 2007 @@ -33,3 +33,27 @@ le32write_postinc(dataptr, value.first); le32write_postinc(dataptr, value.second); } + +uint16_t be16read(uint8_t *dataptr) +{ + return dataptr[0] << 8 | dataptr[1]; +} + +uint16_t be16read_postinc(uint8_t *&dataptr) +{ + uint16_t res = be16read(dataptr); + dataptr += 2; + return res; +} + +uint32_t be32read(uint8_t *dataptr) +{ + return be16read(dataptr) << 16 | be16read(dataptr+2); +} + +uint32_t be32read_postinc(uint8_t *&dataptr) +{ + uint32_t res = be32read(dataptr); + dataptr += 4; + return res; +} Modified: branches/powerpc/reactos/tools/ppc-build/elfpe/util.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/elfpe/util.h (original) +++ branches/powerpc/reactos/tools/ppc-build/elfpe/util.h Tue May 1 11:20:45 2007 @@ -12,6 +12,10 @@ uint16_t le16read_postinc(uint8_t *&dataptr); uint32_t le32read(uint8_t *dataptr); uint32_t le32read_postinc(uint8_t *&dataptr); +uint16_t be16read(uint8_t *dataptr); +uint16_t be16read_postinc(uint8_t *&dataptr); +uint32_t be32read(uint8_t *dataptr); +uint32_t be32read_postinc(uint8_t *&dataptr); typedef std::pair<uint32_t, uint32_t> u32pair_t; void le32pwrite_postinc(uint8_t *&dataptr, const u32pair_t &pair); void le32pwrite(uint8_t *dataptr, const u32pair_t &pair);

1 0

[gedmurphy] 26603: add hh to the build
by gedmurphy＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: gedmurphy Date: Tue May 1 02:41:09 2007 New Revision: 26603 URL: http://svn.reactos.org/svn/reactos?rev=26603&view=rev Log: add hh to the build Modified: trunk/reactos/base/applications/applications.rbuild Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applicat… ============================================================================== --- trunk/reactos/base/applications/applications.rbuild (original) +++ trunk/reactos/base/applications/applications.rbuild Tue May 1 02:41:09 2007 @@ -18,6 +18,9 @@ </directory> <directory name="games"> <xi:include href="games/games.rbuild" /> +</directory> +<directory name="hh"> + <xi:include href="hh/hh.rbuild" /> </directory> <directory name="hostname"> <xi:include href="hostname/hostname.rbuild" />

1 0

[gedmurphy] 26602: a couple of small fixes to the marlett font
by gedmurphy＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: gedmurphy Date: Tue May 1 02:39:32 2007 New Revision: 26602 URL: http://svn.reactos.org/svn/reactos?rev=26602&view=rev Log: a couple of small fixes to the marlett font Modified: trunk/reactos/media/fonts/Marlett.ttf Modified: trunk/reactos/media/fonts/Marlett.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/Marlett.ttf?re… ============================================================================== Binary files - no diff available.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs