Ros-diffs June 2007

ros-diffs@reactos.org

21 participants
420 discussions

[dgorbachev] 26943: Burmese keyboard layout (2/2)
by dgorbachev＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: dgorbachev Date: Wed May 30 16:21:10 2007 New Revision: 26943 URL: http://svn.reactos.org/svn/reactos?rev=26943&view=rev Log: Burmese keyboard layout (2/2) 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 Wed May 30 16:21:10 2007 @@ -82,6 +82,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041e","Layout Text",0x00000000,"Thai" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000422","Layout File",0x00000000,"kbdur.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000422","Layout Text",0x00000000,"Ukrainian" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000455","Layout File",0x00000000,"kbdbur.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000455","Layout Text",0x00000000,"Burmese" ; Network HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Network Adapters" 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 Wed May 30 16:21:10 2007 @@ -118,6 +118,7 @@ dll\directx\devenum\devenum.dll 1 dll\keyboard\kbdbe\kbdbe.dll 1 +dll\keyboard\kbdbur\kbdbur.dll 1 dll\keyboard\kbdda\kbdda.dll 1 dll\keyboard\kbddv\kbddv.dll 1 dll\keyboard\kbdes\kbdes.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 Wed May 30 16:21:10 2007 @@ -94,6 +94,7 @@ [KeyboardLayout] 00000813 = "Belgian (point)" +00000455 = "Burmese" 00000406 = "Danish (Denmark)" 00000809 = "English (United Kingdom)" 00000409 = "English (USA)" @@ -118,6 +119,7 @@ [Files.KeyboardLayout] 00000813 = kbdbe.dll +00000455 = kbdbur.dll 00000406 = kbdda.dll 00010409 = kbddv.dll 0000040A = kbdes.dll

1 0

[dgorbachev] 26942: Burmese keyboard layout (1/2)
by dgorbachev＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: dgorbachev Date: Wed May 30 16:20:44 2007 New Revision: 26942 URL: http://svn.reactos.org/svn/reactos?rev=26942&view=rev Log: Burmese keyboard layout (1/2) Added: trunk/reactos/dll/keyboard/kbdbur/ trunk/reactos/dll/keyboard/kbdbur/kbdbur.c trunk/reactos/dll/keyboard/kbdbur/kbdbur.def trunk/reactos/dll/keyboard/kbdbur/kbdbur.rbuild trunk/reactos/dll/keyboard/kbdbur/kbdbur.rc Modified: trunk/reactos/dll/keyboard/keyboard.rbuild Added: trunk/reactos/dll/keyboard/kbdbur/kbdbur.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbur/kbdbur… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbur/kbdbur.c (added) +++ trunk/reactos/dll/keyboard/kbdbur/kbdbur.c Wed May 30 16:20:44 2007 @@ -1,0 +1,387 @@ +/* + * ReactOS Burmese keyboard layout + * Copyright (C) 2007 ReactOS + * License: LGPL, see: LGPL.txt + * + */ + +#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_OEM_102, VK_F11, VK_F12, + /* - 59 - */ + VK_CLEAR, VK_OEM_WSCTRL, VK_OEM_FINISH, VK_OEM_JUMP, VK_EREOF, /* EREOF */ + VK_OEM_BACKTAB, VK_OEM_AUTO, VK_EMPTY, VK_ZOOM, /* ZOOM */ + VK_HELP, + /* - 64 - */ + /* Even more F-Keys (for example, NCR keyboards from the early 90's) */ + VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20, + VK_F21, VK_F22, VK_F23, + /* - 6f - */ + /* Not sure who uses these codes */ + VK_OEM_PA3, VK_EMPTY, VK_OEM_RESET, + /* - 72 - */ + VK_EMPTY, 0xc1, VK_EMPTY, VK_EMPTY, + /* - 76 - */ + /* One more f-key */ + VK_F24, + /* - 77 - */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */ + 0, + /* - 80 - */ + 0 +}; + +ROSDATA VSC_VK extcode0_to_vk[] = { + { 0x10, VK_MEDIA_PREV_TRACK | KEXT }, + { 0x19, VK_MEDIA_NEXT_TRACK | KEXT }, + { 0x1D, VK_RCONTROL | KEXT }, + { 0x20, VK_VOLUME_MUTE | KEXT }, + { 0x21, VK_LAUNCH_APP2 | KEXT }, + { 0x22, VK_MEDIA_PLAY_PAUSE | KEXT }, + { 0x24, VK_MEDIA_STOP | KEXT }, + { 0x2E, VK_VOLUME_DOWN | KEXT }, + { 0x30, VK_VOLUME_UP | KEXT }, + { 0x32, VK_BROWSER_HOME | KEXT }, + { 0x35, VK_DIVIDE | KEXT }, + { 0x37, VK_SNAPSHOT | KEXT }, + { 0x38, VK_RMENU | KEXT }, + { 0x47, VK_HOME | KEXT }, + { 0x48, VK_UP | KEXT }, + { 0x49, VK_PRIOR | KEXT }, + { 0x4B, VK_LEFT | KEXT }, + { 0x4D, VK_RIGHT | KEXT }, + { 0x4F, VK_END | KEXT }, + { 0x50, VK_DOWN | KEXT }, + { 0x51, VK_NEXT | KEXT }, + { 0x52, VK_INSERT | KEXT }, + { 0x53, VK_DELETE | KEXT }, + { 0x5B, VK_LWIN | KEXT }, + { 0x5C, VK_RWIN | KEXT }, + { 0x5D, VK_APPS | KEXT }, + { 0x5F, VK_SLEEP | KEXT }, + { 0x65, VK_BROWSER_SEARCH | KEXT }, + { 0x66, VK_BROWSER_FAVORITES | KEXT }, + { 0x67, VK_BROWSER_REFRESH | KEXT }, + { 0x68, VK_BROWSER_STOP | KEXT }, + { 0x69, VK_BROWSER_FORWARD | KEXT }, + { 0x6A, VK_BROWSER_BACK | KEXT }, + { 0x6B, VK_LAUNCH_APP1 | KEXT }, + { 0x6C, VK_LAUNCH_MAIL | KEXT }, + { 0x6D, VK_LAUNCH_MEDIA_SELECT | KEXT }, + { 0x1C, VK_RETURN | KEXT }, + { 0x46, VK_CANCEL | KEXT }, + { 0, 0 }, +}; + +ROSDATA VSC_VK extcode1_to_vk[] = { + { 0x1d, VK_PAUSE}, + { 0, 0 }, +}; + +ROSDATA VK_TO_BIT modifier_keys[] = { + { VK_SHIFT, KSHIFT }, + { VK_CONTROL, KCTRL }, + { VK_MENU, KALT }, + { 0, 0 } +}; + +ROSDATA MODIFIERS modifier_bits = { + modifier_keys, + 7, + { 0, 1, 2, SHFT_INVALID, SHFT_INVALID, SHFT_INVALID, 3, 4 } +}; + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + { '5', 0, {0x1045, '%' } }, + { '7', 0, {0x1047, 0x101b} }, + { VK_TAB, 0, {'\t' , '\t' } }, + { VK_ADD, 0, {'+' , '+' } }, + { VK_SUBTRACT, 0, {'-' , '-' } }, + { VK_MULTIPLY, 0, {'*' , '*' } }, + { VK_DIVIDE, 0, {'/' , '/' } }, + { VK_ESCAPE, 0, {0x1b , 0x1b } }, + { VK_SPACE, 0, {' ' , ' ' } }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + { 'S', 0, {0x1035, 0x1080, 0x13} }, + { 'M', 0, {0x102c, 0x1033, 0x0d} }, + { VK_BACK, 0, {'\b' , '\b' , 0x7f} }, + { VK_RETURN, 0, {'\r' , '\r' , '\n'} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + { VK_OEM_3, 0, {0x1091, 0x1090, WCH_NONE, '~' } }, + { '3', 0, {0x1043, 0x100b, WCH_NONE, 0x1076} }, + { '6', 0, {0x1046, '/' , WCH_NONE, '^' } }, + { '8', 0, {0x1048, 0x1002, WCH_NONE, 0x1062} }, + { 'Q', 0, {0x1006, 0x1096, 0x11 , 0x1065} }, + { 'W', 0, {0x1010, 0x1098, 0x17 , 0x1068} }, + { VK_OEM_1, 0, {0x1038, 0x105e, WCH_NONE, ';' } }, + { 'X', 0, {0x1011, 0x100c, 0x18 , 0x106a} }, + { 'V', 0, {0x101c, 0x1020, 0x16 , 0x1074} }, + { 'B', 0, {0x1018, 0x1092, 0x02 , 0x1072} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { + { '1', 0, {0x1041, 0x100d, WCH_NONE, 0x100e , 0x1079} }, + { '2', 0, {0x1042, 0x1078, WCH_NONE, 0x1075 , '@' } }, + { '4', 0, {0x1044, '$' , WCH_NONE, 0x104e , 0x1023} }, + { '9', 0, {0x1049, '(' , WCH_NONE, '|' , 0x2018} }, + { '0', 0, {0x1040, ')' , WCH_NONE, 0x1074 , 0x2019} }, + { VK_OEM_MINUS, 0, {'-' , '*' , WCH_NONE, 0x108a , '_' } }, + { VK_OEM_PLUS, 0, {'=' , '+' , WCH_NONE, 0x108b , 0x109f} }, + { 'E', 0, {0x1014, 0x108e, 0x05 , 0x106e , 0x1077} }, + { 'R', 0, {0x1019, 0x1097, 0x12 , 0x1073 , 0x1029} }, + { 'T', 0, {0x1021, 0x107f, 0x14 , 0x1024 , 0x102a} }, + { 'Y', 0, {0x1015, 0x109a, 0x19 , 0x104c , 0x106f} }, + { 'U', 0, {0x1000, 0x109b, 0x15 , 0x1060 , 0x1009} }, + { 'I', 0, {0x1004, 0x1081, 0x09 , 0x104d , 0x108f} }, + { 'O', 0, {0x101e, 0x1025, 0x0f , 0x108d , 0x1026} }, + { 'P', 0, {0x1005, 0x100f, 0x10 , 0x1064 , 0x1067} }, + { VK_OEM_4, 0, {0x101f, 0x1027, WCH_NONE, '[' , '{' } }, + { VK_OEM_6, 0, {0x1008, '\\' , WCH_NONE, ']' , '}' } }, + { 'A', 0, {0x1031, 0x1017, 0x01 , WCH_NONE, 0x1071} }, + { 'D', 0, {0x102d, 0x102e, 0x04 , 0x1084 , 0x1088} }, + { 'F', 0, {0x1039, 0x1086, 0x06 , 0x1050 , 0x1055} }, + { 'G', 0, {0x105d, 0x107e, 0x07 , 0x1051 , 0x1056} }, + { 'H', 0, {0x1037, 0x1036, 0x08 , 0x1052 , 0x1057} }, + { 'J', 0, {0x1034, 0x1032, 0x0a , 0x1053 , 0x1058} }, + { 'K', 0, {0x102f, 0x1082, 0x0b , 0x1054 , 0x1059} }, + { 'L', 0, {0x1030, 0x1083, 0x0c , 0x1085 , 0x1087} }, + { VK_OEM_7, 0, {0x1012, 0x1013, WCH_NONE, 0x106c , 0x106d} }, + { VK_OEM_5, 0, {0x104f, 0x1089, WCH_NONE, 0x106a , 0x106b} }, + { 'Z', 0, {0x1016, 0x1007, 0x1a , 0x1070 , 0x1066} }, + { 'C', 0, {0x1001, 0x1003, 0x03 , 0x1061 , 0x1063} }, + { 'N', 0, {0x100a, 0x1093, 0x0e , 0x108c , 0x1099} }, + { VK_OEM_COMMA, 0, {0x101a, 0x101d, WCH_NONE, ',' , '<' } }, + { VK_OEM_PERIOD,0, {'.' , 0x105f, WCH_NONE, '.' , '>' } }, + { VK_OEM_2, 0, {0x104b, 0x104a, WCH_NONE, '?' , '!' } }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { + { VK_NUMPAD0, 0, {'0'} }, + { VK_NUMPAD1, 0, {'1'} }, + { VK_NUMPAD2, 0, {'2'} }, + { VK_NUMPAD3, 0, {'3'} }, + { VK_NUMPAD4, 0, {'4'} }, + { VK_NUMPAD5, 0, {'5'} }, + { VK_NUMPAD6, 0, {'6'} }, + { VK_NUMPAD7, 0, {'7'} }, + { VK_NUMPAD8, 0, {'8'} }, + { VK_NUMPAD9, 0, {'9'} }, + { VK_DECIMAL, 0, {'.'} }, + { 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" }, + { 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 -- currently implemented by wine code */ + NULL, + + /* Key names */ + (VSC_LPWSTR *)key_names, + (VSC_LPWSTR *)extended_key_names, + NULL, /* Dead key names */ + + /* scan code to virtual key maps */ + scancode_to_vk, + sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]), + extcode0_to_vk, + extcode1_to_vk, + + MAKELONG(0,1), /* Version 1.0 */ + + /* Ligatures */ + 0, + 0, + NULL +}; + +PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { + return &keyboard_layout_table; +} + +/* EOF */ Added: trunk/reactos/dll/keyboard/kbdbur/kbdbur.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbur/kbdbur… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbur/kbdbur.def (added) +++ trunk/reactos/dll/keyboard/kbdbur/kbdbur.def Wed May 30 16:20:44 2007 @@ -1,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdbur.dll + +EXPORTS +KbdLayerDescriptor +;EOF Added: trunk/reactos/dll/keyboard/kbdbur/kbdbur.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbur/kbdbur… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbur/kbdbur.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdbur/kbdbur.rbuild Wed May 30 16:20:44 2007 @@ -1,0 +1,9 @@ +<module name="kbdbur" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdbur.dll" allowwarnings="true"> + <importlibrary definition="kbdbur.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdbur.c</file> + <file>kbdbur.rc</file> +</module> Added: trunk/reactos/dll/keyboard/kbdbur/kbdbur.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbur/kbdbur… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbur/kbdbur.rc (added) +++ trunk/reactos/dll/keyboard/kbdbur/kbdbur.rc Wed May 30 16:20:44 2007 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Burmese Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdbur\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdbur.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 Wed May 30 16:20:44 2007 @@ -1,6 +1,9 @@ <group> <directory name="kbdbe"> <xi:include href="kbdbe/kbdbe.rbuild" /> + </directory> + <directory name="kbdbur"> + <xi:include href="kbdbur/kbdbur.rbuild" /> </directory> <directory name="kbdda"> <xi:include href="kbdda/kbdda.rbuild" />

1 0

[fireball] 26941: Create olpc branch from trunk 26940.
by fireball＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: fireball Date: Wed May 30 15:24:09 2007 New Revision: 26941 URL: http://svn.reactos.org/svn/reactos?rev=26941&view=rev Log: Create olpc branch from trunk 26940. Added: branches/olpc/ - copied from r26940, trunk/reactos/

1 0

[dgorbachev] 26940: - Do not look outside VkToWcharTable[]. - Check for WCH_NONE.
by dgorbachev＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: dgorbachev Date: Wed May 30 13:35:41 2007 New Revision: 26940 URL: http://svn.reactos.org/svn/reactos?rev=26940&view=rev Log: - Do not look outside VkToWcharTable[]. - Check for WCH_NONE. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Wed May 30 13:35:41 2007 @@ -248,6 +248,7 @@ { return FALSE; } + for (nMod = 0; keyLayout->pVkToWcharTable[nMod].nModifications; nMod++) { vtwTbl = &keyLayout->pVkToWcharTable[nMod]; @@ -263,13 +264,12 @@ if( CapsMod >= keyLayout->pVkToWcharTable[nMod].nModifications ) { - DWORD MaxBit = 1; - while( MaxBit < - keyLayout->pVkToWcharTable[nMod].nModifications ) - MaxBit <<= 1; - - CapsMod &= MaxBit - 1; /* Guarantee that CapsMod lies - in bounds. */ + return FALSE; + } + + if( vkPtr->wch[CapsMod] == WCH_NONE ) + { + return FALSE; } *pbDead = vkPtr->wch[CapsMod] == WCH_DEAD;

1 0

[gedmurphy] 26939: - knock loop back to 0 as it's a shared function. Thanks to Colin for noticing this. - fix a prototype and call it correctly
by gedmurphy＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: gedmurphy Date: Wed May 30 11:11:22 2007 New Revision: 26939 URL: http://svn.reactos.org/svn/reactos?rev=26939&view=rev Log: - knock loop back to 0 as it's a shared function. Thanks to Colin for noticing this. - fix a prototype and call it correctly Modified: trunk/reactos/dll/cpl/ncpa/ncpa.c trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Modified: trunk/reactos/dll/cpl/ncpa/ncpa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.c?rev=26… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.c (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.c Wed May 30 11:11:22 2007 @@ -100,7 +100,7 @@ return; } - for(i=1;;i++) + for(i=0;;i++) { TCHAR pszNewPath[MAX_PATH]; ret = RegEnumKeyEx(hKey,i,tpszName,&dwNameLen,NULL,NULL,NULL,NULL); Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/tcpip_propert… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/tcpip_properties.c (original) +++ trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Wed May 30 11:11:22 2007 @@ -53,7 +53,8 @@ DWORD OldDns2; } TCPIP_PROPERTIES_DATA, *PTCPIP_PROPERTIES_DATA; -void InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc); +void InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc, LPARAM lParam); + DWORD APIENTRY DhcpNotifyConfigChange(LPWSTR ServerName, LPWSTR AdapterName, BOOL NewIpAddress, DWORD IpIndex, DWORD IpAddress, DWORD SubnetMask, @@ -542,8 +543,7 @@ psh.ppsp = psp; psh.pfnCallback = NULL; - InitPropSheetPage(&psp[0], IDD_TCPIPPROPERTIES, TCPIPPropertyPageProc); - psp[0].lParam = (LPARAM) &DlgData; + InitPropSheetPage(&psp[0], IDD_TCPIPPROPERTIES, TCPIPPropertyPageProc, (LPARAM) &DlgData); if (PropertySheetW(&psh) == -1) {

1 0

[hpoussin] 26938: Add a first network adapter at index 0000, as real ones start at index 0001 See issue #2034 for more details.
by hpoussin＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: hpoussin Date: Tue May 29 20:45:43 2007 New Revision: 26938 URL: http://svn.reactos.org/svn/reactos?rev=26938&view=rev Log: Add a first network adapter at index 0000, as real ones start at index 0001 See issue #2034 for more details. Modified: trunk/reactos/media/inf/NET_NIC.inf Modified: trunk/reactos/media/inf/NET_NIC.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/NET_NIC.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/NET_NIC.inf (original) +++ trunk/reactos/media/inf/NET_NIC.inf Tue May 29 20:45:43 2007 @@ -21,6 +21,9 @@ HKR, , Icon, 0, "-5" HKR, , Installer32, 0, "NetCfgx.dll,NetClassInstaller" +; Add a fake network adapter entry in registry (Real adapters start at index 1) +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","",0x00010000,"" + [Strings] ReactOS = "ReactOS Team" DisplayClassName = "Network Adapters"

1 0

[dgorbachev] 26937: Fix bug #2267.
by dgorbachev＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: dgorbachev Date: Tue May 29 17:36:03 2007 New Revision: 26937 URL: http://svn.reactos.org/svn/reactos?rev=26937&view=rev Log: Fix bug #2267. Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Tue May 29 17:36:03 2007 @@ -207,15 +207,20 @@ // EnterCriticalSection(&ddcs); _SEH_TRY { - if (pDDSD->dwSize != sizeof(DDSURFACEDESC)) - { - return DDERR_INVALIDPARAMS; - } - - CopyDDSurfDescToDDSurfDesc2(&dd_desc_v2, (LPDDSURFACEDESC)pDDSD); - ret = Internal_CreateSurface( (LPDDRAWI_DIRECTDRAW_INT)iface,&dd_desc_v2, (LPDIRECTDRAWSURFACE7 *)ppSurf,pUnkOuter); - } - _SEH_HANDLE + if (pDDSD->dwSize == sizeof(DDSURFACEDESC)) + { + CopyDDSurfDescToDDSurfDesc2(&dd_desc_v2, (LPDDSURFACEDESC)pDDSD); + ret = Internal_CreateSurface((LPDDRAWI_DIRECTDRAW_INT)iface, + &dd_desc_v2, + (LPDIRECTDRAWSURFACE7 *)ppSurf, + pUnkOuter); + } + else + { + ret = DDERR_INVALIDPARAMS; + } + } + _SEH_HANDLE { ret = DDERR_GENERIC; } @@ -236,7 +241,7 @@ _SEH_TRY { ret = Internal_CreateSurface( (LPDDRAWI_DIRECTDRAW_INT)iface,pDDSD, ppSurf,pUnkOuter); - } + } _SEH_HANDLE { ret = DDERR_GENERIC;

1 0

[gedmurphy] 26936: - re-organize build scipts to use a common file - patch by Colin Finck
by gedmurphy＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: gedmurphy Date: Tue May 29 17:21:50 2007 New Revision: 26936 URL: http://svn.reactos.org/svn/reactos?rev=26936&view=rev Log: - re-organize build scipts to use a common file - patch by Colin Finck Added: trunk/tools/RosBE-Windows/Build-Shared.cmd Modified: trunk/tools/RosBE-Windows/Build-Multi.cmd trunk/tools/RosBE-Windows/Build.cmd Modified: trunk/tools/RosBE-Windows/Build-Multi.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Build-Multi.cm… ============================================================================== --- trunk/tools/RosBE-Windows/Build-Multi.cmd (original) +++ trunk/tools/RosBE-Windows/Build-Multi.cmd Tue May 29 17:21:50 2007 @@ -12,12 +12,6 @@ set CPUCOUNT= :: -:: Get the current date and time for use in -:: in our build log's file name. -:: -call "%ROSBEBASEDIR%\TimeDate.cmd" - -:: :: Get the number of CPUs in the system so we know how :: many jobs to execute. :: To modify the number used alter the options used with cpucount: @@ -27,26 +21,11 @@ for /f "usebackq" %%i in (`"%ROSBEBASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i :: -:: Check if config.template.rbuild is newer than config.rbuild, -:: if it is then abort the build and inform the user. +:: Set the build command :: -if exist "%_ROSSOURCEDIR%\config.rbuild" ( - "%ROSBEBASEDIR%\Tools\test.exe" "%_ROSSOURCEDIR%\config.template.rbuild" -nt "%_ROSSOURCEDIR%\config.rbuild" - if not errorlevel 1 ( - echo. - echo *** config.template.rbuild is newer than config.rbuild *** - echo *** aborting build. Please check for changes and *** - echo *** update your config.rbuild. *** - echo. - goto :EOF - ) -) +set MAKE_COMMAND="%_MINGWMAKE%" -j %CPUCOUNT% %* :: -:: Now use mingw32-make to build ReactOS, passing along options, if any. +:: Execute the shared build commands :: -if "%1" == "" ( - "%ROSBEBASEDIR%\Tools\buildtime.exe" "%_MINGWMAKE%" -j %CPUCOUNT% 2>&1 | "%ROSBEBASEDIR%\Tools\tee.exe" "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" -) else ( - "%ROSBEBASEDIR%\Tools\buildtime.exe" "%_MINGWMAKE%" -j %CPUCOUNT% %* 2>&1 | "%ROSBEBASEDIR%\Tools\tee.exe" "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" -) +call "%ROSBEBASEDIR%\Build-Shared.cmd" Added: trunk/tools/RosBE-Windows/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Build-Shared.c… ============================================================================== --- trunk/tools/RosBE-Windows/Build-Shared.cmd (added) +++ trunk/tools/RosBE-Windows/Build-Shared.cmd Tue May 29 17:21:50 2007 @@ -1,0 +1,33 @@ +:: Shared actions for "Build.cmd" and "Build-Multi.cmd" + +:: +:: Check if config.template.rbuild is newer than config.rbuild, +:: if it is then abort the build and inform the user. +:: +if exist "%_ROSSOURCEDIR%\config.rbuild" ( + "%ROSBEBASEDIR%\Tools\test.exe" "%_ROSSOURCEDIR%\config.template.rbuild" -nt "%_ROSSOURCEDIR%\config.rbuild" + if not errorlevel 1 ( + echo. + echo *** config.template.rbuild is newer than config.rbuild *** + echo *** aborting build. Please check for changes and *** + echo *** update your config.rbuild. *** + echo. + goto :EOF + ) +) + +:: +:: Get the current date and time for use in +:: in our build log's file name. +:: +call %ROSBEBASEDIR%\TimeDate.cmd + +:: +:: Execute the Build command +:: +call "%ROSBEBASEDIR%\Tools\buildtime.exe" %MAKE_COMMAND% 2>&1 | "%ROSBEBASEDIR%\Tools\tee.exe" "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" + +:: +:: highlight the fact that building has ended +:: +call "%ROSBEBASEDIR%\Tools\flash.exe" Modified: trunk/tools/RosBE-Windows/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Build.cmd?rev=… ============================================================================== --- trunk/tools/RosBE-Windows/Build.cmd (original) +++ trunk/tools/RosBE-Windows/Build.cmd Tue May 29 17:21:50 2007 @@ -5,37 +5,11 @@ @echo off :: -:: Get the current date and time for use in -:: in our build log's file name. +:: Set the build command :: -call "%ROSBEBASEDIR%\TimeDate.cmd" +set MAKE_COMMAND="%_MINGWMAKE%" %* :: -:: Check if config.template.rbuild is newer than config.rbuild, -:: if it is then abort the build and inform the user. +:: Execute the shared build commands :: -if exist "%_ROSSOURCEDIR%\config.rbuild" ( - "%ROSBEBASEDIR%\Tools\test.exe" "%_ROSSOURCEDIR%\config.template.rbuild" -nt "%_ROSSOURCEDIR%\config.rbuild" - if not errorlevel 1 ( - echo. - echo *** config.template.rbuild is newer than config.rbuild *** - echo *** aborting build. Please check for changes and *** - echo *** update your config.rbuild. *** - echo. - goto :EOF - ) -) - -:: -:: Now use mingw32-make to build ReactOS, passing along options, if any. -:: -if "%1" == "" ( - "%ROSBEBASEDIR%\Tools\buildtime.exe" "%_MINGWMAKE%" 2>&1 | "%ROSBEBASEDIR%\Tools\tee.exe" "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" -) else ( - "%ROSBEBASEDIR%\Tools\buildtime.exe" "%_MINGWMAKE%" %* 2>&1 | "%ROSBEBASEDIR%\Tools\tee.exe" "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" -) - -:: -:: highlight the fact that building has ended -:: -call "%ROSBEBASEDIR%\Tools\flash.exe" +call "%ROSBEBASEDIR%\Build-Shared.cmd"

1 0

[janderwald] 26935: - clean up GuiHandleSysMenuCommand a bit
by janderwald＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: janderwald Date: Tue May 29 15:23:31 2007 New Revision: 26935 URL: http://svn.reactos.org/svn/reactos?rev=26935&view=rev Log: - clean up GuiHandleSysMenuCommand a bit Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Tue May 29 15:23:31 2007 @@ -1485,10 +1485,10 @@ CPLFunc(hWnd, CPL_DBLCLK, (LPARAM)&SharedInfo, Defaults); } -static BOOL FASTCALL -GuiConsoleHandleSysMenuCommand(HWND hWnd, WPARAM wParam, PGUI_CONSOLE_DATA GuiData) -{ - BOOL Ret = TRUE; +static LRESULT FASTCALL +GuiConsoleHandleSysMenuCommand(HWND hWnd, WPARAM wParam, LPARAM lParam, PGUI_CONSOLE_DATA GuiData) +{ + LRESULT Ret = TRUE; switch(wParam) { @@ -1509,10 +1509,9 @@ break; default: - Ret = FALSE; + Ret = DefWindowProcW(hWnd, WM_SYSCOMMAND, wParam, lParam); break; } - return Ret; } @@ -1709,8 +1708,7 @@ GuiConsoleMouseMove(hWnd, wParam, lParam); break; case WM_SYSCOMMAND: - if (!GuiConsoleHandleSysMenuCommand(hWnd, wParam, GuiData)) - Result = DefWindowProcW(hWnd, msg, wParam, lParam); + Result = GuiConsoleHandleSysMenuCommand(hWnd, wParam, lParam, GuiData); break; case WM_SIZE: GuiConsoleResize(hWnd, wParam, lParam);

1 0

[fireball] 26934: - Give "RAW" filesystem driver a name which it deserves.
by fireball＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: fireball Date: Tue May 29 01:34:49 2007 New Revision: 26934 URL: http://svn.reactos.org/svn/reactos?rev=26934&view=rev Log: - Give "RAW" filesystem driver a name which it deserves. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Tue May 29 01:34:49 2007 @@ -832,6 +832,7 @@ PDRIVER_OBJECT DriverObject; LDR_DATA_TABLE_ENTRY ModuleObject; NTSTATUS Status; + UNICODE_STRING DriverName; /* Use IopRootDeviceNode for now */ Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, NULL, &DeviceNode); @@ -841,11 +842,12 @@ ModuleObject.DllBase = NULL; ModuleObject.SizeOfImage = 0; ModuleObject.EntryPoint = RawFsDriverEntry; + RtlInitUnicodeString(&DriverName, L"RAW"); /* Initialize it */ Status = IopInitializeDriverModule(DeviceNode, &ModuleObject, - &DeviceNode->ServiceName, + &DriverName, TRUE, &DriverObject); if (!NT_SUCCESS(Status)) @@ -1160,6 +1162,8 @@ (PVOID*)&DriverObject); if (!NT_SUCCESS(Status)) return Status; + DPRINT("IopCreateDriver(): created DO %p\n", DriverObject); + /* Set up the Object */ RtlZeroMemory(DriverObject, ObjectSize); DriverObject->Type = IO_TYPE_DRIVER;

1 0

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 June 2007