December 2011 - Wine-commits

Aric Stewart : usp10: Add Tifinagh script.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: e5ad5cd11acf8f15e3dd99a27aaebfdf98af8ff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5ad5cd11acf8f15e3dd99a27… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 14 07:28:46 2011 -0600 usp10: Add Tifinagh script. --- dlls/usp10/shape.c | 1 + dlls/usp10/tests/usp10.c | 10 ++++++++++ dlls/usp10/usp10.c | 9 ++++++++- dlls/usp10/usp10_internal.h | 1 + 4 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 02457cb..67397b4 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -666,6 +666,7 @@ static const ScriptShapeData ShapingData[] = {{ ethiopic_features, 4}, NULL, "ethi", "", NULL, NULL}, {{ mongolian_features, 4}, NULL, "mong", "", ContextualShape_Mongolian, NULL}, {{ mongolian_features, 4}, NULL, "mong", "", ContextualShape_Mongolian, NULL}, + {{ no_features, 0}, NULL, "tfng", "", NULL, NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 43edc76..080cc4c 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -160,6 +160,7 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString, #define yi_tag MS_MAKE_TAG('y','i',' ',' ') #define ethi_tag MS_MAKE_TAG('e','t','h','i') #define mong_tag MS_MAKE_TAG('m','o','n','g') +#define tfng_tag MS_MAKE_TAG('t','f','n','g') static void test_ScriptItemize( void ) { @@ -380,6 +381,11 @@ static void test_ScriptItemize( void ) static const int b351[2] = {2,2}; static const int b352[2] = {2,3}; + /* Tifinagh */ + static const WCHAR test36[] = {0x2d5c,0x2d49,0x2d3c,0x2d49,0x2d4f,0x2d30,0x2d56}; + static const itemTest t361[2] = {{{0,0,0,0,0},0,0,0,0,tfng_tag,TRUE,{-1,-1,-1,-1,latn_tag}},{{0,0,0,0,0},7,0,0,0,-1,FALSE}}; + static const itemTest t362[2] = {{{0,0,0,0,0},0,0,0,2,tfng_tag,TRUE,{-1,1,1,1,latn_tag}},{{0,0,0,0,0},7,0,0,0,-1,FALSE}}; + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; SCRIPT_STATE State; @@ -448,6 +454,7 @@ static void test_ScriptItemize( void ) test_items_ok(test33,4,NULL,NULL,1,t331,FALSE,0); test_items_ok(test34,3,NULL,NULL,1,t341,FALSE,0); test_items_ok(test35,13,NULL,NULL,1,t351,FALSE,b351); + test_items_ok(test36,7,NULL,NULL,1,t361,FALSE,0); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -490,6 +497,7 @@ static void test_ScriptItemize( void ) test_items_ok(test33,4,&Control,&State,1,t331,FALSE,0); test_items_ok(test34,3,&Control,&State,1,t341,FALSE,0); test_items_ok(test35,13,&Control,&State,1,t351,FALSE,b351); + test_items_ok(test36,7,&Control,&State,1,t361,FALSE,0); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -532,6 +540,7 @@ static void test_ScriptItemize( void ) test_items_ok(test33,4,&Control,&State,1,t332,FALSE,0); test_items_ok(test34,3,&Control,&State,1,t342,FALSE,b342); test_items_ok(test35,13,&Control,&State,1,t352,FALSE,b352); + test_items_ok(test36,7,&Control,&State,1,t362,FALSE,0); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -575,6 +584,7 @@ static void test_ScriptItemize( void ) test_items_ok(test33,4,&Control,&State,1,t332,FALSE,0); test_items_ok(test34,3,&Control,&State,1,t342,FALSE,b342); test_items_ok(test35,13,&Control,&State,1,t352,FALSE,b352); + test_items_ok(test36,7,&Control,&State,1,t362,FALSE,0); } static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 5d7ba33..ed482fe 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -171,6 +171,8 @@ static const scriptRange scriptRanges[] = { { Script_Latin, 0x2c60, 0x2c7f, 0, 0}, /* Georgian: U+2D00–U+2D2F */ { Script_Georgian, 0x2d00, 0x2d2f, 0, 0}, + /* Tifinagh: U+2D30–U+2D7F */ + { Script_Tifinagh, 0x2d30, 0x2d7f, 0, 0}, /* Ethiopic Extensions: U+2D80–U+2DDF */ { Script_Ethiopic, 0x2d80, 0x2ddf, 0, 0}, /* Cyrillic Extended-A: U+2DE0–U+2DFF */ @@ -532,6 +534,10 @@ static const scriptData scriptInformation[] = { {LANG_MONGOLIAN, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('m','o','n','g'), {'M','o','n','g','o','l','i','a','n',' ','B','a','i','t','i'}}, + {{Script_Tifinagh, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + MS_MAKE_TAG('t','f','n','g'), + {'E','b','r','i','m','a'}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -567,7 +573,8 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[56].props, &scriptInformation[57].props, &scriptInformation[58].props, &scriptInformation[59].props, &scriptInformation[60].props, &scriptInformation[61].props, - &scriptInformation[62].props, &scriptInformation[63].props + &scriptInformation[62].props, &scriptInformation[63].props, + &scriptInformation[64].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 1b3f31c..d8e710d 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -95,6 +95,7 @@ #define Script_Ethiopic_Numeric 61 #define Script_Mongolian 62 #define Script_Mongolian_Numeric 63 +#define Script_Tifinagh 64 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Aric Stewart : usp10: Add N'Ko script.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: e7112792efe66ad4d0b1fe64e56d2760adedd955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7112792efe66ad4d0b1fe64e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 14 07:28:56 2011 -0600 usp10: Add N'Ko script. --- dlls/usp10/shape.c | 1 + dlls/usp10/tests/usp10.c | 10 ++++++++++ dlls/usp10/usp10.c | 8 +++++++- dlls/usp10/usp10_internal.h | 1 + 4 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 67397b4..69ac076 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -667,6 +667,7 @@ static const ScriptShapeData ShapingData[] = {{ mongolian_features, 4}, NULL, "mong", "", ContextualShape_Mongolian, NULL}, {{ mongolian_features, 4}, NULL, "mong", "", ContextualShape_Mongolian, NULL}, {{ no_features, 0}, NULL, "tfng", "", NULL, NULL}, + {{ no_features, 0}, NULL, "nko ", "", NULL, NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 080cc4c..6516fb8 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -161,6 +161,7 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString, #define ethi_tag MS_MAKE_TAG('e','t','h','i') #define mong_tag MS_MAKE_TAG('m','o','n','g') #define tfng_tag MS_MAKE_TAG('t','f','n','g') +#define nko_tag MS_MAKE_TAG('n','k','o',' ') static void test_ScriptItemize( void ) { @@ -386,6 +387,11 @@ static void test_ScriptItemize( void ) static const itemTest t361[2] = {{{0,0,0,0,0},0,0,0,0,tfng_tag,TRUE,{-1,-1,-1,-1,latn_tag}},{{0,0,0,0,0},7,0,0,0,-1,FALSE}}; static const itemTest t362[2] = {{{0,0,0,0,0},0,0,0,2,tfng_tag,TRUE,{-1,1,1,1,latn_tag}},{{0,0,0,0,0},7,0,0,0,-1,FALSE}}; + /* N'Ko */ + static const WCHAR test37[] = {0x07d2,0x07de,0x07cf}; + static const itemTest t371[2] = {{{0,0,0,0,0},0,1,1,1,nko_tag,TRUE,{-1,0,0,0,arab_tag}},{{0,0,0,0,0},3,0,0,0,-1,FALSE}}; + static const itemTest t372[2] = {{{0,0,0,0,0},0,1,1,1,nko_tag,TRUE,{-1,0,0,2,arab_tag}},{{0,0,0,0,0},3,0,0,0,-1,FALSE}}; + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; SCRIPT_STATE State; @@ -455,6 +461,7 @@ static void test_ScriptItemize( void ) test_items_ok(test34,3,NULL,NULL,1,t341,FALSE,0); test_items_ok(test35,13,NULL,NULL,1,t351,FALSE,b351); test_items_ok(test36,7,NULL,NULL,1,t361,FALSE,0); + test_items_ok(test37,3,NULL,NULL,1,t371,FALSE,0); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -498,6 +505,7 @@ static void test_ScriptItemize( void ) test_items_ok(test34,3,&Control,&State,1,t341,FALSE,0); test_items_ok(test35,13,&Control,&State,1,t351,FALSE,b351); test_items_ok(test36,7,&Control,&State,1,t361,FALSE,0); + test_items_ok(test37,3,&Control,&State,1,t371,FALSE,0); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -541,6 +549,7 @@ static void test_ScriptItemize( void ) test_items_ok(test34,3,&Control,&State,1,t342,FALSE,b342); test_items_ok(test35,13,&Control,&State,1,t352,FALSE,b352); test_items_ok(test36,7,&Control,&State,1,t362,FALSE,0); + test_items_ok(test37,3,&Control,&State,1,t372,FALSE,0); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -585,6 +594,7 @@ static void test_ScriptItemize( void ) test_items_ok(test34,3,&Control,&State,1,t342,FALSE,b342); test_items_ok(test35,13,&Control,&State,1,t352,FALSE,b352); test_items_ok(test36,7,&Control,&State,1,t362,FALSE,0); + test_items_ok(test37,3,&Control,&State,1,t372,FALSE,0); } static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index ed482fe..37e94e4 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -81,6 +81,8 @@ static const scriptRange scriptRanges[] = { { Script_Arabic, 0x750, 0x77f, 0, 0}, /* Thaana: U+0780–U+07BF */ { Script_Thaana, 0x780, 0x7bf, 0, 0}, + /* N’Ko: U+07C0–U+07FF */ + { Script_NKo, 0x7c0, 0x7ff, 0, 0}, /* Devanagari: U+0900–U+097F */ { Script_Devanagari, 0x900, 0x97f, Script_Devanagari_Numeric, 0}, /* Bengali: U+0980–U+09FF */ @@ -538,6 +540,10 @@ static const scriptData scriptInformation[] = { {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('t','f','n','g'), {'E','b','r','i','m','a'}}, + {{Script_NKo, 1, 1, 0, 0, 0, 0, { 1,0,0,0,0,0,0,0,0,0,0}}, + {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + MS_MAKE_TAG('n','k','o',' '), + {0}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -574,7 +580,7 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[58].props, &scriptInformation[59].props, &scriptInformation[60].props, &scriptInformation[61].props, &scriptInformation[62].props, &scriptInformation[63].props, - &scriptInformation[64].props + &scriptInformation[64].props, &scriptInformation[65].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index d8e710d..e2a5c15 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -96,6 +96,7 @@ #define Script_Mongolian 62 #define Script_Mongolian_Numeric 63 #define Script_Tifinagh 64 +#define Script_NKo 65 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Aric Stewart : usp10: Add Vai script.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: c697d95967e09aef40623150dfa0534045d1376d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c697d95967e09aef40623150d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 14 07:29:03 2011 -0600 usp10: Add Vai script. --- dlls/usp10/shape.c | 2 ++ dlls/usp10/tests/usp10.c | 10 ++++++++++ dlls/usp10/usp10.c | 13 ++++++++++++- dlls/usp10/usp10_internal.h | 2 ++ 4 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 69ac076..acf1fdf 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -668,6 +668,8 @@ static const ScriptShapeData ShapingData[] = {{ mongolian_features, 4}, NULL, "mong", "", ContextualShape_Mongolian, NULL}, {{ no_features, 0}, NULL, "tfng", "", NULL, NULL}, {{ no_features, 0}, NULL, "nko ", "", NULL, NULL}, + {{ no_features, 0}, NULL, "vai ", "", NULL, NULL}, + {{ no_features, 0}, NULL, "vai ", "", NULL, NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 6516fb8..932aaa7 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -162,6 +162,7 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString, #define mong_tag MS_MAKE_TAG('m','o','n','g') #define tfng_tag MS_MAKE_TAG('t','f','n','g') #define nko_tag MS_MAKE_TAG('n','k','o',' ') +#define vai_tag MS_MAKE_TAG('v','a','i',' ') static void test_ScriptItemize( void ) { @@ -392,6 +393,11 @@ static void test_ScriptItemize( void ) static const itemTest t371[2] = {{{0,0,0,0,0},0,1,1,1,nko_tag,TRUE,{-1,0,0,0,arab_tag}},{{0,0,0,0,0},3,0,0,0,-1,FALSE}}; static const itemTest t372[2] = {{{0,0,0,0,0},0,1,1,1,nko_tag,TRUE,{-1,0,0,2,arab_tag}},{{0,0,0,0,0},3,0,0,0,-1,FALSE}}; + /* Vai */ + static const WCHAR test38[] = {0xa559,0xa524}; + static const itemTest t381[2] = {{{0,0,0,0,0},0,0,0,0,vai_tag,TRUE,{-1,-1,-1,-1,latn_tag}},{{0,0,0,0,0},2,0,0,0,-1,FALSE}}; + static const itemTest t382[2] = {{{0,0,0,0,0},0,0,0,2,vai_tag,TRUE,{-1,1,1,1,latn_tag}},{{0,0,0,0,0},2,0,0,0,-1,FALSE}}; + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; SCRIPT_STATE State; @@ -462,6 +468,7 @@ static void test_ScriptItemize( void ) test_items_ok(test35,13,NULL,NULL,1,t351,FALSE,b351); test_items_ok(test36,7,NULL,NULL,1,t361,FALSE,0); test_items_ok(test37,3,NULL,NULL,1,t371,FALSE,0); + test_items_ok(test38,2,NULL,NULL,1,t381,FALSE,0); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -506,6 +513,7 @@ static void test_ScriptItemize( void ) test_items_ok(test35,13,&Control,&State,1,t351,FALSE,b351); test_items_ok(test36,7,&Control,&State,1,t361,FALSE,0); test_items_ok(test37,3,&Control,&State,1,t371,FALSE,0); + test_items_ok(test38,2,&Control,&State,1,t381,FALSE,0); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -550,6 +558,7 @@ static void test_ScriptItemize( void ) test_items_ok(test35,13,&Control,&State,1,t352,FALSE,b352); test_items_ok(test36,7,&Control,&State,1,t362,FALSE,0); test_items_ok(test37,3,&Control,&State,1,t372,FALSE,0); + test_items_ok(test38,2,&Control,&State,1,t382,FALSE,0); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -595,6 +604,7 @@ static void test_ScriptItemize( void ) test_items_ok(test35,13,&Control,&State,1,t352,FALSE,b352); test_items_ok(test36,7,&Control,&State,1,t362,FALSE,0); test_items_ok(test37,3,&Control,&State,1,t372,FALSE,0); + test_items_ok(test38,2,&Control,&State,1,t382,FALSE,0); } static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 37e94e4..a73d8e9 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -227,6 +227,8 @@ static const scriptRange scriptRanges[] = { { Script_CJK_Han ,0x4e00, 0x9fff, 0, 0}, /* Yi: U+A000–U+A4CF */ { Script_Yi ,0xa000, 0xa4cf, 0, 0}, + /* Vai: U+A500–U+A63F */ + { Script_Vai ,0xa500, 0xa63f, Script_Vai_Numeric, 0}, /* Cyrillic Extended-B: U+A640–U+A69F */ { Script_Cyrillic, 0xa640, 0xa69f, 0, 0}, /* Modifier Tone Letters: U+A700–U+A71F */ @@ -544,6 +546,14 @@ static const scriptData scriptInformation[] = { {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('n','k','o',' '), {0}}, + {{Script_Vai, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + MS_MAKE_TAG('v','a','i',' '), + {'E','b','r','i','m','a'}}, + {{Script_Vai_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {0, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + MS_MAKE_TAG('v','a','i',' '), + {'E','b','r','i','m','a'}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -580,7 +590,8 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[58].props, &scriptInformation[59].props, &scriptInformation[60].props, &scriptInformation[61].props, &scriptInformation[62].props, &scriptInformation[63].props, - &scriptInformation[64].props, &scriptInformation[65].props + &scriptInformation[64].props, &scriptInformation[65].props, + &scriptInformation[66].props, &scriptInformation[67].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index e2a5c15..03a219e 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -97,6 +97,8 @@ #define Script_Mongolian_Numeric 63 #define Script_Tifinagh 64 #define Script_NKo 65 +#define Script_Vai 66 +#define Script_Vai_Numeric 67 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Aric Stewart : usp10: Add Cherokee script.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: fa5d9da009c2fcda6dbd4fc1393cb83fd532ddfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa5d9da009c2fcda6dbd4fc13… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 14 07:29:10 2011 -0600 usp10: Add Cherokee script. --- dlls/usp10/shape.c | 1 + dlls/usp10/tests/usp10.c | 10 ++++++++++ dlls/usp10/usp10.c | 9 ++++++++- dlls/usp10/usp10_internal.h | 1 + 4 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index acf1fdf..ff1a229 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -670,6 +670,7 @@ static const ScriptShapeData ShapingData[] = {{ no_features, 0}, NULL, "nko ", "", NULL, NULL}, {{ no_features, 0}, NULL, "vai ", "", NULL, NULL}, {{ no_features, 0}, NULL, "vai ", "", NULL, NULL}, + {{ no_features, 0}, NULL, "cher", "", NULL, NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 932aaa7..0d520c7 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -163,6 +163,7 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString, #define tfng_tag MS_MAKE_TAG('t','f','n','g') #define nko_tag MS_MAKE_TAG('n','k','o',' ') #define vai_tag MS_MAKE_TAG('v','a','i',' ') +#define cher_tag MS_MAKE_TAG('c','h','e','r') static void test_ScriptItemize( void ) { @@ -398,6 +399,11 @@ static void test_ScriptItemize( void ) static const itemTest t381[2] = {{{0,0,0,0,0},0,0,0,0,vai_tag,TRUE,{-1,-1,-1,-1,latn_tag}},{{0,0,0,0,0},2,0,0,0,-1,FALSE}}; static const itemTest t382[2] = {{{0,0,0,0,0},0,0,0,2,vai_tag,TRUE,{-1,1,1,1,latn_tag}},{{0,0,0,0,0},2,0,0,0,-1,FALSE}}; + /* Cherokee */ + static const WCHAR test39[] = {0x13e3,0x13b3,0x13a9,0x0020,0x13a6,0x13ec,0x13c2,0x13af,0x13cd,0x13d7}; + static const itemTest t391[2] = {{{0,0,0,0,0},0,0,0,0,cher_tag,FALSE},{{0,0,0,0,0},10,0,0,0,-1,FALSE}}; + static const itemTest t392[2] = {{{0,0,0,0,0},0,0,0,2,cher_tag,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0},10,0,0,0,-1,FALSE}}; + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; SCRIPT_STATE State; @@ -469,6 +475,7 @@ static void test_ScriptItemize( void ) test_items_ok(test36,7,NULL,NULL,1,t361,FALSE,0); test_items_ok(test37,3,NULL,NULL,1,t371,FALSE,0); test_items_ok(test38,2,NULL,NULL,1,t381,FALSE,0); + test_items_ok(test39,10,NULL,NULL,1,t391,FALSE,0); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -514,6 +521,7 @@ static void test_ScriptItemize( void ) test_items_ok(test36,7,&Control,&State,1,t361,FALSE,0); test_items_ok(test37,3,&Control,&State,1,t371,FALSE,0); test_items_ok(test38,2,&Control,&State,1,t381,FALSE,0); + test_items_ok(test39,10,&Control,&State,1,t391,FALSE,0); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -559,6 +567,7 @@ static void test_ScriptItemize( void ) test_items_ok(test36,7,&Control,&State,1,t362,FALSE,0); test_items_ok(test37,3,&Control,&State,1,t372,FALSE,0); test_items_ok(test38,2,&Control,&State,1,t382,FALSE,0); + test_items_ok(test39,10,&Control,&State,1,t392,FALSE,0); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -605,6 +614,7 @@ static void test_ScriptItemize( void ) test_items_ok(test36,7,&Control,&State,1,t362,FALSE,0); test_items_ok(test37,3,&Control,&State,1,t372,FALSE,0); test_items_ok(test38,2,&Control,&State,1,t382,FALSE,0); + test_items_ok(test39,10,&Control,&State,1,t392,FALSE,0); } static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index a73d8e9..d69ce06 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -118,6 +118,8 @@ static const scriptRange scriptRanges[] = { /* Ethiopic: U+1200–U+137F */ /* Ethiopic Extensions: U+1380–U+139F */ { Script_Ethiopic, 0x1200, 0x139f, 0, 0}, + /* Cherokee: U+13A0–U+13FF */ + { Script_Cherokee, 0x13a0, 0x13ff, 0, 0}, /* Khmer: U+1780–U+17FF */ { Script_Khmer, 0x1780, 0x17ff, Script_Khmer_Numeric, 0}, /* Mongolian: U+1800–U+18AF */ @@ -554,6 +556,10 @@ static const scriptData scriptInformation[] = { {0, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('v','a','i',' '), {'E','b','r','i','m','a'}}, + {{Script_Cherokee, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {0x5c, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + MS_MAKE_TAG('c','h','e','r'), + {'P','l','a','n','t','a','g','e','n','e','t',' ','C','h','e','r','o','k','e','e'}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -591,7 +597,8 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[60].props, &scriptInformation[61].props, &scriptInformation[62].props, &scriptInformation[63].props, &scriptInformation[64].props, &scriptInformation[65].props, - &scriptInformation[66].props, &scriptInformation[67].props + &scriptInformation[66].props, &scriptInformation[67].props, + &scriptInformation[68].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 03a219e..969fb4e 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -99,6 +99,7 @@ #define Script_NKo 65 #define Script_Vai 66 #define Script_Vai_Numeric 67 +#define Script_Cherokee 68 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Aric Stewart : usp10: Add Canadian Aboriginal Syllabics script.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: 1c40824572a2bfb48d2b9d094558356b08c0f49a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c40824572a2bfb48d2b9d094… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 14 07:29:19 2011 -0600 usp10: Add Canadian Aboriginal Syllabics script. --- dlls/usp10/shape.c | 1 + dlls/usp10/tests/usp10.c | 10 ++++++++++ dlls/usp10/usp10.c | 10 +++++++++- dlls/usp10/usp10_internal.h | 1 + 4 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index ff1a229..b8caed2 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -671,6 +671,7 @@ static const ScriptShapeData ShapingData[] = {{ no_features, 0}, NULL, "vai ", "", NULL, NULL}, {{ no_features, 0}, NULL, "vai ", "", NULL, NULL}, {{ no_features, 0}, NULL, "cher", "", NULL, NULL}, + {{ no_features, 0}, NULL, "cans", "", NULL, NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 0d520c7..c8906c9 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -164,6 +164,7 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString, #define nko_tag MS_MAKE_TAG('n','k','o',' ') #define vai_tag MS_MAKE_TAG('v','a','i',' ') #define cher_tag MS_MAKE_TAG('c','h','e','r') +#define cans_tag MS_MAKE_TAG('c','a','n','s') static void test_ScriptItemize( void ) { @@ -404,6 +405,11 @@ static void test_ScriptItemize( void ) static const itemTest t391[2] = {{{0,0,0,0,0},0,0,0,0,cher_tag,FALSE},{{0,0,0,0,0},10,0,0,0,-1,FALSE}}; static const itemTest t392[2] = {{{0,0,0,0,0},0,0,0,2,cher_tag,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0},10,0,0,0,-1,FALSE}}; + /* Canadian Aboriginal Syllabics */ + static const WCHAR test40[] = {0x1403,0x14c4,0x1483,0x144e,0x1450,0x1466}; + static const itemTest t401[2] = {{{0,0,0,0,0},0,0,0,0,cans_tag,FALSE},{{0,0,0,0,0},6,0,0,0,-1,FALSE}}; + static const itemTest t402[2] = {{{0,0,0,0,0},0,0,0,2,cans_tag,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0},6,0,0,0,-1,FALSE}}; + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; SCRIPT_STATE State; @@ -476,6 +482,7 @@ static void test_ScriptItemize( void ) test_items_ok(test37,3,NULL,NULL,1,t371,FALSE,0); test_items_ok(test38,2,NULL,NULL,1,t381,FALSE,0); test_items_ok(test39,10,NULL,NULL,1,t391,FALSE,0); + test_items_ok(test40,6,NULL,NULL,1,t401,FALSE,0); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -522,6 +529,7 @@ static void test_ScriptItemize( void ) test_items_ok(test37,3,&Control,&State,1,t371,FALSE,0); test_items_ok(test38,2,&Control,&State,1,t381,FALSE,0); test_items_ok(test39,10,&Control,&State,1,t391,FALSE,0); + test_items_ok(test40,6,&Control,&State,1,t401,FALSE,0); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -568,6 +576,7 @@ static void test_ScriptItemize( void ) test_items_ok(test37,3,&Control,&State,1,t372,FALSE,0); test_items_ok(test38,2,&Control,&State,1,t382,FALSE,0); test_items_ok(test39,10,&Control,&State,1,t392,FALSE,0); + test_items_ok(test40,6,&Control,&State,1,t402,FALSE,0); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -615,6 +624,7 @@ static void test_ScriptItemize( void ) test_items_ok(test37,3,&Control,&State,1,t372,FALSE,0); test_items_ok(test38,2,&Control,&State,1,t382,FALSE,0); test_items_ok(test39,10,&Control,&State,1,t392,FALSE,0); + test_items_ok(test40,6,&Control,&State,1,t402,FALSE,0); } static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index d69ce06..4d0e52b 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -120,10 +120,14 @@ static const scriptRange scriptRanges[] = { { Script_Ethiopic, 0x1200, 0x139f, 0, 0}, /* Cherokee: U+13A0–U+13FF */ { Script_Cherokee, 0x13a0, 0x13ff, 0, 0}, + /* Canadian Aboriginal Syllabics: U+1400–U+167F */ + { Script_Canadian, 0x1400, 0x167f, 0, 0}, /* Khmer: U+1780–U+17FF */ { Script_Khmer, 0x1780, 0x17ff, Script_Khmer_Numeric, 0}, /* Mongolian: U+1800–U+18AF */ { Script_Mongolian, 0x1800, 0x18af, Script_Mongolian_Numeric, 0}, + /* Canadian Aboriginal Syllabics Extended: U+18B0–U+18FF */ + { Script_Canadian, 0x18b0, 0x18ff, 0, 0}, /* Tai Le: U+1950–U+197F */ { Script_Tai_Le, 0x1950, 0x197f, 0, 0}, /* New Tai Lue: U+1980–U+19DF */ @@ -560,6 +564,10 @@ static const scriptData scriptInformation[] = { {0x5c, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('c','h','e','r'), {'P','l','a','n','t','a','g','e','n','e','t',' ','C','h','e','r','o','k','e','e'}}, + {{Script_Canadian, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {0x5d, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + MS_MAKE_TAG('c','a','n','s'), + {'E','u','p','h','e','m','i','a'}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -598,7 +606,7 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[62].props, &scriptInformation[63].props, &scriptInformation[64].props, &scriptInformation[65].props, &scriptInformation[66].props, &scriptInformation[67].props, - &scriptInformation[68].props + &scriptInformation[68].props, &scriptInformation[69].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 969fb4e..696189b 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -100,6 +100,7 @@ #define Script_Vai 66 #define Script_Vai_Numeric 67 #define Script_Cherokee 68 +#define Script_Canadian 69 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Aric Stewart : usp10: Add Ethiopic script.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: a65c818ca02a024170a55775480e0e1e0179f3da URL: http://source.winehq.org/git/wine.git/?a=commit;h=a65c818ca02a024170a557754… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 14 07:27:38 2011 -0600 usp10: Add Ethiopic script. --- dlls/usp10/shape.c | 10 ++++++++++ dlls/usp10/tests/usp10.c | 10 ++++++++++ dlls/usp10/usp10.c | 16 +++++++++++++++- dlls/usp10/usp10_internal.h | 3 +++ 4 files changed, 38 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 4b399d7..578f7ce 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -573,6 +573,14 @@ static const char* required_khmer_features[] = static OPENTYPE_FEATURE_RECORD no_features[] = { }; +static OPENTYPE_FEATURE_RECORD ethiopic_features[] = +{ + { MS_MAKE_TAG('c','c','m','p'), 1}, + { MS_MAKE_TAG('l','o','c','l'), 1}, + { MS_MAKE_TAG('c','a','l','t'), 1}, + { MS_MAKE_TAG('l','i','g','a'), 1}, +}; + typedef struct ScriptShapeDataTag { TEXTRANGE_PROPERTIES defaultTextRange; const char** requiredFeatures; @@ -645,6 +653,8 @@ static const ScriptShapeData ShapingData[] = {{ no_features, 0}, NULL, "kana", "", NULL, NULL}, {{ no_features, 0}, NULL, "hang", "", NULL, NULL}, {{ no_features, 0}, NULL, "yi ", "", NULL, NULL}, + {{ ethiopic_features, 4}, NULL, "ethi", "", NULL, NULL}, + {{ ethiopic_features, 4}, NULL, "ethi", "", NULL, NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index b2538f8..1af5695 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -158,6 +158,7 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString, #define kana_tag MS_MAKE_TAG('k','a','n','a') #define hang_tag MS_MAKE_TAG('h','a','n','g') #define yi_tag MS_MAKE_TAG('y','i',' ',' ') +#define ethi_tag MS_MAKE_TAG('e','t','h','i') static void test_ScriptItemize( void ) { @@ -357,6 +358,11 @@ static void test_ScriptItemize( void ) static const itemTest t331[2] = {{{0,0,0,0,0},0,0,0,0,yi_tag,FALSE},{{0,0,0,0,0},4,0,0,0,-1,FALSE}}; static const itemTest t332[2] = {{{0,0,0,0,0},0,0,0,2,yi_tag,FALSE},{{0,0,0,0,0},4,0,0,0,-1,FALSE}}; + /* Ethiopic */ + static const WCHAR test34[] = {0x130d,0x12d5,0x12dd}; + static const itemTest t341[2] = {{{0,0,0,0,0},0,0,0,0,ethi_tag,FALSE},{{0,0,0,0,0},3,0,0,0,-1,FALSE}}; + static const itemTest t342[2] = {{{0,0,0,0,0},0,0,0,2,ethi_tag,FALSE},{{0,0,0,0,0},3,0,0,0,-1,FALSE}}; + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; SCRIPT_STATE State; @@ -423,6 +429,7 @@ static void test_ScriptItemize( void ) test_items_ok(test31,8,NULL,NULL,1,t311,FALSE,2); test_items_ok(test32,3,NULL,NULL,1,t321,FALSE,0); test_items_ok(test33,4,NULL,NULL,1,t331,FALSE,0); + test_items_ok(test34,3,NULL,NULL,1,t341,FALSE,0); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -463,6 +470,7 @@ static void test_ScriptItemize( void ) test_items_ok(test31,8,&Control,&State,1,t311,FALSE,2); test_items_ok(test32,3,&Control,&State,1,t321,FALSE,0); test_items_ok(test33,4,&Control,&State,1,t331,FALSE,0); + test_items_ok(test34,3,&Control,&State,1,t341,FALSE,0); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -503,6 +511,7 @@ static void test_ScriptItemize( void ) test_items_ok(test31,8,&Control,&State,1,t312,FALSE,2); test_items_ok(test32,3,&Control,&State,1,t322,FALSE,0); test_items_ok(test33,4,&Control,&State,1,t332,FALSE,0); + test_items_ok(test34,3,&Control,&State,1,t342,FALSE,2); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -544,6 +553,7 @@ static void test_ScriptItemize( void ) test_items_ok(test31,8,&Control,&State,1,t312,FALSE,2); test_items_ok(test32,3,&Control,&State,1,t322,FALSE,0); test_items_ok(test33,4,&Control,&State,1,t332,FALSE,0); + test_items_ok(test34,3,&Control,&State,1,t342,FALSE,2); } static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 71888db..3a1ff9f 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -113,6 +113,9 @@ static const scriptRange scriptRanges[] = { { Script_Georgian, 0x10a0, 0x10ff, 0, 0}, /* Hangul Jamo: U+1100–U+11FF */ { Script_Hangul, 0x1100, 0x11ff, 0, 0}, + /* Ethiopic: U+1200–U+137F */ + /* Ethiopic Extensions: U+1380–U+139F */ + { Script_Ethiopic, 0x1200, 0x139f, 0, 0}, /* Khmer: U+1780–U+17FF */ { Script_Khmer, 0x1780, 0x17ff, Script_Khmer_Numeric, 0}, /* Tai Le: U+1950–U+197F */ @@ -166,6 +169,8 @@ static const scriptRange scriptRanges[] = { { Script_Latin, 0x2c60, 0x2c7f, 0, 0}, /* Georgian: U+2D00–U+2D2F */ { Script_Georgian, 0x2d00, 0x2d2f, 0, 0}, + /* Ethiopic Extensions: U+2D80–U+2DDF */ + { Script_Ethiopic, 0x2d80, 0x2ddf, 0, 0}, /* Cyrillic Extended-A: U+2DE0–U+2DFF */ { Script_Cyrillic, 0x2de0, 0x2dff, 0, 0}, /* CJK Radicals Supplement: U+2E80–U+2EFF */ @@ -509,6 +514,14 @@ static const scriptData scriptInformation[] = { {LANG_ENGLISH, 0, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, MS_MAKE_TAG('y','i',' ',' '), {'M','i','c','r','o','s','o','f','t',' ','Y','i',' ','B','a','i','t','i'}}, + {{Script_Ethiopic, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {0x5e, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + MS_MAKE_TAG('e','t','h','i'), + {'N','y','a','l','a'}}, + {{Script_Ethiopic_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {0x5e, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + MS_MAKE_TAG('e','t','h','i'), + {'N','y','a','l','a'}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -542,7 +555,8 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[52].props, &scriptInformation[53].props, &scriptInformation[54].props, &scriptInformation[55].props, &scriptInformation[56].props, &scriptInformation[57].props, - &scriptInformation[58].props, &scriptInformation[59].props + &scriptInformation[58].props, &scriptInformation[59].props, + &scriptInformation[60].props, &scriptInformation[61].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 563323e..aa72f08 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -90,6 +90,9 @@ #define Script_Kana 57 #define Script_Hangul 58 #define Script_Yi 59 +/* Unicode Chapter 13 */ +#define Script_Ethiopic 60 +#define Script_Ethiopic_Numeric 61 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Aric Stewart : usp10: Allow for multiple broken item counts.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: eb084562be02e5bb2b7fffec1576521a92276763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb084562be02e5bb2b7fffec1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 14 07:27:47 2011 -0600 usp10: Allow for multiple broken item counts. --- dlls/usp10/tests/usp10.c | 41 +++++++++++++++++++++++++---------------- 1 files changed, 25 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb084562be02e5bb2b7ff…

1 0

Aric Stewart : usp10: Add Mongolian script.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: be9369e7fe9c71a8e432363811ede5ba2a7d09e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be9369e7fe9c71a8e43236381… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 14 07:27:56 2011 -0600 usp10: Add Mongolian script. --- dlls/usp10/shape.c | 78 +++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/tests/usp10.c | 12 +++++++ dlls/usp10/usp10.c | 13 +++++++- dlls/usp10/usp10_internal.h | 2 + 4 files changed, 104 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 578f7ce..02457cb 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -54,6 +54,7 @@ static void ContextualShape_Telugu(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p static void ContextualShape_Kannada(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Malayalam(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Khmer(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); +static void ContextualShape_Mongolian(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); typedef VOID (*ShapeCharGlyphPropProc)( HDC , ScriptCache*, SCRIPT_ANALYSIS*, const WCHAR*, const INT, const WORD*, const INT, WORD*, SCRIPT_CHARPROP*, SCRIPT_GLYPHPROP*); @@ -581,6 +582,14 @@ static OPENTYPE_FEATURE_RECORD ethiopic_features[] = { MS_MAKE_TAG('l','i','g','a'), 1}, }; +static OPENTYPE_FEATURE_RECORD mongolian_features[] = +{ + { MS_MAKE_TAG('c','c','m','p'), 1}, + { MS_MAKE_TAG('l','o','c','l'), 1}, + { MS_MAKE_TAG('c','a','l','t'), 1}, + { MS_MAKE_TAG('r','l','i','g'), 1}, +}; + typedef struct ScriptShapeDataTag { TEXTRANGE_PROPERTIES defaultTextRange; const char** requiredFeatures; @@ -655,6 +664,8 @@ static const ScriptShapeData ShapingData[] = {{ no_features, 0}, NULL, "yi ", "", NULL, NULL}, {{ ethiopic_features, 4}, NULL, "ethi", "", NULL, NULL}, {{ ethiopic_features, 4}, NULL, "ethi", "", NULL, NULL}, + {{ mongolian_features, 4}, NULL, "mong", "", ContextualShape_Mongolian, NULL}, + {{ mongolian_features, 4}, NULL, "mong", "", ContextualShape_Mongolian, NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) @@ -3048,6 +3059,73 @@ static void ContextualShape_Khmer(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps HeapFree(GetProcessHeap(),0,syllables); } +static inline BOOL mongolian_wordbreak(WCHAR chr) +{ + return ((chr == 0x0020) || (chr == 0x200C) || (chr == 0x202F) || (chr == 0x180E) || (chr == 0x1800) || (chr == 0x1802) || (chr == 0x1803) || (chr == 0x1805) || (chr == 0x1808) || (chr == 0x1809) || (chr == 0x1807)); +} + +static void ContextualShape_Mongolian(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust) +{ + INT *context_shape; + INT dirL; + int i; + + if (*pcGlyphs != cChars) + { + ERR("Number of Glyphs and Chars need to match at the beginning\n"); + return; + } + + if (!psa->fLogicalOrder && psa->fRTL) + dirL = -1; + else + dirL = 1; + + if (!psc->GSUB_Table) + psc->GSUB_Table = load_gsub_table(hdc); + + if (!psc->GSUB_Table) + return; + + context_shape = HeapAlloc(GetProcessHeap(),0,sizeof(INT) * cChars); + + for (i = 0; i < cChars; i++) + { + if (i == 0 || mongolian_wordbreak(pwcChars[i-1])) + { + if ((i == cChars-1) || mongolian_wordbreak(pwcChars[i+1])) + context_shape[i] = Xn; + else + context_shape[i] = Xl; + } + else + { + if ((i == cChars-1) || mongolian_wordbreak(pwcChars[i+1])) + context_shape[i] = Xr; + else + context_shape[i] = Xm; + } + } + + /* Contextual Shaping */ + i = 0; + while(i < *pcGlyphs) + { + INT nextIndex; + INT prevCount = *pcGlyphs; + nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, i, dirL, pcGlyphs, contextual_features[context_shape[i]]); + if (nextIndex > GSUB_E_NOGLYPH) + { + UpdateClusters(nextIndex, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); + i = nextIndex; + } + else + i++; + } + + HeapFree(GetProcessHeap(),0,context_shape); +} + static void ShapeCharGlyphProp_Default( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS* psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD* pwLogClust, SCRIPT_CHARPROP* pCharProp, SCRIPT_GLYPHPROP* pGlyphProp) { int i,k; diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 464dd2a..43edc76 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -159,6 +159,7 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString, #define hang_tag MS_MAKE_TAG('h','a','n','g') #define yi_tag MS_MAKE_TAG('y','i',' ',' ') #define ethi_tag MS_MAKE_TAG('e','t','h','i') +#define mong_tag MS_MAKE_TAG('m','o','n','g') static void test_ScriptItemize( void ) { @@ -372,6 +373,13 @@ static void test_ScriptItemize( void ) static const itemTest t342[2] = {{{0,0,0,0,0},0,0,0,2,ethi_tag,FALSE},{{0,0,0,0,0},3,0,0,0,-1,FALSE}}; static const int b342[2] = {2,2}; + /* Mongolian */ + static const WCHAR test35[] = {0x182e,0x1823,0x1829,0x182d,0x1823,0x182f,0x0020,0x182a,0x1822,0x1834,0x1822,0x182d,0x180c}; + static const itemTest t351[2] = {{{0,0,0,0,0},0,0,0,0,mong_tag,FALSE},{{0,0,0,0,0},13,0,0,0,-1,FALSE}}; + static const itemTest t352[2] = {{{0,0,0,0,0},0,0,0,2,mong_tag,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0},13,0,0,0,-1,FALSE}}; + static const int b351[2] = {2,2}; + static const int b352[2] = {2,3}; + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; SCRIPT_STATE State; @@ -439,6 +447,7 @@ static void test_ScriptItemize( void ) test_items_ok(test32,3,NULL,NULL,1,t321,FALSE,0); test_items_ok(test33,4,NULL,NULL,1,t331,FALSE,0); test_items_ok(test34,3,NULL,NULL,1,t341,FALSE,0); + test_items_ok(test35,13,NULL,NULL,1,t351,FALSE,b351); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -480,6 +489,7 @@ static void test_ScriptItemize( void ) test_items_ok(test32,3,&Control,&State,1,t321,FALSE,0); test_items_ok(test33,4,&Control,&State,1,t331,FALSE,0); test_items_ok(test34,3,&Control,&State,1,t341,FALSE,0); + test_items_ok(test35,13,&Control,&State,1,t351,FALSE,b351); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -521,6 +531,7 @@ static void test_ScriptItemize( void ) test_items_ok(test32,3,&Control,&State,1,t322,FALSE,0); test_items_ok(test33,4,&Control,&State,1,t332,FALSE,0); test_items_ok(test34,3,&Control,&State,1,t342,FALSE,b342); + test_items_ok(test35,13,&Control,&State,1,t352,FALSE,b352); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -563,6 +574,7 @@ static void test_ScriptItemize( void ) test_items_ok(test32,3,&Control,&State,1,t322,FALSE,0); test_items_ok(test33,4,&Control,&State,1,t332,FALSE,0); test_items_ok(test34,3,&Control,&State,1,t342,FALSE,b342); + test_items_ok(test35,13,&Control,&State,1,t352,FALSE,b352); } static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 3a1ff9f..5d7ba33 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -118,6 +118,8 @@ static const scriptRange scriptRanges[] = { { Script_Ethiopic, 0x1200, 0x139f, 0, 0}, /* Khmer: U+1780–U+17FF */ { Script_Khmer, 0x1780, 0x17ff, Script_Khmer_Numeric, 0}, + /* Mongolian: U+1800–U+18AF */ + { Script_Mongolian, 0x1800, 0x18af, Script_Mongolian_Numeric, 0}, /* Tai Le: U+1950–U+197F */ { Script_Tai_Le, 0x1950, 0x197f, 0, 0}, /* New Tai Lue: U+1980–U+19DF */ @@ -522,6 +524,14 @@ static const scriptData scriptInformation[] = { {0x5e, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('e','t','h','i'), {'N','y','a','l','a'}}, + {{Script_Mongolian, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_MONGOLIAN, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + MS_MAKE_TAG('m','o','n','g'), + {'M','o','n','g','o','l','i','a','n',' ','B','a','i','t','i'}}, + {{Script_Mongolian_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_MONGOLIAN, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + MS_MAKE_TAG('m','o','n','g'), + {'M','o','n','g','o','l','i','a','n',' ','B','a','i','t','i'}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -556,7 +566,8 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[54].props, &scriptInformation[55].props, &scriptInformation[56].props, &scriptInformation[57].props, &scriptInformation[58].props, &scriptInformation[59].props, - &scriptInformation[60].props, &scriptInformation[61].props + &scriptInformation[60].props, &scriptInformation[61].props, + &scriptInformation[62].props, &scriptInformation[63].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index aa72f08..1b3f31c 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -93,6 +93,8 @@ /* Unicode Chapter 13 */ #define Script_Ethiopic 60 #define Script_Ethiopic_Numeric 61 +#define Script_Mongolian 62 +#define Script_Mongolian_Numeric 63 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Nikolay Sivov : msxml3: Added IXMLDOMParseError2 support.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: 0151f4741af3b554ef324faed3a3ad3b1c27ba70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0151f4741af3b554ef324faed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 14 15:42:23 2011 +0300 msxml3: Added IXMLDOMParseError2 support. --- dlls/msxml3/dispex.c | 2 +- dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/parseerror.c | 122 +++++++++++++++++++++++++++++-------------- dlls/msxml3/tests/domdoc.c | 10 ++++ 4 files changed, 94 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0151f4741af3b554ef324…

1 0

Nikolay Sivov : msxml3: Initialize VARIANT before passing it to VariantCopy .
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: 2cd62a5dbd51164291cfc717955d6009e287fa68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cd62a5dbd51164291cfc7179… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 14 14:51:30 2011 +0300 msxml3: Initialize VARIANT before passing it to VariantCopy. --- dlls/msxml3/dispex.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index d13b182..23b8805 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -553,6 +553,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc switch(wFlags) { case INVOKE_PROPERTYGET: + V_VT(pvarRes) = VT_EMPTY; return VariantCopy(pvarRes, var); case INVOKE_PROPERTYPUT: VariantClear(var);

1 0