Module: wine Branch: master Commit: 866eec810e7342630d47887f8ad7e1fbb5a0e788 URL: http://source.winehq.org/git/wine.git/?a=commit;h=866eec810e7342630d47887f8a...
Author: Huw Davies huw@codeweavers.com Date: Wed Aug 16 11:01:51 2017 +0100
usp10: Undefined characters above the BMP should be assigned to Script_Surrogates.
Signed-off-by: Huw Davies huw@codeweavers.com Signed-off-by: Aric Stewart aric@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/usp10/tests/usp10.c | 57 +++++++++++++++++++++++++++++++++++++++++------- dlls/usp10/usp10.c | 2 +- 2 files changed, 50 insertions(+), 9 deletions(-)
diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index d302714..f0eb500 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -228,7 +228,7 @@ static void test_ScriptItemize( void ) 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}, @@ -252,11 +252,10 @@ static const itemTest t2d5[5] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, 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}}; @@ -267,7 +266,7 @@ static const itemTest t2d5[5] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, 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}};
@@ -276,7 +275,7 @@ static const itemTest t64[3] = {{{0,0,0,0,0,0},0,0,0,0,1,hebr_tag,FALSE}, 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}}; @@ -927,6 +926,47 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, 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, DWORD cchString, SCRIPT_CONTROL *Control, SCRIPT_STATE *State, DWORD item, DWORD nGlyphs, @@ -4003,6 +4043,7 @@ START_TEST(usp10) ok(hfont != NULL, "SelectObject failed: %p\n", hfont);
test_ScriptItemize(); + test_ScriptItemize_surrogates(); test_ScriptItemIzeShapePlace(hdc,pwOutGlyphs); test_ScriptGetCMap(hdc, pwOutGlyphs); test_ScriptCacheGetHeight(hdc); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index a6309ed..40fc89a 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -963,7 +963,7 @@ static enum usp10_script get_char_script(const WCHAR *str, unsigned int index,
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;