Ros-diffs September 2017

ros-diffs@reactos.org

17 participants
284 discussions

[akhaldi] 75940: [USP10_WINETEST] Sync with Wine Staging 2.16. CORE-13762

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 24 11:17:14 2017 New Revision: 75940 URL: http://svn.reactos.org/svn/reactos?rev=75940&view=rev Log: [USP10_WINETEST] Sync with Wine Staging 2.16. CORE-13762 Modified: trunk/rostests/winetests/usp10/usp10.c Modified: trunk/rostests/winetests/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/usp10/usp10.c?r… ============================================================================== --- trunk/rostests/winetests/usp10/usp10.c [iso-8859-1] (original) +++ trunk/rostests/winetests/usp10/usp10.c [iso-8859-1] Sun Sep 24 11:17:14 2017 @@ -231,7 +231,7 @@ static const itemTest t2d2[6] = {{{0,0,0,0,0,0},0,0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0,0},3,0,0,0,0,0,FALSE},{{0,0,0,0,0,0},4,0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0,0},7,1,1,1,0,arab_tag,FALSE},{{0,0,0,0,0,0},10,0,0,0,0,0,FALSE},{{0,0,0,0,0,0},11,0,0,0,0,-1,FALSE}}; static const itemTest t2d3[5] = {{{0,0,0,0,0,0},0,0,0,2,0,latn_tag,FALSE},{{0,0,0,0,0,0},3,0,0,2,0,0,FALSE},{{0,0,0,0,0,0},4,0,0,2,0,latn_tag,FALSE},{{0,0,0,0,0,0},7,1,1,1,0,arab_tag,FALSE},{{0,0,0,0,0,0},11,0,0,0,0,-1,FALSE}}; static const itemTest t2d4[3] = {{{0,0,0,0,0,0},0,0,0,2,0,latn_tag,FALSE},{{0,0,0,0,0,0},7,1,1,1,0,arab_tag,FALSE},{{0,0,0,0,0,0},11,0,0,0,0,-1,FALSE}}; -static const itemTest t2d5[5] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, + static const itemTest t2d5[5] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, {{0,0,0,0,0,0},3,0,0,0,1,0,FALSE}, {{0,0,0,0,0,0},4,0,0,0,1,latn_tag,FALSE}, {{0,0,0,0,0,0},7,0,0,0,1,arab_tag,FALSE}, @@ -255,11 +255,10 @@ static const int b43[2] = {4,4}; /* Arabic */ - static const WCHAR test5[] = -{0x0627,0x0644,0x0635,0x0651,0x0650,0x062d,0x0629,0x064f,' ',0x062a,0x064e, -0x0627,0x062c,0x064c,' ',0x0639,0x064e,0x0644,0x0649,' ', -0x0631,0x064f,0x0624,0x0648,0x0633,0x0650,' ',0x0627,0x0644 -,0x0623,0x0635,0x0650,0x062d,0x0651,0x064e,0x0627,0x0621,0x0650,0}; + static const WCHAR test5[] = {0x0627,0x0644,0x0635,0x0651,0x0650,0x062d,0x0629,0x064f,' ',0x062a,0x064e, + 0x0627,0x062c,0x064c,' ',0x0639,0x064e,0x0644,0x0649,' ', + 0x0631,0x064f,0x0624,0x0648,0x0633,0x0650,' ',0x0627,0x0644, + 0x0623,0x0635,0x0650,0x062d,0x0651,0x064e,0x0627,0x0621,0x0650,0}; static const itemTest t51[2] = {{{0,0,0,0,0,0},0,1,1,1,0,arab_tag,FALSE},{{0,0,0,0,0,0},38,0,0,0,0,-1,FALSE}}; static const itemTest t52[2] = {{{0,0,0,0,0,0},0,0,0,0,1,arab_tag,FALSE}, {{0,0,0,0,0,0},38,0,0,0,0,-1,FALSE}}; @@ -270,7 +269,7 @@ static const itemTest t61[3] = {{{0,0,0,0,0,0},0,1,1,1,0,hebr_tag,TRUE,{-1,0,0,0,-1,-1}},{{0,0,0,0,0,0},4,0,0,0,0,0,FALSE},{{0,0,0,0,0,0},5,0,0,0,0,-1,FALSE}}; static const itemTest t62[3] = {{{0,0,0,0,0,0},0,1,1,1,0,hebr_tag,FALSE},{{0,0,0,0,0,0},4,1,1,1,0,0,FALSE},{{0,0,0,0,0,0},5,0,0,0,0,-1,FALSE}}; static const itemTest t63[2] = {{{0,0,0,0,0,0},0,1,1,1,0,hebr_tag,FALSE},{{0,0,0,0,0,0},5,0,0,0,0,-1,FALSE}}; -static const itemTest t64[3] = {{{0,0,0,0,0,0},0,0,0,0,1,hebr_tag,FALSE}, + static const itemTest t64[3] = {{{0,0,0,0,0,0},0,0,0,0,1,hebr_tag,FALSE}, {{0,0,0,0,0,0},4,0,0,0,1,0,FALSE}, {{0,0,0,0,0,0},5,0,0,0,0,-1,FALSE}}; @@ -279,7 +278,7 @@ static const itemTest t71[4] = {{{0,0,0,0,0,0},0,0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0,0},9,1,1,1,0,hebr_tag,TRUE,{-1,0,0,0,-1,-1}},{{0,0,0,0,0,0},19,0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0,0},29,0,0,0,0,-1,FALSE}}; static const itemTest t72[4] = {{{0,0,0,0,0,0},0,0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0,0},9,1,1,1,0,hebr_tag,FALSE},{{0,0,0,0,0,0},18,0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0,0},29,0,0,0,0,-1,FALSE}}; static const itemTest t73[4] = {{{0,0,0,0,0,0},0,0,0,2,0,latn_tag,FALSE},{{0,0,0,0,0,0},8,1,1,1,0,hebr_tag,FALSE},{{0,0,0,0,0,0},19,0,0,2,0,latn_tag,FALSE},{{0,0,0,0,0,0},29,0,0,0,0,-1,FALSE}}; -static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, + static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, {{0,0,0,0,0,0},9,0,0,0,1,hebr_tag,FALSE}, {{0,0,0,0,0,0},19,0,0,0,1,latn_tag,FALSE}, {{0,0,0,0,0,0},29,0,0,0,0,-1,FALSE}}; @@ -928,6 +927,47 @@ test_items_ok(test56,6,&Control,&State,1,t562,FALSE,0); test_items_ok(test57,13,&Control,&State,7,t573,FALSE,0); test_items_ok(test58,13,&Control,&State,1,t582,FALSE,0); +} + +static void make_surrogate(DWORD i, WORD out[2]) +{ + static const DWORD mask = (1 << 10) - 1; + + if (i <= 0xffff) + { + out[0] = i; + out[1] = 0; + } + else + { + i -= 0x010000; + out[0] = ((i >> 10) & mask) + 0xd800; + out[1] = (i & mask) + 0xdc00; + } +} + +static void test_ScriptItemize_surrogates(void) +{ + HRESULT hr; + WCHAR surrogate[2]; + WORD Script_Surrogates; + SCRIPT_ITEM items[2]; + int num; + + /* Find Script_Surrogates */ + surrogate[0] = 0xd800; + hr = ScriptItemize( surrogate, 1, 2, NULL, NULL, items, &num ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( num == 1, "got %d\n", num ); + ok( items[0].a.eScript != SCRIPT_UNDEFINED, "got script %x\n", items[0].a.eScript ); + Script_Surrogates = items[0].a.eScript; + + /* Show that an invalid character has script Script_Surrogates */ + make_surrogate( 0x01ffff, surrogate ); + hr = ScriptItemize( surrogate, 2, 2, NULL, NULL, items, &num ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( num == 1, "got %d\n", num ); + ok( items[0].a.eScript == Script_Surrogates, "got script %x\n", items[0].a.eScript ); } static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, @@ -4006,6 +4046,7 @@ ok(hfont != NULL, "SelectObject failed: %p\n", hfont); test_ScriptItemize(); + test_ScriptItemize_surrogates(); test_ScriptItemIzeShapePlace(hdc,pwOutGlyphs); test_ScriptGetCMap(hdc, pwOutGlyphs); test_ScriptCacheGetHeight(hdc);

7 years, 3 months

[akhaldi] 75939: [USP10] Sync with Wine Staging 2.16. CORE-13762 9d32c2d usp10: Fall back to 'dflt' language if shaping language tag isn't found. 866eec8 usp10: Undefined characters above the BMP s...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 24 11:17:06 2017 New Revision: 75939 URL: http://svn.reactos.org/svn/reactos?rev=75939&view=rev Log: [USP10] Sync with Wine Staging 2.16. CORE-13762 9d32c2d usp10: Fall back to 'dflt' language if shaping language tag isn't found. 866eec8 usp10: Undefined characters above the BMP should be assigned to Script_Surrogates. 4f96439 user32: Fix rendering of tabs in edit control. b736dbe make_unicode: Update data tables to Unicode 10.0.0. Modified: trunk/reactos/dll/win32/usp10/bracket.c trunk/reactos/dll/win32/usp10/indicsyllable.c trunk/reactos/dll/win32/usp10/linebreak.c trunk/reactos/dll/win32/usp10/mirror.c trunk/reactos/dll/win32/usp10/shape.c trunk/reactos/dll/win32/usp10/shaping.c trunk/reactos/dll/win32/usp10/usp10.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/usp10/bracket.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/bracket.c?… ============================================================================== --- trunk/reactos/dll/win32/usp10/bracket.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/bracket.c [iso-8859-1] Sun Sep 24 11:17:06 2017 @@ -1,5 +1,5 @@ /* Unicode Bidirectional Bracket table */ -/* generated from http://www.unicode.org/Public/9.0.0/ucd/BidiBrackets.txt */ +/* generated from http://www.unicode.org/Public/10.0.0/ucd/BidiBrackets.txt */ /* DO NOT EDIT!! */ const unsigned short /* DECLSPEC_HIDDEN */ bidi_bracket_table[768] = Modified: trunk/reactos/dll/win32/usp10/indicsyllable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/indicsylla… ============================================================================== --- trunk/reactos/dll/win32/usp10/indicsyllable.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/indicsyllable.c [iso-8859-1] Sun Sep 24 11:17:06 2017 @@ -1,9 +1,9 @@ /* Unicode Indic Syllabic Category */ -/* generated from http://www.unicode.org/Public/9.0.0/ucd/IndicSyllabicCategory.txt */ -/* and from http://www.unicode.org/Public/9.0.0/ucd/IndicPositionalCategory.txt */ +/* generated from http://www.unicode.org/Public/10.0.0/ucd/IndicSyllabicCategory.txt */ +/* and from http://www.unicode.org/Public/10.0.0/ucd/IndicPositionalCategory.txt */ /* DO NOT EDIT!! */ -const unsigned short /* DECLSPEC_HIDDEN */ indic_syllabic_table[3296] = +const unsigned short /* DECLSPEC_HIDDEN */ indic_syllabic_table[3312] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, @@ -51,41 +51,41 @@ 0x04b0, 0x04c0, 0x04d0, 0x04e0, 0x04f0, 0x0500, 0x0400, 0x0270, 0x0510, 0x0520, 0x0370, 0x0530, 0x0540, 0x0550, 0x0330, 0x0270, 0x0560, 0x0520, 0x0370, 0x0570, 0x0580, 0x0590, 0x0330, 0x05a0, - 0x0560, 0x0520, 0x02f0, 0x05b0, 0x05c0, 0x05d0, 0x0330, 0x05e0, - 0x05f0, 0x0600, 0x02f0, 0x0610, 0x0620, 0x0630, 0x0400, 0x0640, - 0x0650, 0x02f0, 0x0660, 0x0670, 0x0680, 0x0290, 0x0270, 0x0270, - 0x0690, 0x06a0, 0x06b0, 0x06c0, 0x06d0, 0x06e0, 0x0270, 0x0270, - 0x0270, 0x06f0, 0x0700, 0x0710, 0x0720, 0x02f0, 0x0730, 0x0740, - 0x0750, 0x0760, 0x0770, 0x0780, 0x0790, 0x0270, 0x0270, 0x0270, - 0x02f0, 0x02f0, 0x07a0, 0x07b0, 0x07c0, 0x07d0, 0x07e0, 0x07f0, - 0x0800, 0x0810, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, - 0x0820, 0x0830, 0x0840, 0x0830, 0x0840, 0x0850, 0x0820, 0x0860, - 0x02f0, 0x02f0, 0x0870, 0x0880, 0x0890, 0x08a0, 0x0290, 0x0270, - 0x08b0, 0x0660, 0x08c0, 0x08d0, 0x0400, 0x02f0, 0x08e0, 0x08f0, - 0x02f0, 0x02f0, 0x0900, 0x0910, 0x0920, 0x0290, 0x0270, 0x0270, - 0x02f0, 0x0930, 0x02f0, 0x02f0, 0x0940, 0x0950, 0x0960, 0x0970, + 0x05b0, 0x0520, 0x02f0, 0x05c0, 0x05d0, 0x05e0, 0x0330, 0x05f0, + 0x0600, 0x0610, 0x02f0, 0x0620, 0x0630, 0x0640, 0x0400, 0x0650, + 0x0660, 0x02f0, 0x0670, 0x0680, 0x0690, 0x0290, 0x0270, 0x0270, + 0x06a0, 0x06b0, 0x06c0, 0x06d0, 0x06e0, 0x06f0, 0x0270, 0x0270, + 0x0270, 0x0700, 0x0710, 0x0720, 0x0730, 0x02f0, 0x0740, 0x0750, + 0x0760, 0x0770, 0x0780, 0x0790, 0x07a0, 0x0270, 0x0270, 0x0270, + 0x02f0, 0x02f0, 0x07b0, 0x07c0, 0x07d0, 0x07e0, 0x07f0, 0x0800, + 0x0810, 0x0820, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, + 0x0830, 0x0840, 0x0850, 0x0840, 0x0850, 0x0860, 0x0830, 0x0870, + 0x02f0, 0x02f0, 0x0880, 0x0890, 0x08a0, 0x08b0, 0x0290, 0x0270, + 0x08c0, 0x0670, 0x08d0, 0x08e0, 0x0400, 0x02f0, 0x08f0, 0x0900, + 0x02f0, 0x02f0, 0x0910, 0x0920, 0x0930, 0x0290, 0x0270, 0x0270, + 0x02f0, 0x0940, 0x02f0, 0x02f0, 0x0950, 0x0960, 0x0970, 0x0980, 0x0290, 0x0290, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, - 0x0980, 0x0840, 0x02f0, 0x0990, 0x09a0, 0x0290, 0x09b0, 0x09c0, - 0x09d0, 0x02f0, 0x09e0, 0x09f0, 0x02f0, 0x02f0, 0x0a00, 0x0a10, - 0x02f0, 0x02f0, 0x0a20, 0x0a30, 0x0a40, 0x0270, 0x0270, 0x0270, - 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0a50, 0x0a60, 0x0a70, + 0x0990, 0x0850, 0x02f0, 0x09a0, 0x09b0, 0x0290, 0x09c0, 0x09d0, + 0x09e0, 0x02f0, 0x09f0, 0x0a00, 0x02f0, 0x02f0, 0x0a10, 0x0a20, + 0x02f0, 0x02f0, 0x0a30, 0x0a40, 0x0a50, 0x0270, 0x0270, 0x0270, + 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0a60, 0x0a70, 0x0a80, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, - 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0a80, - 0x0a90, 0x0aa0, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0ab0, - 0x0ac0, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, + 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0a90, + 0x0aa0, 0x0ab0, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0ac0, + 0x0ad0, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, - 0x0270, 0x0270, 0x0270, 0x0270, 0x0ad0, 0x0270, 0x0270, 0x0270, - 0x0ae0, 0x02f0, 0x0af0, 0x0270, 0x02f0, 0x0b00, 0x0b10, 0x0b20, - 0x0b30, 0x0b40, 0x02f0, 0x0b50, 0x0b60, 0x0290, 0x0b70, 0x0b80, - 0x0b90, 0x02f0, 0x0ba0, 0x02f0, 0x0bb0, 0x0bc0, 0x0270, 0x0270, - 0x0bd0, 0x02f0, 0x02f0, 0x0be0, 0x0bf0, 0x0290, 0x0c00, 0x0c10, - 0x0c20, 0x02f0, 0x0c30, 0x0c40, 0x0c50, 0x0290, 0x02f0, 0x0c60, - 0x02f0, 0x02f0, 0x02f0, 0x0c70, 0x0c80, 0x0270, 0x0c90, 0x0ca0, + 0x0270, 0x0270, 0x0270, 0x0270, 0x0ae0, 0x0270, 0x0270, 0x0270, + 0x0af0, 0x02f0, 0x0b00, 0x0270, 0x02f0, 0x0b10, 0x0b20, 0x0b30, + 0x0b40, 0x0b50, 0x02f0, 0x0b60, 0x0b70, 0x0290, 0x0b80, 0x0b90, + 0x0ba0, 0x02f0, 0x0bb0, 0x02f0, 0x0bc0, 0x0bd0, 0x0270, 0x0270, + 0x0be0, 0x02f0, 0x02f0, 0x0bf0, 0x0c00, 0x0290, 0x0c10, 0x0c20, + 0x0c30, 0x02f0, 0x0c40, 0x0c50, 0x0c60, 0x0290, 0x02f0, 0x0c70, + 0x02f0, 0x02f0, 0x02f0, 0x0c80, 0x0c90, 0x0270, 0x0ca0, 0x0cb0, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, - 0x0270, 0x0270, 0x0270, 0x0270, 0x0cb0, 0x0cc0, 0x0cd0, 0x0290, + 0x0270, 0x0270, 0x0270, 0x0270, 0x0cc0, 0x0cd0, 0x0ce0, 0x0290, /* values */ 0x5f00, 0x9c00, 0x9500, 0x9500, 0x8600, 0x8600, 0x8600, 0x8600, - 0x7e00, 0x6e00, 0x5d00, 0x5100, 0x4200, 0x2d00, 0x1700, 0x0a00, + 0x7e00, 0x6e00, 0x6c00, 0x6000, 0x5100, 0x3c00, 0x2600, 0x1900, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -127,7 +127,7 @@ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0107, 0x0000, 0x0000, 0x0000, 0x0000, 0x000a, 0x000a, 0x0000, 0x000a, 0x000a, 0x000a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0501, 0x0501, 0x0102, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0006, 0x000a, 0x0000, 0x000a, 0x000a, 0x0000, 0x000a, 0x000a, 0x0000, @@ -149,7 +149,7 @@ 0x0107, 0x0607, 0x0607, 0x0607, 0x0607, 0x0507, 0x0000, 0x0507, 0x0507, 0x0007, 0x0000, 0x0107, 0x0107, 0x0605, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x000a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x000a, 0x0519, 0x0519, 0x0519, 0x0504, 0x0504, 0x0504, 0x000a, 0x0000, 0x000a, 0x000a, 0x0000, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0000, 0x0000, 0x0604, 0x0003, 0x0107, 0x0507, 0x0107, 0x0607, 0x0607, 0x0607, 0x0607, 0x0000, 0x0000, 0x0207, @@ -190,8 +190,10 @@ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000a, 0x0000, 0x0000, 0x001f, 0x001f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, - 0x000a, 0x000a, 0x000a, 0x0000, 0x0000, 0x0003, 0x0107, 0x0107, + 0x0501, 0x0501, 0x0101, 0x0102, 0x0000, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, + 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, + 0x000a, 0x000a, 0x000a, 0x0516, 0x0516, 0x0003, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0607, 0x0607, 0x0000, 0x0207, 0x0207, 0x0207, 0x0000, 0x0407, 0x0407, 0x0407, 0x0505, 0x0015, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000b, 0x000b, 0x000b, 0x0107, @@ -306,12 +308,12 @@ 0x0607, 0x0207, 0x0107, 0x0507, 0x0000, 0x0000, 0x0000, 0x0000, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0006, 0x0006, 0x0006, - 0x0006, 0x0006, 0x0006, 0x000a, 0x000a, 0x020e, 0x060e, 0x010f, - 0x050f, 0x050f, 0x050f, 0x060f, 0x060f, 0x060f, 0x060f, 0x0000, + 0x0006, 0x0006, 0x0006, 0x000a, 0x000a, 0x020e, 0x060e, 0x010d, + 0x050f, 0x050f, 0x050c, 0x060d, 0x060d, 0x060d, 0x060d, 0x0000, 0x0017, 0x0107, 0x0507, 0x0107, 0x0107, 0x0507, 0x0507, 0x0507, 0x0507, 0x0607, 0x0607, 0x0507, 0x0607, 0x0107, 0x0207, 0x0207, - 0x0207, 0x0207, 0x0207, 0x0507, 0x0507, 0x0513, 0x0513, 0x0513, - 0x0513, 0x0513, 0x0521, 0x0521, 0x0521, 0x0000, 0x0000, 0x0621, + 0x0207, 0x0207, 0x0207, 0x0507, 0x0501, 0x0513, 0x0513, 0x0513, + 0x0513, 0x0513, 0x0516, 0x0521, 0x0521, 0x0000, 0x0000, 0x0621, 0x0501, 0x0501, 0x0501, 0x050c, 0x0102, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x000a, 0x000a, 0x000a, 0x000a, 0x0504, 0x0107, 0x0507, 0x0507, @@ -342,7 +344,7 @@ 0x0619, 0x0619, 0x0519, 0x0519, 0x0619, 0x0619, 0x0619, 0x0619, 0x0519, 0x0119, 0x0d00, 0x0d00, 0x0d00, 0x0d00, 0x0d00, 0x0d00, 0x0d00, 0x0000, 0x0000, 0x0000, 0x0000, 0x0600, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0002, 0x0002, 0x0519, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0002, 0x0002, 0x0519, 0x0000, 0x0000, 0x0119, 0x0019, 0x0019, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0521, 0x0000, 0x0000, 0x0000, 0x0000, @@ -376,7 +378,7 @@ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0519, 0x0519, 0x0519, 0x0519, 0x0519, 0x0519, 0x0519, 0x0519, 0x0519, 0x0519, 0x0519, 0x0519, 0x0519, 0x0519, 0x0519, 0x0519, - 0x0519, 0x0519, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0519, 0x0519, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, @@ -389,7 +391,7 @@ 0x0501, 0x0501, 0x050c, 0x0102, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x000a, 0x000a, 0x000a, 0x0006, 0x0006, 0x0006, 0x000a, 0x000a, 0x000a, 0x000a, 0x0504, 0x0107, 0x0107, 0x0507, 0x0507, - 0x0607, 0x0607, 0x0207, 0x0207, 0x0507, 0x010d, 0x010e, 0x010e, + 0x0607, 0x0607, 0x0207, 0x0207, 0x0507, 0x010d, 0x010e, 0x000e, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0507, 0x0000, 0x000a, Modified: trunk/reactos/dll/win32/usp10/linebreak.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/linebreak.… ============================================================================== --- trunk/reactos/dll/win32/usp10/linebreak.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/linebreak.c [iso-8859-1] Sun Sep 24 11:17:06 2017 @@ -1,8 +1,8 @@ /* Unicode Line Break Properties */ -/* generated from http://www.unicode.org/Public/9.0.0/ucd/LineBreak.txt */ +/* generated from http://www.unicode.org/Public/10.0.0/ucd/LineBreak.txt */ /* DO NOT EDIT!! */ -const unsigned short /* DECLSPEC_HIDDEN */ wine_linebreak_table[7264] = +const unsigned short /* DECLSPEC_HIDDEN */ wine_linebreak_table[7248] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0170, @@ -54,22 +54,22 @@ 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0790, 0x07a0, 0x07b0, 0x07c0, 0x07d0, 0x05b0, 0x0580, 0x07e0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x07f0, 0x0800, 0x07b0, 0x05b0, 0x0760, 0x0810, - 0x05b0, 0x0820, 0x0830, 0x0840, 0x05b0, 0x0850, 0x0860, 0x0860, - 0x0860, 0x0860, 0x05b0, 0x0870, 0x0860, 0x0880, 0x0890, 0x0580, - 0x08a0, 0x05b0, 0x05b0, 0x08b0, 0x0580, 0x08c0, 0x08d0, 0x05b0, - 0x08e0, 0x08f0, 0x0900, 0x0910, 0x0920, 0x0930, 0x0940, 0x0950, - 0x0960, 0x08f0, 0x0900, 0x0970, 0x0980, 0x0990, 0x09a0, 0x09b0, - 0x09c0, 0x0690, 0x0900, 0x09d0, 0x09e0, 0x09f0, 0x0940, 0x0a00, - 0x0a10, 0x08f0, 0x0900, 0x09d0, 0x0a20, 0x0a30, 0x0940, 0x0a40, - 0x0a50, 0x0a60, 0x0a70, 0x0a80, 0x0a90, 0x0aa0, 0x09a0, 0x0ab0, - 0x0ac0, 0x0ad0, 0x0900, 0x0ae0, 0x0af0, 0x0b00, 0x0940, 0x0b10, - 0x0b20, 0x0ad0, 0x0900, 0x0b30, 0x0af0, 0x0b40, 0x0940, 0x0b50, - 0x0b60, 0x0ad0, 0x05b0, 0x0b70, 0x0b80, 0x0b90, 0x0940, 0x0ba0, - 0x0bb0, 0x0bc0, 0x05b0, 0x0bd0, 0x0be0, 0x0bf0, 0x09a0, 0x0c00, - 0x0c10, 0x0c20, 0x0c20, 0x0c30, 0x0c40, 0x0c50, 0x0860, 0x0860, - 0x0c60, 0x0c70, 0x0c80, 0x0c90, 0x0ca0, 0x0cb0, 0x0860, 0x0860, + 0x05b0, 0x0820, 0x0830, 0x0840, 0x05b0, 0x0850, 0x0860, 0x0870, + 0x0870, 0x0870, 0x05b0, 0x0880, 0x0870, 0x0890, 0x08a0, 0x0580, + 0x08b0, 0x05b0, 0x05b0, 0x08c0, 0x0580, 0x08d0, 0x08e0, 0x05b0, + 0x08f0, 0x0900, 0x0910, 0x0920, 0x0930, 0x0940, 0x0950, 0x0960, + 0x0970, 0x0900, 0x0910, 0x0980, 0x0990, 0x09a0, 0x09b0, 0x09c0, + 0x09d0, 0x0690, 0x0910, 0x09e0, 0x09f0, 0x0a00, 0x0950, 0x0a10, + 0x0a20, 0x0900, 0x0910, 0x09e0, 0x0a30, 0x0a40, 0x0950, 0x0a50, + 0x0a60, 0x0a70, 0x0a80, 0x0a90, 0x0aa0, 0x0ab0, 0x09b0, 0x0ac0, + 0x0ad0, 0x0ae0, 0x0910, 0x0af0, 0x0b00, 0x0b10, 0x0950, 0x0b20, + 0x0b30, 0x0ae0, 0x0910, 0x0b40, 0x0b00, 0x0b50, 0x0950, 0x0b60, + 0x0ad0, 0x0ae0, 0x05b0, 0x0b70, 0x0b80, 0x0b90, 0x0950, 0x0ba0, + 0x0bb0, 0x0bc0, 0x05b0, 0x0bd0, 0x0be0, 0x0bf0, 0x09b0, 0x0c00, + 0x0c10, 0x0c20, 0x0c20, 0x0c30, 0x0c40, 0x0c50, 0x0870, 0x0870, + 0x0c60, 0x0c70, 0x0c80, 0x0c90, 0x0ca0, 0x0cb0, 0x0870, 0x0870, 0x0cc0, 0x0cd0, 0x07b0, 0x0ce0, 0x0cf0, 0x05b0, 0x0d00, 0x0d10, - 0x0d20, 0x0d30, 0x0580, 0x0d40, 0x0d50, 0x0d60, 0x0860, 0x0860, + 0x0d20, 0x0d30, 0x0580, 0x0d40, 0x0d50, 0x0d60, 0x0870, 0x0870, 0x0c20, 0x0c20, 0x0c20, 0x0c20, 0x0d70, 0x0c20, 0x0c20, 0x0c20, 0x0c20, 0x0d80, 0x05b0, 0x05b0, 0x0d90, 0x05b0, 0x05b0, 0x05b0, 0x0da0, 0x0da0, 0x0da0, 0x0da0, 0x0da0, 0x0da0, 0x0db0, 0x0db0, @@ -84,16 +84,16 @@ 0x0e70, 0x0e80, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0e90, 0x0ea0, 0x0eb0, 0x0ec0, 0x05b0, 0x0ed0, 0x05b0, 0x0ee0, 0x0eb0, 0x0ef0, 0x0c20, 0x0c20, 0x0c20, 0x0c20, 0x0c20, 0x0f00, 0x0f10, 0x0e50, - 0x0f20, 0x0f10, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0a40, + 0x0f20, 0x0f10, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0a50, 0x0f30, 0x05b0, 0x0f40, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0f50, 0x05b0, 0x0840, 0x0f60, 0x0f60, 0x0f70, 0x0c20, 0x0f80, 0x0f90, 0x0c20, 0x0c20, 0x0fa0, 0x0c20, 0x0fb0, 0x0fc0, 0x05b0, 0x05b0, 0x05b0, 0x0fd0, 0x0c20, 0x0c20, 0x0c20, 0x0fe0, 0x0c20, 0x0ff0, - 0x0f10, 0x0f10, 0x0f80, 0x1000, 0x0860, 0x0860, 0x0860, 0x0860, + 0x0f10, 0x0f10, 0x0f80, 0x1000, 0x0870, 0x0870, 0x0870, 0x0870, 0x1010, 0x05b0, 0x05b0, 0x1020, 0x1030, 0x1040, 0x1050, 0x1060, 0x1070, 0x05b0, 0x1080, 0x07b0, 0x05b0, 0x05b0, 0x07f0, 0x1090, 0x05b0, 0x05b0, 0x1020, 0x10a0, 0x10b0, 0x07b0, 0x05b0, 0x10c0, - 0x0ea0, 0x0860, 0x0860, 0x0860, 0x0a40, 0x10d0, 0x10e0, 0x10f0, + 0x0ea0, 0x0870, 0x0870, 0x0870, 0x0a50, 0x10d0, 0x10e0, 0x10f0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0580, 0x0580, 0x0580, 0x1100, 0x05b0, 0x0e60, 0x05b0, 0x05b0, 0x0e60, 0x1110, 0x05b0, 0x1120, @@ -106,80 +106,80 @@ 0x1320, 0x1330, 0x1340, 0x1350, 0x05b0, 0x05b0, 0x1360, 0x05b0, 0x1370, 0x1380, 0x1390, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x13a0, - 0x05b0, 0x05b0, 0x13b0, 0x0860, 0x13c0, 0x0860, 0x13d0, 0x13d0, - 0x13d0, 0x13d0, 0x13d0, 0x13d0, 0x13d0, 0x13d0, 0x13d0, 0x13e0, - 0x13d0, 0x13d0, 0x13d0, 0x13d0, 0x1270, 0x13d0, 0x13d0, 0x13f0, - 0x13d0, 0x1400, 0x1410, 0x1420, 0x1430, 0x1440, 0x1450, 0x05b0, - 0x1460, 0x1470, 0x05b0, 0x1480, 0x1490, 0x05b0, 0x14a0, 0x14b0, - 0x05b0, 0x14c0, 0x05b0, 0x14d0, 0x14e0, 0x14f0, 0x1500, 0x1510, - 0x1520, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1530, 0x1540, 0x1550, - 0x13d0, 0x1560, 0x05b0, 0x05b0, 0x1570, 0x05b0, 0x1580, 0x05b0, + 0x05b0, 0x05b0, 0x13b0, 0x0870, 0x0860, 0x0870, 0x13c0, 0x13c0, + 0x13c0, 0x13c0, 0x13c0, 0x13c0, 0x13c0, 0x13c0, 0x13c0, 0x13d0, + 0x13c0, 0x13c0, 0x13c0, 0x13c0, 0x1270, 0x13c0, 0x13c0, 0x13e0, + 0x13c0, 0x13f0, 0x1400, 0x1410, 0x1420, 0x1430, 0x1440, 0x05b0, + 0x1450, 0x1460, 0x05b0, 0x1470, 0x1480, 0x05b0, 0x1490, 0x14a0, + 0x05b0, 0x14b0, 0x05b0, 0x14c0, 0x14d0, 0x14e0, 0x14f0, 0x1500, + 0x1510, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1520, 0x1530, 0x1540, + 0x13c0, 0x1550, 0x05b0, 0x05b0, 0x1560, 0x05b0, 0x1570, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, - 0x1590, 0x15a0, 0x05b0, 0x05b0, 0x05b0, 0x1370, 0x05b0, 0x15b0, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x15c0, 0x05b0, 0x15d0, - 0x05b0, 0x15e0, 0x05b0, 0x15f0, 0x0900, 0x1600, 0x1610, 0x0860, + 0x1580, 0x1590, 0x05b0, 0x05b0, 0x05b0, 0x1370, 0x05b0, 0x15a0, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x15b0, 0x05b0, 0x15c0, + 0x05b0, 0x15d0, 0x05b0, 0x15e0, 0x0910, 0x15f0, 0x1600, 0x0870, 0x05b0, 0x05b0, 0x0840, 0x05b0, 0x05b0, 0x0840, 0x05b0, 0x05b0, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1620, 0x1630, - 0x05b0, 0x05b0, 0x0d90, 0x05b0, 0x05b0, 0x05b0, 0x1640, 0x1650, - 0x05b0, 0x13b0, 0x1660, 0x1660, 0x1660, 0x1660, 0x0580, 0x0580, - 0x1670, 0x1680, 0x1690, 0x16a0, 0x16b0, 0x0860, 0x0860, 0x0860, - 0x16c0, 0x16d0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16e0, - 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, - 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16f0, 0x0860, 0x1700, - 0x1710, 0x1720, 0x1730, 0x1740, 0x1750, 0x16c0, 0x1760, 0x16c0, - 0x1770, 0x1780, 0x1790, 0x16c0, 0x1760, 0x16c0, 0x1770, 0x17a0, - 0x17b0, 0x16c0, 0x17c0, 0x17d0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, - 0x17e0, 0x16c0, 0x16c0, 0x17f0, 0x16c0, 0x16c0, 0x16e0, 0x1800, - 0x16c0, 0x17e0, 0x16c0, 0x16c0, 0x1810, 0x16c0, 0x16c0, 0x16c0, - 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x17e0, - 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, - 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, - 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, - 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, - 0x16c0, 0x1820, 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, - 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, - 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, 0x16c0, - 0x1830, 0x16c0, 0x16c0, 0x16c0, 0x1840, 0x05b0, 0x05b0, 0x10c0, - 0x1850, 0x05b0, 0x1860, 0x0860, 0x05b0, 0x05b0, 0x1620, 0x1870, - 0x05b0, 0x1880, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1890, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1610, 0x1620, + 0x05b0, 0x05b0, 0x0d90, 0x05b0, 0x05b0, 0x05b0, 0x1630, 0x1640, + 0x05b0, 0x13b0, 0x1650, 0x1650, 0x1650, 0x1650, 0x0580, 0x0580, + 0x1660, 0x1670, 0x1680, 0x1690, 0x16a0, 0x0870, 0x0870, 0x0870, + 0x16b0, 0x16c0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16d0, + 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, + 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16e0, 0x0870, 0x16f0, + 0x1700, 0x1710, 0x1720, 0x1730, 0x1740, 0x16b0, 0x1750, 0x16b0, + 0x1760, 0x1770, 0x1780, 0x16b0, 0x1750, 0x16b0, 0x1760, 0x1790, + 0x17a0, 0x16b0, 0x17b0, 0x17c0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, + 0x17b0, 0x16b0, 0x16b0, 0x17d0, 0x16b0, 0x16b0, 0x16d0, 0x17e0, + 0x16b0, 0x17b0, 0x16b0, 0x16b0, 0x17f0, 0x16b0, 0x16b0, 0x16b0, + 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x17b0, + 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, + 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, + 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, + 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, + 0x16b0, 0x1800, 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, + 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, + 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, 0x16b0, + 0x1810, 0x16b0, 0x16b0, 0x16b0, 0x1820, 0x05b0, 0x05b0, 0x10c0, + 0x1830, 0x05b0, 0x1840, 0x0870, 0x05b0, 0x05b0, 0x1610, 0x1850, + 0x05b0, 0x1860, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1870, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, - 0x05b0, 0x05b0, 0x0840, 0x0a40, 0x0860, 0x0860, 0x0860, 0x18a0, - 0x18b0, 0x05b0, 0x18c0, 0x18d0, 0x05b0, 0x05b0, 0x05b0, 0x18e0, - 0x18f0, 0x05b0, 0x05b0, 0x1020, 0x1900, 0x0f10, 0x0580, 0x1910, - 0x07b0, 0x05b0, 0x1920, 0x05b0, 0x1930, 0x1940, 0x0da0, 0x1950, - 0x08a0, 0x05b0, 0x05b0, 0x1960, 0x1970, 0x1980, 0x0c20, 0x1990, - 0x05b0, 0x05b0, 0x19a0, 0x19b0, 0x19c0, 0x19d0, 0x0c20, 0x0c20, - 0x0c20, 0x0c20, 0x0c20, 0x0c20, 0x19e0, 0x19f0, 0x0760, 0x1a00, - 0x1a10, 0x1a20, 0x1660, 0x05b0, 0x05b0, 0x05b0, 0x0f50, 0x05b0, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1a30, 0x0f10, - 0x1a40, 0x1a50, 0x1a60, 0x1a70, 0x1a60, 0x1a80, 0x1a60, 0x1a40, - 0x1a50, 0x1a60, 0x1a70, 0x1a60, 0x1a80, 0x1a60, 0x1a40, 0x1a50, - 0x1a60, 0x1a70, 0x1a60, 0x1a80, 0x1a60, 0x1a40, 0x1a50, 0x1a60, - 0x1a70, 0x1a60, 0x1a80, 0x1a60, 0x1a40, 0x1a50, 0x1a60, 0x1a70, - 0x1a60, 0x1a80, 0x1a60, 0x1a40, 0x1a50, 0x1a60, 0x1a70, 0x1a60, - 0x1a80, 0x1a60, 0x1a40, 0x1a50, 0x1a60, 0x1a70, 0x1a60, 0x1a80, - 0x1a60, 0x1a40, 0x1a50, 0x1a60, 0x1a70, 0x1a60, 0x1a80, 0x1a60, - 0x1a40, 0x1a50, 0x1a60, 0x1a70, 0x1a60, 0x1a80, 0x1a60, 0x1a40, - 0x1a50, 0x1a60, 0x1a70, 0x1a60, 0x1a80, 0x1a60, 0x1a40, 0x1a50, - 0x1a60, 0x1a70, 0x1a60, 0x1a80, 0x1a60, 0x1a40, 0x1a50, 0x1a60, - 0x1a70, 0x1a60, 0x1a80, 0x1a60, 0x1a40, 0x1a50, 0x1a60, 0x1a70, - 0x1a60, 0x1a80, 0x1a60, 0x1a40, 0x1a50, 0x1a60, 0x1a70, 0x1a60, - 0x1a80, 0x1a60, 0x1a40, 0x1a50, 0x1a60, 0x1a70, 0x1a60, 0x1a80, - 0x1a60, 0x1a40, 0x1a50, 0x1a60, 0x1a70, 0x1a60, 0x1a80, 0x1a60, - 0x1a60, 0x1a70, 0x1a60, 0x1a80, 0x1a60, 0x1a40, 0x1a50, 0x1a60, - 0x1a70, 0x1a60, 0x1a90, 0x0db0, 0x1aa0, 0x0dd0, 0x0dd0, 0x1ab0, - 0x1ac0, 0x1ac0, 0x1ac0, 0x1ac0, 0x1ac0, 0x1ac0, 0x1ac0, 0x1ac0, - 0x1ac0, 0x1ac0, 0x1ac0, 0x1ac0, 0x1ac0, 0x1ac0, 0x1ac0, 0x1ac0, - 0x0860, 0x0860, 0x0860, 0x0860, 0x0860, 0x0860, 0x0860, 0x0860, - 0x0860, 0x0860, 0x0860, 0x0860, 0x0860, 0x0860, 0x0860, 0x0860, - 0x13b0, 0x1ad0, 0x1ae0, 0x1af0, 0x1b00, 0x05b0, 0x05b0, 0x05b0, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1600, 0x1b10, 0x05b0, 0x05b0, - 0x05b0, 0x05b0, 0x05b0, 0x1b20, 0x0860, 0x05b0, 0x05b0, 0x05b0, - 0x05b0, 0x1b30, 0x05b0, 0x05b0, 0x0a40, 0x0860, 0x0860, 0x1b40, - 0x0580, 0x1b50, 0x0580, 0x1b60, 0x1b70, 0x1b80, 0x1b90, 0x1130, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1ba0, - 0x1bb0, 0x1bc0, 0x16c0, 0x1bd0, 0x16c0, 0x1be0, 0x1bf0, 0x1c00, - 0x16c0, 0x1c10, 0x16c0, 0x17e0, 0x1c20, 0x1c30, 0x1c40, 0x1c50, + 0x05b0, 0x05b0, 0x0840, 0x0a50, 0x0870, 0x0870, 0x0870, 0x1880, + 0x1890, 0x05b0, 0x18a0, 0x18b0, 0x05b0, 0x05b0, 0x05b0, 0x18c0, + 0x18d0, 0x05b0, 0x05b0, 0x1020, 0x18e0, 0x0f10, 0x0580, 0x18f0, + 0x07b0, 0x05b0, 0x1900, 0x05b0, 0x1910, 0x1920, 0x0da0, 0x1930, + 0x08b0, 0x05b0, 0x05b0, 0x1940, 0x1950, 0x1960, 0x0c20, 0x1970, + 0x05b0, 0x05b0, 0x1980, 0x1990, 0x19a0, 0x19b0, 0x0c20, 0x0c20, + 0x0c20, 0x0c20, 0x0c20, 0x0c20, 0x19c0, 0x19d0, 0x0760, 0x19e0, + 0x19f0, 0x1a00, 0x1650, 0x05b0, 0x05b0, 0x05b0, 0x0f50, 0x05b0, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1a10, 0x0f10, + 0x1a20, 0x1a30, 0x1a40, 0x1a50, 0x1a40, 0x1a60, 0x1a40, 0x1a20, + 0x1a30, 0x1a40, 0x1a50, 0x1a40, 0x1a60, 0x1a40, 0x1a20, 0x1a30, + 0x1a40, 0x1a50, 0x1a40, 0x1a60, 0x1a40, 0x1a20, 0x1a30, 0x1a40, + 0x1a50, 0x1a40, 0x1a60, 0x1a40, 0x1a20, 0x1a30, 0x1a40, 0x1a50, + 0x1a40, 0x1a60, 0x1a40, 0x1a20, 0x1a30, 0x1a40, 0x1a50, 0x1a40, + 0x1a60, 0x1a40, 0x1a20, 0x1a30, 0x1a40, 0x1a50, 0x1a40, 0x1a60, + 0x1a40, 0x1a20, 0x1a30, 0x1a40, 0x1a50, 0x1a40, 0x1a60, 0x1a40, + 0x1a20, 0x1a30, 0x1a40, 0x1a50, 0x1a40, 0x1a60, 0x1a40, 0x1a20, + 0x1a30, 0x1a40, 0x1a50, 0x1a40, 0x1a60, 0x1a40, 0x1a20, 0x1a30, + 0x1a40, 0x1a50, 0x1a40, 0x1a60, 0x1a40, 0x1a20, 0x1a30, 0x1a40, + 0x1a50, 0x1a40, 0x1a60, 0x1a40, 0x1a20, 0x1a30, 0x1a40, 0x1a50, + 0x1a40, 0x1a60, 0x1a40, 0x1a20, 0x1a30, 0x1a40, 0x1a50, 0x1a40, + 0x1a60, 0x1a40, 0x1a20, 0x1a30, 0x1a40, 0x1a50, 0x1a40, 0x1a60, + 0x1a40, 0x1a20, 0x1a30, 0x1a40, 0x1a50, 0x1a40, 0x1a60, 0x1a40, + 0x1a40, 0x1a50, 0x1a40, 0x1a60, 0x1a40, 0x1a20, 0x1a30, 0x1a40, + 0x1a50, 0x1a40, 0x1a70, 0x0db0, 0x1a80, 0x0dd0, 0x0dd0, 0x1a90, + 0x1aa0, 0x1aa0, 0x1aa0, 0x1aa0, 0x1aa0, 0x1aa0, 0x1aa0, 0x1aa0, + 0x1aa0, 0x1aa0, 0x1aa0, 0x1aa0, 0x1aa0, 0x1aa0, 0x1aa0, 0x1aa0, + 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, + 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, + 0x13b0, 0x1ab0, 0x1ac0, 0x1ad0, 0x1ae0, 0x05b0, 0x05b0, 0x05b0, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1af0, 0x1b00, 0x05b0, 0x05b0, + 0x05b0, 0x05b0, 0x05b0, 0x1b10, 0x0870, 0x05b0, 0x05b0, 0x05b0, + 0x05b0, 0x1b20, 0x05b0, 0x05b0, 0x0a50, 0x0870, 0x0870, 0x1b30, + 0x0580, 0x1b40, 0x0580, 0x1b50, 0x1b60, 0x1b70, 0x1b80, 0x1130, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1b90, + 0x1ba0, 0x1bb0, 0x16b0, 0x1bc0, 0x16b0, 0x1bd0, 0x1be0, 0x1bf0, + 0x16b0, 0x1c00, 0x16b0, 0x17b0, 0x1c10, 0x1c20, 0x1c30, 0x1c40, /* values */ 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0022, 0x0003, 0x0001, 0x0001, 0x0002, 0x0004, 0x0004, @@ -275,6 +275,8 @@ 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x001d, 0x0011, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, @@ -306,7 +308,7 @@ 0x001d, 0x001d, 0x0004, 0x0004, 0x0011, 0x0011, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001d, 0x001d, 0x001b, 0x001b, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001b, 0x001d, 0x001a, 0x0011, 0x0011, 0x0011, 0x0011, + 0x001d, 0x001b, 0x001d, 0x001a, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, 0x0011, @@ -328,7 +330,7 @@ 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001a, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0004, @@ -371,10 +373,8 @@ 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x0011, 0x0011, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x001d, 0x0004, 0x0004, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x0004, @@ -549,10 +549,10 @@ 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x0011, + 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, 0x0011, 0x001d, 0x0011, 0x001d, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, @@ -636,11 +636,9 @@ 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0012, 0x0013, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001e, 0x001e, 0x001e, 0x001e, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, 0x0024, @@ -711,7 +709,7 @@ 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, @@ -733,8 +731,8 @@ 0x0012, 0x0013, 0x0022, 0x0022, 0x0022, 0x0022, 0x0017, 0x001d, 0x0022, 0x0022, 0x001d, 0x0022, 0x0022, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0025, 0x0025, 0x0022, 0x0022, 0x0022, 0x001d, - 0x0022, 0x0022, 0x0012, 0x0022, 0x0022, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0022, 0x0022, 0x0012, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, + 0x0022, 0x0022, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, @@ -768,11 +766,9 @@ 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, - 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0011, 0x0011, + 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0011, 0x0011, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, - 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, - 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0011, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, 0x0027, @@ -873,6 +869,8 @@ 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0011, 0x0026, 0x0011, 0x0026, 0x0026, 0x0011, 0x0026, 0x0026, 0x0011, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, 0x0026, + 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, Modified: trunk/reactos/dll/win32/usp10/mirror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/mirror.c?r… ============================================================================== --- trunk/reactos/dll/win32/usp10/mirror.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/mirror.c [iso-8859-1] Sun Sep 24 11:17:06 2017 @@ -1,5 +1,5 @@ /* Unicode BiDi mirroring */ -/* generated from http://www.unicode.org/Public/9.0.0/ucd/BidiMirroring.txt */ +/* generated from http://www.unicode.org/Public/10.0.0/ucd/BidiMirroring.txt */ /* DO NOT EDIT!! */ #include <windef.h> Modified: trunk/reactos/dll/win32/usp10/shape.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/shape.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/shape.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/shape.c [iso-8859-1] Sun Sep 24 11:17:06 2017 @@ -626,8 +626,12 @@ } while(attempt && !feature); /* try in the default (latin) table */ - if (!feature && !script) - OpenType_GetFontFeatureTags(psc, MS_MAKE_TAG('l','a','t','n'), MS_MAKE_TAG('d','f','l','t'), FALSE, MS_MAKE_TAG(feat[0],feat[1],feat[2],feat[3]), tableType, 1, &tags, &cTags, &feature); + if (!feature) + { + if (!script) + script = MS_MAKE_TAG('l','a','t','n'); + OpenType_GetFontFeatureTags(psc, script, MS_MAKE_TAG('d','f','l','t'), FALSE, MS_MAKE_TAG(feat[0],feat[1],feat[2],feat[3]), tableType, 1, &tags, &cTags, &feature); + } } TRACE("Feature %s located at %p\n",debugstr_an(feat,4),feature); Modified: trunk/reactos/dll/win32/usp10/shaping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/shaping.c?… ============================================================================== --- trunk/reactos/dll/win32/usp10/shaping.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/shaping.c [iso-8859-1] Sun Sep 24 11:17:06 2017 @@ -1,8 +1,8 @@ /* Unicode Arabic shaping */ -/* generated from http://www.unicode.org/Public/9.0.0/ucd/ArabicShaping.txt */ +/* generated from http://www.unicode.org/Public/10.0.0/ucd/ArabicShaping.txt */ /* DO NOT EDIT!! */ -const unsigned short /* DECLSPEC_HIDDEN */ wine_shaping_table[2864] = +const unsigned short /* DECLSPEC_HIDDEN */ wine_shaping_table[2912] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, @@ -52,64 +52,64 @@ 0x0410, 0x0420, 0x0430, 0x0440, 0x0450, 0x0460, 0x0470, 0x0480, 0x0490, 0x04a0, 0x04b0, 0x0360, 0x04c0, 0x04d0, 0x04e0, 0x04f0, 0x0340, 0x0340, 0x0500, 0x0510, 0x0520, 0x0530, 0x0540, 0x0550, - 0x0340, 0x0560, 0x0570, 0x0340, 0x0580, 0x0590, 0x0340, 0x0340, - 0x0340, 0x0340, 0x05a0, 0x05b0, 0x0340, 0x05c0, 0x05d0, 0x0360, - 0x05e0, 0x0340, 0x0340, 0x05f0, 0x0600, 0x0610, 0x0620, 0x0340, - 0x0630, 0x0340, 0x0340, 0x0640, 0x0650, 0x0340, 0x0620, 0x0340, - 0x0660, 0x0340, 0x0340, 0x0640, 0x0670, 0x0630, 0x0340, 0x0680, - 0x0660, 0x0340, 0x0340, 0x0640, 0x0690, 0x0340, 0x0620, 0x0340, - 0x0630, 0x0340, 0x0340, 0x06a0, 0x0650, 0x06b0, 0x0620, 0x0340, - 0x06c0, 0x0340, 0x0340, 0x0340, 0x06d0, 0x0340, 0x0340, 0x0340, - 0x0510, 0x0340, 0x0340, 0x06e0, 0x06f0, 0x0700, 0x0620, 0x0340, - 0x0630, 0x0340, 0x0340, 0x06a0, 0x0710, 0x0340, 0x0620, 0x0340, - 0x0630, 0x0340, 0x0340, 0x0340, 0x0650, 0x0340, 0x0620, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0720, 0x0730, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0740, 0x0750, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0760, 0x0770, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0780, 0x0340, 0x0790, 0x0340, 0x0340, 0x0340, 0x07a0, - 0x07b0, 0x07c0, 0x0360, 0x07d0, 0x06b0, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x07e0, 0x07f0, 0x0340, 0x0800, 0x0510, 0x0810, - 0x0820, 0x0350, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x07e0, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0830, 0x0340, 0x0830, 0x0340, 0x0620, 0x0340, 0x0620, - 0x0340, 0x0340, 0x0340, 0x0840, 0x0850, 0x0860, 0x0340, 0x0340, - 0x0870, 0x0340, 0x0530, 0x0530, 0x0530, 0x0530, 0x0530, 0x0880, - 0x0890, 0x0530, 0x08a0, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x08b0, 0x08c0, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x08d0, 0x0340, 0x0340, 0x0340, 0x08e0, 0x08f0, 0x0900, - 0x0340, 0x0340, 0x0340, 0x0910, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0920, 0x0340, 0x0340, 0x0930, 0x06c0, 0x0340, 0x0940, 0x0920, - 0x0950, 0x0340, 0x0960, 0x0340, 0x0340, 0x0340, 0x0970, 0x0950, - 0x0340, 0x0340, 0x0980, 0x0990, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x09a0, 0x09b0, 0x09c0, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0360, 0x0360, 0x0360, 0x09d0, - 0x09e0, 0x0340, 0x09f0, 0x0340, 0x0340, 0x0340, 0x0a00, 0x0340, + 0x0340, 0x0560, 0x0570, 0x0340, 0x0580, 0x0590, 0x05a0, 0x0340, + 0x0340, 0x0340, 0x05b0, 0x05c0, 0x0340, 0x05d0, 0x05e0, 0x0360, + 0x05f0, 0x0340, 0x0340, 0x0600, 0x0610, 0x0620, 0x0630, 0x0340, + 0x0640, 0x0340, 0x0340, 0x0650, 0x0660, 0x0340, 0x0630, 0x0340, + 0x0670, 0x0340, 0x0340, 0x0650, 0x0680, 0x0640, 0x0340, 0x0690, + 0x0670, 0x0340, 0x0340, 0x0650, 0x06a0, 0x0340, 0x0630, 0x06b0, + 0x0640, 0x0340, 0x0340, 0x06c0, 0x0660, 0x06d0, 0x0630, 0x0340, + 0x06e0, 0x0340, 0x0340, 0x0340, 0x06f0, 0x0340, 0x0340, 0x0340, + 0x0510, 0x0340, 0x0340, 0x0700, 0x0710, 0x0720, 0x0630, 0x0340, + 0x0640, 0x0340, 0x0340, 0x06c0, 0x0730, 0x0340, 0x0630, 0x0340, + 0x0740, 0x0340, 0x0340, 0x0750, 0x0660, 0x0340, 0x0630, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0760, 0x0770, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0780, 0x0790, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0340, 0x07a0, 0x07b0, 0x0340, 0x0340, 0x0340, + 0x0340, 0x07c0, 0x0340, 0x07d0, 0x0340, 0x0340, 0x0340, 0x07e0, + 0x07f0, 0x0800, 0x0360, 0x0810, 0x06d0, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0820, 0x0830, 0x0340, 0x0840, 0x0510, 0x0850, + 0x0860, 0x0350, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0820, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0870, 0x0340, 0x0870, 0x0340, 0x0630, 0x0340, 0x0630, + 0x0340, 0x0340, 0x0340, 0x0880, 0x0890, 0x08a0, 0x0340, 0x0340, + 0x08b0, 0x0340, 0x0530, 0x0530, 0x0530, 0x0530, 0x0530, 0x08c0, + 0x08d0, 0x0530, 0x08e0, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x08f0, 0x0900, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0910, 0x0340, 0x0340, 0x0340, 0x0920, 0x0930, 0x0940, + 0x0340, 0x0340, 0x0340, 0x0950, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0960, 0x0340, 0x0340, 0x0970, 0x06e0, 0x0340, 0x0980, 0x0960, + 0x0740, 0x0340, 0x0990, 0x0340, 0x0340, 0x0340, 0x09a0, 0x0740, + 0x0340, 0x0340, 0x09b0, 0x09c0, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x09d0, 0x09e0, 0x09f0, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0360, 0x0360, 0x0360, 0x0a00, + 0x0a10, 0x0340, 0x0a20, 0x0340, 0x0340, 0x0340, 0x0a30, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0360, 0x0360, 0x0510, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0490, 0x0950, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0490, 0x0740, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0490, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0360, 0x0360, - 0x0340, 0x0340, 0x0a10, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0a20, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0490, 0x0a30, - 0x0340, 0x06e0, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0950, - 0x0a40, 0x0340, 0x0700, 0x0340, 0x0530, 0x0530, 0x0530, 0x0a50, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0a60, 0x0340, 0x0360, 0x0950, - 0x0340, 0x0340, 0x0a70, 0x0340, 0x0a80, 0x0950, 0x0340, 0x0340, - 0x05e0, 0x0340, 0x0340, 0x0a90, 0x0340, 0x0340, 0x0aa0, 0x0340, - 0x0340, 0x0340, 0x0ab0, 0x0ac0, 0x0ad0, 0x0340, 0x0340, 0x0640, - 0x0340, 0x0340, 0x0340, 0x0ae0, 0x0630, 0x0340, 0x0af0, 0x06b0, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0b00, 0x0340, - 0x0340, 0x0b10, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0a40, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0a50, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0490, 0x0a60, + 0x0340, 0x0700, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0740, + 0x0a70, 0x0340, 0x0720, 0x0340, 0x0530, 0x0530, 0x0530, 0x0a80, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0a90, 0x0340, 0x0360, 0x0740, + 0x0340, 0x0340, 0x0aa0, 0x0340, 0x0ab0, 0x0740, 0x0340, 0x0340, + 0x05f0, 0x0340, 0x0340, 0x0ac0, 0x0340, 0x0340, 0x0ad0, 0x0340, + 0x0340, 0x0340, 0x0ae0, 0x0af0, 0x0b00, 0x0340, 0x0340, 0x0650, + 0x0340, 0x0340, 0x0340, 0x0b10, 0x0640, 0x0340, 0x0b20, 0x06d0, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0b30, 0x0340, + 0x0340, 0x0b40, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0360, 0x0340, 0x0360, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0490, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, - 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0b20, + 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0340, 0x0b50, /* values */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -187,10 +187,12 @@ 0x0004, 0x0002, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0002, 0x0004, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, + 0x3404, 0x3400, 0x3404, 0x3404, 0x3404, 0x3404, 0x3400, 0x3402, + 0x3404, 0x3402, 0x3402, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0404, 0x0404, 0x0604, 0x0b04, 0x0f04, 0x1004, 0x1204, 0x1304, - 0x0104, 0x0104, 0x0802, 0x0302, 0x3402, 0x0000, 0x0702, 0x0a04, - 0x0d04, 0x3502, 0x0802, 0x0c04, 0x1104, 0x0000, 0x0404, 0x0404, - 0x0404, 0x0802, 0x0104, 0x3604, 0x3604, 0x3604, 0x0000, 0x0000, + 0x0104, 0x0104, 0x0802, 0x0302, 0x3502, 0x0000, 0x0702, 0x0a04, + 0x0d04, 0x3602, 0x0802, 0x0c04, 0x1104, 0x0000, 0x0404, 0x0404, + 0x0404, 0x0802, 0x0104, 0x3704, 0x3704, 0x3704, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, @@ -220,6 +222,8 @@ 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -235,6 +239,10 @@ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, + 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0000, @@ -305,8 +313,6 @@ 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, @@ -321,8 +327,8 @@ 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0005, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Sun Sep 24 11:17:06 2017 @@ -952,7 +952,7 @@ if (!(range = bsearch(&ch, script_ranges, ARRAY_SIZE(script_ranges), sizeof(*script_ranges), usp10_compare_script_range))) - return Script_Undefined; + return (*consumed == 2) ? Script_Surrogates : Script_Undefined; if (range->numericScript && (type & C1_DIGIT || type2 == C2_ARABICNUMBER)) return range->numericScript; @@ -1817,7 +1817,12 @@ cTabStops = 0; } else - defWidth = 8 * psc->tm.tmAveCharWidth; + { + if (pTabdef->iScale) + defWidth = (32 * pTabdef->iScale) / 4; + else + defWidth = 8 * psc->tm.tmAveCharWidth; + } for (; cTabStops>0 ; lpTabPos++, cTabStops--) { @@ -1831,10 +1836,10 @@ if( nTabOrg + position > current_x) { - if( *lpTabPos >= 0) + if( position >= 0) { /* a left aligned tab */ - x = (nTabOrg + *lpTabPos) - current_x; + x = (nTabOrg + position) - current_x; break; } else Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 24 11:17:06 2017 @@ -189,7 +189,7 @@ reactos/dll/win32/updspapi # Synced to WineStaging-2.9 reactos/dll/win32/url # Synced to WineStaging-2.9 reactos/dll/win32/urlmon # Synced to WineStaging-2.16 -reactos/dll/win32/usp10 # Synced to WineStaging-2.9 +reactos/dll/win32/usp10 # Synced to WineStaging-2.16 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/vbscript # Synced to WineStaging-2.9 reactos/dll/win32/version # Synced to WineStaging-2.9

7 years, 3 months

[pschweitzer] 75938: [FASTFAT] Implement statistics counting for create operations.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Sep 24 09:50:36 2017 New Revision: 75938 URL: http://svn.reactos.org/svn/reactos?rev=75938&view=rev Log: [FASTFAT] Implement statistics counting for create operations. Modified: trunk/reactos/drivers/filesystems/fastfat/create.c trunk/reactos/drivers/filesystems/fastfat/vfat.h Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Sun Sep 24 09:50:36 2017 @@ -468,6 +468,8 @@ return STATUS_CANNOT_DELETE; } + vfatAddToStat(DeviceExt, Fat.CreateHits, 1); + pFcb = DeviceExt->VolumeFcb; if (pFcb->OpenHandleCount == 0) @@ -486,6 +488,7 @@ FALSE); if (!NT_SUCCESS(Status)) { + vfatAddToStat(DeviceExt, Fat.FailedCreates, 1); return Status; } } @@ -493,6 +496,7 @@ vfatAttachFCBToFileObject(DeviceExt, pFcb, FileObject); DeviceExt->OpenHandleCount++; pFcb->OpenHandleCount++; + vfatAddToStat(DeviceExt, Fat.SuccessfulCreates, 1); Irp->IoStatus.Information = FILE_OPENED; return STATUS_SUCCESS; @@ -566,12 +570,16 @@ /* Try opening the file. */ if (!OpenTargetDir) { + vfatAddToStat(DeviceExt, Fat.CreateHits, 1); + Status = VfatOpenFile(DeviceExt, &PathNameU, FileObject, RequestedDisposition, RequestedOptions, &ParentFcb); } else { PVFATFCB TargetFcb; LONG idx, FileNameLen; + + vfatAddToStat(DeviceExt, Fat.CreateHits, 1); ParentFcb = (FileObject->RelatedFileObject != NULL) ? FileObject->RelatedFileObject->FsContext : NULL; if (ParentFcb) @@ -654,6 +662,7 @@ if (!NT_SUCCESS(Status)) { VfatCloseFile(DeviceExt, FileObject); + vfatAddToStat(DeviceExt, Fat.FailedCreates, 1); return Status; } } @@ -670,6 +679,15 @@ else if (ParentFcb != NULL) { vfatReleaseFCB(DeviceExt, ParentFcb); + } + + if (NT_SUCCESS(Status)) + { + vfatAddToStat(DeviceExt, Fat.SuccessfulCreates, 1); + } + else + { + vfatAddToStat(DeviceExt, Fat.FailedCreates, 1); } return Status; @@ -689,12 +707,14 @@ { vfatReleaseFCB(DeviceExt, ParentFcb); } + vfatAddToStat(DeviceExt, Fat.FailedCreates, 1); return Status; } if (!NT_SUCCESS(Status) && ParentFcb == NULL) { DPRINT1("VfatOpenFile failed for '%wZ', status %x\n", &PathNameU, Status); + vfatAddToStat(DeviceExt, Fat.FailedCreates, 1); return Status; } @@ -712,6 +732,7 @@ if (TrailingBackslash) { vfatReleaseFCB(DeviceExt, ParentFcb); + vfatAddToStat(DeviceExt, Fat.FailedCreates, 1); return STATUS_OBJECT_NAME_INVALID; } Attributes |= FILE_ATTRIBUTE_ARCHIVE; @@ -726,6 +747,7 @@ if (!NT_SUCCESS(Status)) { vfatReleaseFCB(DeviceExt, pFcb); + vfatAddToStat(DeviceExt, Fat.FailedCreates, 1); return Status; } @@ -745,12 +767,14 @@ } else { + vfatAddToStat(DeviceExt, Fat.FailedCreates, 1); return Status; } } else { vfatReleaseFCB(DeviceExt, ParentFcb); + vfatAddToStat(DeviceExt, Fat.FailedCreates, 1); return Status; } } @@ -769,9 +793,11 @@ VfatCloseFile(DeviceExt, FileObject); if (TrailingBackslash && !vfatFCBIsDirectory(pFcb)) { + vfatAddToStat(DeviceExt, Fat.FailedCreates, 1); return STATUS_OBJECT_NAME_INVALID; } Irp->IoStatus.Information = FILE_EXISTS; + vfatAddToStat(DeviceExt, Fat.FailedCreates, 1); return STATUS_OBJECT_NAME_COLLISION; } @@ -785,6 +811,7 @@ if (!NT_SUCCESS(Status)) { VfatCloseFile(DeviceExt, FileObject); + vfatAddToStat(DeviceExt, Fat.FailedCreates, 1); return Status; } } @@ -796,17 +823,20 @@ vfatFCBIsDirectory(pFcb)) { VfatCloseFile (DeviceExt, FileObject); + vfatAddToStat(DeviceExt, Fat.FailedCreates, 1); return STATUS_FILE_IS_A_DIRECTORY; } if (BooleanFlagOn(RequestedOptions, FILE_DIRECTORY_FILE) && !vfatFCBIsDirectory(pFcb)) { VfatCloseFile (DeviceExt, FileObject); + vfatAddToStat(DeviceExt, Fat.FailedCreates, 1); return STATUS_NOT_A_DIRECTORY; } if (TrailingBackslash && !vfatFCBIsDirectory(pFcb)) { VfatCloseFile (DeviceExt, FileObject); + vfatAddToStat(DeviceExt, Fat.FailedCreates, 1); return STATUS_OBJECT_NAME_INVALID; } #ifndef USE_ROS_CC_AND_FS @@ -823,6 +853,7 @@ DPRINT1("%d %d %d\n", Stack->Parameters.Create.SecurityContext->DesiredAccess & FILE_WRITE_DATA, RequestedDisposition == FILE_OVERWRITE, RequestedDisposition == FILE_OVERWRITE_IF); VfatCloseFile (DeviceExt, FileObject); + vfatAddToStat(DeviceExt, Fat.FailedCreates, 1); return (BooleanFlagOn(RequestedOptions, FILE_DELETE_ON_CLOSE)) ? STATUS_CANNOT_DELETE : STATUS_SHARING_VIOLATION; } @@ -844,6 +875,7 @@ if(!BooleanFlagOn(pFcb->Flags, FCB_IS_PAGE_FILE)) { VfatCloseFile(DeviceExt, FileObject); + vfatAddToStat(DeviceExt, Fat.FailedCreates, 1); return STATUS_INVALID_PARAMETER; } } @@ -857,6 +889,7 @@ if (BooleanFlagOn(pFcb->Flags, FCB_IS_PAGE_FILE)) { VfatCloseFile(DeviceExt, FileObject); + vfatAddToStat(DeviceExt, Fat.FailedCreates, 1); return STATUS_INVALID_PARAMETER; } } @@ -881,6 +914,7 @@ if (!NT_SUCCESS (Status)) { VfatCloseFile(DeviceExt, FileObject); + vfatAddToStat(DeviceExt, Fat.FailedCreates, 1); return Status; } } @@ -938,6 +972,15 @@ /* FIXME : test write access if requested */ + if (NT_SUCCESS(Status)) + { + vfatAddToStat(DeviceExt, Fat.SuccessfulCreates, 1); + } + else + { + vfatAddToStat(DeviceExt, Fat.FailedCreates, 1); + } + return Status; } Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Sun Sep 24 09:50:36 2017 @@ -602,6 +602,12 @@ return BooleanFlagOn(DeviceExt->Flags, VCB_IS_FATX); } +#define vfatAddToStat(Vcb, Stat, Inc) \ +{ \ + PSTATISTICS Stats = &(Vcb)->Statistics[KeGetCurrentProcessorNumber() % VfatGlobalData->NumberProcessors]; \ + Stats->Stat += Inc; \ +} + /* blockdev.c */ NTSTATUS

7 years, 3 months

[pschweitzer] 75937: [FASTFAT] Start implementing statistics support. So far, everything is just nulled. These 0 can be properly queried with fsutil fsinfo statistics.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Sep 24 08:56:06 2017 New Revision: 75937 URL: http://svn.reactos.org/svn/reactos?rev=75937&view=rev Log: [FASTFAT] Start implementing statistics support. So far, everything is just nulled. These 0 can be properly queried with fsutil fsinfo statistics. Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c trunk/reactos/drivers/filesystems/fastfat/iface.c trunk/reactos/drivers/filesystems/fastfat/vfat.h Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Sun Sep 24 08:56:06 2017 @@ -532,6 +532,7 @@ UNICODE_STRING VolumeLabelU; ULONG HashTableSize; ULONG eocMark; + ULONG i; FATINFO FatInfo; DPRINT("VfatMount(IrpContext %p)\n", IrpContext); @@ -669,6 +670,23 @@ goto ByeBye; } + DeviceExt->Statistics = ExAllocatePoolWithTag(NonPagedPool, + sizeof(STATISTICS) * VfatGlobalData->NumberProcessors, + TAG_VFAT); + if (DeviceExt->Statistics == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto ByeBye; + } + + RtlZeroMemory(DeviceExt->Statistics, sizeof(STATISTICS) * VfatGlobalData->NumberProcessors); + for (i = 0; i < VfatGlobalData->NumberProcessors; ++i) + { + DeviceExt->Statistics[i].Base.FileSystemType = FILESYSTEM_STATISTICS_TYPE_FAT; + DeviceExt->Statistics[i].Base.Version = 1; + DeviceExt->Statistics[i].Base.SizeOfCompleteStructure = sizeof(STATISTICS); + } + DeviceExt->FATFileObject = IoCreateStreamFileObject(NULL, DeviceExt->StorageDevice); Fcb = vfatNewFCB(DeviceExt, &NameU); if (Fcb == NULL) @@ -776,6 +794,8 @@ ObDereferenceObject (DeviceExt->FATFileObject); if (DeviceExt && DeviceExt->SpareVPB) ExFreePoolWithTag(DeviceExt->SpareVPB, TAG_VFAT); + if (DeviceExt && DeviceExt->Statistics) + ExFreePoolWithTag(DeviceExt->Statistics, TAG_VFAT); if (Fcb) vfatDestroyFCB(Fcb); if (Ccb) @@ -1188,6 +1208,46 @@ return STATUS_SUCCESS; } +static +NTSTATUS +VfatGetStatistics( + PVFAT_IRP_CONTEXT IrpContext) +{ + PVOID Buffer; + ULONG Length; + NTSTATUS Status; + PDEVICE_EXTENSION DeviceExt; + + DeviceExt = IrpContext->DeviceExt; + Length = IrpContext->Stack->Parameters.FileSystemControl.OutputBufferLength; + Buffer = IrpContext->Irp->AssociatedIrp.SystemBuffer; + + if (Length < sizeof(FILESYSTEM_STATISTICS)) + { + return STATUS_BUFFER_TOO_SMALL; + } + + if (Buffer == NULL) + { + return STATUS_INVALID_USER_BUFFER; + } + + if (Length >= sizeof(STATISTICS) * VfatGlobalData->NumberProcessors) + { + Length = sizeof(STATISTICS) * VfatGlobalData->NumberProcessors; + Status = STATUS_SUCCESS; + } + else + { + Status = STATUS_BUFFER_OVERFLOW; + } + + RtlCopyMemory(Buffer, DeviceExt->Statistics, Length); + IrpContext->Irp->IoStatus.Information = Length; + + return Status; +} + /* * FUNCTION: File system control */ @@ -1243,6 +1303,10 @@ Status = VfatDismountVolume(IrpContext); break; + case FSCTL_FILESYSTEM_GET_STATISTICS: + Status = VfatGetStatistics(IrpContext); + break; + default: Status = STATUS_INVALID_DEVICE_REQUEST; } Modified: trunk/reactos/drivers/filesystems/fastfat/iface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/iface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/iface.c [iso-8859-1] Sun Sep 24 08:56:06 2017 @@ -91,6 +91,7 @@ RtlZeroMemory (VfatGlobalData, sizeof(VFAT_GLOBAL_DATA)); VfatGlobalData->DriverObject = DriverObject; VfatGlobalData->DeviceObject = DeviceObject; + VfatGlobalData->NumberProcessors = KeNumberProcessors; /* Enable this to enter the debugger when file system corruption * has been detected: VfatGlobalData->Flags = VFAT_BREAK_ON_CORRUPTION; */ Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Sun Sep 24 08:56:06 2017 @@ -289,6 +289,13 @@ PGET_NEXT_DIR_ENTRY GetNextDirEntry; } VFAT_DISPATCH, *PVFAT_DISPATCH; +#define STATISTICS_SIZE_NO_PAD (sizeof(FILESYSTEM_STATISTICS) + sizeof(FAT_STATISTICS)) +typedef struct _STATISTICS { + FILESYSTEM_STATISTICS Base; + FAT_STATISTICS Fat; + UCHAR Pad[((STATISTICS_SIZE_NO_PAD + 0x3f) & ~0x3f) - STATISTICS_SIZE_NO_PAD]; +} STATISTICS, *PSTATISTICS; + typedef struct DEVICE_EXTENSION { ERESOURCE DirResource; @@ -308,6 +315,7 @@ BOOLEAN AvailableClustersValid; ULONG Flags; struct _VFATFCB *VolumeFcb; + PSTATISTICS Statistics; /* Pointers to functions for manipulating FAT. */ PGET_NEXT_CLUSTER GetNextCluster; @@ -383,6 +391,7 @@ PDRIVER_OBJECT DriverObject; PDEVICE_OBJECT DeviceObject; ULONG Flags; + ULONG NumberProcessors; ERESOURCE VolumeListLock; LIST_ENTRY VolumeListHead; NPAGED_LOOKASIDE_LIST FcbLookasideList;

7 years, 3 months

[ekohl] 75936: [WLNOTIFY] - Add Notifications for the Scheduler Service.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Sep 23 22:29:36 2017 New Revision: 75936 URL: http://svn.reactos.org/svn/reactos?rev=75936&view=rev Log: [WLNOTIFY] - Add Notifications for the Scheduler Service. Added: trunk/reactos/dll/win32/wlnotify/schedsvc.c (with props) Modified: trunk/reactos/dll/win32/wlnotify/CMakeLists.txt trunk/reactos/dll/win32/wlnotify/wlnotify.spec Modified: trunk/reactos/dll/win32/wlnotify/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlnotify/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/wlnotify/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlnotify/CMakeLists.txt [iso-8859-1] Sat Sep 23 22:29:36 2017 @@ -2,6 +2,7 @@ spec2def(wlnotify.dll wlnotify.spec ADD_IMPORTLIB) list(APPEND SOURCE + schedsvc.c test.c wlnotify.c precomp.h) @@ -12,6 +13,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/wlnotify.def) set_module_type(wlnotify win32dll UNICODE ENTRYPOINT DllMain 12) -add_importlibs(wlnotify kernel32 ntdll) +add_importlibs(wlnotify advapi32 kernel32 ntdll) add_pch(wlnotify precomp.h SOURCE) add_cd_file(TARGET wlnotify DESTINATION reactos/system32 FOR all) Added: trunk/reactos/dll/win32/wlnotify/schedsvc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlnotify/schedsv… ============================================================================== --- trunk/reactos/dll/win32/wlnotify/schedsvc.c (added) +++ trunk/reactos/dll/win32/wlnotify/schedsvc.c [iso-8859-1] Sat Sep 23 22:29:36 2017 @@ -0,0 +1,109 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/wlnotify/schedsvc.c + * PURPOSE: Scheduler service logon notifications + * PROGRAMMER: Eric Kohl <eric.kohl(a)reactos.org> + */ + +#include "precomp.h" +#include <winsvc.h> + +#define _NDEBUG +#include <debug.h> + + +VOID +WINAPI +SchedEventLogoff( + PWLX_NOTIFICATION_INFO pInfo) +{ + SC_HANDLE hManager = NULL; + SC_HANDLE hService = NULL; + SERVICE_STATUS ServiceStatus; + + DPRINT("SchedStartShellEvent\n"); + DPRINT("Size: %lu\n", pInfo->Size); + DPRINT("Flags: %lx\n", pInfo->Flags); + DPRINT("UserName: %S\n", pInfo->UserName); + DPRINT("Domain: %S\n", pInfo->Domain); + DPRINT("WindowStation: %S\n", pInfo->WindowStation); + DPRINT("hToken: %p\n", pInfo->hToken); + DPRINT("hDesktop: %p\n", pInfo->hDesktop); + DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + + hManager = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); + if (hManager == NULL) + { + DPRINT1("OpenSCManagerW() failed (Error %lu)\n", GetLastError()); + goto done; + } + + hService = OpenServiceW(hManager, L"Schedule", SERVICE_USER_DEFINED_CONTROL); + if (hManager == NULL) + { + DPRINT1("OpenServiceW() failed (Error %lu)\n", GetLastError()); + goto done; + } + + if (!ControlService(hService, 129, &ServiceStatus)) + { + DPRINT1("ControlService() failed (Error %lu)\n", GetLastError()); + } + +done: + if (hService != NULL) + CloseServiceHandle(hService); + + if (hManager != NULL) + CloseServiceHandle(hManager); +} + + +VOID +WINAPI +SchedStartShell( + PWLX_NOTIFICATION_INFO pInfo) +{ + SC_HANDLE hManager = NULL; + SC_HANDLE hService = NULL; + SERVICE_STATUS ServiceStatus; + + DPRINT("SchedStartShellEvent\n"); + DPRINT("Size: %lu\n", pInfo->Size); + DPRINT("Flags: %lx\n", pInfo->Flags); + DPRINT("UserName: %S\n", pInfo->UserName); + DPRINT("Domain: %S\n", pInfo->Domain); + DPRINT("WindowStation: %S\n", pInfo->WindowStation); + DPRINT("hToken: %p\n", pInfo->hToken); + DPRINT("hDesktop: %p\n", pInfo->hDesktop); + DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); + + hManager = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); + if (hManager == NULL) + { + DPRINT1("OpenSCManagerW() failed (Error %lu)\n", GetLastError()); + goto done; + } + + hService = OpenServiceW(hManager, L"Schedule", SERVICE_USER_DEFINED_CONTROL); + if (hManager == NULL) + { + DPRINT1("OpenServiceW() failed (Error %lu)\n", GetLastError()); + goto done; + } + + if (!ControlService(hService, 128, &ServiceStatus)) + { + DPRINT1("ControlService() failed (Error %lu)\n", GetLastError()); + } + +done: + if (hService != NULL) + CloseServiceHandle(hService); + + if (hManager != NULL) + CloseServiceHandle(hManager); +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/wlnotify/schedsvc.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/wlnotify/wlnotify.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlnotify/wlnotif… ============================================================================== --- trunk/reactos/dll/win32/wlnotify/wlnotify.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlnotify/wlnotify.spec [iso-8859-1] Sat Sep 23 22:29:36 2017 @@ -1,3 +1,23 @@ +;@ stub RegisterTicketExpiredNotificationEvent +;@ stub SCardResumeCertProp +;@ stub SCardStartCertProp +;@ stub SCardStopCertProp +;@ stub SCardSuspendCertProp +@ stdcall SchedEventLogoff(ptr) +@ stdcall SchedStartShell(ptr) +;@ stub SensDisconnectEvent +;@ stub SensLockEvent +;@ stub SensLogoffEvent +;@ stub SensLogonEvent +;@ stub SensPostShellEvent +;@ stub SensReconnectEvent +;@ stub SensShutdownEvent +;@ stub SensStartScreenSaverEvent +;@ stub SensStartShellEvent +;@ stub SensStartupEvent +;@ stub SensStopScreenSaverEvent +;@ stub SensUnlockEvent +;@ stub ShowNotificationBallonW @ stdcall TestDisconnectEvent(ptr) @ stdcall TestLockEvent(ptr) @ stdcall TestLogoffEvent(ptr) @@ -10,3 +30,13 @@ @ stdcall TestStartupEvent(ptr) @ stdcall TestStopScreenSaverEvent(ptr) @ stdcall TestUnlockEvent(ptr) +;@ stub TSEventDisconnect +;@ stub TSEventLogoff +;@ stub TSEventLogon +;@ stub TSEventPostShell +;@ stub TSEventReconnect +;@ stub TSEventShutdown +;@ stub TSEventStartShell +;@ stub TSEventStartup +;@ stub TermsrvCreateTempDir +;@ stub UnregisterTicketExpiredNotificationEvent

7 years, 3 months

[pschweitzer] 75935: [FSUTIL] Use saved last error, don't get it again

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Sep 23 20:22:59 2017 New Revision: 75935 URL: http://svn.reactos.org/svn/reactos?rev=75935&view=rev Log: [FSUTIL] Use saved last error, don't get it again Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c [iso-8859-1] Sat Sep 23 20:22:59 2017 @@ -523,7 +523,7 @@ } else { - PrintErrorMessage(GetLastError()); + PrintErrorMessage(Error); CloseHandle(Volume); return 1; }

7 years, 3 months

[pschweitzer] 75934: [FSUTIL] Implement fsutil fsinfo statistics Note that compared to w2k3 one, ours really supports FAT volumes (even though our FAT doesn't support it!).

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Sep 23 20:15:16 2017 New Revision: 75934 URL: http://svn.reactos.org/svn/reactos?rev=75934&view=rev Log: [FSUTIL] Implement fsutil fsinfo statistics Note that compared to w2k3 one, ours really supports FAT volumes (even though our FAT doesn't support it!). Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c [iso-8859-1] Sat Sep 23 20:15:16 2017 @@ -12,12 +12,14 @@ static HandlerProc DrivesMain; static HandlerProc DriveTypeMain; static HandlerProc VolumeInfoMain; +static HandlerProc StatisticsMain; static HandlerItem HandlersList[] = { /* Proc, name, help */ { DrivesMain, _T("drives"), _T("Enumerates the drives") }, { DriveTypeMain, _T("drivetype"), _T("Provides the type of a drive") }, { VolumeInfoMain, _T("volumeinfo"), _T("Provides informations about a volume") }, + { StatisticsMain, _T("statistics"), _T("Displays volume statistics") }, }; static int @@ -156,6 +158,416 @@ return 0; } +#define DUMP_VALUE(stats, value) fprintf(stdout, "%s: %lu\n", #value, stats->value) + +static void +DumpBase(PFILESYSTEM_STATISTICS Base, TCHAR * Name) +{ + /* Print FS name */ + _ftprintf(stdout, _T("File system type: %s\n\n"), Name); + + /* And then, dump any base stat */ + DUMP_VALUE(Base, UserFileReads); + DUMP_VALUE(Base, UserFileReadBytes); + DUMP_VALUE(Base, UserDiskReads); + DUMP_VALUE(Base, UserFileWrites); + DUMP_VALUE(Base, UserFileWriteBytes); + DUMP_VALUE(Base, UserDiskWrites); + DUMP_VALUE(Base, MetaDataReads); + DUMP_VALUE(Base, MetaDataReadBytes); + DUMP_VALUE(Base, MetaDataDiskReads); + DUMP_VALUE(Base, MetaDataWrites); + DUMP_VALUE(Base, MetaDataWriteBytes); + DUMP_VALUE(Base, MetaDataDiskWrites); + + _ftprintf(stdout, _T("\n")); +} + +static void +DumpExFat(PVOID Statistics, PVOID Specific) +{ + PEXFAT_STATISTICS ExFat; + PFILESYSTEM_STATISTICS Base; + + Base = Statistics; + ExFat = Specific; + + /* First, display the generic stats */ + DumpBase(Base, _T("EXFAT")); + + /* Then, display the EXFAT specific ones */ + DUMP_VALUE(ExFat, CreateHits); + DUMP_VALUE(ExFat, SuccessfulCreates); + DUMP_VALUE(ExFat, FailedCreates); + DUMP_VALUE(ExFat, NonCachedReads); + DUMP_VALUE(ExFat, NonCachedReadBytes); + DUMP_VALUE(ExFat, NonCachedWrites); + DUMP_VALUE(ExFat, NonCachedWriteBytes); + DUMP_VALUE(ExFat, NonCachedDiskReads); + DUMP_VALUE(ExFat, NonCachedDiskWrites); +} + +static void +DumpFat(PVOID Statistics, PVOID Specific) +{ + PFAT_STATISTICS Fat; + PFILESYSTEM_STATISTICS Base; + + Base = Statistics; + Fat = Specific; + + /* First, display the generic stats */ + DumpBase(Base, _T("FAT")); + + /* Then, display the FAT specific ones */ + DUMP_VALUE(Fat, CreateHits); + DUMP_VALUE(Fat, SuccessfulCreates); + DUMP_VALUE(Fat, FailedCreates); + DUMP_VALUE(Fat, NonCachedReads); + DUMP_VALUE(Fat, NonCachedReadBytes); + DUMP_VALUE(Fat, NonCachedWrites); + DUMP_VALUE(Fat, NonCachedWriteBytes); + DUMP_VALUE(Fat, NonCachedDiskReads); + DUMP_VALUE(Fat, NonCachedDiskWrites); +} + +static void +DumpNtfs(PVOID Statistics, PVOID Specific) +{ + PNTFS_STATISTICS Ntfs; + PFILESYSTEM_STATISTICS Base; + + Base = Statistics; + Ntfs = Specific; + + /* First, display the generic stats */ + DumpBase(Base, _T("NTFS")); + + /* Then, display the NTFS specific ones */ + DUMP_VALUE(Ntfs, MftReads); + DUMP_VALUE(Ntfs, MftReadBytes); + DUMP_VALUE(Ntfs, MftWrites); + DUMP_VALUE(Ntfs, MftWriteBytes); + DUMP_VALUE(Ntfs, Mft2Writes); + DUMP_VALUE(Ntfs, Mft2WriteBytes); + DUMP_VALUE(Ntfs, RootIndexReads); + DUMP_VALUE(Ntfs, RootIndexReadBytes); + DUMP_VALUE(Ntfs, RootIndexWrites); + DUMP_VALUE(Ntfs, RootIndexWriteBytes); + DUMP_VALUE(Ntfs, BitmapReads); + DUMP_VALUE(Ntfs, BitmapReadBytes); + DUMP_VALUE(Ntfs, BitmapWrites); + DUMP_VALUE(Ntfs, BitmapWriteBytes); + DUMP_VALUE(Ntfs, MftBitmapReads); + DUMP_VALUE(Ntfs, MftBitmapReadBytes); + DUMP_VALUE(Ntfs, MftBitmapWrites); + DUMP_VALUE(Ntfs, MftBitmapWriteBytes); + DUMP_VALUE(Ntfs, UserIndexReads); + DUMP_VALUE(Ntfs, UserIndexReadBytes); + DUMP_VALUE(Ntfs, UserIndexWrites); + DUMP_VALUE(Ntfs, UserIndexWriteBytes); + DUMP_VALUE(Ntfs, LogFileReads); + DUMP_VALUE(Ntfs, LogFileReadBytes); + DUMP_VALUE(Ntfs, LogFileWrites); + DUMP_VALUE(Ntfs, LogFileWriteBytes); +} + +#define GET_NEXT(stats, length, iter, type) (type)((ULONG_PTR)stats + (length * iter)) +#define SUM_VALUE(stats, new, value) stats->value += new->value + +inline int +ValidateSizes(ULONG Length, DWORD ProcCount, DWORD BytesRead, DWORD SpecificSize) +{ + /* Check whether we could read our base length for every processor */ + if (Length * ProcCount > BytesRead) + { + _ftprintf(stderr, _T("Only performed a partial read: %lu (expected: %lu)\n"), BytesRead, Length * ProcCount); + return 1; + } + + /* Check whether this covers a specific entry and a generic entry for every processor */ + if ((sizeof(FILESYSTEM_STATISTICS) + SpecificSize) * ProcCount > BytesRead) + { + _ftprintf(stderr, _T("Only performed a partial read: %lu (expected: %lu)\n"), BytesRead, (sizeof(FILESYSTEM_STATISTICS) + SpecificSize)); + return 1; + } + + return 0; +} + +inline void +SumBase(PFILESYSTEM_STATISTICS Base, PFILESYSTEM_STATISTICS NextBase) +{ + /* Sum any entry in the generic structures */ + SUM_VALUE(Base, NextBase, UserFileReads); + SUM_VALUE(Base, NextBase, UserFileReadBytes); + SUM_VALUE(Base, NextBase, UserDiskReads); + SUM_VALUE(Base, NextBase, UserFileWrites); + SUM_VALUE(Base, NextBase, UserFileWriteBytes); + SUM_VALUE(Base, NextBase, UserDiskWrites); + SUM_VALUE(Base, NextBase, MetaDataReads); + SUM_VALUE(Base, NextBase, MetaDataReadBytes); + SUM_VALUE(Base, NextBase, MetaDataDiskReads); + SUM_VALUE(Base, NextBase, MetaDataWrites); + SUM_VALUE(Base, NextBase, MetaDataWriteBytes); + SUM_VALUE(Base, NextBase, MetaDataDiskWrites); +} + +static int +SumExFat(PVOID Statistics, PVOID Specific, ULONG Length, DWORD ProcCount, DWORD BytesRead) +{ + DWORD i; + PEXFAT_STATISTICS ExFat; + PFILESYSTEM_STATISTICS Base; + + /* First, validate we won't read beyond allocation */ + if (ValidateSizes(Length, ProcCount, BytesRead, sizeof(EXFAT_STATISTICS))) + { + return 1; + } + + Base = Statistics; + ExFat = Specific; + + /* And for every processor, sum every relevant value in first entry */ + for (i = 1; i < ProcCount; ++i) + { + PEXFAT_STATISTICS NextExFat; + PFILESYSTEM_STATISTICS NextBase; + + NextBase = GET_NEXT(Base, Length, i, PFILESYSTEM_STATISTICS); + NextExFat = GET_NEXT(ExFat, Length, i, PEXFAT_STATISTICS); + + /* Generic first */ + SumBase(Base, NextBase); + /* Specific then */ + SUM_VALUE(ExFat, NextExFat, CreateHits); + SUM_VALUE(ExFat, NextExFat, SuccessfulCreates); + SUM_VALUE(ExFat, NextExFat, FailedCreates); + SUM_VALUE(ExFat, NextExFat, NonCachedReads); + SUM_VALUE(ExFat, NextExFat, NonCachedReadBytes); + SUM_VALUE(ExFat, NextExFat, NonCachedWrites); + SUM_VALUE(ExFat, NextExFat, NonCachedWriteBytes); + SUM_VALUE(ExFat, NextExFat, NonCachedDiskReads); + SUM_VALUE(ExFat, NextExFat, NonCachedDiskWrites); + } + + return 0; +} + +static int +SumFat(PVOID Statistics, PVOID Specific, ULONG Length, DWORD ProcCount, DWORD BytesRead) +{ + DWORD i; + PFAT_STATISTICS Fat; + PFILESYSTEM_STATISTICS Base; + + /* First, validate we won't read beyond allocation */ + if (ValidateSizes(Length, ProcCount, BytesRead, sizeof(FAT_STATISTICS))) + { + return 1; + } + + Base = Statistics; + Fat = Specific; + + /* And for every processor, sum every relevant value in first entry */ + for (i = 1; i < ProcCount; ++i) + { + PFAT_STATISTICS NextFat; + PFILESYSTEM_STATISTICS NextBase; + + NextBase = GET_NEXT(Base, Length, i, PFILESYSTEM_STATISTICS); + NextFat = GET_NEXT(Fat, Length, i, PFAT_STATISTICS); + + /* Generic first */ + SumBase(Base, NextBase); + /* Specific then */ + SUM_VALUE(Fat, NextFat, CreateHits); + SUM_VALUE(Fat, NextFat, SuccessfulCreates); + SUM_VALUE(Fat, NextFat, FailedCreates); + SUM_VALUE(Fat, NextFat, NonCachedReads); + SUM_VALUE(Fat, NextFat, NonCachedReadBytes); + SUM_VALUE(Fat, NextFat, NonCachedWrites); + SUM_VALUE(Fat, NextFat, NonCachedWriteBytes); + SUM_VALUE(Fat, NextFat, NonCachedDiskReads); + SUM_VALUE(Fat, NextFat, NonCachedDiskWrites); + } + + return 0; +} + +static int +SumNtfs(PVOID Statistics, PVOID Specific, ULONG Length, DWORD ProcCount, DWORD BytesRead) +{ + DWORD i; + PNTFS_STATISTICS Ntfs; + PFILESYSTEM_STATISTICS Base; + + /* First, validate we won't read beyond allocation */ + if (ValidateSizes(Length, ProcCount, BytesRead, sizeof(NTFS_STATISTICS))) + { + return 1; + } + + Base = Statistics; + Ntfs = Specific; + + /* And for every processor, sum every relevant value in first entry */ + for (i = 1; i < ProcCount; ++i) + { + PNTFS_STATISTICS NextNtfs; + PFILESYSTEM_STATISTICS NextBase; + + NextBase = GET_NEXT(Base, Length, i, PFILESYSTEM_STATISTICS); + NextNtfs = GET_NEXT(Ntfs, Length, i, PNTFS_STATISTICS); + + /* Generic first */ + SumBase(Base, NextBase); + /* Specific then */ + SUM_VALUE(Ntfs, NextNtfs, MftReads); + SUM_VALUE(Ntfs, NextNtfs, MftReadBytes); + SUM_VALUE(Ntfs, NextNtfs, MftWrites); + SUM_VALUE(Ntfs, NextNtfs, MftWriteBytes); + SUM_VALUE(Ntfs, NextNtfs, Mft2Writes); + SUM_VALUE(Ntfs, NextNtfs, Mft2WriteBytes); + SUM_VALUE(Ntfs, NextNtfs, RootIndexReads); + SUM_VALUE(Ntfs, NextNtfs, RootIndexReadBytes); + SUM_VALUE(Ntfs, NextNtfs, RootIndexWrites); + SUM_VALUE(Ntfs, NextNtfs, RootIndexWriteBytes); + SUM_VALUE(Ntfs, NextNtfs, BitmapReads); + SUM_VALUE(Ntfs, NextNtfs, BitmapReadBytes); + SUM_VALUE(Ntfs, NextNtfs, BitmapWrites); + SUM_VALUE(Ntfs, NextNtfs, BitmapWriteBytes); + SUM_VALUE(Ntfs, NextNtfs, MftBitmapReads); + SUM_VALUE(Ntfs, NextNtfs, MftBitmapReadBytes); + SUM_VALUE(Ntfs, NextNtfs, MftBitmapWrites); + SUM_VALUE(Ntfs, NextNtfs, MftBitmapWriteBytes); + SUM_VALUE(Ntfs, NextNtfs, UserIndexReads); + SUM_VALUE(Ntfs, NextNtfs, UserIndexReadBytes); + SUM_VALUE(Ntfs, NextNtfs, UserIndexWrites); + SUM_VALUE(Ntfs, NextNtfs, UserIndexWriteBytes); + SUM_VALUE(Ntfs, NextNtfs, LogFileReads); + SUM_VALUE(Ntfs, NextNtfs, LogFileReadBytes); + SUM_VALUE(Ntfs, NextNtfs, LogFileWrites); + SUM_VALUE(Ntfs, NextNtfs, LogFileWriteBytes); + } + + return 0; +} + +static int +StatisticsMain(int argc, const TCHAR *argv[]) +{ + HANDLE Volume; + SYSTEM_INFO SystemInfo; + FILESYSTEM_STATISTICS Buffer; + PFILESYSTEM_STATISTICS Statistics; + DWORD BytesRead, Length, ProcCount; + /* +1 because 0 isn't assigned to a filesystem */ + void (*DumpFct[FILESYSTEM_STATISTICS_TYPE_EXFAT + 1])(PVOID, PVOID) = { NULL, DumpNtfs, DumpFat, DumpExFat }; + int (*SumFct[FILESYSTEM_STATISTICS_TYPE_EXFAT + 1])(PVOID, PVOID, ULONG, DWORD, DWORD) = { NULL, SumNtfs, SumFat, SumExFat }; + + /* We need a volume (letter or GUID) */ + if (argc < 2) + { + _ftprintf(stderr, _T("Usage: fsutil fsinfo statistics <volume>\n")); + _ftprintf(stderr, _T("\tFor example: fsutil fsinfo statistics c:\n")); + return 1; + } + + /* Get a handle for the volume */ + Volume = OpenVolume(argv[1], FALSE); + if (Volume == INVALID_HANDLE_VALUE) + { + return 1; + } + + /* And query the statistics status - this call is expected to fail */ + Statistics = &Buffer; + Length = sizeof(Buffer); + /* Assume we have a single proc for now */ + ProcCount = 1; + if (DeviceIoControl(Volume, FSCTL_FILESYSTEM_GET_STATISTICS, NULL, 0, Statistics, + Length, &BytesRead, NULL) == FALSE) + { + DWORD Error; + + /* Check we failed because we provided a too small buffer */ + Error = GetLastError(); + if (Error == ERROR_MORE_DATA) + { + /* Get proc count */ + GetSystemInfo(&SystemInfo); + ProcCount = SystemInfo.dwNumberOfProcessors; + /* Get the maximum size to allocate: it's the total size (generic + specific) for every proc */ + Length = Statistics->SizeOfCompleteStructure * ProcCount; + + Statistics = LocalAlloc(LPTR, Length); + if (Statistics == NULL) + { + _ftprintf(stderr, _T("Failed to allocate memory!\n")); + CloseHandle(Volume); + return 1; + } + + /* Reissue the FSCTL, it's supposed to succeed now! */ + if (DeviceIoControl(Volume, FSCTL_FILESYSTEM_GET_STATISTICS, NULL, 0, Statistics, + Length, &BytesRead, NULL) == FALSE) + { + PrintErrorMessage(GetLastError()); + LocalFree(Statistics); + CloseHandle(Volume); + return 1; + } + } + else + { + PrintErrorMessage(GetLastError()); + CloseHandle(Volume); + return 1; + } + } + + /* No need to deal with the volume any longer */ + CloseHandle(Volume); + + /* We only support FAT, EXFAT and NTFS for now */ + if (Statistics->FileSystemType > FILESYSTEM_STATISTICS_TYPE_EXFAT || Statistics->FileSystemType < FILESYSTEM_STATISTICS_TYPE_NTFS) + { + _ftprintf(stderr, _T("Unrecognized file system type: %d\n"), Statistics->FileSystemType); + if (Statistics != &Buffer) + { + LocalFree(Statistics); + } + + return 1; + } + + /* Sum all the statistics (both generic and specific) from all the processors in the first entry */ + if (SumFct[Statistics->FileSystemType](Statistics, (PVOID)((ULONG_PTR)Statistics + sizeof(FILESYSTEM_STATISTICS)), + Statistics->SizeOfCompleteStructure, ProcCount, BytesRead)) + { + if (Statistics != &Buffer) + { + LocalFree(Statistics); + } + + return 1; + } + + /* And finally, display the statistics (both generic and specific) */ + DumpFct[Statistics->FileSystemType](Statistics, (PVOID)((ULONG_PTR)Statistics + sizeof(FILESYSTEM_STATISTICS))); + + /* If we allocated memory, release it */ + if (Statistics != &Buffer) + { + LocalFree(Statistics); + } + + return 0; +} + static void PrintUsage(const TCHAR * Command) {

7 years, 3 months

[pschweitzer] 75933: [PSDK] Define FSCTL_FILESYSTEM_GET_STATISTICS and its associated structures

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Sep 23 20:13:54 2017 New Revision: 75933 URL: http://svn.reactos.org/svn/reactos?rev=75933&view=rev Log: [PSDK] Define FSCTL_FILESYSTEM_GET_STATISTICS and its associated structures Modified: trunk/reactos/sdk/include/psdk/winioctl.h Modified: trunk/reactos/sdk/include/psdk/winioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/winioctl.… ============================================================================== --- trunk/reactos/sdk/include/psdk/winioctl.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/winioctl.h [iso-8859-1] Sat Sep 23 20:13:54 2017 @@ -631,6 +631,7 @@ #define _FILESYSTEMFSCTL_ #define FSCTL_MARK_VOLUME_DIRTY CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 12, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_FILESYSTEM_GET_STATISTICS CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 24, METHOD_BUFFERED, FILE_ANY_ACCESS) #if (_WIN32_WINNT >= _WIN32_WINNT_NT4) #define FSCTL_IS_VOLUME_DIRTY CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 30, METHOD_BUFFERED, FILE_ANY_ACCESS) #endif @@ -649,6 +650,130 @@ #define VOLUME_UPGRADE_SCHEDULED (0x00000002) #define VOLUME_SESSION_OPEN (0x00000004) #endif + +typedef struct _FILESYSTEM_STATISTICS { + USHORT FileSystemType; + USHORT Version; + ULONG SizeOfCompleteStructure; + ULONG UserFileReads; + ULONG UserFileReadBytes; + ULONG UserDiskReads; + ULONG UserFileWrites; + ULONG UserFileWriteBytes; + ULONG UserDiskWrites; + ULONG MetaDataReads; + ULONG MetaDataReadBytes; + ULONG MetaDataDiskReads; + ULONG MetaDataWrites; + ULONG MetaDataWriteBytes; + ULONG MetaDataDiskWrites; +} FILESYSTEM_STATISTICS, *PFILESYSTEM_STATISTICS; + +#define FILESYSTEM_STATISTICS_TYPE_NTFS 1 +#define FILESYSTEM_STATISTICS_TYPE_FAT 2 +#define FILESYSTEM_STATISTICS_TYPE_EXFAT 3 + +typedef struct _FAT_STATISTICS { + ULONG CreateHits; + ULONG SuccessfulCreates; + ULONG FailedCreates; + ULONG NonCachedReads; + ULONG NonCachedReadBytes; + ULONG NonCachedWrites; + ULONG NonCachedWriteBytes; + ULONG NonCachedDiskReads; + ULONG NonCachedDiskWrites; +} FAT_STATISTICS, *PFAT_STATISTICS; + +typedef struct _EXFAT_STATISTICS { + ULONG CreateHits; + ULONG SuccessfulCreates; + ULONG FailedCreates; + ULONG NonCachedReads; + ULONG NonCachedReadBytes; + ULONG NonCachedWrites; + ULONG NonCachedWriteBytes; + ULONG NonCachedDiskReads; + ULONG NonCachedDiskWrites; +} EXFAT_STATISTICS, *PEXFAT_STATISTICS; + +typedef struct _NTFS_STATISTICS { + ULONG LogFileFullExceptions; + ULONG OtherExceptions; + ULONG MftReads; + ULONG MftReadBytes; + ULONG MftWrites; + ULONG MftWriteBytes; + struct { + USHORT Write; + USHORT Create; + USHORT SetInfo; + USHORT Flush; + } MftWritesUserLevel; + USHORT MftWritesFlushForLogFileFull; + USHORT MftWritesLazyWriter; + USHORT MftWritesUserRequest; + ULONG Mft2Writes; + ULONG Mft2WriteBytes; + struct { + USHORT Write; + USHORT Create; + USHORT SetInfo; + USHORT Flush; + } Mft2WritesUserLevel; + USHORT Mft2WritesFlushForLogFileFull; + USHORT Mft2WritesLazyWriter; + USHORT Mft2WritesUserRequest; + ULONG RootIndexReads; + ULONG RootIndexReadBytes; + ULONG RootIndexWrites; + ULONG RootIndexWriteBytes; + ULONG BitmapReads; + ULONG BitmapReadBytes; + ULONG BitmapWrites; + ULONG BitmapWriteBytes; + USHORT BitmapWritesFlushForLogFileFull; + USHORT BitmapWritesLazyWriter; + USHORT BitmapWritesUserRequest; + struct { + USHORT Write; + USHORT Create; + USHORT SetInfo; + } BitmapWritesUserLevel; + ULONG MftBitmapReads; + ULONG MftBitmapReadBytes; + ULONG MftBitmapWrites; + ULONG MftBitmapWriteBytes; + USHORT MftBitmapWritesFlushForLogFileFull; + USHORT MftBitmapWritesLazyWriter; + USHORT MftBitmapWritesUserRequest; + struct { + USHORT Write; + USHORT Create; + USHORT SetInfo; + USHORT Flush; + } MftBitmapWritesUserLevel; + ULONG UserIndexReads; + ULONG UserIndexReadBytes; + ULONG UserIndexWrites; + ULONG UserIndexWriteBytes; + ULONG LogFileReads; + ULONG LogFileReadBytes; + ULONG LogFileWrites; + ULONG LogFileWriteBytes; + struct { + ULONG Calls; + ULONG Clusters; + ULONG Hints; + ULONG RunsReturned; + ULONG HintsHonored; + ULONG HintsClusters; + ULONG Cache; + ULONG CacheClusters; + ULONG CacheMiss; + ULONG CacheMissClusters; + } Allocate; +} NTFS_STATISTICS, *PNTFS_STATISTICS; #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) typedef struct _FSCTL_GET_INTEGRITY_INFORMATION_BUFFER {

7 years, 3 months

[ekohl] 75932: [LSASRV] Add some comments and improve trace messages.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Sep 23 18:58:39 2017 New Revision: 75932 URL: http://svn.reactos.org/svn/reactos?rev=75932&view=rev Log: [LSASRV] Add some comments and improve trace messages. Modified: trunk/reactos/dll/win32/lsasrv/authport.c trunk/reactos/dll/win32/lsasrv/database.c Modified: trunk/reactos/dll/win32/lsasrv/authport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authport.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authport.c [iso-8859-1] Sat Sep 23 18:58:39 2017 @@ -22,7 +22,7 @@ LsapDeregisterLogonProcess(PLSA_API_MSG RequestMsg, PLSAP_LOGON_CONTEXT LogonContext) { - TRACE("(%p %p)\n", RequestMsg, LogonContext); + TRACE("LsapDeregisterLogonProcess(%p %p)\n", RequestMsg, LogonContext); RemoveHeadList(&LogonContext->Entry); @@ -44,7 +44,7 @@ PLSAP_LOGON_CONTEXT Context = NULL; NTSTATUS Status; - TRACE("(%p)\n", RequestMsg); + TRACE("LsapCheckLogonProcess(%p)\n", RequestMsg); TRACE("Client ID: %p %p\n", RequestMsg->h.ClientId.UniqueProcess, RequestMsg->h.ClientId.UniqueThread); @@ -93,7 +93,7 @@ REMOTE_PORT_VIEW RemotePortView; NTSTATUS Status = STATUS_SUCCESS; - TRACE("(%p)\n", RequestMsg); + TRACE("LsapHandlePortConnection(%p)\n", RequestMsg); TRACE("Logon Process Name: %s\n", RequestMsg->ConnectInfo.LogonProcessNameBuffer); Modified: trunk/reactos/dll/win32/lsasrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/database.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] Sat Sep 23 18:58:39 2017 @@ -299,21 +299,25 @@ if (!NT_SUCCESS(Status)) goto done; + /* Set the Primary Domain Name attribute */ LsapSetObjectAttribute(PolicyObject, L"PolPrDmN", NULL, 0); + /* Set the Primary Domain SID attribute */ LsapSetObjectAttribute(PolicyObject, L"PolPrDmS", NULL, 0); + /* Set the Account Domain Name attribute */ LsapSetObjectAttribute(PolicyObject, L"PolAcDmN", NULL, 0); + /* Set the Account Domain SID attribute */ LsapSetObjectAttribute(PolicyObject, L"PolAcDmS", AccountDomainSid,

7 years, 3 months

[ekohl] 75931: [DATETIME] Invert the sort order of the timezone list. List the timezones from GMT-12:00 to GMT+13:00.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Sep 23 18:54:58 2017 New Revision: 75931 URL: http://svn.reactos.org/svn/reactos?rev=75931&view=rev Log: [DATETIME] Invert the sort order of the timezone list. List the timezones from GMT-12:00 to GMT+13:00. Modified: trunk/reactos/dll/cpl/timedate/timezone.c Modified: trunk/reactos/dll/cpl/timedate/timezone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timezone.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timezone.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/timedate/timezone.c [iso-8859-1] Sat Sep 23 18:54:58 2017 @@ -48,7 +48,7 @@ Entry = TimeZoneListHead; while (Entry != NULL) { - if (Entry->TimezoneInfo.Bias > Bias) + if (Entry->TimezoneInfo.Bias < Bias) return Entry; if (Entry->TimezoneInfo.Bias == Bias)

7 years, 3 months

← Newer
1
...
5
6
7
8
9
10
11
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2017