Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dquintana] 63533: [BROWSEUI] * This shouldn't have been commited. The browse windows were freezing because it was trying to use the menu from shell32 instead of rshell.
by dquintana＠svn.reactos.org 02 Jun '14

02 Jun '14

Author: dquintana Date: Mon Jun 2 13:23:06 2014 New Revision: 63533 URL: http://svn.reactos.org/svn/reactos?rev=63533&view=rev Log: [BROWSEUI] * This shouldn't have been commited. The browse windows were freezing because it was trying to use the menu from shell32 instead of rshell. Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Mon Jun 2 13:23:06 2014 @@ -29,7 +29,7 @@ #define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) -#define USE_CUSTOM_MENUBAND 0 +#define USE_CUSTOM_MENUBAND 1 // navigation controls and menubar just send a message to parent window /*

1 0

[khornicek] 63532: [KBDCZ][KBDCZ1] - add support for VK_OEM_102 and Shift+AltGr combinations in kbdcz1 - fix left arrow in kbdcz - reduce diff between the layouts - misc cleanup - Patch by Radek Li...
by khornicek＠svn.reactos.org 02 Jun '14

02 Jun '14

Author: khornicek Date: Mon Jun 2 10:41:52 2014 New Revision: 63532 URL: http://svn.reactos.org/svn/reactos?rev=63532&view=rev Log: [KBDCZ][KBDCZ1] - add support for VK_OEM_102 and Shift+AltGr combinations in kbdcz1 - fix left arrow in kbdcz - reduce diff between the layouts - misc cleanup - Patch by Radek Liska CORE-8283 Modified: trunk/reactos/dll/keyboard/kbdcz/kbdcz.c trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.c Modified: trunk/reactos/dll/keyboard/kbdcz/kbdcz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcz/kbdcz.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdcz/kbdcz.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdcz/kbdcz.c [iso-8859-1] Mon Jun 2 10:41:52 2014 @@ -78,7 +78,7 @@ VK_SNAPSHOT, /* - 55 - */ /* Oddities, and the remaining standard F-Keys */ - VK_EMPTY, VK_OEM_102, VK_F11, VK_F12, + VK_EMPTY, VK_OEM_102, 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 */ @@ -159,20 +159,45 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, - 7, - { 0, 1, 2, 0, 0, 0, 3, 0 } - /* Modifier bit order: NONE, SHIFT, CTRL, SHIFT-CTRL, ALT (not used), SHIFT-ALT (not used), CTRL-ALT, SHIFT-CTRL-ALT */ + 7, /* Modifier bit order */ + { + 0, /* NONE */ + 1, /* SHIFT */ + 2, /* CTRL */ + 0, /* SHIFT-CTRL (not used) */ + 0, /* ALT (not used) */ + 0, /* SHIFT-ALT (not used) */ + 3, /* CTRL-ALT */ + 0, /* SHIFT-CTRL-ALT (not used) */ + } +}; +/* ^ This table shows which column in any VK_TO_WCHARS* structure will be used on which modifier */ + +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 } }; ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { /* Keys that do not have shift states */ - { 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, {' ', ' ' } }, + { 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 } }; @@ -207,7 +232,7 @@ { VK_EMPTY, 0, { WCH_NONE, WCH_NONE, WCH_NONE, 0x00b4 } }, // 9 dead letter { '0', 0, { 0x00e9, '0', WCH_NONE, WCH_DEAD } }, // e with acute { VK_EMPTY, 0, { WCH_NONE, WCH_NONE, WCH_NONE, 0x02dd } }, // 0 dead letter - + /* The misc */ { VK_OEM_MINUS, 0, { '=', '%', WCH_NONE, WCH_DEAD } }, // diaeresis { VK_EMPTY, 0, { WCH_NONE, WCH_NONE, WCH_NONE, 0x00a8 } }, // VK_OEM_MINUS dead letter @@ -224,61 +249,45 @@ { VK_OEM_COMMA, 0, { ',', '?', WCH_NONE, '<' } }, { VK_OEM_PERIOD, 0, { '.', ':', WCH_NONE, '>' } }, { VK_OEM_2, 0, { '-', '_', WCH_NONE, '*' } }, - + /* The alphabet */ { 'A', CAPLOK, {'a', 'A', 0x01, WCH_NONE } }, - { 'B', CAPLOK, {'b', 'B', 0x02, '{' } }, - { 'C', CAPLOK, {'c', 'C', 0x03, '&' } }, - { 'D', CAPLOK, {'d', 'D', 0x04, 0x0110 } }, - { 'E', CAPLOK, {'e', 'E', 0x05, 0x20AC } }, - { 'F', CAPLOK, {'f', 'F', 0x06, '[' } }, - { 'G', CAPLOK, {'g', 'G', 0x07, ']' } }, + { 'B', CAPLOK, {'b', 'B', 0x02, '{' } }, + { 'C', CAPLOK, {'c', 'C', 0x03, '&' } }, + { 'D', CAPLOK, {'d', 'D', 0x04, 0x0110 } }, + { 'E', CAPLOK, {'e', 'E', 0x05, 0x20AC } }, + { 'F', CAPLOK, {'f', 'F', 0x06, '[' } }, + { 'G', CAPLOK, {'g', 'G', 0x07, ']' } }, { 'H', CAPLOK, {'h', 'H', 0x08, WCH_NONE } }, { 'I', CAPLOK, {'i', 'I', 0x09, WCH_NONE } }, { 'J', CAPLOK, {'j', 'J', 0x0a, WCH_NONE } }, - { 'K', CAPLOK, {'k', 'K', 0x0b, 0x0142 } }, - { 'L', CAPLOK, {'l', 'L', 0x0c, 0x0141 } }, + { 'K', CAPLOK, {'k', 'K', 0x0b, 0x0142 } }, + { 'L', CAPLOK, {'l', 'L', 0x0c, 0x0141 } }, { 'M', CAPLOK, {'m', 'M', 0x0d, WCH_NONE } }, - { 'N', CAPLOK, {'n', 'N', 0x0e, '}' } }, + { 'N', CAPLOK, {'n', 'N', 0x0e, '}' } }, { 'O', CAPLOK, {'o', 'O', 0x0f, WCH_NONE } }, { 'P', CAPLOK, {'p', 'P', 0x10, WCH_NONE } }, - { 'Q', CAPLOK, {'q', 'Q', 0x11, '\\' } }, + { 'Q', CAPLOK, {'q', 'Q', 0x11, '\\' } }, { 'R', CAPLOK, {'r', 'R', 0x12, WCH_NONE } }, - { 'S', CAPLOK, {'s', 'S', 0x13, WCH_NONE } }, + { 'S', CAPLOK, {'s', 'S', 0x13, 0x0111 } }, { 'T', CAPLOK, {'t', 'T', 0x14, WCH_NONE } }, { 'U', CAPLOK, {'u', 'U', 0x15, WCH_NONE } }, - { 'V', CAPLOK, {'v', 'V', 0x16, '@' } }, - { 'W', CAPLOK, {'w', 'W', 0x17, '|' } }, - { 'X', CAPLOK, {'x', 'X', 0x18, '#' } }, + { 'V', CAPLOK, {'v', 'V', 0x16, '@' } }, + { 'W', CAPLOK, {'w', 'W', 0x17, '|' } }, + { 'X', CAPLOK, {'x', 'X', 0x18, '#' } }, { 'Y', CAPLOK, {'y', 'Y', 0x19, WCH_NONE } }, { 'Z', CAPLOK, {'z', 'Z', 0x1a, 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, {','} }, - { VK_BACK, 0, {'\010'} }, - { 0, 0 } -}; - -#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } +#define vk_master(n, x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { - vk_master(1,keypad_numbers), - vk_master(2,key_to_chars_2mod), - vk_master(3,key_to_chars_3mod), - vk_master(4,key_to_chars_4mod), - { 0,0,0 } + vk_master(1, keypad_numbers), + vk_master(2, key_to_chars_2mod), + vk_master(3, key_to_chars_3mod), + vk_master(4, key_to_chars_4mod), + { 0, 0, 0 } }; ROSDATA VSC_LPWSTR key_names[] = { @@ -348,7 +357,9 @@ { 0x47, L"Home" }, { 0x48, L"Up" }, { 0x49, L"Page Up" }, - { 0x4a, L"Left" }, + /* { 0x4a, L"Left" },*/ + { 0x4a, L"-" }, + { 0x4b, L"Left" }, { 0x4c, L"Center" }, { 0x4d, L"Right" }, { 0x4f, L"End" }, @@ -423,9 +434,9 @@ }; ROSDATA DEADKEY_LPWSTR dead_key_names[] = { - L"\x00a1" L"hacek", // caron - L"\x00b4" L"carka", // acute - L"\x005e" L"krouzek", // ring + L"\x00a1" L"hacek", // caron + L"\x00b4" L"carka", // acute + L"\x005e" L"krouzek", // ring NULL }; Modified: trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcz1/kbdcz1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.c [iso-8859-1] Mon Jun 2 10:41:52 2014 @@ -78,7 +78,7 @@ VK_SNAPSHOT, /* - 55 - */ /* Oddities, and the remaining standard F-Keys */ - VK_EMPTY, VK_EMPTY, VK_F11, VK_F12, + VK_EMPTY, VK_OEM_102, 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 */ @@ -159,89 +159,21 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, - 7, - { 0, 1, 2, 0, 0, 0, 3, 0 } - /* Modifier bit order: NONE, SHIFT, CTRL, SHIFT-CTRL, ALT (not used), SHIFT-ALT (not used), CTRL-ALT, SHIFT-CTRL-ALT */ -}; - -ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { - /* Keys that do not have shift states */ - { VK_TAB, 0, {'\t','\t'} }, - { VK_ADD, 0, {'+', '+'} }, - { VK_SUBTRACT, 0, {'-', '-'} }, - { VK_MULTIPLY, 0, {'*', '*'} }, - { VK_DIVIDE, 0, {'/', '/'} }, - { VK_OEM_2 ,0, {'-', '_'} }, - { VK_ESCAPE, 0, {0x1b,0x1b} }, - { VK_SPACE, 0, {' ', ' '} }, - { 0, 0 } -}; - -ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { - /* normal - shift - ctrl */ - /* The alphabet */ - { 'A', CAPLOK, {'a', 'A', 0x01} }, - { 'B', CAPLOK, {'b', 'B', 0x02} }, - { 'C', CAPLOK, {'c', 'C', 0x03} }, - { 'D', CAPLOK, {'d', 'D', 0x04} }, - { 'F', CAPLOK, {'f', 'F', 0x06} }, - { 'G', CAPLOK, {'g', 'G', 0x07} }, - { 'H', CAPLOK, {'h', 'H', 0x08} }, - { 'I', CAPLOK, {'i', 'I', 0x09} }, - { 'J', CAPLOK, {'j', 'J', 0x0a} }, - { 'K', CAPLOK, {'k', 'K', 0x0b} }, - { 'L', CAPLOK, {'l', 'L', 0x0c} }, - { 'M', CAPLOK, {'m', 'M', 0x0d} }, - { 'N', CAPLOK, {'n', 'N', 0x0e} }, - { 'O', CAPLOK, {'o', 'O', 0x0f} }, - { 'P', CAPLOK, {'p', 'P', 0x10} }, - { 'Q', CAPLOK, {'q', 'Q', 0x11} }, - { 'R', CAPLOK, {'r', 'R', 0x12} }, - { 'S', CAPLOK, {'s', 'S', 0x13} }, - { 'T', CAPLOK, {'t', 'T', 0x14} }, - { 'U', CAPLOK, {'u', 'U', 0x15} }, - { 'V', CAPLOK, {'v', 'V', 0x16} }, - { 'W', CAPLOK, {'w', 'W', 0x17} }, - { 'X', CAPLOK, {'x', 'X', 0x18} }, - { 'Y', CAPLOK, {'y', 'Y', 0x19} }, - { 'Z', CAPLOK, {'z', 'Z', 0x1a} }, - - /* Legacy (telnet-style) ascii escapes */ - { VK_RETURN, 0, {'\r', '\r', '\n'} }, - { 0,0 } -}; - -ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { -/* Normal, shifted, control, Alt+Gr */ - { '1', 0, {'+', '1', WCH_NONE, '!' } }, - { '2', 0, {0x011b, '2', 0, '@' } }, // e with caron - { '3', 0, {0x0161, '3', WCH_NONE, '#' } }, // s with caron - { '4', 0, {0x010d, '4', WCH_NONE, '$' } }, // c with caron - { '5', 0, {0x0159, '5', WCH_NONE, '%' } }, // r with caron - { '6', 0, {0x017e, '6', 0x1e, '^' } }, // z with caron - { '7', 0, {0x00fd, '7', WCH_NONE, '&' } }, // y with acute - { '8', 0, {0x00e1, '8', WCH_NONE, '*' } }, // a with acute - { '9', 0, {0x00ed, '9', WCH_NONE, '(' } }, // i with acute - { '0', 0, {0x00e9, '0', WCH_NONE, ')' } }, // e with acute - { VK_OEM_PLUS, 0, {WCH_DEAD, WCH_DEAD, WCH_NONE, '=' } }, // dead letters - acute, caron - { VK_EMPTY, 0, {0x00b4, 0x02c7, WCH_NONE, WCH_NONE } }, // VK_OEM_PLUS death - { VK_OEM_MINUS, 0, {'=', '%', 0x1f, '-' } }, - { VK_OEM_1, 0, {0x016f, '\"', WCH_NONE, ';' } }, // u with ring - { VK_OEM_7, 0, {0x00a7, '!', WCH_NONE, 0x00a4 } }, // section sign - { VK_OEM_4, 0, {0x00fa, '/', WCH_NONE, '[' } }, // u with acute - { VK_OEM_5, 0, {WCH_DEAD, 0x2018, WCH_NONE, '\\' } }, // diaeresis, left single quotation mark - { VK_EMPTY, 0, {0x00a8, WCH_NONE, WCH_NONE, WCH_NONE } }, // VK_OEM_5 death - { VK_OEM_6, 0, {')', '(', WCH_NONE, ']' } }, - { VK_OEM_3, 0, {';', WCH_DEAD, WCH_NONE, '`' } }, // ring - { VK_EMPTY, 0, {WCH_NONE, 0x00b0, WCH_NONE, WCH_NONE } }, // VK_OEM_3 death - { VK_OEM_COMMA, 0, {',', '?', WCH_NONE, '<' } }, - { VK_OEM_PERIOD, 0, {'.', ':', WCH_NONE, '>' } }, - { 'E', CAPLOK, {'e', 'E', 0x05, 0x20AC } }, // symbol for euro (currency) - { 0, 0 } -}; + 7, /* Modifier bit order */ + { + 0, /* NONE */ + 1, /* SHIFT */ + 2, /* CTRL */ + 0, /* SHIFT-CTRL (not used) */ + 0, /* ALT (not used) */ + 0, /* SHIFT-ALT (not used) */ + 3, /* CTRL-ALT */ + 4, /* SHIFT-CTRL-ALT */ + } +}; +/* ^ This table shows which column in any VK_TO_WCHARS* structure will be used on which modifier */ ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { - { VK_DECIMAL, 0, {','} }, { VK_NUMPAD0, 0, {'0'} }, { VK_NUMPAD1, 0, {'1'} }, { VK_NUMPAD2, 0, {'2'} }, @@ -252,18 +184,103 @@ { 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_WCHARS2 key_to_chars_2mod[] = { + /* Keys that do not have shift states */ + { 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[] = { + /* normal - shift - ctrl */ + + /* Legacy (telnet-style) ascii escapes */ + { VK_RETURN, 0, {'\r', '\r', '\n' } }, + { 0,0 } +}; + +ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { +/* Normal, shifted, control, Alt+Gr, Sh+Alt+Gr */ + + /* The numbers */ + { '1', 0, { '+', '1', WCH_NONE, '!', WCH_NONE } }, + { '2', 0, { 0x011b, '2', 0, '@', WCH_NONE } }, // e with caron + { '3', 0, { 0x0161, '3', WCH_NONE, '#', WCH_NONE } }, // s with caron + { '4', 0, { 0x010d, '4', WCH_NONE, '$', WCH_NONE } }, // c with caron + { '5', 0, { 0x0159, '5', WCH_NONE, '%', WCH_NONE } }, // r with caron + { '6', 0, { 0x017e, '6', 0x1e, '^', WCH_NONE } }, // z with caron + { '7', 0, { 0x00fd, '7', WCH_NONE, '&', WCH_NONE } }, // y with acute + { '8', 0, { 0x00e1, '8', WCH_NONE, '*', WCH_NONE } }, // a with acute + { '9', 0, { 0x00ed, '9', WCH_NONE, '(', WCH_NONE } }, // i with acute + { '0', 0, { 0x00e9, '0', WCH_NONE, ')', WCH_NONE } }, // e with acute + + /* The misc */ + { VK_OEM_PLUS, 0, { WCH_DEAD, WCH_DEAD, WCH_NONE, '=', '+' } }, // dead letters - acute, caron + { VK_EMPTY, 0, { 0x00b4, 0x02c7, WCH_NONE, WCH_NONE, WCH_NONE } }, // VK_OEM_PLUS dead letter + { VK_OEM_MINUS, 0, { '=', '%', 0x1f, '-', '_' } }, + { VK_OEM_1, 0, { 0x016f, '\"', WCH_NONE, ';', ':' } }, // u with ring + { VK_OEM_7, 0, { 0x00a7, '!', WCH_NONE, 0x00a4, WCH_DEAD } }, // section sign, currency sign + { VK_EMPTY, 0, { WCH_NONE, WCH_NONE, WCH_NONE, WCH_NONE, '^' } }, // VK_OEM_7 dead letter + { VK_OEM_4, 0, { 0x00fa, '/', WCH_NONE, '[', '{' } }, // u with acute + { VK_OEM_5, 0, { WCH_DEAD, 0x2018, WCH_NONE, '\\', '|' } }, // diaeresis, left single quotation mark + { VK_EMPTY, 0, { 0x00a8, WCH_NONE, WCH_NONE, WCH_NONE, WCH_NONE } }, // VK_OEM_5 dead letter + { VK_OEM_6, 0, { ')', '(', WCH_NONE, ']', '}' } }, + { VK_OEM_3, 0, { ';', WCH_DEAD, WCH_NONE, '`', '~' } }, // ring + { VK_EMPTY, 0, { WCH_NONE, 0x00b0, WCH_NONE, WCH_NONE, WCH_NONE } }, // VK_OEM_3 dead letter + { VK_OEM_COMMA, 0, { ',', '?', WCH_NONE, '<', 0x00d7 } }, // multiplication sign + { VK_OEM_PERIOD, 0, { '.', ':', WCH_NONE, '>', 0x00f7 } }, // division sign + { VK_OEM_2, 0, { '-', '_', WCH_NONE, '/', '?' } }, + { VK_OEM_102, 0, { '\\', '|', 0x1c/*FS*/, 0x00df, WCH_DEAD } }, // sharp s, double acute accent + { VK_EMPTY, 0, { WCH_NONE, WCH_NONE, WCH_NONE, WCH_NONE, 0x02dd } }, // VK_OEM_102 dead letter + + /* The alphabet */ + { 'A', CAPLOK, { 'a', 'A', 0x01, WCH_NONE, WCH_NONE } }, + { 'B', CAPLOK, { 'b', 'B', 0x02, WCH_NONE, WCH_NONE } }, + { 'C', CAPLOK, { 'c', 'C', 0x03, WCH_NONE, WCH_NONE } }, + { 'D', CAPLOK, { 'd', 'D', 0x04, WCH_NONE, WCH_NONE } }, + { 'E', CAPLOK, { 'e', 'E', 0x05, 0x20AC, WCH_NONE } }, // symbol for euro (currency) + { 'F', CAPLOK, { 'f', 'F', 0x06, WCH_NONE, WCH_NONE } }, + { 'G', CAPLOK, { 'g', 'G', 0x07, WCH_NONE, WCH_NONE } }, + { 'H', CAPLOK, { 'h', 'H', 0x08, WCH_NONE, WCH_NONE } }, + { 'I', CAPLOK, { 'i', 'I', 0x09, WCH_NONE, WCH_NONE } }, + { 'J', CAPLOK, { 'j', 'J', 0x0a, WCH_NONE, WCH_NONE } }, + { 'K', CAPLOK, { 'k', 'K', 0x0b, WCH_NONE, WCH_NONE } }, + { 'L', CAPLOK, { 'l', 'L', 0x0c, WCH_NONE, WCH_NONE } }, + { 'M', CAPLOK, { 'm', 'M', 0x0d, WCH_NONE, WCH_NONE } }, + { 'N', CAPLOK, { 'n', 'N', 0x0e, WCH_NONE, WCH_NONE } }, + { 'O', CAPLOK, { 'o', 'O', 0x0f, WCH_NONE, WCH_NONE } }, + { 'P', CAPLOK, { 'p', 'P', 0x10, WCH_NONE, WCH_NONE } }, + { 'Q', CAPLOK, { 'q', 'Q', 0x11, WCH_NONE, WCH_NONE } }, + { 'R', CAPLOK, { 'r', 'R', 0x12, WCH_NONE, WCH_NONE } }, + { 'S', CAPLOK, { 's', 'S', 0x13, WCH_NONE, WCH_NONE } }, + { 'T', CAPLOK, { 't', 'T', 0x14, WCH_NONE, WCH_NONE } }, + { 'U', CAPLOK, { 'u', 'U', 0x15, WCH_NONE, WCH_NONE } }, + { 'V', CAPLOK, { 'v', 'V', 0x16, WCH_NONE, WCH_NONE } }, + { 'W', CAPLOK, { 'w', 'W', 0x17, WCH_NONE, WCH_NONE } }, + { 'X', CAPLOK, { 'x', 'X', 0x18, WCH_NONE, WCH_NONE } }, + { 'Y', CAPLOK, { 'y', 'Y', 0x19, WCH_NONE, WCH_NONE } }, + { 'Z', CAPLOK, { 'z', 'Z', 0x1a, WCH_NONE, WCH_NONE } }, + { 0, 0 } +}; + +#define vk_master(n, x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { - vk_master(1,keypad_numbers), - vk_master(2,key_to_chars_2mod), - vk_master(3,key_to_chars_3mod), - vk_master(4,key_to_chars_4mod), - { 0,0,0 } + vk_master(1, keypad_numbers), + vk_master(2, key_to_chars_2mod), + vk_master(3, key_to_chars_3mod), + vk_master(5, key_to_chars_5mod), + { 0, 0, 0 } }; ROSDATA VSC_LPWSTR key_names[] = { @@ -333,7 +350,9 @@ { 0x47, L"Home" }, { 0x48, L"Up" }, { 0x49, L"Page Up" }, - { 0x4a, L"Left" }, + /* { 0x4a, L"Left" },*/ + { 0x4a, L"-" }, + { 0x4b, L"Left" }, { 0x4c, L"Center" }, { 0x4d, L"Right" }, { 0x4f, L"End" }, @@ -401,16 +420,16 @@ { DEADTRANS(0x0075, 0x00a8, 0x00fc, 0x0000) }, // u with diaeresis { DEADTRANS(0x0020, 0x00a8, 0x00a8, 0x0000) }, // space > diaeresis - { DEADTRANS(0x0055, 0x00b0, 0x016e, 0x0000) }, // U with round - { DEADTRANS(0x0075, 0x00b0, 0x016f, 0x0000) }, // u with round - { DEADTRANS(0x0020, 0x00b0, 0x00b0, 0x0000) }, // space > round + { DEADTRANS(0x0055, 0x00b0, 0x016e, 0x0000) }, // U with ring + { DEADTRANS(0x0075, 0x00b0, 0x016f, 0x0000) }, // u with ring + { DEADTRANS(0x0020, 0x00b0, 0x00b0, 0x0000) }, // space > ring { 0, 0, 0 }, }; ROSDATA DEADKEY_LPWSTR dead_key_names[] = { - L"\x00a1" L"hacek", // caron - L"\x00b4" L"carka", // acute - L"\x005e" L"krouzek", // round + L"\x00a1" L"hacek", // caron + L"\x00b4" L"carka", // acute + L"\x005e" L"krouzek", // ring NULL }; @@ -422,7 +441,7 @@ /* character from vk tables */ vk_to_wchar_master_table, - /* diacritical marks -- */ + /* diacritical marks */ dead_key, /* Key names */ @@ -447,4 +466,3 @@ PKBDTABLES WINAPI KbdLayerDescriptor(VOID) { return &keyboard_layout_table; } -

1 0

[jimtabor] 63531: [User32] - Fix recursive loops during Alt+Esc and Tab. Dedicated to Hermès Bélusca-Maïto.
by jimtabor＠svn.reactos.org 01 Jun '14

01 Jun '14

Author: jimtabor Date: Sun Jun 1 22:32:24 2014 New Revision: 63531 URL: http://svn.reactos.org/svn/reactos?rev=63531&view=rev Log: [User32] - Fix recursive loops during Alt+Esc and Tab. Dedicated to Hermès Bélusca-Maïto. Modified: trunk/reactos/win32ss/user/user32/controls/appswitch.c Modified: trunk/reactos/win32ss/user/user32/controls/appswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/appswitch.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/appswitch.c [iso-8859-1] Sun Jun 1 22:32:24 2014 @@ -17,7 +17,7 @@ #define MAX_WINDOWS 120 // Global variables -HWND switchdialog; +HWND switchdialog = NULL; HFONT dialogFont; int selectedWindow = 0; BOOL isOpen = FALSE; @@ -334,19 +334,26 @@ LRESULT WINAPI DoAppSwitch( WPARAM wParam, LPARAM lParam ) { - HWND hwnd; + HWND hwnd, hwndActive; MSG msg; BOOL Esc = FALSE; INT Count = 0; WCHAR Text[1024]; - switchdialog = NULL; + // Already in the loop. + if (switchdialog) return 0; + + hwndActive = GetActiveWindow(); + // Nothing is active so exit. + if (!hwndActive) return 0; + // Capture current active window. + SetCapture( hwndActive ); switch (lParam) { case VK_TAB: - if( !CreateSwitcherWindow(User32Instance) ) return 0; - if( !GetDialogFont() ) return 0; + if( !CreateSwitcherWindow(User32Instance) ) goto Exit; + if( !GetDialogFont() ) goto Exit; ProcessHotKey(); break; @@ -354,7 +361,7 @@ windowCount = 0; Count = 0; EnumWindowsZOrder(EnumerateCallback, 0); - if (windowCount < 2) return 0; + if (windowCount < 2) goto Exit; if (wParam == SC_NEXTWINDOW) Count = 1; else @@ -373,7 +380,7 @@ break; default: - return 0; + goto Exit; } // Main message loop: while (1) @@ -471,6 +478,7 @@ } } Exit: + ReleaseCapture(); if (switchdialog) DestroyWindow(switchdialog); switchdialog = NULL; selectedWindow = 0;

1 0

[tkreuzer] 63530: [INCLUDE] - Move definition of va_list to crtdefs.h - Remove useless definitions from vadefs.h - Cleanup the mess in stdarg.h - Add memmove prototype to intrin_x86.h, since it's u...
by tkreuzer＠svn.reactos.org 01 Jun '14

01 Jun '14

Author: tkreuzer Date: Sun Jun 1 21:47:51 2014 New Revision: 63530 URL: http://svn.reactos.org/svn/reactos?rev=63530&view=rev Log: [INCLUDE] - Move definition of va_list to crtdefs.h - Remove useless definitions from vadefs.h - Cleanup the mess in stdarg.h - Add memmove prototype to intrin_x86.h, since it's used there - basetyps.h: guard STDMETHODCALLTYPE & friends from redefinition - guiddef.h: define FAR, include string.h - ntdef.h: don't include stdarg.h and string anymore, enable STRICT, remove FAR, add STDMETHODCALLTYPE & friends Modified: trunk/reactos/include/crt/crtdefs.h trunk/reactos/include/crt/mingw32/intrin_x86.h trunk/reactos/include/crt/stdarg.h trunk/reactos/include/crt/vadefs.h trunk/reactos/include/psdk/basetyps.h trunk/reactos/include/psdk/guiddef.h trunk/reactos/include/psdk/ntdef.h Modified: trunk/reactos/include/crt/crtdefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/crtdefs.h?rev=… ============================================================================== --- trunk/reactos/include/crt/crtdefs.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/crtdefs.h [iso-8859-1] Sun Jun 1 21:47:51 2014 @@ -20,6 +20,10 @@ #endif #endif +#undef _CRT_PACKING +#define _CRT_PACKING 8 +#pragma pack(push,_CRT_PACKING) + /* Disable non-ANSI C definitions if compiling with __STDC__ */ //HACK: Disabled //#if __STDC__ @@ -28,10 +32,6 @@ /** Properties ***************************************************************/ - -#undef _CRT_PACKING -#define _CRT_PACKING 8 -#pragma pack(push,_CRT_PACKING) #ifndef _CRT_STRINGIZE #define __CRT_STRINGIZE(_Value) #_Value @@ -325,6 +325,22 @@ #define _WCTYPE_T_DEFINED typedef unsigned short wint_t; typedef unsigned short wctype_t; +#endif + +#ifdef __GNUC__ +#ifndef __GNUC_VA_LIST +#define __GNUC_VA_LIST + typedef __builtin_va_list __gnuc_va_list; +#endif +#endif + +#ifndef _VA_LIST_DEFINED +#define _VA_LIST_DEFINED +#if defined(__GNUC__) + typedef __gnuc_va_list va_list; +#elif defined(_MSC_VER) + typedef _Writable_bytes_(_Inexpressible_("length varies")) char * va_list; +#endif #endif #ifndef _ERRCODE_DEFINED Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] Sun Jun 1 21:47:51 2014 @@ -70,6 +70,7 @@ #endif /*** memcopy must be memmove ***/ +void* memmove(void*, const void*, size_t); __INTRIN_INLINE void* memcpy(void* dest, const void* source, size_t num) { return memmove(dest, source, num); Modified: trunk/reactos/include/crt/stdarg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdarg.h?rev=6… ============================================================================== --- trunk/reactos/include/crt/stdarg.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdarg.h [iso-8859-1] Sun Jun 1 21:47:51 2014 @@ -28,123 +28,17 @@ * ISO C Standard: 7.15 Variable arguments <stdarg.h> */ +#pragma once + #ifndef _INC_STDARG #define _INC_STDARG + +#include <crtdefs.h> +#include <vadefs.h> + #ifndef _WIN32 #error Only Win32 target is supported! #endif - -#ifndef _STDARG_H -#ifndef _ANSI_STDARG_H_ -#ifndef __need___va_list -#define _STDARG_H -#define _ANSI_STDARG_H_ -#endif /* not __need___va_list */ -#undef __need___va_list - -/* Define __gnuc_va_list. */ - -#ifdef __GNUC__ -#ifndef __GNUC_VA_LIST -#define __GNUC_VA_LIST -typedef __builtin_va_list __gnuc_va_list; -#endif -#endif - -/* Define the standard macros for the user, - if this invocation was from the user program. */ -#ifdef _STDARG_H - -#ifdef __GNUC__ -#define va_start(v,l) __builtin_va_start(v,l) -#define va_end(v) __builtin_va_end(v) -#define va_arg(v,l) __builtin_va_arg(v,l) -#if !defined(__STRICT_ANSI__) || __STDC_VERSION__ + 0 >= 199900L -#define va_copy(d,s) __builtin_va_copy(d,s) -#endif -#define __va_copy(d,s) __builtin_va_copy(d,s) -#endif - -/* Define va_list, if desired, from __gnuc_va_list. */ -/* We deliberately do not define va_list when called from - stdio.h, because ANSI C says that stdio.h is not supposed to define - va_list. stdio.h needs to have access to that data type, - but must not use that name. It should use the name __gnuc_va_list, - which is safe because it is reserved for the implementation. */ - -#ifdef _HIDDEN_VA_LIST /* On OSF1, this means varargs.h is "half-loaded". */ -#undef _VA_LIST -#endif - -#ifdef _BSD_VA_LIST -#undef _BSD_VA_LIST -#endif - -#ifdef __GNUC__ -#if defined(__svr4__) || (defined(_SCO_DS) && !defined(__VA_LIST)) -/* SVR4.2 uses _VA_LIST for an internal alias for va_list, - so we must avoid testing it and setting it here. - SVR4 uses _VA_LIST as a flag in stdarg.h, but we should - have no conflict with that. */ -#ifndef _VA_LIST_ -#define _VA_LIST_ -#ifdef __i860__ -#ifndef _VA_LIST -#define _VA_LIST va_list -#endif -#endif /* __i860__ */ -typedef __gnuc_va_list va_list; -#ifdef _SCO_DS -#define __VA_LIST -#endif -#endif /* _VA_LIST_ */ -#else /* not __svr4__ || _SCO_DS */ - -/* The macro _VA_LIST_ is the same thing used by this file in Ultrix. - But on BSD NET2 we must not test or define or undef it. - (Note that the comments in NET 2's ansi.h - are incorrect for _VA_LIST_--see stdio.h!) */ -#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__FreeBSD__) || defined(WINNT) -/* The macro _VA_LIST_DEFINED is used in Windows NT 3.5 */ -#ifndef _VA_LIST_DEFINED -/* The macro _VA_LIST is used in SCO Unix 3.2. */ -#ifndef _VA_LIST -/* The macro _VA_LIST_T_H is used in the Bull dpx2 */ -#ifndef _VA_LIST_T_H -/* The macro __va_list__ is used by BeOS. */ -#ifndef __va_list__ -typedef __gnuc_va_list va_list; -#endif /* not __va_list__ */ -#endif /* not _VA_LIST_T_H */ -#endif /* not _VA_LIST */ -#endif /* not _VA_LIST_DEFINED */ -#if !(defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__FreeBSD__)) -#define _VA_LIST_ -#endif -#ifndef _VA_LIST -#define _VA_LIST -#endif -#ifndef _VA_LIST_DEFINED -#define _VA_LIST_DEFINED -#endif -#ifndef _VA_LIST_T_H -#define _VA_LIST_T_H -#endif -#ifndef __va_list__ -#define __va_list__ -#endif - -#endif /* not _VA_LIST_, except on certain systems */ - -#endif /* not __svr4__ */ - -#endif /* __GNUC__ */ -#endif /* _STDARG_H */ - -#endif /* not _ANSI_STDARG_H_ */ -#endif /* not _STDARG_H */ - -#include <vadefs.h> #ifndef va_start #define va_start _crt_va_start Modified: trunk/reactos/include/crt/vadefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/vadefs.h?rev=6… ============================================================================== --- trunk/reactos/include/crt/vadefs.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/vadefs.h [iso-8859-1] Sun Jun 1 21:47:51 2014 @@ -18,39 +18,6 @@ #ifdef __cplusplus extern "C" { -#endif - -#ifndef _UINTPTR_T_DEFINED -#define _UINTPTR_T_DEFINED -#ifndef __uintptr_t_defined -#define __uintptr_t_defined -#undef uintptr_t -#ifdef _WIN64 -#if defined(__GNUC__) && defined(__STRICT_ANSI__) - typedef unsigned int uintptr_t __attribute__ ((mode (DI))); -#else - __MINGW_EXTENSION typedef unsigned __int64 uintptr_t; -#endif -#else - typedef unsigned long uintptr_t; -#endif -#endif -#endif - -#ifdef __GNUC__ -#ifndef __GNUC_VA_LIST -#define __GNUC_VA_LIST - typedef __builtin_va_list __gnuc_va_list; -#endif -#endif - -#ifndef _VA_LIST_DEFINED -#define _VA_LIST_DEFINED -#if defined(__GNUC__) - typedef __gnuc_va_list va_list; -#elif defined(_MSC_VER) - typedef char * va_list; -#endif #endif #ifdef __cplusplus Modified: trunk/reactos/include/psdk/basetyps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetyps.h?re… ============================================================================== --- trunk/reactos/include/psdk/basetyps.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/basetyps.h [iso-8859-1] Sun Jun 1 21:47:51 2014 @@ -33,6 +33,7 @@ # endif #endif +#ifndef STDMETHODCALLTYPE #define STDMETHODCALLTYPE __stdcall #define STDMETHODVCALLTYPE __cdecl #define STDAPICALLTYPE __stdcall @@ -45,6 +46,7 @@ #define STDAPIV_(t) EXTERN_C t STDAPIVCALLTYPE #define STDMETHODIMPV HRESULT STDMETHODVCALLTYPE #define STDMETHODIMPV_(t) t STDMETHODVCALLTYPE +#endif /* !STDMETHODCALLTYPE */ #if defined(__cplusplus) && !defined(CINTERFACE) # define interface struct Modified: trunk/reactos/include/psdk/guiddef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/guiddef.h?rev… ============================================================================== --- trunk/reactos/include/psdk/guiddef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/guiddef.h [iso-8859-1] Sun Jun 1 21:47:51 2014 @@ -18,6 +18,7 @@ #ifndef GUID_DEFINED #define GUID_DEFINED + typedef struct _GUID { #ifdef _MSC_VER @@ -29,6 +30,10 @@ unsigned short Data3; unsigned char Data4[ 8 ]; } GUID; +#endif + +#ifndef FAR +#define FAR #endif #ifndef DECLSPEC_SELECTANY @@ -109,6 +114,8 @@ #define REFFMTID const FMTID* __MIDL_CONST #endif /* !defined(__cplusplus) && !defined(CINTERFACE) */ +#if !defined(__midl) && !defined(__WIDL__) +#include <string.h> #if defined(__cplusplus) && !defined(CINTERFACE) __inline int InlineIsEqualGUID(REFGUID rguid1, REFGUID rguid2) @@ -131,6 +138,7 @@ #define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID))) #endif /* defined(__cplusplus) && !defined(CINTERFACE) */ +#endif /* __midl && __WIDL__ */ #if defined(__cplusplus) && !defined(CINTERFACE) #include <string.h> Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdef.h [iso-8859-1] Sun Jun 1 21:47:51 2014 @@ -31,10 +31,6 @@ #include <specstrings.h> #include <kernelspecs.h> -// FIXME: Shouldn't be included! -#include <stdarg.h> -#include <string.h> - #ifdef __cplusplus extern "C" { #endif @@ -42,7 +38,7 @@ /* Default to strict */ #ifndef NO_STRICT #ifndef STRICT -//#define STRICT 1 // FIXME: disabled for now +#define STRICT 1 #endif #endif @@ -66,11 +62,6 @@ #ifndef CRITICAL #define CRITICAL -#endif - -// FIXME: deprecated -#ifndef FAR -#define FAR #endif /* Constant modifier */ @@ -96,12 +87,6 @@ /* Defines the "size" of an any-size array */ #ifndef ANYSIZE_ARRAY #define ANYSIZE_ARRAY 1 -#endif - -#ifdef __cplusplus -#define EXTERN_C extern "C" -#else -#define EXTERN_C extern #endif /* Helper macro to enable gcc's extension. */ @@ -232,6 +217,12 @@ #define PROBE_ALIGNMENT32(_s) TYPE_ALIGNMENT(ULONG) #endif +#ifdef __cplusplus +#define EXTERN_C extern "C" +#else +#define EXTERN_C extern +#endif + /* Calling Conventions */ #if defined(_MANAGED) #define FASTCALL __stdcall @@ -242,6 +233,30 @@ #endif #define NTAPI __stdcall + +#ifndef STDMETHODCALLTYPE +#define STDMETHODCALLTYPE __stdcall +#define STDMETHODVCALLTYPE __cdecl +#define STDAPICALLTYPE __stdcall +#define STDAPIVCALLTYPE __cdecl +#define STDAPI EXTERN_C HRESULT STDAPICALLTYPE +#define STDAPI_(t) EXTERN_C t STDAPICALLTYPE +#define STDMETHODIMP HRESULT STDMETHODCALLTYPE +#define STDMETHODIMP_(t) t STDMETHODCALLTYPE +#define STDAPIV EXTERN_C HRESULT STDAPIVCALLTYPE +#define STDAPIV_(t) EXTERN_C t STDAPIVCALLTYPE +#define STDMETHODIMPV HRESULT STDMETHODVCALLTYPE +#define STDMETHODIMPV_(t) t STDMETHODVCALLTYPE +#endif /* !STDMETHODCALLTYPE */ + +#define STDOVERRIDEMETHODIMP __override STDMETHODIMP +#define STDOVERRIDEMETHODIMP_(t) __override STDMETHODIMP_(t) +#define IFACEMETHODIMP __override STDMETHODIMP +#define IFACEMETHODIMP_(t) __override STDMETHODIMP_(t) +#define STDOVERRIDEMETHODIMPV __override STDMETHODIMPV +#define STDOVERRIDEMETHODIMPV_(t) __override STDMETHODIMPV_(t) +#define IFACEMETHODIMPV __override STDMETHODIMPV +#define IFACEMETHODIMPV_(t) __override STDMETHODIMPV_(t) /* Import and Export Specifiers */

1 0

[tkreuzer] 63529: [KS] Fix to compile with STRICT enabled [CMAKE] Enable rostests in x64 build
by tkreuzer＠svn.reactos.org 01 Jun '14

01 Jun '14

Author: tkreuzer Date: Sun Jun 1 17:07:09 2014 New Revision: 63529 URL: http://svn.reactos.org/svn/reactos?rev=63529&view=rev Log: [KS] Fix to compile with STRICT enabled [CMAKE] Enable rostests in x64 build Modified: trunk/reactos/drivers/ksfilter/ks/filterfactory.c trunk/reactos/modules/CMakeLists.txt Modified: trunk/reactos/drivers/ksfilter/ks/filterfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filterfactory.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filterfactory.c [iso-8859-1] Sun Jun 1 17:07:09 2014 @@ -542,7 +542,7 @@ PLIST_ENTRY Entry; PSYMBOLIC_LINK_ENTRY SymEntry; BOOLEAN Found; - HKEY hKey; + HANDLE hKey; NTSTATUS Status = STATUS_SUCCESS; IKsFilterFactoryImpl * Factory = (IKsFilterFactoryImpl*)CONTAINING_RECORD(FilterFactory, IKsFilterFactoryImpl, FilterFactory); @@ -742,5 +742,5 @@ /* done */ return Status; -} - +} + Modified: trunk/reactos/modules/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/modules/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/modules/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/modules/CMakeLists.txt [iso-8859-1] Sun Jun 1 17:07:09 2014 @@ -1,5 +1,3 @@ - -if(NOT ARCH STREQUAL "amd64") if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/rostests/) add_subdirectory(rostests) @@ -12,5 +10,3 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/wallpaper/) add_subdirectory(wallpaper) endif() - -endif()

1 0

[dreimer] 63528: Revert that... sorry
by dreimer＠svn.reactos.org 01 Jun '14

01 Jun '14

Author: dreimer Date: Sun Jun 1 12:00:32 2014 New Revision: 63528 URL: http://svn.reactos.org/svn/reactos?rev=63528&view=rev Log: Revert that... sorry Modified: trunk/reactos/cmake/config.cmake Modified: trunk/reactos/cmake/config.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/config.cmake?rev=635… ============================================================================== --- trunk/reactos/cmake/config.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/config.cmake [iso-8859-1] Sun Jun 1 12:00:32 2014 @@ -58,7 +58,7 @@ "Whether to compile support for ELF files. Do not enable unless you know what you're doing.") -set(NSWPAT TRUE CACHE BOOL +set(NSWPAT FALSE CACHE BOOL "Whether to build apps/libs with features covered by software patents. If you live in a country where software patents are valid/apply, don't enable this (except they/you purchased a license from the patent owner).

1 0

[dreimer] 63527: [RAPPS] - Database update and some missed sourceforge mirror fixes by me and myself. - rapps: (for database) Many Improvements and Many Fixes by Erdem Ersoy CORE-7710 #resolve #com...
by dreimer＠svn.reactos.org 01 Jun '14

01 Jun '14

Author: dreimer Date: Sun Jun 1 11:58:21 2014 New Revision: 63527 URL: http://svn.reactos.org/svn/reactos?rev=63527&view=rev Log: [RAPPS] - Database update and some missed sourceforge mirror fixes by me and myself. - rapps: (for database) Many Improvements and Many Fixes by Erdem Ersoy CORE-7710 #resolve #comment Committed, thx for your help. Modified: trunk/reactos/base/applications/rapps/rapps/abyss.txt trunk/reactos/base/applications/rapps/rapps/bochs.txt trunk/reactos/base/applications/rapps/rapps/boswars.txt trunk/reactos/base/applications/rapps/rapps/codeblocks.txt trunk/reactos/base/applications/rapps/rapps/codeblocks_gcc.txt trunk/reactos/base/applications/rapps/rapps/codeblocks_gcc_2.txt trunk/reactos/base/applications/rapps/rapps/devcpp_mingw32.txt trunk/reactos/base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt trunk/reactos/base/applications/rapps/rapps/doublecommander.txt trunk/reactos/base/applications/rapps/rapps/dplus.txt trunk/reactos/base/applications/rapps/rapps/dvdwritenow.txt trunk/reactos/base/applications/rapps/rapps/fap.txt trunk/reactos/base/applications/rapps/rapps/fira.txt trunk/reactos/base/applications/rapps/rapps/firefox.txt trunk/reactos/base/applications/rapps/rapps/lazaruside.txt trunk/reactos/base/applications/rapps/rapps/libreoffice.txt trunk/reactos/base/applications/rapps/rapps/mcwin32.txt trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/mpc.txt trunk/reactos/base/applications/rapps/rapps/npp.txt trunk/reactos/base/applications/rapps/rapps/openoffice.txt trunk/reactos/base/applications/rapps/rapps/opera.txt trunk/reactos/base/applications/rapps/rapps/peazip.txt trunk/reactos/base/applications/rapps/rapps/putty.txt trunk/reactos/base/applications/rapps/rapps/python.txt trunk/reactos/base/applications/rapps/rapps/qmmp.txt trunk/reactos/base/applications/rapps/rapps/rosbe.txt trunk/reactos/base/applications/rapps/rapps/scite.txt trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt trunk/reactos/base/applications/rapps/rapps/seamonkey.txt trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt trunk/reactos/base/applications/rapps/rapps/thunderbird.txt trunk/reactos/base/applications/rapps/rapps/totalcommander.txt trunk/reactos/base/applications/rapps/rapps/utorrent.txt trunk/reactos/base/applications/rapps/rapps/vb5run.txt trunk/reactos/base/applications/rapps/rapps/vb6run.txt trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt trunk/reactos/base/applications/rapps/rapps/vc2008sp1run.txt trunk/reactos/base/applications/rapps/rapps/vc2010run.txt trunk/reactos/base/applications/rapps/rapps/vc6run.txt trunk/reactos/base/applications/rapps/rapps/winboard.txt trunk/reactos/base/applications/rapps/rapps/zaz.txt trunk/reactos/cmake/config.cmake Modified: trunk/reactos/base/applications/rapps/rapps/abyss.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/abyss.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/abyss.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -1,9 +1,9 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = Abyss Web server X1 -Version = 2.9.0.1 +Version = 2.9.3.2 Licence = Freeware Description = Abyss Web Server enables you to host your Web sites on your computer. It supports secure SSL/TLS connections (HTTPS) as well as a wide range of Web technologies. It can also run advanced PHP, Perl, Python, ASP, ASP.NET, and Ruby on Rails Web applications, which can be backed by databases such as MySQL, SQLite, MS SQL Server, MS Access, or Oracle. Size = 2.1 MB Modified: trunk/reactos/base/applications/rapps/rapps/bochs.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/bochs.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/bochs.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -1,16 +1,16 @@ -; UTF-8 +ï»¿; UTF-8 ; Polish translation by wojo664 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = Bochs -Version = 2.6.2 +Version = 2.6.5 Licence = LGPL v2 Description = Bochs is a highly portable open source IA-32 (x86) PC emulator written in C++, that runs on most popular platforms. Size = 4.7 MB Category = 15 URLSite = http://bochs.sourceforge.net/ -URLDownload = http://download.sourceforge.net/project/bochs/bochs/2.6.2/Bochs-2.6.2.exe +URLDownload = http://download.sourceforge.net/project/bochs/bochs/2.6.5/Bochs-2.6.5.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/boswars.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/boswars.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/boswars.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -27,5 +27,5 @@ Size = 62,3 Mo [Section.041f] -Description = Bos Wars, gelecekÃ§i ve gerÃ§ek zamanlÄ± bir izlem oyunudur. Oyunu baÅlatmak iÃ§in Microsoft Visual C++ 2008 YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼'nÃ¼ kurunuz. +Description = Bos Wars, gelecekÃ§i ve gerÃ§ek zamanlÄ± bir izlem oyunudur. Oyunu baÅlatmak iÃ§in Microsoft Visual C++ 2008 YÃ¼rÃ¼tÃ¼cÃ¼'yÃ¼ kurunuz. Size = 62,3 MB Modified: trunk/reactos/base/applications/rapps/rapps/codeblocks.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/codeblocks.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/codeblocks.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -9,7 +9,7 @@ Size = 29.2 MB Category = 7 URLSite = http://www.codeblocks.org/ -URLDownload = http://sourceforge.net/projects/codeblocks/files/Binaries/13.12/Windows/cod… +URLDownload = http://download.sourceforge.net/project/codeblocks/Binaries/13.12/Windows/c… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/codeblocks_gcc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/codeblocks_gcc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/codeblocks_gcc.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -9,7 +9,7 @@ Size = 97.8 MB Category = 7 URLSite = http://www.codeblocks.org/ -URLDownload = http://sourceforge.net/projects/codeblocks/files/Binaries/13.12/Windows/cod… +URLDownload = http://download.sourceforge.net/project/codeblocks/Binaries/13.12/Windows/c… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/codeblocks_gcc_2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/codeblocks_gcc_2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/codeblocks_gcc_2.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -9,7 +9,7 @@ Size = 100 MB Category = 7 URLSite = http://www.codeblocks.org/ -URLDownload = http://sourceforge.net/projects/codeblocks/files/Binaries/13.12/Windows/cod… +URLDownload = http://download.sourceforge.net/project/codeblocks/Binaries/13.12/Windows/c… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/devcpp_mingw32.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/devcpp_mingw32.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/devcpp_mingw32.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -1,15 +1,15 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = Orwell Dev-C++ MinGW32 -Version = 5.6.2 +Version = 5.6.3 Licence = GPLv2 Description = A maintained version of Dev-C++. It contains MinGW32 compiler. Size = 60.2 MB Category = 7 URLSite = http://orwelldevcpp.blogspot.com/ -URLDownload = http://sourceforge.net/projects/orwelldevcpp/files/Setup%20Releases/Dev-Cpp… +URLDownload = http://download.sourceforge.net/project/orwelldevcpp/Setup%20Releases/Dev-C… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -1,15 +1,15 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = Orwell Dev-C++ TDM GCC x64 -Version = 5.6.2 +Version = 5.6.3 Licence = GPLv2 Description = A maintained version of Dev-C++. It contains 64 bit TDM-GCC compiler. Size = 44.8 MB Category = 7 URLSite = http://orwelldevcpp.blogspot.com/ -URLDownload = http://sourceforge.net/projects/orwelldevcpp/files/Setup%20Releases/Dev-Cpp… +URLDownload = http://download.sourceforge.net/project/orwelldevcpp/Setup%20Releases/Dev-C… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/doublecommander.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/doublecommander.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/doublecommander.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -1,15 +1,15 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = Double Commander -Version = 0.5.9 Beta +Version = 0.5.10 Beta Licence = GPL Description = Double Commander is an open source file manager with two panels side by side. You need 7-Zip or a similar Utility to extract it. Size = 7.6 MB Category = 12 URLSite = http://doublecmd.sourceforge.net/ -URLDownload = http://download.sourceforge.net/project/doublecmd/DC%20for%20Windows%2032%2… +URLDownload = http://download.sourceforge.net/project/doublecmd/DC%20for%20Windows%2032%2… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/dplus.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/dplus.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/dplus.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -9,7 +9,7 @@ Size = 1.36 MB Category = 5 URLSite = http://dplus-browser.sourceforge.net/ -URLDownload = http://heanet.dl.sourceforge.net/project/dplus-browser/Releases/dplus-0.5b/… +URLDownload = http://download.sourceforge.net/project/dplus-browser/Releases/dplus-0.5b/d… CDPath = none [Section.0410] Modified: trunk/reactos/base/applications/rapps/rapps/dvdwritenow.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/dvdwritenow.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/dvdwritenow.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -33,5 +33,5 @@ [Section.041f] Licence = Ãcretsiz -Description = Ãcretsiz bir doÄrudan CD/DVD kaydedici yazÄ±lÄ±mÄ±. Kurulduktan sonra CD/DVD RW'lerinizi USB Flash veyÃ¢ Ã§Ä±karÄ±labilir sÃ¢bit disk sÃ¼rÃ¼cÃ¼leri olarak kullanabilirsiniz. Bununla birlikte UDF kÃ¼tÃ¼k dizgesiyle kaydedilmiÅ CD/DVD RW'lere yazabilirsiniz. AyrÄ±ca Microsoft DVDâROM'larÄ±, Ahead InCD ile kaydedilmiÅ RW diskleri gibi baÅka yazÄ±lÄ±mlarla oluÅturulmuÅ UDF diskleri okuyabilirsiniz. Kurmak iÃ§in bir ZIP Ã§Ä±karma izlencesi gerekir. +Description = Ãcretsiz bir doÄrudan CD/DVD kaydedici yazÄ±lÄ±mÄ±. Kurulduktan sonra CD/DVD RW'lerinizi, USB Flash veyÃ¢ Ã§Ä±karÄ±labilir sÃ¢bit disk sÃ¼rÃ¼cÃ¼leri olarak kullanabilirsiniz. Bununla birlikte UDF kÃ¼tÃ¼k dizgesiyle kaydedilmiÅ CD/DVD RW'lere yazabilirsiniz. AyrÄ±ca Microsoft DVDâROM'larÄ±, Ahead InCD ile kaydedilmiÅ RW diskleri gibi baÅka yazÄ±lÄ±mlarla oluÅturulmuÅ UDF diskleri okuyabilirsiniz. Kurmak iÃ§in bir ZIP Ã§Ä±karma izlencesi gerekir. Size = 1,2 MB Modified: trunk/reactos/base/applications/rapps/rapps/fap.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/fap.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/fap.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -1,15 +1,15 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = Fox Audio Player -Version = 0.10.0 +Version = 0.10.2 Licence = GPL Description = Simple and lightweight audio player. -Size = 1.89 MB +Size = 1.9 MB Category = 1 URLSite = http://foxaudioplayer.sourceforge.net/ -URLDownload = http://svn.reactos.org/packages/fap-0.10.0-win32-bin.exe +URLDownload = http://svn.reactos.org/packages/fap-0.10.2-win32.exe CDPath = none [Section.0407] @@ -20,7 +20,7 @@ [Section.040c] Description = Lecteur audio simple et lÃ©ger. -Size = 1,89 Mo +Size = 1,9 Mo [Section.0410] Description = Un semplice e leggero lettore audio. @@ -33,12 +33,12 @@ [Section.0418] Description = Un lector audio simplu Èi uÈor. -Size = 1,89 Mo +Size = 1,9 Mo [Section.041f] Name = Fox Ses OynatÄ±cÄ±sÄ± Description = BayaÄÄ± ve yeÄni ses oynatÄ±cÄ±sÄ±. -Size = 1,89 MB +Size = 1,9 MB [Section.0422] Description = ÐÑÐ¾ÑÑÐ¸Ð¹ ÑÐ° Ð¼Ð°Ð»ÐµÐ½ÑÐºÐ¸Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð²Ð°Ñ Ð°ÑÐ´ÑÐ¾ ÑÐ°Ð¹Ð»ÑÐ². Modified: trunk/reactos/base/applications/rapps/rapps/fira.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/fira.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/fira.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -1,13 +1,13 @@ -; UTF-8 +ï»¿; UTF-8 ; Polish translation by wojo664 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = Mozilla Fira Font -Version = 1.0 +Version = 3.1 Licence = Unknown Description = Mozilla Fira Font Pack, Includes Mono and Sans fonts. Unzip in the ReactOS's folder. -Size = 543 kB +Size = 1.1 MB Category = 14 URLSite = https://github.com/mozilla/Fira URLDownload = http://svn.reactos.org/packages/Fira.exe @@ -28,10 +28,10 @@ [Section.0418] Licence = NespecificatÄ Description = Pachetul Mozilla Fira Font, include fonturile Mono Èi Sans. DezarhivaÈi Ã®n dosarul âReactOSâ. (FIXME) -Size = 543 ko +Size = 1,1 Mo [Section.041f] Name = Mozilla Fira YazÄ± Tipi Licence = Bilinmiyor Description = Mozilla Fira YazÄ± Tipi Paketi, Mono ve Sans yazÄ± tiplerini kapsar. ReactOS'un dizinine Ã§Ä±kartÄ±nÄ±z. -Size = 543 KB +Size = 1,1 MB Modified: trunk/reactos/base/applications/rapps/rapps/firefox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -1,84 +1,84 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] -Name = Mozilla Firefox 28 -Version = 28.0 +Name = Mozilla Firefox 29 +Version = 29.0.1 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. -Size = 22.9 MB +Size = 27.7 MB Category = 5 URLSite = http://www.mozilla.org/en-US/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/28.0/win32/en-US/Fi… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/en-US/… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. -Size = 22.8 MB +Size = 27.5 MB URLSite = http://www.mozilla.org/de/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/28.0/win32/de/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/de/Fir… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. -Size = 22.7 MB +Size = 27.5 MB URLSite = http://www.mozilla.org/es-ES/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/28.0/win32/es-ES/Fi… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/es-ES/… [Section.040c] Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs. -Size = 23,0 Mo +Size = 27,8 Mo URLSite = http://www.mozilla.org/fr/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/28.0/win32/fr/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/fr/Fir… [Section.0410] Description = Il piÃ¹ popolare e uno dei migliori web browser gratuiti. -Size = 22.7 MB +Size = 27.5 MB URLSite = http://www.mozilla.org/it/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/28.0/win32/it/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/it/Fir… [Section.0413] Description = De meest populaire en een van de beste gratis Web browsers. -Size = 23.4 MB +Size = 28.2 MB URLSite = http://www.mozilla.org/nl/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/28.0/win32/nl/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/nl/Fir… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. -Size = 22.8 MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/28.0/win32/nb-NO/Fi… +Size = 27.5 MB +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/nb-NO/… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. -Size = 23.7 MB +Size = 28.4 MB URLSite = http://www.mozilla.org/pl/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/28.0/win32/pl/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/pl/Fir… [Section.0418] Description = Cel mai popular Èi unul dintre cele mai bune navigatoare web gratuite existente. -Size = 23,3 Mo +Size = 28,0 Mo URLSite = http://www.mozilla.org/ro/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/28.0/win32/ro/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/ro/Fir… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². -Size = 23,2 MB +Size = 27.9 MB URLSite = http://www.mozilla.org/ru/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/28.0/win32/ru/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/ru/Fir… [Section.041b] Description = NajpopulÃ¡rnejÅ¡Ã a jeden z najlepÅ¡Ãch slobodnÃ½ webovÃ½ch prehliadaÄov. -Size = 23,4 MB +Size = 28.2 MB URLSite = http://www.mozilla.org/sk/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/28.0/win32/sk/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/sk/Fir… [Section.041f] Description = ÃzgÃ¼r UmÃ»mÃ® AÄ tarayÄ±cÄ±larÄ± arasÄ±nda en tutulanÄ± ve en iyilerinden biri. -Size = 22,8 MB +Size = 27,5 MB URLSite = http://www.mozilla.org/tr/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/28.0/win32/tr/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/tr/Fir… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². -Size = 23,2 MB +Size = 27.9 MB URLSite = http://www.mozilla.org/uk/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/28.0/win32/uk/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/uk/Fir… Modified: trunk/reactos/base/applications/rapps/rapps/lazaruside.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/lazaruside.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/lazaruside.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -1,16 +1,16 @@ -; UTF-8 +ï»¿; UTF-8 ; Polish translation by wojo664 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = Lazarus -Version = 1.2 +Version = 1.2.2 Licence = modified LGPL, GPL Description = A cross-platform integrated development environment (IDE) that lets you create visual (GUI) and non-visual Object Pascal programs, and uses the Free Pascal compiler to generate your executable. -Size = 112 MB +Size = 114 MB Category = 7 URLSite = http://www.lazarus.freepascal.org/ -URLDownload = http://download.sourceforge.net/project/lazarus/Lazarus%20Windows%2032%20bi… +URLDownload = http://download.sourceforge.net/project/lazarus/Lazarus%20Windows%2032%20bi… CDPath = none [Section.0407] @@ -25,7 +25,7 @@ [Section.0418] Licence = GPL, LGPL modificatÄ Description = Un mediu integrat de dezvoltare (IDE) multi-platformÄ care vÄ permite crearea de programe Object Pascal, atÃ¢t vizuale (GUI) cÃ¢t Èi ne-vizuale, Èi utilizeazÄ compilatorul Free Pascal pentru a genera executabile. -Size = 112 Mo +Size = 114 Mo [Section.041f] Licence = DeÄiÅtirilmiÅ LGPL, GPL Modified: trunk/reactos/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -1,15 +1,15 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = LibreOffice -Version = 4.2.3 +Version = 4.2.4 Licence = LGPL Description = A powerful and open source office suite. It has been forked from OpenOffice. -Size = 211.0 MB +Size = 209.3 MB Category = 6 URLSite = http://www.documentfoundation.org/ -URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.2.3/win/x86/Lib… +URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.2.4/win/x86/Lib… CDPath = none [Section.0407] @@ -20,7 +20,7 @@ [Section.040c] Description = PrÃ©cÃ©demment appelÃ© OpenOffice. Suite bureautique open source. (FIXME) -Size = 211,0 Mo +Size = 209,3 Mo [Section.0410] Description = Precedentemente chiamato OpenOffice. Open Source Office Suite. (FIXME) @@ -33,11 +33,11 @@ [Section.0418] Description = Fostul OpenOffice. Suita de aplicaÈii de biroticÄ open-source. (FIXME) -Size = 211,0 Mo +Size = 209,3 Mo [Section.041f] Description = GÃ¼Ã§lÃ¼ ve aÃ§Ä±k kaynak bir bÃ¼ro takÄ±mÄ±. OpenOffice'ten Ã§atallanÄ±lmÄ±ÅtÄ±r. -Size = 211,0 MB +Size = 209,3 MB [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ Ð¾ÑÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ. (FIXME) Modified: trunk/reactos/base/applications/rapps/rapps/mcwin32.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mcwin32.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mcwin32.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -9,7 +9,7 @@ Size = 2.35 MB Category = 12 URLSite = http://sourceforge.net/projects/mcwin32/ -URLDownload = http://optimate.dl.sourceforge.net/project/mcwin32/mcwin32-build183-setup.e… +URLDownload = http://download.sourceforge.net/project/mcwin32/mcwin32-build183-setup.exe CDPath = none [Section.0410] Modified: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -1,15 +1,15 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = Miranda IM -Version = 0.10.22 +Version = 0.10.23 Licence = GPL Description = Open source multiprotocol instant messaging application - May not work completely. -Size = 2.8 MB +Size = 3.8 MB Category = 5 URLSite = http://www.miranda-im.org/ -URLDownload = http://files.miranda-im.org/stable/0.10.22.0/miranda-im-v0.10.22-unicode.exe +URLDownload = http://files.miranda-im.org/stable/0.10.23.0/miranda-im-v0.10.23-unicode.exe CDPath = none [Section.0407] @@ -20,7 +20,7 @@ [Section.040c] Description = Application de messagerie instantannÃ©e multi-protocoles open source - pourrait ne pas fonctionner complÃ¨tement. -Size = 2,8 Mo +Size = 3,8 Mo [Section.0410] Description = Multi-protocollo open source per applicazioni di messaggistica istantanea - potrebbe non funzionare del tutto. @@ -33,11 +33,11 @@ [Section.0418] Description = AplicaÈie de mesagerie instant multiprotocol (open-source) - posibil cu limitÄri Ã®n funcÈionalitate. -Size = 2,8 Mo +Size = 3,8 Mo [Section.041f] Description = AÃ§Ä±k kaynak, Ã§oklu iletiÅim kÃ¢ideli, evgin iletileÅme uygulamasÄ±. Eksiksiz olarak Ã§alÄ±Åmayabilir. -Size = 2,8 MB +Size = 3,8 MB [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ° Ð¼ÑÐ»ÑÑÐ¸Ð¿ÑÐ¾ÑÐ¾ÐºÐ¾Ð»ÑÐ½Ð° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð° Ð¼Ð¸ÑÑÑÐ²Ð¸Ñ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ñ - Ð¼Ð¾Ð¶Ðµ Ð½Ðµ Ð¿ÑÐ°ÑÑÐ²Ð°ÑÐ¸ Ð¿Ð¾Ð²Ð½ÑÑÑÑ. Modified: trunk/reactos/base/applications/rapps/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mpc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mpc.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -1,15 +1,15 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = Media Player Classic Home Cinema -Version = 1.7.4 +Version = 1.7.5 Licence = GPL Description = A media player. Size = 10.1 MB Category = 2 URLSite = http://mpc-hc.org/ -URLDownload = http://download.sourceforge.net/project/mpc-hc/MPC%20HomeCinema%20-%20Win32… +URLDownload = http://download.sourceforge.net/project/mpc-hc/MPC%20HomeCinema%20-%20Win32… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/npp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/npp.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/npp.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -1,15 +1,15 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = Notepad++ -Version = 6.5.5 +Version = 6.6.3 Licence = GPL Description = A text editor. Size = 7.3 MB Category = 6 URLSite = http://notepad-plus-plus.org/ -URLDownload = http://download.tuxfamily.org/notepadplus/6.5.5/npp.6.5.5.Installer.exe +URLDownload = http://download.tuxfamily.org/notepadplus/6.6.3/npp.6.6.3.Installer.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/openoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openoffice.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openoffice.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -1,52 +1,52 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] -Name = OpenOffice 4.0 -Version = 4.0.1 +Name = OpenOffice 4.1 +Version = 4.1.0 Licence = LGPL Description = The open source office suite. Size = 136.79 MB Category = 6 URLSite = http://www.openoffice.org/ -URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.0.1/binaries… +URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.0/binaries… CDPath = none [Section.0407] Description = DIE Open Source Office Suite. (FIXME) Size = 154.88 MB URLSite = http://www.openoffice.org/de/ -URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.0.1/binaries… +URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.0/binaries… [Section.040a] Description = La suite de ofimÃ¡tica de cÃ³digo abierto. Size = 126.29 MB URLSite = http://www.openoffice.org/es/ -URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.0.1/binaries… +URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.0/binaries… [Section.040c] Description = LA suite bureautique open source. Size = 127,22 Mo URLSite = http://www.openoffice.org/fr/ -URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.0.1/binaries… +URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.0/binaries… [Section.0410] Description = La suite di office Open Source. Size = 132.39 MB URLSite = http://www.openoffice.org/it/ -URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.0.1/binaries… +URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.0/binaries… [Section.0413] Description = Open-bron Office Pakket. (FIXME) Size = 132.11 MB URLSite = http://www.openoffice.org/nl/ -URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.0.1/binaries… +URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.0/binaries… [Section.0415] Description = Otwarty pakiet biurowy. Size = 127.47 MB URLSite = http://www.openoffice.org/pl/ -URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.0.1/binaries… +URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.0/binaries… [Section.0418] Description = Suita de aplicaÈii de biroticÄ open-source. @@ -57,7 +57,7 @@ Description = Bir aÃ§Ä±k kaynak bÃ¼ro takÄ±mÄ±. Size = 124,36 MB URLSite = http://www.openoffice.org/tr/ -URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.0.1/binaries… +URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.0/binaries… [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ Ð¾ÑÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ. @@ -68,4 +68,4 @@ Description = Open-bron Office Pakket. (FIXME) Size = 132.11 MB URLSite = http://www.openoffice.org/nl/ -URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.0.1/binaries… +URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.0/binaries… Modified: trunk/reactos/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/opera.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/opera.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -1,15 +1,15 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = Opera -Version = 12.16 +Version = 12.17 Licence = Freeware Description = The popular Opera Browser with many advanced features and including a Mail and BitTorrent client. -Size = 12.56 MB +Size = 12.57 MB Category = 5 URLSite = http://www.opera.com/ -URLDownload = http://ftp.opera.com/pub/opera/win/1216/int/Opera_1216_int_Setup.exe +URLDownload = http://ftp.opera.com/pub/opera/win/1217/int/Opera_1217_int_Setup.exe CDPath = none [Section.0405] @@ -23,7 +23,7 @@ [Section.040c] Description = Le populaire navigateur Opera avec beaucoup de fonctionnalitÃ©s avancÃ©es, incluant un client mail et BitTorrent. -Size = 12,56 Mo +Size = 12,57 Mo [Section.0410] Description = Il famoso browser Opera con funzionalitÃ avanzate come un client BitTorrent integrato e la gestione delle Mail. @@ -37,7 +37,7 @@ [Section.0418] Licence = GratuitÄ Description = Navigatorul popular Opera cu multe funcÈionalitÄÈi avansate incluzÃ¢nd poÈtÄ electronicÄ Èi un client de BitTorrent. -Size = 12,56 Mo +Size = 12,57 Mo [Section.0419] Description = ÐÐ¾Ð¿ÑÐ»ÑÑÐ½ÑÐ¹ Ð±ÑÐ°ÑÐ·ÐµÑ ÑÐ¾ Ð¼Ð½Ð¾Ð³Ð¸Ð¼Ð¸ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐ¼Ð¸ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑÐ¼Ð¸, Ð²ÐºÐ»ÑÑÐ°ÑÑÐ¸Ð¹ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð² Ð¿Ð¾ÑÑÑ Ð¸ BitTorrent. @@ -45,7 +45,7 @@ [Section.041f] Licence = Ãcretsiz Description = Bir posta ve BitTorrent istemcisini kapsayan birÃ§ok geliÅmiÅ husÃ»siyetle, tutulan Opera TarayÄ±cÄ±. -Size = 12,56 MB +Size = 12,57 MB [Section.0422] Description = ÐÐ¾Ð¿ÑÐ»ÑÑÐ½Ð¸Ð¹ Ð±ÑÐ°ÑÐ·ÐµÑ Ð· Ð±Ð°Ð³Ð°ÑÑÐ¼Ð° Ð´Ð¾Ð´Ð°ÑÐºÐ¾Ð²Ð¸Ð¼Ð¸ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑÑÐ¼Ð¸, ÑÐºÐ¸Ð¹ Ð²ÐºÐ»ÑÑÐ°Ñ Ð² ÑÐµÐ±Ðµ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ð¹ ÑÐ° BitTorrent ÐºÐ»ÑÑÐ½ÑÐ¸. Modified: trunk/reactos/base/applications/rapps/rapps/peazip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/peazip.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/peazip.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -1,15 +1,15 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = PeaZip -Version = 5.3.0 +Version = 5.3.1 Licence = LGPL v3, OpenCandy EULA Description = PeaZip is a free, cross-platform, open source file and archive manager. It supports over 150 archive formats. Size = 5.8 MB Category = 12 URLSite = http://peazip.sourceforge.net/ -URLDownload = http://sourceforge.net/projects/peazip/files/5.3.0/peazip-5.3.0.WINDOWS.exe +URLDownload = http://download.sourceforge.net/project/peazip/5.3.1/peazip-5.3.1.WINDOWS.e… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/putty.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/putty.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/putty.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -36,7 +36,7 @@ Size = 1,78 Mo [Section.041f] -Description = ÃzgÃ¼r bir SSH, Telnet, rlogin ve iÅlenmemiÅ TCP istemcisi. +Description = Ãcretsiz bir SSH, Telnet, rlogin ve iÅlenmemiÅ TCP istemcisi. Size = 1,78 MB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/python.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/python.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/python.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -1,15 +1,15 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = Python 3 -Version = 3.4.0 +Version = 3.4.1 Licence = GPL/LGPL Description = A remarkably powerful dynamic programming language. -Size = 23.4 MB +Size = 23.3 MB Category = 7 URLSite = http://www.python.org/ -URLDownload = http://www.python.org/ftp/python/3.4.0/python-3.4.0.msi +URLDownload = http://www.python.org/ftp/python/3.4.1/python-3.4.1.msi CDPath = none [Section.0407] @@ -20,7 +20,7 @@ [Section.040c] Description = Un langage de programmation dynamique remarquablement puissant. -Size = 23,4 Mo +Size = 23,3 Mo [Section.0410] Description = Un Linguaggio di programmazione dinamico e potente. @@ -33,11 +33,11 @@ [Section.0418] Description = Un limbaj de programare dinamic Èi puternic. -Size = 23,4 Mo +Size = 23,3 Mo [Section.041f] Description = Dikkat Ã§ekici, gÃ¼Ã§lÃ¼ ve devingen bir izlenceleme dili. -Size = 23,4 MB +Size = 23,3 MB [Section.0422] Description = ÐÑÐ¶Ðµ Ð¿Ð¾ÑÑÐ¶Ð½Ð° Ð´Ð¸Ð½Ð°Ð¼ÑÑÐ½Ð° Ð¼Ð¾Ð²Ð° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼ÑÐ²Ð°Ð½Ð½Ñ. Modified: trunk/reactos/base/applications/rapps/rapps/qmmp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/qmmp.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/qmmp.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -1,16 +1,16 @@ -; UTF-8 +ï»¿; UTF-8 ; Polish translation by wojo664 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = Qmmp (Qt-based Multimedia Player) -Version = 0.7.3 +Version = 0.7.7 Licence = GPL Description = Qmmp is an audio-player, written with the help of the Qt library. The user interface is similar to WinAMP or XMMS. Alternative user interfaces also are available. -Size = 16.0 MB +Size = 10.5 MB Category = 1 URLSite = http://qmmp.ylsoftware.com/index.php -URLDownload = http://qmmp.ylsoftware.com/files/windows/qmmp-0.7.3-win32.exe +URLDownload = http://qmmp.ylsoftware.com/files/windows/qmmp-0.7.7-win32.exe CDPath = none [Section.0407] @@ -24,7 +24,7 @@ [Section.0418] Description = Qmmp este un lector audio, ce utilizeazÄ biblioteca QT. InterfaÈa de utilizare e asemÄnÄtoare cu cea din WinAMP sau XMMS. De asemenea sunt disponibile interfeÈe de utilizare alternative. -Size = 16,0 Mo +Size = 10,5 Mo [Section.0419] Description = ÐÑÐ´Ð¸Ð¾Ð¿Ð»ÐµÐµÑ Qmmp (Qt-based Multimedia Player). @@ -32,4 +32,4 @@ [Section.041f] Name = Qmmp (Qt TabanlÄ± Ãoklu Ortam OynatÄ±cÄ±sÄ±) Description = Qmmp, Qt kitaplÄ±ÄÄ±nÄ±n yardÄ±mÄ±yla yazÄ±lmÄ±Å bir ses oynatÄ±cÄ±sÄ±dÄ±r. KullanÄ±cÄ± arayÃ¼zÃ¼ WinAMP'a ve XMMS'ye benzer. BaÅka kullanÄ±cÄ± arayÃ¼zleri de vardÄ±r. -Size = 16,0 MB +Size = 10,5 MB Modified: trunk/reactos/base/applications/rapps/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/rosbe.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/rosbe.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -9,7 +9,7 @@ Size = 28.3 MB Category = 7 URLSite = http://reactos.org/wiki/Build_Environment -URLDownload = http://downloads.sourceforge.net/reactos/RosBE-2.1.1.exe +URLDownload = http://download.sourceforge.net/reactos/RosBE-2.1.1.exe CDPath = none [Section.0405] Modified: trunk/reactos/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -1,15 +1,15 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = SciTE -Version = 3.4.1 +Version = 3.4.3 Licence = Freeware Description = SciTE is a SCIntilla based text editor. Originally built to demonstrate Scintilla, it has grown to be a generally useful editor with facilities for building and running programs. -Size = 730 kB +Size = 737 kB Category = 7 URLSite = http://www.scintilla.org/ -URLDownload = http://download.sourceforge.net/project/scintilla/SciTE/3.4.1/Sc341.exe +URLDownload = http://download.sourceforge.net/project/scintilla/SciTE/3.4.3/Sc343.exe CDPath = none [Section.0407] @@ -20,7 +20,7 @@ [Section.040c] Description = SciTE est un Ã©diteur de texte basÃ© sur SCIntilla. Originelement rÃ©alisÃ© pour montrer Scintilla, il a Ã©voluÃ© pour devenir un Ã©diteur gÃ©nÃ©ralement utile avec des options pour compiler et lancer des programmes. -Size = 730 ko +Size = 737 ko [Section.0410] Description = SciTE Ã¨ un editor di testo basato su scintilla. Originariamente costruito per dimostrare Scintilla, Ã¨ cresciuto fino a essere un editor generalmente utile con strutture per la creazione e l'esecuzione di programmi. @@ -34,12 +34,12 @@ [Section.0418] Licence = GratuitÄ Description = SciTE este un editor de text bazat pe SCIntilla. Construit iniÈial pentru a demonstra Scintilla, a crescut ulterior Ã®ntr-un editor de uz general cu funcÈionalitÄÈi de compilare Èi execuÈie a programelor. -Size = 730 ko +Size = 737 ko [Section.041f] Licence = Ãcretsiz Description = SciTE, bir Scintilla tabanlÄ± metin dÃ¼zenleyicisidir. Ä°lk baÅta Scintilla'yÄ± gÃ¶stermek iÃ§in yapÄ±ldÄ±, izlenceleri yapmak ve Ã§alÄ±ÅtÄ±rmak yetenekleriyle bir umÃ»miyetle kullanÄ±ÅlÄ± dÃ¼zenleyici olmak iÃ§in geliÅti. -Size = 730 KB +Size = 737 KB [Section.0422] Description = Ð¢ÐµÐºÑÑÐ¾Ð²Ð¸Ð¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ Ð½Ð° Ð¾ÑÐ½Ð¾Ð²Ñ SCIntilla. ÐÑÐ² Ð·ÑÐ±ÑÐ°Ð½Ð¸Ð¹ ÑÐº Ð¿ÑÐµÐ·ÐµÐ½ÑÐ°ÑÑÑ Scintilla, Ð°Ð»Ðµ Ð²Ð¸ÑÑÑ Ð´Ð¾ ÑÐµÐ´Ð°ÐºÑÐ¾ÑÐ° Ð·Ð°Ð³Ð°Ð»ÑÐ½Ð¾Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ð½Ð½Ñ Ð· Ð·Ð°ÑÐ¾Ð±Ð°Ð¼Ð¸ Ð·Ð±Ð¸ÑÐ°Ð½Ð½Ñ ÑÐ° Ð·Ð°Ð¿ÑÑÐºÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼. Modified: trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -40,7 +40,7 @@ Size = 136,67 ko [Section.041f] -Name = SDL (BayaÄÄ± DoÄrudan Ortam KatmanÄ±) YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼ +Name = SDL (BayaÄÄ± DoÄrudan Ortam KatmanÄ±) YÃ¼rÃ¼tÃ¼cÃ¼ Description = BirÃ§ok aÃ§Ä±k kaynak oyunu Ã§alÄ±ÅtÄ±rmak iÃ§in gereklidir. ÃÄ±kartmak iÃ§in 7-Zip ya da benzeri bir yazÄ±lÄ±m kullanmanÄ±z gerekir. Size = 136,67 KB Modified: trunk/reactos/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -1,46 +1,46 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = Mozilla SeaMonkey -Version = 2.25 +Version = 2.26 Licence = MPL/GPL/LGPL Description = Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need. Size = 23.90 MB Category = 5 URLSite = http://www.seamonkey-project.org/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.25/win32/en-US/… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.26/win32/en-US/… CDPath = none [Section.0407] Description = Mozilla Suite lebt. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benÃ¶tigen. Size = 23.80 MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.25/win32/de/Sea… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.26/win32/de/Sea… [Section.040a] Description = La suite de Mozilla estÃ¡ viva. Es el primero y Ãºnico navegador web, gestor de correo, lector de noticias, Chat y editor HTML que necesitarÃ¡s. Size = 23.79 MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.25/win32/es-ES/… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.26/win32/es-ES/… [Section.040c] Description = La suite Mozilla est en vie. Ceci est le seul et l'unique package navigateur, client mail, client chat et composer dont vous aurez besoin. Size = 24,06 Mo -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.25/win32/fr/Sea… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.26/win32/fr/Sea… [Section.0410] Description = Mozilla Suite Ã¨ vivo. Questo Ã¨ l'unico pachetto che include Browser, Mail, Chat, e Composer di cui avrete mai bisogno... Size = 23.71 MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.25/win32/it/Sea… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.26/win32/it/Sea… [Section.0413] Description = Mozilla Suite bundelt alle applicaties voor het Web: Browser, Mail, Chat, Composer. Size = 24.40 MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.25/win32/nl/Sea… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.26/win32/nl/Sea… [Section.0415] Description = Pakiet Mozilla Å¼yje. W zestawie: przeglÄdarka, klient poczty, IRC oraz Edytor HTML - wszystko, czego potrzebujesz. Size = 24.72 MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.25/win32/pl/Sea… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.26/win32/pl/Sea… [Section.0418] Description = Suita Mozilla. Acest pachet ce Ã®ncorporeazÄ navigator, poÈtÄ electronicÄ, client IRC Èi editor HTML, acoperind astfel o arie largÄ de necesitÄÈi. @@ -49,14 +49,14 @@ [Section.0419] Description = ÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ Mozilla Suite. ÐÐºÐ»ÑÑÐ°ÐµÑ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ, IRC-ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸ HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Size = 24.27 MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.25/win32/ru/Sea… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.26/win32/ru/Sea… [Section.041f] Description = Mozilla BohÃ§asÄ± saÄ. Bu, hiÃ§ gereksinim duymayacaÄÄ±nÄ±z, yalnÄ±zca TarayÄ±cÄ±, Posta, SÃ¶yleÅi ve Yazar bohÃ§asÄ±dÄ±r. Size = 23,83 MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.25/win32/tr/Sea… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.26/win32/tr/Sea… [Section.0422] Description = ÐÑÐ¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð½Ñ Mozilla Suite. ÐÐºÐ»ÑÑÐ°Ñ Ð² ÑÐµÐ±Ðµ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ð¹ ÐºÐ»ÑÑÐ½Ñ, IRC-ÐºÐ»ÑÑÐ½Ñ ÑÐ° HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Size = 24.27 MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.25/win32/ru/Sea… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.26/win32/ru/Sea… Modified: trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -1,15 +1,15 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = SumatraPDF -Version = 2.4 +Version = 2.5.2 Licence = GPLv3 Description = Sumatra PDF is a slim, free, open-source PDF reader. Portable out of the box. Size = 4.0 MB Category = 6 URLSite = http://blog.kowalczyk.info/software/sumatrapdf/free-pdf-reader.html -URLDownload = https://kjkpub.s3.amazonaws.com/sumatrapdf/rel/SumatraPDF-2.4-install.exe +URLDownload = https://kjkpub.s3.amazonaws.com/sumatrapdf/rel/SumatraPDF-2.5.2-install.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -1,79 +1,79 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = Mozilla Thunderbird 24 -Version = 24.4.0 +Version = 24.5.0 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Mail Clients out there. Size = 21.12 MB Category = 5 URLSite = https://www.mozilla.org/en-US/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.4.0/win32/en… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/en… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Mail-Clients. Size = 20.96 MB URLSite = https://www.mozilla.org/de/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.4.0/win32/de… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/de… [Section.040a] Description = El mÃ¡s popular y uno de los mejores clientes mail que hay. Size = 20.92 MB URLSite = https://www.mozilla.org/es-ES/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.4.0/win32/es… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/es… [Section.040c] Description = Le plus populaire et l'un des meilleurs clients mail gratuits disponible. Size = 21,27 Mo URLSite = https://www.mozilla.org/fr/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.4.0/win32/fr… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/fr… [Section.0410] Description = Il piÃ¹ popolare e il migliore Client mail gratuito. Size = 20.91 MB URLSite = https://www.mozilla.org/it/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.4.0/win32/it… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/it… [Section.0413] Description = De meest populaire en een van de beste gratis e-mail-programma's. Size = 21.61 MB URLSite = https://www.mozilla.org/nl/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.4.0/win32/nl… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/nl… [Section.0415] Description = Najpopularniejszy i jeden z najlepszych darmowych klientÃ³w poczty. Size = 21.80 MB URLSite = https://www.mozilla.org/pl/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.4.0/win32/pl… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/pl… [Section.0418] Description = Cel mai popular Èi unul dintre cele mai bune clientele gratuite de poÈtÄ electronicÄ. Size = 21,48 Mo URLSite = https://www.mozilla.org/ro/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.4.0/win32/ro… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/ro… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². Size = 21.38 MB URLSite = https://www.mozilla.org/ru/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.4.0/win32/ru… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/ru… [Section.041f] Description = ÃzgÃ¼r posta istemcileri arasÄ±nda en tutulanÄ± ve en iyilerinden biri. Size = 20,99 MB URLSite = https://www.mozilla.org/tr/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.4.0/win32/tr… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/tr… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ñ ÐºÐ»ÑÑÐ½ÑÑÐ². Size = 21.41 MB URLSite = https://www.mozilla.org/uk/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.4.0/win32/uk… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/uk… [Section.0813] Description = De meest populaire en een van de beste gratis e-mail-programma's. Size = 9.71 MB URLSite = https://www.mozilla.org/nl/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.4.0/win32/nl… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/nl… Modified: trunk/reactos/base/applications/rapps/rapps/totalcommander.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/totalcommander.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/totalcommander.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -1,15 +1,15 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = Total Commander -Version = 8.50 +Version = 8.51a Licence = Shareware Description = Total Commander is a file manager with two panels side by side. -Size = 3.5 MB +Size = 3.55 MB Category = 12 URLSite = http://www.ghisler.com/ -URLDownload = http://www.slo.ru/download/total_commander/tcm850x32.exe +URLDownload = http://www.slo.ru/download/total_commander/tcm851ax32.exe CDPath = none [Section.0407] @@ -28,12 +28,12 @@ [Section.0418] Licence = Versiune de evaluare Description = Total Commander este un gestionar de fiÈiere dupÄ modelul Â«douÄ paneluri alÄturateÂ». -Size = 3,5 Mo +Size = 3,55 Mo [Section.041f] Licence = PaylaÅÄ±mlÄ± Description = Total Commander, yan yana iki bÃ¶lmeli bir kÃ¼tÃ¼k yÃ¶neticisidir. -Size = 3,5 MB +Size = 3,55 MB [Section.0813] Description = Total Commander is een bestandsbeheerder met twee panelen zij aan zij. Modified: trunk/reactos/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -1,9 +1,9 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = ÂµTorrent -Version = 3.4.1 +Version = 3.4.2 Licence = Freeware for non-commercial uses Description = Small and fast BitTorrent Client. Size = 1.6 MB Modified: trunk/reactos/base/applications/rapps/rapps/vb5run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vb5run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vb5run.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -43,9 +43,9 @@ Size = 969,59 ko [Section.041f] -Name = Microsoft Visual Basic 5 YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼ +Name = Microsoft Visual Basic 5 YÃ¼rÃ¼tÃ¼cÃ¼ Licence = Bilinmiyor -Description = Microsoft Visual Basic 5 YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼. ÅunlarÄ± iÃ§erir: advpack.dll, asycfilt.dll, comcat.dll, msvbvm50.dll, oleaut32.dll, olepro32.dll. +Description = Microsoft Visual Basic 5 YÃ¼rÃ¼tÃ¼cÃ¼. ÅunlarÄ± iÃ§erir: advpack.dll, asycfilt.dll, comcat.dll, msvbvm50.dll, oleaut32.dll, olepro32.dll. Size = 969,59 KB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/vb6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vb6run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vb6run.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -43,9 +43,9 @@ Size = 1,02 Mo [Section.041f] -Name = Microsoft Visual Basic 6 YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼ +Name = Microsoft Visual Basic 6 YÃ¼rÃ¼tÃ¼cÃ¼ Licence = Bilinmiyor -Description = Microsoft Visual Basic 6 YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼. ÅunlarÄ± iÃ§erir: advpack.dll, asycfilt.dll, comcat.dll, msvbvm60.dll, oleaut32.dll, olepro32.dll. +Description = Microsoft Visual Basic 6 YÃ¼rÃ¼tÃ¼cÃ¼. ÅunlarÄ± iÃ§erir: advpack.dll, asycfilt.dll, comcat.dll, msvbvm60.dll, oleaut32.dll, olepro32.dll. Size = 1,02 MB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -45,7 +45,7 @@ [Section.041f] Name = Microsoft Visual C++ 2005 SP1 Yeniden DaÄÄ±tÄ±labilir Paket Licence = Bilinmiyor -Description = Microsoft Visual Studio 2005 YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼ SP1. ÅunlarÄ± iÃ§erir: atl80.dll, mfc80.dll, mfcm80.dll, mfcm80u.dll, msdia80.dll, msvcm80.dll, msvcp80.dll, msvcr80.dll, vcomp.dll. +Description = Microsoft Visual Studio 2005 YÃ¼rÃ¼tÃ¼cÃ¼ SP1. ÅunlarÄ± iÃ§erir: atl80.dll, mfc80.dll, mfcm80.dll, mfcm80u.dll, msdia80.dll, msvcm80.dll, msvcp80.dll, msvcr80.dll, vcomp.dll. Size = 2,6 MB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/vc2008sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc2008sp1run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc2008sp1run.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -45,7 +45,7 @@ [Section.041f] Name = Microsoft Visual C++ 2008 SP1 Yeniden DaÄÄ±tÄ±labilir Paket Licence = Bilinmiyor -Description = Microsoft Visual Studio 2008 SP1 YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼. ÅunlarÄ± iÃ§erir: atl90.dll, mfc90.dll, mfc90u.dll, mfcm90.dll, mfcm90u.dll, msdia90.dll, msvcm90.dll, msvcp90.dll, msvcr90.dll, vcomp90.dll. +Description = Microsoft Visual Studio 2008 SP1 YÃ¼rÃ¼tÃ¼cÃ¼. ÅunlarÄ± iÃ§erir: atl90.dll, mfc90.dll, mfc90u.dll, mfcm90.dll, mfcm90u.dll, msdia90.dll, msvcm90.dll, msvcp90.dll, msvcr90.dll, vcomp90.dll. Size = 4,02 MB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/vc2010run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc2010run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc2010run.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -45,7 +45,7 @@ [Section.041f] Name = Microsoft Visual C++ 2010 Yeniden DaÄÄ±tÄ±labilir Paket Licence = Bilinmiyor -Description = Microsoft Visual Studio 2010 YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼. ÅunlarÄ± iÃ§erir: atl100.dll, mfc100.dll, mfc100u.dll, mfcm100.dll, mfcm100u.dll, msdia100.dll, msvcm100.dll, msvcp100.dll, msvcr100.dll, vcomp100.dll. +Description = Microsoft Visual Studio 2010 YÃ¼rÃ¼tÃ¼cÃ¼. ÅunlarÄ± iÃ§erir: atl100.dll, mfc100.dll, mfc100u.dll, mfcm100.dll, mfcm100u.dll, msdia100.dll, msvcm100.dll, msvcp100.dll, msvcr100.dll, vcomp100.dll. Size = 4,8 MB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/vc6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc6run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc6run.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -45,7 +45,7 @@ [Section.041f] Name = Microsoft Visual C++ 6 Yeniden DaÄÄ±tÄ±labilir Paket Licence = Bilinmiyor -Description = Microsoft Visual Studio 6 YÃ¼rÃ¼tÃ¼cÃ¼sÃ¼. ÅunlarÄ± iÃ§erir: advpack.dll, asycfilt.dll, atla.dll, atlu.dll, comcat.dll, mfc42.dll, mfc42u.dll, msvcirt.dll, msvcp60.dll, msvcrt.dll, oleaut32.dll, olepro32.dll. +Description = Microsoft Visual Studio 6 YÃ¼rÃ¼tÃ¼cÃ¼. ÅunlarÄ± iÃ§erir: advpack.dll, asycfilt.dll, atla.dll, atlu.dll, comcat.dll, mfc42.dll, mfc42u.dll, msvcirt.dll, msvcp60.dll, msvcrt.dll, oleaut32.dll, olepro32.dll. Size = 1,75 MB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/winboard.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/winboard.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/winboard.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -4,8 +4,8 @@ [Section] Name = WinBoard Version = 4.2.7b -Licence = GPL 3 -Description = WinBoard is a graphical chessboard for the Windows/ReactOS that can serve as a user interface for GNU Chess, Crafty, and other chess engines, for the Internet Chess Servers, and for electronic mail correspondence chess. +Licence = GPLv3 +Description = WinBoard is a graphical chessboard for the Windows/ReactOS that can serve as a user interface for GNU Chess, Crafty, and other chess engines, for the Internet chess servers, and for electronic mail correspondence chess. Size = 5.93 MB Category = 4 URLSite = http://www.gnu.org/software/xboard/ @@ -36,7 +36,8 @@ Size = 5,93 Mo [Section.041f] -Description = WinBoard; GNU Chess, Crafty ve diÄer satranÃ§ motorlarÄ±nÄ± UmÃ»mÃ® AÄ satranÃ§ sunucularÄ± ve postayla yazÄ±ÅmalÄ± satranÃ§ iÃ§in bir arayÃ¼z olarak sunan, Windows/ReactOS iÃ§in bir Ã§izgelik satranÃ§ tahtasÄ±dÄ±r. +Licence = GPL 3. sÃ¼rÃ¼m +Description = WinBoard, UmÃ»mÃ® AÄ satranÃ§ sunucularÄ±na ve postayla yazÄ±ÅmalÄ± satranca GNU Chess, Crafty ve baÅka satranÃ§ motorlarÄ±nÄ± bir kullanÄ±cÄ± arayÃ¼zÃ¼ olarak sunabilen, Windows/ReactOS iÃ§in bir Ã§izgelik satranÃ§ tahtasÄ±dÄ±r. Size = 5,93 MB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/zaz.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/zaz.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/zaz.txt [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -6,7 +6,7 @@ Name = Zaz Version = 1.0.0 Licence = GPL -Description = Zaz is a free software arcade action puzzle computer game, a little bit like Frozen Bubble. +Description = Zaz is a free arcade action puzzle computer game, a little bit like Frozen Bubble. Size = 21.0 MB Category = 4 URLSite = http://zaz.sourceforge.net @@ -27,5 +27,5 @@ Size = 21,0 Mo [Section.041f] -Description = Zaz, atari salonu oyunu tÃ¼rÃ¼nde, geliÅimli bir bulmaca oyunudur. Bir nebze DonmuÅ KabarcÄ±klar'a benzemektedir. +Description = Zaz; Ã¼cretsiz, atari salonu oyunu tÃ¼rÃ¼nde, devingen bir bulmaca oyunudur, birazcÄ±k Frozen Bubble'a benzer. Size = 21,0 MB Modified: trunk/reactos/cmake/config.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/config.cmake?rev=635… ============================================================================== --- trunk/reactos/cmake/config.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/config.cmake [iso-8859-1] Sun Jun 1 11:58:21 2014 @@ -58,7 +58,7 @@ "Whether to compile support for ELF files. Do not enable unless you know what you're doing.") -set(NSWPAT FALSE CACHE BOOL +set(NSWPAT TRUE CACHE BOOL "Whether to build apps/libs with features covered by software patents. If you live in a country where software patents are valid/apply, don't enable this (except they/you purchased a license from the patent owner).

1 0

[khornicek] 63526: [EVENTVWR] - sync and translate the czech resources
by khornicek＠svn.reactos.org 01 Jun '14

01 Jun '14

Author: khornicek Date: Sun Jun 1 11:11:07 2014 New Revision: 63526 URL: http://svn.reactos.org/svn/reactos?rev=63526&view=rev Log: [EVENTVWR] - sync and translate the czech resources Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc [iso-8859-1] Sun Jun 1 11:11:07 2014 @@ -7,6 +7,10 @@ MENUITEM "&Aplikace", ID_LOG_APPLICATION MENUITEM "&ZabezpeÄenÃ", ID_LOG_SECURITY MENUITEM "&SystÃ©m", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "UloÅ¾it &Protokol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Odstranit udÃ¡losti", ID_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "&Konec", IDM_EXIT END @@ -95,6 +99,8 @@ IDS_EVENTLOG_AUDIT_FAILURE "Audit selhal" IDS_EVENTLOG_SUCCESS "ÃspÄch" IDS_EVENTLOG_UNKNOWN_TYPE "NeznÃ¡mÃ¡ udÃ¡lost" + IDS_CLEAREVENTS_MSG "Chcete tento protokol pÅed odstranÄnÃm uloÅ¾it?" + IDS_SAVE_FILTER "Protokol udÃ¡lostÃ (*.evt)\0*.evt\0" END STRINGTABLE

1 0

[tkreuzer] 63525: [EVENTEVWR] * when displaying message boxes, set the parent to the main window/details dialog instead of using NULL. *add a function for showing the last Win32 error and replace t...
by tkreuzer＠svn.reactos.org 01 Jun '14

01 Jun '14

Author: tkreuzer Date: Sun Jun 1 11:00:09 2014 New Revision: 63525 URL: http://svn.reactos.org/svn/reactos?rev=63525&view=rev Log: [EVENTEVWR] * when displaying message boxes, set the parent to the main window/details dialog instead of using NULL. *add a function for showing the last Win32 error and replace two message boxes with a call to it. *add the ability to save event logs to a file. *add the ability to clear event logs. *In QueryEventMessages(), assign lpSourceLogName and lpComputerName after the call to OpenEventLog, not before. Patch by Ricardo Hanke CORE-7863 #comment Comitted in r63525, thanks Modified: trunk/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc trunk/reactos/base/applications/mscutils/eventvwr/resource.h Modified: trunk/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt [iso-8859-1] Sun Jun 1 11:00:09 2014 @@ -1,7 +1,7 @@ add_executable(eventvwr eventvwr.c eventvwr.rc) set_module_type(eventvwr win32gui UNICODE) -add_importlibs(eventvwr user32 comctl32 advapi32 msvcrt kernel32) +add_importlibs(eventvwr user32 comctl32 comdlg32 advapi32 msvcrt kernel32) if(MSVC) add_importlibs(eventvwr ntdll) endif() Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Sun Jun 1 11:00:09 2014 @@ -28,9 +28,11 @@ #include <windef.h> #include <winbase.h> #include <winuser.h> +#include <wingdi.h> #include <winnls.h> #include <winreg.h> #include <commctrl.h> +#include <commdlg.h> #include "resource.h" @@ -42,7 +44,7 @@ static const LPWSTR EVENT_SOURCE_APPLICATION = L"Application"; static const LPWSTR EVENT_SOURCE_SECURITY = L"Security"; static const LPWSTR EVENT_SOURCE_SYSTEM = L"System"; -static const WCHAR szWindowClass[] = L"EVENTVWR"; /* the main window class name*/ +static const WCHAR szWindowClass[] = L"EVENTVWR"; /* the main window class name*/ //MessageFile message buffer size #define EVENT_MESSAGE_EVENTTEXT_BUFFER 1024*10 @@ -58,12 +60,15 @@ HINSTANCE hInst; /* current instance */ WCHAR szTitle[MAX_LOADSTRING]; /* The title bar text */ WCHAR szTitleTemplate[MAX_LOADSTRING]; /* The logged-on title bar text */ +WCHAR szSaveFilter[MAX_LOADSTRING]; /* Filter Mask for the save Dialog */ HWND hwndMainWindow; /* Main window */ HWND hwndListView; /* ListView control */ HWND hwndStatus; /* Status bar */ +HMENU hMainMenu; /* The application's main menu */ WCHAR szStatusBarTemplate[MAX_LOADSTRING]; /* The status bar text */ PEVENTLOGRECORD *g_RecordPtrs = NULL; DWORD g_TotalRecords = 0; +OPENFILENAMEW sfn; LPWSTR lpSourceLogName = NULL; LPWSTR lpComputerName = NULL; @@ -135,6 +140,25 @@ HeapFree(GetProcessHeap(), 0, g_RecordPtrs[iIndex]); HeapFree(GetProcessHeap(), 0, g_RecordPtrs); g_RecordPtrs = NULL; +} + +VOID +ShowLastWin32Error(VOID) +{ + DWORD dwError; + LPWSTR lpMessageBuffer; + + dwError = GetLastError(); + FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + dwError, + 0, + (LPWSTR)&lpMessageBuffer, + 0, + NULL); + + MessageBoxW(hwndMainWindow, lpMessageBuffer, szTitle, MB_OK | MB_ICONERROR); + LocalFree(lpMessageBuffer); } VOID @@ -219,10 +243,7 @@ } else { - MessageBoxW(NULL, - L"Registry access failed!", - L"Event Log", - MB_OK | MB_ICONINFORMATION); + ShowLastWin32Error(); } if (hSourceKey != NULL) @@ -524,20 +545,17 @@ dwFlags = EVENTLOG_FORWARDS_READ | EVENTLOG_SEQUENTIAL_READ; - lpSourceLogName = lpLogName; - lpComputerName = lpMachineName; - /* Open the event log. */ hEventLog = OpenEventLogW(lpMachineName, lpLogName); if (hEventLog == NULL) { - MessageBoxW(NULL, - L"Could not open the event log.", - L"Event Log", - MB_OK | MB_ICONINFORMATION); + ShowLastWin32Error(); return FALSE; } + + lpSourceLogName = lpLogName; + lpComputerName = lpMachineName; /* Disable listview redraw */ SendMessage(hwndListView, WM_SETREDRAW, FALSE, 0); @@ -551,6 +569,17 @@ /* Get the total number of event log records. */ GetNumberOfEventLogRecords (hEventLog , &dwTotalRecords); g_TotalRecords = dwTotalRecords; + + if (dwTotalRecords > 0) + { + EnableMenuItem(hMainMenu, ID_CLEAR_EVENTS, MF_BYCOMMAND | MF_ENABLED); + EnableMenuItem(hMainMenu, ID_SAVE_PROTOCOL, MF_BYCOMMAND | MF_ENABLED); + } + else + { + EnableMenuItem(hMainMenu, ID_CLEAR_EVENTS, MF_BYCOMMAND | MF_GRAYED); + EnableMenuItem(hMainMenu, ID_SAVE_PROTOCOL, MF_BYCOMMAND | MF_GRAYED); + } g_RecordPtrs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwTotalRecords * sizeof(PVOID)); @@ -704,6 +733,97 @@ SendMessageW(hwndListView, WM_SETREDRAW, TRUE, 0); // Close the event log. + CloseEventLog(hEventLog); + + return TRUE; +} + + +VOID +SaveProtocol(VOID) +{ + HANDLE hEventLog; + WCHAR szFileName[MAX_PATH]; + + ZeroMemory(szFileName, sizeof(szFileName)); + + sfn.lpstrFile = szFileName; + sfn.nMaxFile = MAX_PATH; + + if (!GetSaveFileNameW(&sfn)) + { + return; + } + + hEventLog = OpenEventLogW(lpComputerName, lpSourceLogName); + if (!hEventLog) + { + ShowLastWin32Error(); + return; + } + + if (!BackupEventLogW(hEventLog, szFileName)) + { + ShowLastWin32Error(); + } + + CloseEventLog(hEventLog); +} + + +BOOL +ClearEvents(VOID) +{ + HANDLE hEventLog; + WCHAR szFileName[MAX_PATH]; + WCHAR szMessage[MAX_LOADSTRING]; + + ZeroMemory(szFileName, sizeof(szFileName)); + ZeroMemory(szMessage, sizeof(szMessage)); + + LoadStringW(hInst, IDS_CLEAREVENTS_MSG, szMessage, MAX_LOADSTRING); + + sfn.lpstrFile = szFileName; + sfn.nMaxFile = MAX_PATH; + + switch (MessageBoxW(hwndMainWindow, szMessage, szTitle, MB_YESNOCANCEL | MB_ICONINFORMATION)) + { + case IDCANCEL: + { + return FALSE; + break; + } + + case IDNO: + { + sfn.lpstrFile = NULL; + break; + } + + case IDYES: + { + if (!GetSaveFileNameW(&sfn)) + { + return FALSE; + } + break; + } + } + + hEventLog = OpenEventLogW(lpComputerName, lpSourceLogName); + if (!hEventLog) + { + ShowLastWin32Error(); + return FALSE; + } + + if (!ClearEventLogW(hEventLog, sfn.lpstrFile)) + { + ShowLastWin32Error(); + CloseEventLog(hEventLog); + return FALSE; + } + CloseEventLog(hEventLog); return TRUE; @@ -905,6 +1025,20 @@ lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 8, &lvc); + // Initialize the save Dialog + ZeroMemory(&sfn, sizeof(sfn)); + ZeroMemory(szSaveFilter, sizeof(szSaveFilter)); + + LoadStringW(hInst, IDS_SAVE_FILTER, szSaveFilter, MAX_LOADSTRING); + + sfn.lStructSize = sizeof(sfn); + sfn.hwndOwner = hwndMainWindow; + sfn.hInstance = hInstance; + sfn.lpstrFilter = szSaveFilter; + sfn.lpstrInitialDir = NULL; + sfn.Flags = OFN_HIDEREADONLY | OFN_SHAREAWARE; + sfn.lpstrDefExt = NULL; + ShowWindow(hwndMainWindow, nCmdShow); UpdateWindow(hwndMainWindow); @@ -934,6 +1068,7 @@ switch (message) { case WM_CREATE: + hMainMenu = GetMenu(hWnd); CheckMenuRadioItem(GetMenu(hWnd), ID_LOG_APPLICATION, ID_LOG_SYSTEM, @@ -1002,6 +1137,17 @@ } break; + case ID_SAVE_PROTOCOL: + SaveProtocol(); + break; + + case ID_CLEAR_EVENTS: + if (ClearEvents()) + { + Refresh(); + } + break; + case IDM_REFRESH: Refresh(); break; @@ -1011,7 +1157,7 @@ break; case IDM_HELP: - MessageBoxW(NULL, + MessageBoxW(hwndMainWindow, L"Help not implemented yet!", L"Event Log", MB_OK | MB_ICONINFORMATION); @@ -1221,7 +1367,7 @@ return (INT_PTR)TRUE; case IDHELP: - MessageBoxW(NULL, + MessageBoxW(hDlg, L"Help not implemented yet!", L"Event Log", MB_OK | MB_ICONINFORMATION); Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc [iso-8859-1] Sun Jun 1 11:00:09 2014 @@ -7,6 +7,10 @@ MENUITEM "&ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ", ID_LOG_APPLICATION MENUITEM "&Ð¡Ð¸Ð³ÑÑÐ½Ð¾ÑÑ", ID_LOG_SECURITY MENUITEM "&Ð£ÑÐµÐ´Ð±Ð°", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM SEPARATOR + MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "ÐÐ·&ÑÐ¾Ð´", IDM_EXIT END @@ -95,6 +99,8 @@ IDS_EVENTLOG_AUDIT_FAILURE "Audit Failure" IDS_EVENTLOG_SUCCESS "Success" IDS_EVENTLOG_UNKNOWN_TYPE "Unknown Event" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc [iso-8859-1] Sun Jun 1 11:00:09 2014 @@ -9,6 +9,10 @@ MENUITEM "&Anwendung", ID_LOG_APPLICATION MENUITEM "&Sicherheit", ID_LOG_SECURITY MENUITEM "&System", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "Protokoll s&peichern...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM SEPARATOR + MENUITEM "Alle E&reignisse lÃ¶schen", ID_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "B&eenden", IDM_EXIT END @@ -97,6 +101,8 @@ IDS_EVENTLOG_AUDIT_FAILURE "Audit Fehlgeschlagen" IDS_EVENTLOG_SUCCESS "Erfolgreich" IDS_EVENTLOG_UNKNOWN_TYPE "Unbekanntes Ereignis" + IDS_CLEAREVENTS_MSG "MÃ¶chten Sie dieses Protokoll vor dem LÃ¶schen speichern?" + IDS_SAVE_FILTER "Ereignisprotokoll (*.evt)\0*.evt\0" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc [iso-8859-1] Sun Jun 1 11:00:09 2014 @@ -9,6 +9,10 @@ MENUITEM "&ÎÏÎ±ÏÎ¼Î¿Î³Î®", ID_LOG_APPLICATION MENUITEM "&ÎÏÏÎ¬Î»ÎµÎ¹Î±", ID_LOG_SECURITY MENUITEM "&Î£ÏÏÏÎ·Î¼Î±", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM SEPARATOR + MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "Î&Î¾Î¿Î´Î¿Ï", IDM_EXIT END @@ -97,6 +101,8 @@ IDS_EVENTLOG_AUDIT_FAILURE "Audit Failure" IDS_EVENTLOG_SUCCESS "ÎÏÎ¹ÏÏÏÎ¯Î±" IDS_EVENTLOG_UNKNOWN_TYPE "ÎÎ³Î½ÏÏÏÎ¿ ÏÏÎ¼Î²Î¬Î½" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc [iso-8859-1] Sun Jun 1 11:00:09 2014 @@ -15,6 +15,10 @@ MENUITEM "&Application", ID_LOG_APPLICATION MENUITEM "&Security", ID_LOG_SECURITY MENUITEM "&System", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM SEPARATOR + MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "E&xit", IDM_EXIT END @@ -103,6 +107,8 @@ IDS_EVENTLOG_AUDIT_FAILURE "Audit Failure" IDS_EVENTLOG_SUCCESS "Success" IDS_EVENTLOG_UNKNOWN_TYPE "Unknown Event" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc [iso-8859-1] Sun Jun 1 11:00:09 2014 @@ -9,6 +9,10 @@ MENUITEM "&AplicaciÃ³n", ID_LOG_APPLICATION MENUITEM "&Seguridad", ID_LOG_SECURITY MENUITEM "&Sistema", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM SEPARATOR + MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "S&alir", IDM_EXIT END @@ -97,6 +101,8 @@ IDS_EVENTLOG_AUDIT_FAILURE "Auditoria Fallida" IDS_EVENTLOG_SUCCESS "Acierto" IDS_EVENTLOG_UNKNOWN_TYPE "Evento Desconocido" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc [iso-8859-1] Sun Jun 1 11:00:09 2014 @@ -9,6 +9,10 @@ MENUITEM "&Application", ID_LOG_APPLICATION MENUITEM "&SÃ©curitÃ©", ID_LOG_SECURITY MENUITEM "&SystÃ¨me", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM SEPARATOR + MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "Quitter", IDM_EXIT END @@ -97,6 +101,8 @@ IDS_EVENTLOG_AUDIT_FAILURE "Ãchec de l'audit" IDS_EVENTLOG_SUCCESS "SuccÃ¨s" IDS_EVENTLOG_UNKNOWN_TYPE "ÃvÃ©nement Inconnu" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc [iso-8859-1] Sun Jun 1 11:00:09 2014 @@ -9,6 +9,10 @@ MENUITEM "×××©××", ID_LOG_APPLICATION MENUITEM "×××××", ID_LOG_SECURITY MENUITEM "××¢×¨××ª", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM SEPARATOR + MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "××¦×××", IDM_EXIT END @@ -97,6 +101,8 @@ IDS_EVENTLOG_AUDIT_FAILURE "Audit Failure" IDS_EVENTLOG_SUCCESS "××¦×××" IDS_EVENTLOG_UNKNOWN_TYPE "×××¨××¢ ×× ××××¢" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc [iso-8859-1] Sun Jun 1 11:00:09 2014 @@ -9,6 +9,10 @@ MENUITEM "&Applicazioni", ID_LOG_APPLICATION MENUITEM "&Sicurezza", ID_LOG_SECURITY MENUITEM "&Sistema", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM SEPARATOR + MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "E&sci", IDM_EXIT END @@ -97,6 +101,8 @@ IDS_EVENTLOG_AUDIT_FAILURE "Audit fallita" IDS_EVENTLOG_SUCCESS "Successo" IDS_EVENTLOG_UNKNOWN_TYPE "Evento sconosciuto" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc [iso-8859-1] Sun Jun 1 11:00:09 2014 @@ -9,6 +9,10 @@ MENUITEM "ã¢ããªã±ã¼ã·ã§ã³(&A)", ID_LOG_APPLICATION MENUITEM "ã»ãã¥ãªãã£(&S)", ID_LOG_SECURITY MENUITEM "ã·ã¹ãã (&S)", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM SEPARATOR + MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "çµäº(&X)", IDM_EXIT END @@ -97,6 +101,8 @@ IDS_EVENTLOG_AUDIT_FAILURE "å¤±æã®ç£æ»" IDS_EVENTLOG_SUCCESS "æå" IDS_EVENTLOG_UNKNOWN_TYPE "ä¸æãªã¤ãã³ã" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc [iso-8859-1] Sun Jun 1 11:00:09 2014 @@ -9,6 +9,10 @@ MENUITEM "ì íë¦¬ì¼ì´ì(&A)", ID_LOG_APPLICATION MENUITEM "ë³´ì(&S)", ID_LOG_SECURITY MENUITEM "ìì¤í(&S)", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM SEPARATOR + MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "ì¢ë£(&X)", IDM_EXIT END @@ -97,6 +101,8 @@ IDS_EVENTLOG_AUDIT_FAILURE "ê°ì¬ ì¤í¨" IDS_EVENTLOG_SUCCESS "ì±ê³µ" IDS_EVENTLOG_UNKNOWN_TYPE "ìë ¤ì§ì§ ìì ì´ë²¤í¸" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc [iso-8859-1] Sun Jun 1 11:00:09 2014 @@ -7,6 +7,10 @@ MENUITEM "&Applikasjon", ID_LOG_APPLICATION MENUITEM "&Sikkerhet", ID_LOG_SECURITY MENUITEM "&System", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM SEPARATOR + MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "A&vslutt", IDM_EXIT END @@ -95,6 +99,8 @@ IDS_EVENTLOG_AUDIT_FAILURE "Revisjon misslykkes" IDS_EVENTLOG_SUCCESS "Suksess" IDS_EVENTLOG_UNKNOWN_TYPE "Ukjent hendelse" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc [iso-8859-1] Sun Jun 1 11:00:09 2014 @@ -9,6 +9,10 @@ MENUITEM "&Aplikacja", ID_LOG_APPLICATION MENUITEM "&Zabezpieczenia", ID_LOG_SECURITY MENUITEM "&System", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM SEPARATOR + MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "&WyjÅcie", IDM_EXIT END @@ -97,6 +101,8 @@ IDS_EVENTLOG_AUDIT_FAILURE "Nieudany Audyt" IDS_EVENTLOG_SUCCESS "Sukces" IDS_EVENTLOG_UNKNOWN_TYPE "Zdarzenie nieznane" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc [iso-8859-1] Sun Jun 1 11:00:09 2014 @@ -9,6 +9,10 @@ MENUITEM "&Aplicativo", ID_LOG_APPLICATION MENUITEM "S&eguranÃ§a", ID_LOG_SECURITY MENUITEM "&Sistema", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM SEPARATOR + MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "&Sair", IDM_EXIT END @@ -97,6 +101,8 @@ IDS_EVENTLOG_AUDIT_FAILURE "Falha na Auditoria" IDS_EVENTLOG_SUCCESS "Sucesso" IDS_EVENTLOG_UNKNOWN_TYPE "Evento Desconhecido" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc [iso-8859-1] Sun Jun 1 11:00:09 2014 @@ -9,6 +9,10 @@ MENUITEM "&AplicaÈie", ID_LOG_APPLICATION MENUITEM "Se&curitate", ID_LOG_SECURITY MENUITEM "&Sistem", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM SEPARATOR + MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "I&eÈire", IDM_EXIT END @@ -97,6 +101,8 @@ IDS_EVENTLOG_AUDIT_FAILURE "EÈec audit" IDS_EVENTLOG_SUCCESS "Succes" IDS_EVENTLOG_UNKNOWN_TYPE "Eveniment necunoscut" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] Sun Jun 1 11:00:09 2014 @@ -9,6 +9,10 @@ MENUITEM "&ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹", ID_LOG_APPLICATION MENUITEM "&ÐÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÐ¸", ID_LOG_SECURITY MENUITEM "&Ð¡Ð¸ÑÑÐµÐ¼Ñ", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM SEPARATOR + MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "Ð&ÑÑÐ¾Ð´", IDM_EXIT END @@ -97,6 +101,8 @@ IDS_EVENTLOG_AUDIT_FAILURE "ÐÑÐ´Ð¸Ñ Ð¾ÑÐºÐ°Ð·Ð¾Ð²" IDS_EVENTLOG_SUCCESS "Ð£ÑÐ¿ÐµÑ" IDS_EVENTLOG_UNKNOWN_TYPE "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð¾Ðµ ÑÐ¾Ð±ÑÑÐ¸Ðµ" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc [iso-8859-1] Sun Jun 1 11:00:09 2014 @@ -12,6 +12,10 @@ MENUITEM "&Application", ID_LOG_APPLICATION MENUITEM "&Security", ID_LOG_SECURITY MENUITEM "&System", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM SEPARATOR + MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "&SkonÄiÅ¥", IDM_EXIT END @@ -100,6 +104,8 @@ IDS_EVENTLOG_AUDIT_FAILURE "Kontrola zlyhala" IDS_EVENTLOG_SUCCESS "Ãspech" //Success IDS_EVENTLOG_UNKNOWN_TYPE "NeznÃ¡ma udalosÅ¥" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc [iso-8859-1] Sun Jun 1 11:00:09 2014 @@ -15,6 +15,10 @@ MENUITEM "&Aplikacion", ID_LOG_APPLICATION MENUITEM "&Siguri", ID_LOG_SECURITY MENUITEM "&Sistemi", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM SEPARATOR + MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "Dil", IDM_EXIT END @@ -103,6 +107,8 @@ IDS_EVENTLOG_AUDIT_FAILURE "Audit dÃ«shtoj" IDS_EVENTLOG_SUCCESS "Sukses" IDS_EVENTLOG_UNKNOWN_TYPE "Ngjraje e panjohur" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc [iso-8859-1] Sun Jun 1 11:00:09 2014 @@ -9,6 +9,10 @@ MENUITEM "&Applikation", ID_LOG_APPLICATION MENUITEM "&SÃ¤kerhet", ID_LOG_SECURITY MENUITEM "&System", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM SEPARATOR + MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "A&vsluta", IDM_EXIT END @@ -97,6 +101,8 @@ IDS_EVENTLOG_AUDIT_FAILURE "Revision misslyckades" IDS_EVENTLOG_SUCCESS "Uppgift lyckades" IDS_EVENTLOG_UNKNOWN_TYPE "OkÃ¤nd hÃ¤ndelse" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc [iso-8859-1] Sun Jun 1 11:00:09 2014 @@ -15,6 +15,10 @@ MENUITEM "&Uygulama", ID_LOG_APPLICATION MENUITEM "&GÃ¼venlik", ID_LOG_SECURITY MENUITEM "&Dizge", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM SEPARATOR + MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "&ÃÄ±kÄ±Å", IDM_EXIT END @@ -103,6 +107,8 @@ IDS_EVENTLOG_AUDIT_FAILURE "BaÅarÄ±sÄ±zlÄ±k Denetimi" IDS_EVENTLOG_SUCCESS "BaÅarÄ±" IDS_EVENTLOG_UNKNOWN_TYPE "Bilinmeyen Olay" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc [iso-8859-1] Sun Jun 1 11:00:09 2014 @@ -9,6 +9,10 @@ MENUITEM "&ÐÑÐ¾Ð³ÑÐ°Ð¼Ð°", ID_LOG_APPLICATION MENUITEM "&ÐÐ°ÑÐ¸ÑÑ", ID_LOG_SECURITY MENUITEM "&Ð¡Ð¸ÑÑÐµÐ¼Ð°", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM SEPARATOR + MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "Ð&Ð¸ÑÑÐ´", IDM_EXIT END @@ -97,6 +101,8 @@ IDS_EVENTLOG_AUDIT_FAILURE "ÐÑÐ´Ð¸Ñ Ð²ÑÐ´Ð¼Ð¾Ð²" IDS_EVENTLOG_SUCCESS "Ð£ÑÐ¿ÑÑ" IDS_EVENTLOG_UNKNOWN_TYPE "ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° Ð¿Ð¾Ð´ÑÑ" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc [iso-8859-1] Sun Jun 1 11:00:09 2014 @@ -9,6 +9,10 @@ MENUITEM "åºç¨ç¨åºæ¥å¿(&A)", ID_LOG_APPLICATION MENUITEM "å®å¨æ¥å¿(&S)", ID_LOG_SECURITY MENUITEM "ç³»ç»æ¥å¿(&Y)", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM SEPARATOR + MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "éåº(&X)", IDM_EXIT END @@ -97,6 +101,8 @@ IDS_EVENTLOG_AUDIT_FAILURE "å®¡æ ¸å¤±è´¥" IDS_EVENTLOG_SUCCESS "æå" IDS_EVENTLOG_UNKNOWN_TYPE "æªç¥äºä»¶" + IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?" + IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/resource.h [iso-8859-1] Sun Jun 1 11:00:09 2014 @@ -46,6 +46,8 @@ #define ID_VIEW_REFRESH 32780 #define ID_REFRESH 32781 #define IDM_REFRESH 32782 +#define ID_CLEAR_EVENTS 32783 +#define ID_SAVE_PROTOCOL 32784 /* String IDs */ #define IDS_APP_TITLE 103 @@ -59,6 +61,8 @@ #define IDS_EVENTLOG_AUDIT_FAILURE 255 #define IDS_EVENTLOG_SUCCESS 256 #define IDS_EVENTLOG_UNKNOWN_TYPE 257 +#define IDS_CLEAREVENTS_MSG 258 +#define IDS_SAVE_FILTER 259 #define IDS_COLUMNTYPE 300 #define IDS_COLUMNDATE 301

1 0

[tkreuzer] 63524: [INCLUDE] - ntdef.h: add missing RTL_NUMBER_OF_FIELD, RTL_PADDING_BETWEEN_FIELDS, RotateLeft*, PRODUCT_*, SUBLANG_*, SORT_*, LANG_SYSTEM_DEFAULT, LANG_USER_DEFAULT, a few LOCALE_*...
by tkreuzer＠svn.reactos.org 01 Jun '14

01 Jun '14

Author: tkreuzer Date: Sun Jun 1 10:15:07 2014 New Revision: 63524 URL: http://svn.reactos.org/svn/reactos?rev=63524&view=rev Log: [INCLUDE] - ntdef.h: add missing RTL_NUMBER_OF_FIELD, RTL_PADDING_BETWEEN_FIELDS, RotateLeft*, PRODUCT_*, SUBLANG_*, SORT_*, LANG_SYSTEM_DEFAULT, LANG_USER_DEFAULT, a few LOCALE_* - winnt.h: add missing LOCALE_SYSTEM_DEFAULT, LOCALE_USER_DEFAULT - winnls.h: remove definitions that don't belong there, add some missing ones, remove wineisms - intrin.h Implement _rotl64 for GCC - basetyps.h: add #pragma once, move include to the top Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h trunk/reactos/include/psdk/basetyps.h trunk/reactos/include/psdk/ntdef.h trunk/reactos/include/psdk/winnls.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] Sun Jun 1 10:15:07 2014 @@ -1003,6 +1003,7 @@ __INTRIN_INLINE unsigned char _rotl8(unsigned char value, unsigned char shift); __INTRIN_INLINE unsigned short _rotl16(unsigned short value, unsigned char shift); __INTRIN_INLINE unsigned int _rotl(unsigned int value, int shift); +__INTRIN_INLINE unsigned __int64 _rotl64(unsigned __int64 value, int shift); __INTRIN_INLINE unsigned int _rotr(unsigned int value, int shift); __INTRIN_INLINE unsigned char _rotr8(unsigned char value, unsigned char shift); __INTRIN_INLINE unsigned short _rotr16(unsigned short value, unsigned char shift); @@ -1113,6 +1114,21 @@ __asm__("roll %b[shift], %k[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); return retval; } + +#ifdef _M_AMD64 +__INTRIN_INLINE unsigned __int64 _rotl64(unsigned __int64 value, int shift) +{ + unsigned __int64 retval; + __asm__("rolq %b[shift], %k[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); + return retval; +} +#else +__INTRIN_INLINE unsigned __int64 _rotl64(unsigned __int64 value, int shift) +{ + /* FIXME: this is probably not optimal */ + return (value << shift) | (value >> (64 - shift)); +} +#endif __INTRIN_INLINE unsigned int _rotr(unsigned int value, int shift) { Modified: trunk/reactos/include/psdk/basetyps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetyps.h?re… ============================================================================== --- trunk/reactos/include/psdk/basetyps.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/basetyps.h [iso-8859-1] Sun Jun 1 10:15:07 2014 @@ -1,5 +1,9 @@ + #ifndef _BASETYPS_H #define _BASETYPS_H +#pragma once + +#include <guiddef.h> #ifndef __OBJC__ # ifdef __cplusplus @@ -72,8 +76,6 @@ # define DECLARE_INTERFACE_(i,b) DECLARE_INTERFACE(i) #endif -#include <guiddef.h> - #ifndef _ERROR_STATUS_T_DEFINED #define _ERROR_STATUS_T_DEFINED typedef unsigned long error_status_t; Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdef.h [iso-8859-1] Sun Jun 1 10:15:07 2014 @@ -39,6 +39,13 @@ extern "C" { #endif +/* Default to strict */ +#ifndef NO_STRICT +#ifndef STRICT +//#define STRICT 1 // FIXME: disabled for now +#endif +#endif + /* Pseudo Modifiers for Input Parameters */ #ifndef IN @@ -89,6 +96,12 @@ /* Defines the "size" of an any-size array */ #ifndef ANYSIZE_ARRAY #define ANYSIZE_ARRAY 1 +#endif + +#ifdef __cplusplus +#define EXTERN_C extern "C" +#else +#define EXTERN_C extern #endif /* Helper macro to enable gcc's extension. */ @@ -579,6 +592,7 @@ #pragma warning(push) #pragma warning(disable:4201) #endif + /* Used to store a non-float 8 byte aligned structure */ typedef struct _QUAD { @@ -701,24 +715,6 @@ UNICODE_STRING64, *PUNICODE_STRING64, ANSI_STRING64, *PANSI_STRING64; -/* LangID and NLS */ -#define MAKELANGID(p, s) ((((USHORT)(s)) << 10) | (USHORT)(p)) -#define PRIMARYLANGID(lgid) ((USHORT)(lgid) & 0x3ff) -#define SUBLANGID(lgid) ((USHORT)(lgid) >> 10) - -#define NLS_VALID_LOCALE_MASK 0x000fffff - -#define MAKELCID(lgid, srtid) ((ULONG)((((ULONG)((USHORT)(srtid))) << 16) | \ - ((ULONG)((USHORT)(lgid))))) -#define MAKESORTLCID(lgid, srtid, ver) \ - ((ULONG)((MAKELCID(lgid, srtid)) | \ - (((ULONG)((USHORT)(ver))) << 20))) -#define LANGIDFROMLCID(lcid) ((USHORT)(lcid)) -#define SORTIDFROMLCID(lcid) ((USHORT)((((ULONG)(lcid)) >> 16) & 0xf)) -#define SORTVERSIONFROMLCID(lcid) ((USHORT)((((ULONG)(lcid)) >> 20) & 0xf)) - -#define LOCALE_NAME_MAX_LENGTH 85 - /* Object Attributes */ typedef struct _OBJECT_ATTRIBUTES { ULONG Length; @@ -836,6 +832,8 @@ UCHAR Reserved; } PROCESSOR_NUMBER, *PPROCESSOR_NUMBER; +#define ALL_PROCESSOR_GROUPS 0xffff + _IRQL_requires_same_ _Function_class_(EXCEPTION_ROUTINE) typedef @@ -904,6 +902,20 @@ #endif #define ARRAYSIZE(A) RTL_NUMBER_OF_V2(A) #define _ARRAYSIZE(A) RTL_NUMBER_OF_V1(A) + +#define RTL_NUMBER_OF_FIELD(type, field) \ + (RTL_NUMBER_OF(RTL_FIELD_TYPE(type, field))) + +#define RTL_PADDING_BETWEEN_FIELDS(type, field1, field2) \ + ((FIELD_OFFSET(type, field2) > FIELD_OFFSET(type, field1)) \ + ? (FIELD_OFFSET(type, field2) - FIELD_OFFSET(type, field1) - RTL_FIELD_SIZE(type, field1)) \ + : (FIELD_OFFSET(type, field1) - FIELD_OFFSET(type, field2) - RTL_FIELD_SIZE(type, field2))) + +#if defined(__cplusplus) +#define RTL_CONST_CAST(type) const_cast<type> +#else +#define RTL_CONST_CAST(type) (type) +#endif /* Type Limits */ #define MINCHAR 0x80 @@ -933,6 +945,18 @@ #define Int64ShraMod32(a,b) __ll_rshift(a,b) #define Int64ShrlMod32(a,b) __ull_rshift(a,b) #endif + +#define RotateLeft32 _rotl +#define RotateLeft64 _rotl64 +#define RotateRight32 _rotr +#define RotateRight64 _rotr64 + +#if defined(_M_AMD64) +#define RotateLeft8 _rotl8 +#define RotateLeft16 _rotl16 +#define RotateRight8 _rotr8 +#define RotateRight16 _rotr16 +#endif /* _M_AMD64 */ /* C_ASSERT Definition */ #define C_ASSERT(expr) extern char (*c_assert(void)) [(expr) ? 1 : -1] @@ -965,10 +989,120 @@ #define VER_SUITE_COMPUTE_SERVER 0x00004000 #define VER_SUITE_WH_SERVER 0x00008000 +#define PRODUCT_UNDEFINED 0x00000000 +#define PRODUCT_ULTIMATE 0x00000001 +#define PRODUCT_HOME_BASIC 0x00000002 +#define PRODUCT_HOME_PREMIUM 0x00000003 +#define PRODUCT_ENTERPRISE 0x00000004 +#define PRODUCT_HOME_BASIC_N 0x00000005 +#define PRODUCT_BUSINESS 0x00000006 +#define PRODUCT_STANDARD_SERVER 0x00000007 +#define PRODUCT_DATACENTER_SERVER 0x00000008 +#define PRODUCT_SMALLBUSINESS_SERVER 0x00000009 +#define PRODUCT_ENTERPRISE_SERVER 0x0000000A +#define PRODUCT_STARTER 0x0000000B +#define PRODUCT_DATACENTER_SERVER_CORE 0x0000000C +#define PRODUCT_STANDARD_SERVER_CORE 0x0000000D +#define PRODUCT_ENTERPRISE_SERVER_CORE 0x0000000E +#define PRODUCT_ENTERPRISE_SERVER_IA64 0x0000000F +#define PRODUCT_BUSINESS_N 0x00000010 +#define PRODUCT_WEB_SERVER 0x00000011 +#define PRODUCT_CLUSTER_SERVER 0x00000012 +#define PRODUCT_HOME_SERVER 0x00000013 +#define PRODUCT_STORAGE_EXPRESS_SERVER 0x00000014 +#define PRODUCT_STORAGE_STANDARD_SERVER 0x00000015 +#define PRODUCT_STORAGE_WORKGROUP_SERVER 0x00000016 +#define PRODUCT_STORAGE_ENTERPRISE_SERVER 0x00000017 +#define PRODUCT_SERVER_FOR_SMALLBUSINESS 0x00000018 +#define PRODUCT_SMALLBUSINESS_SERVER_PREMIUM 0x00000019 +#define PRODUCT_HOME_PREMIUM_N 0x0000001A +#define PRODUCT_ENTERPRISE_N 0x0000001B +#define PRODUCT_ULTIMATE_N 0x0000001C +#define PRODUCT_WEB_SERVER_CORE 0x0000001D +#define PRODUCT_MEDIUMBUSINESS_SERVER_MANAGEMENT 0x0000001E +#define PRODUCT_MEDIUMBUSINESS_SERVER_SECURITY 0x0000001F +#define PRODUCT_MEDIUMBUSINESS_SERVER_MESSAGING 0x00000020 +#define PRODUCT_SERVER_FOUNDATION 0x00000021 +#define PRODUCT_HOME_PREMIUM_SERVER 0x00000022 +#define PRODUCT_SERVER_FOR_SMALLBUSINESS_V 0x00000023 +#define PRODUCT_STANDARD_SERVER_V 0x00000024 +#define PRODUCT_DATACENTER_SERVER_V 0x00000025 +#define PRODUCT_ENTERPRISE_SERVER_V 0x00000026 +#define PRODUCT_DATACENTER_SERVER_CORE_V 0x00000027 +#define PRODUCT_STANDARD_SERVER_CORE_V 0x00000028 +#define PRODUCT_ENTERPRISE_SERVER_CORE_V 0x00000029 +#define PRODUCT_HYPERV 0x0000002A +#define PRODUCT_STORAGE_EXPRESS_SERVER_CORE 0x0000002B +#define PRODUCT_STORAGE_STANDARD_SERVER_CORE 0x0000002C +#define PRODUCT_STORAGE_WORKGROUP_SERVER_CORE 0x0000002D +#define PRODUCT_STORAGE_ENTERPRISE_SERVER_CORE 0x0000002E +#define PRODUCT_STARTER_N 0x0000002F +#define PRODUCT_PROFESSIONAL 0x00000030 +#define PRODUCT_PROFESSIONAL_N 0x00000031 +#define PRODUCT_SB_SOLUTION_SERVER 0x00000032 +#define PRODUCT_SERVER_FOR_SB_SOLUTIONS 0x00000033 +#define PRODUCT_STANDARD_SERVER_SOLUTIONS 0x00000034 +#define PRODUCT_STANDARD_SERVER_SOLUTIONS_CORE 0x00000035 +#define PRODUCT_SB_SOLUTION_SERVER_EM 0x00000036 +#define PRODUCT_SERVER_FOR_SB_SOLUTIONS_EM 0x00000037 +#define PRODUCT_SOLUTION_EMBEDDEDSERVER 0x00000038 +#define PRODUCT_SOLUTION_EMBEDDEDSERVER_CORE 0x00000039 +#define PRODUCT_ESSENTIALBUSINESS_SERVER_MGMT 0x0000003B +#define PRODUCT_ESSENTIALBUSINESS_SERVER_ADDL 0x0000003C +#define PRODUCT_ESSENTIALBUSINESS_SERVER_MGMTSVC 0x0000003D +#define PRODUCT_ESSENTIALBUSINESS_SERVER_ADDLSVC 0x0000003E +#define PRODUCT_SMALLBUSINESS_SERVER_PREMIUM_CORE 0x0000003F +#define PRODUCT_CLUSTER_SERVER_V 0x00000040 +#define PRODUCT_EMBEDDED 0x00000041 +#define PRODUCT_STARTER_E 0x00000042 +#define PRODUCT_HOME_BASIC_E 0x00000043 +#define PRODUCT_HOME_PREMIUM_E 0x00000044 +#define PRODUCT_PROFESSIONAL_E 0x00000045 +#define PRODUCT_ENTERPRISE_E 0x00000046 +#define PRODUCT_ULTIMATE_E 0x00000047 +#define PRODUCT_ENTERPRISE_EVALUATION 0x00000048 +#define PRODUCT_MULTIPOINT_STANDARD_SERVER 0x0000004C +#define PRODUCT_MULTIPOINT_PREMIUM_SERVER 0x0000004D +#define PRODUCT_STANDARD_EVALUATION_SERVER 0x0000004F +#define PRODUCT_DATACENTER_EVALUATION_SERVER 0x00000050 +#define PRODUCT_ENTERPRISE_N_EVALUATION 0x00000054 +#define PRODUCT_EMBEDDED_AUTOMOTIVE 0x00000055 +#define PRODUCT_EMBEDDED_INDUSTRY_A 0x00000056 +#define PRODUCT_THINPC 0x00000057 +#define PRODUCT_EMBEDDED_A 0x00000058 +#define PRODUCT_EMBEDDED_INDUSTRY 0x00000059 +#define PRODUCT_EMBEDDED_E 0x0000005A +#define PRODUCT_EMBEDDED_INDUSTRY_E 0x0000005B +#define PRODUCT_EMBEDDED_INDUSTRY_A_E 0x0000005C +#define PRODUCT_STORAGE_WORKGROUP_EVALUATION_SERVER 0x0000005F +#define PRODUCT_STORAGE_STANDARD_EVALUATION_SERVER 0x00000060 +#define PRODUCT_CORE_ARM 0x00000061 +#define PRODUCT_CORE_N 0x00000062 +#define PRODUCT_CORE_COUNTRYSPECIFIC 0x00000063 +#define PRODUCT_CORE_SINGLELANGUAGE 0x00000064 +#define PRODUCT_CORE 0x00000065 +#define PRODUCT_PROFESSIONAL_WMC 0x00000067 +#define PRODUCT_UNLICENSED 0xABCDABCD + +/* LangID and NLS */ +#define MAKELANGID(p, s) ((((USHORT)(s)) << 10) | (USHORT)(p)) +#define PRIMARYLANGID(lgid) ((USHORT)(lgid) & 0x3ff) +#define SUBLANGID(lgid) ((USHORT)(lgid) >> 10) +#define MAKELCID(lgid, srtid) ((ULONG)((((ULONG)((USHORT)(srtid))) << 16) | \ + ((ULONG)((USHORT)(lgid))))) +#define MAKESORTLCID(lgid, srtid, ver) \ + ((ULONG)((MAKELCID(lgid, srtid)) | \ + (((ULONG)((USHORT)(ver))) << 20))) +#define LANGIDFROMLCID(lcid) ((USHORT)(lcid)) +#define SORTIDFROMLCID(lcid) ((USHORT)((((ULONG)(lcid)) >> 16) & 0xf)) +#define SORTVERSIONFROMLCID(lcid) ((USHORT)((((ULONG)(lcid)) >> 20) & 0xf)) + +#define NLS_VALID_LOCALE_MASK 0x000fffff +#define LOCALE_NAME_MAX_LENGTH 85 + /* Primary language IDs. */ #define LANG_NEUTRAL 0x00 #define LANG_INVARIANT 0x7f - #define LANG_AFRIKAANS 0x36 #define LANG_ALBANIAN 0x1c #define LANG_ALSATIAN 0x84 @@ -1108,6 +1242,281 @@ #define LANG_YORUBA 0x6a #define LANG_ZULU 0x35 +#define SUBLANG_NEUTRAL 0x00 +#define SUBLANG_DEFAULT 0x01 +#define SUBLANG_SYS_DEFAULT 0x02 +#define SUBLANG_CUSTOM_DEFAULT 0x03 +#define SUBLANG_CUSTOM_UNSPECIFIED 0x04 +#define SUBLANG_UI_CUSTOM_DEFAULT 0x05 +#define SUBLANG_AFRIKAANS_SOUTH_AFRICA 0x01 +#define SUBLANG_ALBANIAN_ALBANIA 0x01 +#define SUBLANG_ALSATIAN_FRANCE 0x01 +#define SUBLANG_AMHARIC_ETHIOPIA 0x01 +#define SUBLANG_ARABIC_SAUDI_ARABIA 0x01 +#define SUBLANG_ARABIC_IRAQ 0x02 +#define SUBLANG_ARABIC_EGYPT 0x03 +#define SUBLANG_ARABIC_LIBYA 0x04 +#define SUBLANG_ARABIC_ALGERIA 0x05 +#define SUBLANG_ARABIC_MOROCCO 0x06 +#define SUBLANG_ARABIC_TUNISIA 0x07 +#define SUBLANG_ARABIC_OMAN 0x08 +#define SUBLANG_ARABIC_YEMEN 0x09 +#define SUBLANG_ARABIC_SYRIA 0x0a +#define SUBLANG_ARABIC_JORDAN 0x0b +#define SUBLANG_ARABIC_LEBANON 0x0c +#define SUBLANG_ARABIC_KUWAIT 0x0d +#define SUBLANG_ARABIC_UAE 0x0e +#define SUBLANG_ARABIC_BAHRAIN 0x0f +#define SUBLANG_ARABIC_QATAR 0x10 +#define SUBLANG_ARMENIAN_ARMENIA 0x01 +#define SUBLANG_ASSAMESE_INDIA 0x01 +#define SUBLANG_AZERI_LATIN 0x01 +#define SUBLANG_AZERI_CYRILLIC 0x02 +#define SUBLANG_AZERBAIJANI_AZERBAIJAN_LATIN 0x01 +#define SUBLANG_AZERBAIJANI_AZERBAIJAN_CYRILLIC 0x02 +#define SUBLANG_BANGLA_INDIA 0x01 +#define SUBLANG_BANGLA_BANGLADESH 0x02 +#define SUBLANG_BASHKIR_RUSSIA 0x01 +#define SUBLANG_BASQUE_BASQUE 0x01 +#define SUBLANG_BELARUSIAN_BELARUS 0x01 +#define SUBLANG_BENGALI_INDIA 0x01 +#define SUBLANG_BENGALI_BANGLADESH 0x02 +#define SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_LATIN 0x05 +#define SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_CYRILLIC 0x08 +#define SUBLANG_BRETON_FRANCE 0x01 +#define SUBLANG_BULGARIAN_BULGARIA 0x01 +#define SUBLANG_CATALAN_CATALAN 0x01 +#define SUBLANG_CENTRAL_KURDISH_IRAQ 0x01 +#define SUBLANG_CHEROKEE_CHEROKEE 0x01 +#define SUBLANG_CHINESE_TRADITIONAL 0x01 +#define SUBLANG_CHINESE_SIMPLIFIED 0x02 +#define SUBLANG_CHINESE_HONGKONG 0x03 +#define SUBLANG_CHINESE_SINGAPORE 0x04 +#define SUBLANG_CHINESE_MACAU 0x05 +#define SUBLANG_CORSICAN_FRANCE 0x01 +#define SUBLANG_CZECH_CZECH_REPUBLIC 0x01 +#define SUBLANG_CROATIAN_CROATIA 0x01 +#define SUBLANG_CROATIAN_BOSNIA_HERZEGOVINA_LATIN 0x04 +#define SUBLANG_DANISH_DENMARK 0x01 +#define SUBLANG_DARI_AFGHANISTAN 0x01 +#define SUBLANG_DIVEHI_MALDIVES 0x01 +#define SUBLANG_DUTCH 0x01 +#define SUBLANG_DUTCH_BELGIAN 0x02 +#define SUBLANG_ENGLISH_US 0x01 +#define SUBLANG_ENGLISH_UK 0x02 +#define SUBLANG_ENGLISH_AUS 0x03 +#define SUBLANG_ENGLISH_CAN 0x04 +#define SUBLANG_ENGLISH_NZ 0x05 +#define SUBLANG_ENGLISH_EIRE 0x06 +#define SUBLANG_ENGLISH_SOUTH_AFRICA 0x07 +#define SUBLANG_ENGLISH_JAMAICA 0x08 +#define SUBLANG_ENGLISH_CARIBBEAN 0x09 +#define SUBLANG_ENGLISH_BELIZE 0x0a +#define SUBLANG_ENGLISH_TRINIDAD 0x0b +#define SUBLANG_ENGLISH_ZIMBABWE 0x0c +#define SUBLANG_ENGLISH_PHILIPPINES 0x0d +#define SUBLANG_ENGLISH_INDIA 0x10 +#define SUBLANG_ENGLISH_MALAYSIA 0x11 +#define SUBLANG_ENGLISH_SINGAPORE 0x12 +#define SUBLANG_ESTONIAN_ESTONIA 0x01 +#define SUBLANG_FAEROESE_FAROE_ISLANDS 0x01 +#define SUBLANG_FILIPINO_PHILIPPINES 0x01 +#define SUBLANG_FINNISH_FINLAND 0x01 +#define SUBLANG_FRENCH 0x01 +#define SUBLANG_FRENCH_BELGIAN 0x02 +#define SUBLANG_FRENCH_CANADIAN 0x03 +#define SUBLANG_FRENCH_SWISS 0x04 +#define SUBLANG_FRENCH_LUXEMBOURG 0x05 +#define SUBLANG_FRENCH_MONACO 0x06 +#define SUBLANG_FRISIAN_NETHERLANDS 0x01 +#define SUBLANG_FULAH_SENEGAL 0x02 +#define SUBLANG_GALICIAN_GALICIAN 0x01 +#define SUBLANG_GEORGIAN_GEORGIA 0x01 +#define SUBLANG_GERMAN 0x01 +#define SUBLANG_GERMAN_SWISS 0x02 +#define SUBLANG_GERMAN_AUSTRIAN 0x03 +#define SUBLANG_GERMAN_LUXEMBOURG 0x04 +#define SUBLANG_GERMAN_LIECHTENSTEIN 0x05 +#define SUBLANG_GREEK_GREECE 0x01 +#define SUBLANG_GREENLANDIC_GREENLAND 0x01 +#define SUBLANG_GUJARATI_INDIA 0x01 +#define SUBLANG_HAUSA_NIGERIA_LATIN 0x01 +#define SUBLANG_HAWAIIAN_US 0x01 +#define SUBLANG_HEBREW_ISRAEL 0x01 +#define SUBLANG_HINDI_INDIA 0x01 +#define SUBLANG_HUNGARIAN_HUNGARY 0x01 +#define SUBLANG_ICELANDIC_ICELAND 0x01 +#define SUBLANG_IGBO_NIGERIA 0x01 +#define SUBLANG_INDONESIAN_INDONESIA 0x01 +#define SUBLANG_INUKTITUT_CANADA 0x01 +#define SUBLANG_INUKTITUT_CANADA_LATIN 0x02 +#define SUBLANG_IRISH_IRELAND 0x02 +#define SUBLANG_ITALIAN 0x01 +#define SUBLANG_ITALIAN_SWISS 0x02 +#define SUBLANG_JAPANESE_JAPAN 0x01 +#define SUBLANG_KANNADA_INDIA 0x01 +#define SUBLANG_KASHMIRI_SASIA 0x02 +#define SUBLANG_KASHMIRI_INDIA 0x02 +#define SUBLANG_KAZAK_KAZAKHSTAN 0x01 +#define SUBLANG_KHMER_CAMBODIA 0x01 +#define SUBLANG_KICHE_GUATEMALA 0x01 +#define SUBLANG_KINYARWANDA_RWANDA 0x01 +#define SUBLANG_KONKANI_INDIA 0x01 +#define SUBLANG_KOREAN 0x01 +#define SUBLANG_KYRGYZ_KYRGYZSTAN 0x01 +#define SUBLANG_LAO_LAO 0x01 +#define SUBLANG_LATVIAN_LATVIA 0x01 +#define SUBLANG_LITHUANIAN 0x01 +#define SUBLANG_LOWER_SORBIAN_GERMANY 0x02 +#define SUBLANG_LUXEMBOURGISH_LUXEMBOURG 0x01 +#define SUBLANG_MACEDONIAN_MACEDONIA 0x01 +#define SUBLANG_MALAY_MALAYSIA 0x01 +#define SUBLANG_MALAY_BRUNEI_DARUSSALAM 0x02 +#define SUBLANG_MALAYALAM_INDIA 0x01 +#define SUBLANG_MALTESE_MALTA 0x01 +#define SUBLANG_MAORI_NEW_ZEALAND 0x01 +#define SUBLANG_MAPUDUNGUN_CHILE 0x01 +#define SUBLANG_MARATHI_INDIA 0x01 +#define SUBLANG_MOHAWK_MOHAWK 0x01 +#define SUBLANG_MONGOLIAN_CYRILLIC_MONGOLIA 0x01 +#define SUBLANG_MONGOLIAN_PRC 0x02 +#define SUBLANG_NEPALI_INDIA 0x02 +#define SUBLANG_NEPALI_NEPAL 0x01 +#define SUBLANG_NORWEGIAN_BOKMAL 0x01 +#define SUBLANG_NORWEGIAN_NYNORSK 0x02 +#define SUBLANG_OCCITAN_FRANCE 0x01 +#define SUBLANG_ODIA_INDIA 0x01 +#define SUBLANG_ORIYA_INDIA 0x01 +#define SUBLANG_PASHTO_AFGHANISTAN 0x01 +#define SUBLANG_PERSIAN_IRAN 0x01 +#define SUBLANG_POLISH_POLAND 0x01 +#define SUBLANG_PORTUGUESE 0x02 +#define SUBLANG_PORTUGUESE_BRAZILIAN 0x01 +#define SUBLANG_PULAR_SENEGAL 0x02 +#define SUBLANG_PUNJABI_INDIA 0x01 +#define SUBLANG_PUNJABI_PAKISTAN 0x02 +#define SUBLANG_QUECHUA_BOLIVIA 0x01 +#define SUBLANG_QUECHUA_ECUADOR 0x02 +#define SUBLANG_QUECHUA_PERU 0x03 +#define SUBLANG_ROMANIAN_ROMANIA 0x01 +#define SUBLANG_ROMANSH_SWITZERLAND 0x01 +#define SUBLANG_RUSSIAN_RUSSIA 0x01 +#define SUBLANG_SAKHA_RUSSIA 0x01 +#define SUBLANG_SAMI_NORTHERN_NORWAY 0x01 +#define SUBLANG_SAMI_NORTHERN_SWEDEN 0x02 +#define SUBLANG_SAMI_NORTHERN_FINLAND 0x03 +#define SUBLANG_SAMI_LULE_NORWAY 0x04 +#define SUBLANG_SAMI_LULE_SWEDEN 0x05 +#define SUBLANG_SAMI_SOUTHERN_NORWAY 0x06 +#define SUBLANG_SAMI_SOUTHERN_SWEDEN 0x07 +#define SUBLANG_SAMI_SKOLT_FINLAND 0x08 +#define SUBLANG_SAMI_INARI_FINLAND 0x09 +#define SUBLANG_SANSKRIT_INDIA 0x01 +#define SUBLANG_SCOTTISH_GAELIC 0x01 +#define SUBLANG_SERBIAN_BOSNIA_HERZEGOVINA_LATIN 0x06 +#define SUBLANG_SERBIAN_BOSNIA_HERZEGOVINA_CYRILLIC 0x07 +#define SUBLANG_SERBIAN_MONTENEGRO_LATIN 0x0b +#define SUBLANG_SERBIAN_MONTENEGRO_CYRILLIC 0x0c +#define SUBLANG_SERBIAN_SERBIA_LATIN 0x09 +#define SUBLANG_SERBIAN_SERBIA_CYRILLIC 0x0a +#define SUBLANG_SERBIAN_CROATIA 0x01 +#define SUBLANG_SERBIAN_LATIN 0x02 +#define SUBLANG_SERBIAN_CYRILLIC 0x03 +#define SUBLANG_SINDHI_INDIA 0x01 +#define SUBLANG_SINDHI_PAKISTAN 0x02 +#define SUBLANG_SINDHI_AFGHANISTAN 0x02 +#define SUBLANG_SINHALESE_SRI_LANKA 0x01 +#define SUBLANG_SOTHO_NORTHERN_SOUTH_AFRICA 0x01 +#define SUBLANG_SLOVAK_SLOVAKIA 0x01 +#define SUBLANG_SLOVENIAN_SLOVENIA 0x01 +#define SUBLANG_SPANISH 0x01 +#define SUBLANG_SPANISH_MEXICAN 0x02 +#define SUBLANG_SPANISH_MODERN 0x03 +#define SUBLANG_SPANISH_GUATEMALA 0x04 +#define SUBLANG_SPANISH_COSTA_RICA 0x05 +#define SUBLANG_SPANISH_PANAMA 0x06 +#define SUBLANG_SPANISH_DOMINICAN_REPUBLIC 0x07 +#define SUBLANG_SPANISH_VENEZUELA 0x08 +#define SUBLANG_SPANISH_COLOMBIA 0x09 +#define SUBLANG_SPANISH_PERU 0x0a +#define SUBLANG_SPANISH_ARGENTINA 0x0b +#define SUBLANG_SPANISH_ECUADOR 0x0c +#define SUBLANG_SPANISH_CHILE 0x0d +#define SUBLANG_SPANISH_URUGUAY 0x0e +#define SUBLANG_SPANISH_PARAGUAY 0x0f +#define SUBLANG_SPANISH_BOLIVIA 0x10 +#define SUBLANG_SPANISH_EL_SALVADOR 0x11 +#define SUBLANG_SPANISH_HONDURAS 0x12 +#define SUBLANG_SPANISH_NICARAGUA 0x13 +#define SUBLANG_SPANISH_PUERTO_RICO 0x14 +#define SUBLANG_SPANISH_US 0x15 +#define SUBLANG_SWAHILI_KENYA 0x01 +#define SUBLANG_SWEDISH 0x01 +#define SUBLANG_SWEDISH_FINLAND 0x02 +#define SUBLANG_SYRIAC_SYRIA 0x01 +#define SUBLANG_TAJIK_TAJIKISTAN 0x01 +#define SUBLANG_TAMAZIGHT_ALGERIA_LATIN 0x02 +#define SUBLANG_TAMAZIGHT_MOROCCO_TIFINAGH 0x04 +#define SUBLANG_TAMIL_INDIA 0x01 +#define SUBLANG_TAMIL_SRI_LANKA 0x02 +#define SUBLANG_TATAR_RUSSIA 0x01 +#define SUBLANG_TELUGU_INDIA 0x01 +#define SUBLANG_THAI_THAILAND 0x01 +#define SUBLANG_TIBETAN_PRC 0x01 +#define SUBLANG_TIGRIGNA_ERITREA 0x02 +#define SUBLANG_TIGRINYA_ERITREA 0x02 +#define SUBLANG_TIGRINYA_ETHIOPIA 0x01 +#define SUBLANG_TSWANA_BOTSWANA 0x02 +#define SUBLANG_TSWANA_SOUTH_AFRICA 0x01 +#define SUBLANG_TURKISH_TURKEY 0x01 +#define SUBLANG_TURKMEN_TURKMENISTAN 0x01 +#define SUBLANG_UIGHUR_PRC 0x01 +#define SUBLANG_UKRAINIAN_UKRAINE 0x01 +#define SUBLANG_UPPER_SORBIAN_GERMANY 0x01 +#define SUBLANG_URDU_PAKISTAN 0x01 +#define SUBLANG_URDU_INDIA 0x02 +#define SUBLANG_UZBEK_LATIN 0x01 +#define SUBLANG_UZBEK_CYRILLIC 0x02 +#define SUBLANG_VALENCIAN_VALENCIA 0x02 +#define SUBLANG_VIETNAMESE_VIETNAM 0x01 +#define SUBLANG_WELSH_UNITED_KINGDOM 0x01 +#define SUBLANG_WOLOF_SENEGAL 0x01 +#define SUBLANG_XHOSA_SOUTH_AFRICA 0x01 +#define SUBLANG_YAKUT_RUSSIA 0x01 +#define SUBLANG_YI_PRC 0x01 +#define SUBLANG_YORUBA_NIGERIA 0x01 +#define SUBLANG_ZULU_SOUTH_AFRICA 0x01 + +#define SORT_DEFAULT 0x0 +#define SORT_INVARIANT_MATH 0x1 +#define SORT_JAPANESE_XJIS 0x0 +#define SORT_JAPANESE_UNICODE 0x1 +#define SORT_JAPANESE_RADICALSTROKE 0x4 +#define SORT_CHINESE_BIG5 0x0 +#define SORT_CHINESE_PRCP 0x0 +#define SORT_CHINESE_UNICODE 0x1 +#define SORT_CHINESE_PRC 0x2 +#define SORT_CHINESE_BOPOMOFO 0x3 +#define SORT_CHINESE_RADICALSTROKE 0x4 +#define SORT_KOREAN_KSC 0x0 +#define SORT_KOREAN_UNICODE 0x1 +#define SORT_GERMAN_PHONE_BOOK 0x1 +#define SORT_HUNGARIAN_DEFAULT 0x0 +#define SORT_HUNGARIAN_TECHNICAL 0x1 +#define SORT_GEORGIAN_TRADITIONAL 0x0 +#define SORT_GEORGIAN_MODERN 0x1 + +#define LANG_SYSTEM_DEFAULT MAKELANGID(LANG_NEUTRAL, SUBLANG_SYS_DEFAULT)) +#define LANG_USER_DEFAULT MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT)) + +#define LOCALE_SYSTEM_DEFAULT MAKELCID(LANG_SYSTEM_DEFAULT, SORT_DEFAULT) +#define LOCALE_USER_DEFAULT MAKELCID(LANG_USER_DEFAULT, SORT_DEFAULT) +#define LOCALE_CUSTOM_DEFAULT MAKELCID(MAKELANGID(LANG_NEUTRAL, SUBLANG_CUSTOM_DEFAULT), SORT_DEFAULT) +#define LOCALE_CUSTOM_UNSPECIFIED MAKELCID(MAKELANGID(LANG_NEUTRAL, SUBLANG_CUSTOM_UNSPECIFIED), SORT_DEFAULT) +#define LOCALE_CUSTOM_UI_DEFAULT MAKELCID(MAKELANGID(LANG_NEUTRAL, SUBLANG_UI_CUSTOM_DEFAULT), SORT_DEFAULT) +#define LOCALE_NEUTRAL MAKELCID(MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), SORT_DEFAULT) +#define LOCALE_INVARIANT MAKELCID(MAKELANGID(LANG_INVARIANT, SUBLANG_NEUTRAL), SORT_DEFAULT) + #ifdef __cplusplus } // extern "C" #endif Modified: trunk/reactos/include/psdk/winnls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnls.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winnls.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnls.h [iso-8859-1] Sun Jun 1 10:15:07 2014 @@ -116,45 +116,57 @@ #define LOCALE_SABBREVMONTHNAME13 0x100F #define LOCALE_SPOSITIVESIGN 80 #define LOCALE_SNEGATIVESIGN 81 -#define LOCALE_SSCRIPTS 108 +#define LOCALE_SSCRIPTS 108 // FIXME #define LOCALE_IPOSSIGNPOSN 82 #define LOCALE_INEGSIGNPOSN 83 #define LOCALE_IPOSSYMPRECEDES 84 #define LOCALE_IPOSSEPBYSPACE 85 #define LOCALE_INEGSYMPRECEDES 86 #define LOCALE_INEGSEPBYSPACE 87 -#if (WINVER >= 0x0400) #define LOCALE_FONTSIGNATURE 88 #define LOCALE_SISO639LANGNAME 89 #define LOCALE_SISO3166CTRYNAME 90 +#define LOCALE_SNAME 92 // FIXME + +#if (WINVER >= 0x0600) #define LOCALE_SNAME 92 -#endif -#if (WINVER >= 0x0600) +#define LOCALE_SDURATION 93 +#define LOCALE_SKEYBOARDSTOINSTALL 94 +#define LOCALE_SSHORTESTDAYNAME1 96 +#define LOCALE_SSHORTESTDAYNAME2 97 +#define LOCALE_SSHORTESTDAYNAME3 98 +#define LOCALE_SSHORTESTDAYNAME4 99 +#define LOCALE_SSHORTESTDAYNAME5 100 +#define LOCALE_SSHORTESTDAYNAME6 101 +#define LOCALE_SSHORTESTDAYNAME7 102 +#define LOCALE_SISO639LANGNAME2 103 +#define LOCALE_SISO3166CTRYNAME2 104 +#define LOCALE_SNAN 105 +#define LOCALE_SPOSINFINITY 106 +#define LOCALE_SNEGINFINITY 107 #define LOCALE_SSCRIPTS 108 -#endif -#define LOCALE_SYSTEM_DEFAULT 0x800 -#define LOCALE_USER_DEFAULT 0x400 - +#define LOCALE_SPARENT 109 +#define LOCALE_SCONSOLEFALLBACKNAME 110 +#endif /* (WINVER >= 0x0600) */ + +//#if (WINVER >= _WIN32_WINNT_WIN7) #define LOCALE_IREADINGLAYOUT 0x0070 #define LOCALE_INEUTRAL 0x0071 - -#if defined(__GNUC__) -# define LOCALE_NAME_INVARIANT (const WCHAR []){ 0 } -#elif defined(_MSC_VER) -# define LOCALE_NAME_INVARIANT L"" -#else -static const WCHAR LOCALE_NAME_INVARIANT[] = { 0 }; +#define LOCALE_INEGATIVEPERCENT 0x0074 +#define LOCALE_IPOSITIVEPERCENT 0x0075 +#define LOCALE_SPERCENT 0x0076 +#define LOCALE_SPERMILLE 0x0077 +#define LOCALE_SMONTHDAY 0x0078 +#define LOCALE_SSHORTTIME 0x0079 +#define LOCALE_SOPENTYPELANGUAGETAG 0x007a +#define LOCALE_SSORTLOCALE 0x007b +//#endif /* (WINVER >= _WIN32_WINNT_WIN7) */ + +#if (WINVER >= 0x0600) +#define LOCALE_NAME_USER_DEFAULT NULL +#define LOCALE_NAME_INVARIANT L"" +#define LOCALE_NAME_SYSTEM_DEFAULT L"!sys-default-locale" #endif - -#if defined(__GNUC__) -# define LOCALE_NAME_SYSTEM_DEFAULT (const WCHAR []){'!','s','y','s','-','d','e','f','a','u','l','t','-','l','o','c','a','l','e',0} -#elif defined(_MSC_VER) -# define LOCALE_NAME_SYSTEM_DEFAULT L"!sys-default-locale" -#else -static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e','f','a','u','l','t','-','l','o','c','a','l','e',0}; -#endif - -#define LOCALE_NAME_USER_DEFAULT NULL #define LOCALE_IDEFAULTUNIXCODEPAGE 0x1030 /* Wine extension */ Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sun Jun 1 10:15:07 2014 @@ -1460,6 +1460,8 @@ #define LANGIDFROMLCID(l) ((WORD)(l)) #define LANG_SYSTEM_DEFAULT MAKELANGID(LANG_NEUTRAL,SUBLANG_SYS_DEFAULT) #define LANG_USER_DEFAULT MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT) +#define LOCALE_SYSTEM_DEFAULT MAKELCID(LANG_SYSTEM_DEFAULT, SORT_DEFAULT) +#define LOCALE_USER_DEFAULT MAKELCID(LANG_USER_DEFAULT, SORT_DEFAULT) #define LOCALE_NEUTRAL MAKELCID(MAKELANGID(LANG_NEUTRAL,SUBLANG_NEUTRAL),SORT_DEFAULT) #define LOCALE_INVARIANT MAKELCID(MAKELANGID(LANG_INVARIANT, SUBLANG_NEUTRAL), SORT_DEFAULT) #define LOCALE_NAME_MAX_LENGTH 85

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