August 2010 - Wine-Commits - list.winehq.org

Aric Stewart : usp10: Generalize out applying Opentype features and define default features for currently known scripts .
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: 2fb344c117115701ce3c2d7df778786f58886e7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb344c117115701ce3c2d7df… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Aug 12 14:58:14 2010 -0500 usp10: Generalize out applying Opentype features and define default features for currently known scripts. --- dlls/usp10/shape.c | 219 +++++++++++++++++++++++++++---------------- dlls/usp10/usp10.c | 2 + dlls/usp10/usp10_internal.h | 10 ++- include/usp10.h | 14 +++ 4 files changed, 164 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2fb344c117115701ce3c2…

1 0

Aric Stewart : usp10: Add contextual shaping proc to the script shaping data.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: 0401f6c088ffc3e83ea6882fa1cc080d785bc7de URL: http://source.winehq.org/git/wine.git/?a=commit;h=0401f6c088ffc3e83ea6882fa… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Aug 12 14:58:32 2010 -0500 usp10: Add contextual shaping proc to the script shaping data. --- dlls/usp10/shape.c | 45 ++++++++++++++++++++++++------------------ dlls/usp10/usp10.c | 2 +- dlls/usp10/usp10_internal.h | 2 +- 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 0a5f997..0afcf80 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -37,6 +37,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); #define FIRST_ARABIC_CHAR 0x0600 #define LAST_ARABIC_CHAR 0x06ff +typedef VOID (*ContextualShapingProc)(HDC, ScriptCache*, SCRIPT_ANALYSIS*, + WCHAR*, INT, WORD*, INT*, INT); + +static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs); + extern const unsigned short wine_shaping_table[]; extern const unsigned short wine_shaping_forms[LAST_ARABIC_CHAR - FIRST_ARABIC_CHAR + 1][4]; @@ -274,22 +279,23 @@ static OPENTYPE_FEATURE_RECORD syriac_features[] = typedef struct ScriptShapeDataTag { TEXTRANGE_PROPERTIES defaultTextRange; CHAR otTag[5]; + ContextualShapingProc contextProc; } ScriptShapeData; /* in order of scripts */ static const ScriptShapeData ShapingData[] = { - {{ standard_features, 2}, ""}, - {{ standard_features, 2}, "latn"}, - {{ standard_features, 2}, "latn"}, - {{ standard_features, 2}, "latn"}, - {{ standard_features, 2}, ""}, - {{ standard_features, 2}, "latn"}, - {{ arabic_features, 6}, "arab"}, - {{ arabic_features, 6}, "arab"}, - {{ hebrew_features, 1}, "hebr"}, - {{ syriac_features, 4}, "syrc"}, - {{ arabic_features, 6}, "arab"}, + {{ standard_features, 2}, "", NULL}, + {{ standard_features, 2}, "latn", NULL}, + {{ standard_features, 2}, "latn", NULL}, + {{ standard_features, 2}, "latn", NULL}, + {{ standard_features, 2}, "" , NULL}, + {{ standard_features, 2}, "latn", NULL}, + {{ arabic_features, 6}, "arab", ContextualShape_Arabic}, + {{ arabic_features, 6}, "arab", ContextualShape_Arabic}, + {{ hebrew_features, 1}, "hebr", NULL}, + {{ syriac_features, 4}, "syrc", NULL}, + {{ arabic_features, 6}, "arab", ContextualShape_Arabic}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) @@ -858,27 +864,22 @@ static inline BOOL left_join_causing(CHAR joining_type) return (joining_type == jtR || joining_type == jtD || joining_type == jtC); } -/* SHAPE_ShapeArabicGlyphs +/* + * ContextualShape_Arabic */ -void SHAPE_ShapeArabicGlyphs(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs) +static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs) { CHAR *context_type; INT *context_shape; INT dirR, dirL; int i; - if (psa->eScript != Script_Arabic && - psa->eScript != Script_Persian && - psa->eScript != Script_Arabic_Numeric) - return; - if (*pcGlyphs != cChars) { ERR("Number of Glyphs and Chars need to match at the beginning\n"); return; } - if (!psa->fLogicalOrder && psa->fRTL) { dirR = 1; @@ -948,6 +949,12 @@ void SHAPE_ShapeArabicGlyphs(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WC HeapFree(GetProcessHeap(),0,context_type); } +void SHAPE_ContextualShaping(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs) +{ + if (ShapingData[psa->eScript].contextProc) + ShapingData[psa->eScript].contextProc(hdc, psc, psa, pwcChars, cChars, pwOutGlyphs, pcGlyphs, cMaxGlyphs); +} + void SHAPE_ApplyOpenTypeFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, const TEXTRANGE_PROPERTIES *rpRangeProperties) { int i; diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 4f7bcf1..2c75d84 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1198,7 +1198,7 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, } rChars[i] = chInput; } - SHAPE_ShapeArabicGlyphs(hdc, (ScriptCache *)*psc, psa, rChars, cChars, pwOutGlyphs, pcGlyphs, cMaxGlyphs); + SHAPE_ContextualShaping(hdc, (ScriptCache *)*psc, psa, rChars, cChars, pwOutGlyphs, pcGlyphs, cMaxGlyphs); SHAPE_ApplyDefaultOpentypeFeatures(hdc, (ScriptCache *)*psc, psa, pwOutGlyphs, pcGlyphs, cMaxGlyphs); heap_free(rChars); } diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 281a67a..5aeb2b6 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -57,5 +57,5 @@ BOOL BIDI_DetermineLevels( LPCWSTR lpString, INT uCount, const SCRIPT_STATE *s, INT BIDI_ReorderV2lLevel(int level, int *pIndexs, const BYTE* plevel, int cch, BOOL fReverse); INT BIDI_ReorderL2vLevel(int level, int *pIndexs, const BYTE* plevel, int cch, BOOL fReverse); -void SHAPE_ShapeArabicGlyphs(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs); +void SHAPE_ContextualShaping(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs); void SHAPE_ApplyDefaultOpentypeFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs);

1 0

Aric Stewart : usp10: Add Syriac contextual shaping.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: 4ffd3e6af611fe6f2358e43811c13a13dbfd86df URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ffd3e6af611fe6f2358e4381… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Aug 12 14:58:46 2010 -0500 usp10: Add Syriac contextual shaping. --- dlls/usp10/shape.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 120 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 0afcf80..1d4da21 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -41,6 +41,7 @@ typedef VOID (*ContextualShapingProc)(HDC, ScriptCache*, SCRIPT_ANALYSIS*, WCHAR*, INT, WORD*, INT*, INT); static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs); +static void ContextualShape_Syriac(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs); extern const unsigned short wine_shaping_table[]; extern const unsigned short wine_shaping_forms[LAST_ARABIC_CHAR - FIRST_ARABIC_CHAR + 1][4]; @@ -58,7 +59,11 @@ enum joined_forms { Xn=0, Xr, Xl, - Xm + Xm, + /* Syriac Alaph */ + Afj, + Afn, + Afx }; #ifdef WORDS_BIGENDIAN @@ -244,7 +249,11 @@ static const char* contextual_features[] = "isol", "fina", "init", - "medi" + "medi", + /* Syriac Alaph */ + "med2", + "fin2", + "fin3" }; static OPENTYPE_FEATURE_RECORD standard_features[] = @@ -294,7 +303,7 @@ static const ScriptShapeData ShapingData[] = {{ arabic_features, 6}, "arab", ContextualShape_Arabic}, {{ arabic_features, 6}, "arab", ContextualShape_Arabic}, {{ hebrew_features, 1}, "hebr", NULL}, - {{ syriac_features, 4}, "syrc", NULL}, + {{ syriac_features, 4}, "syrc", ContextualShape_Syriac}, {{ arabic_features, 6}, "arab", ContextualShape_Arabic}, }; @@ -829,6 +838,18 @@ static int apply_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, W return GSUB_E_NOFEATURE; } +static WCHAR neighbour_char(int i, int delta, const WCHAR* chars, INT cchLen) +{ + if (i + delta < 0) + return 0; + if ( i+ delta >= cchLen) + return 0; + + i += delta; + + return chars[i]; +} + static CHAR neighbour_joining_type(int i, int delta, const CHAR* context_type, INT cchLen, SCRIPT_ANALYSIS *psa) { if (i + delta < 0) @@ -864,6 +885,14 @@ static inline BOOL left_join_causing(CHAR joining_type) return (joining_type == jtR || joining_type == jtD || joining_type == jtC); } +static inline BOOL word_break_causing(WCHAR chr) +{ + /* we are working within a string of characters already guareented to + be within one script, Syriac, so we do not worry about any characers + other than the space character outside of that range */ + return (chr == 0 || chr == 0x20 ); +} + /* * ContextualShape_Arabic */ @@ -949,6 +978,94 @@ static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p HeapFree(GetProcessHeap(),0,context_type); } +/* + * ContextualShape_Syriac + */ + +#define ALAPH 0x710 +#define DALATH 0x715 +#define RISH 0x72A + +static void ContextualShape_Syriac(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs) +{ + CHAR *context_type; + INT *context_shape; + INT dirR, 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) + { + dirR = 1; + dirL = -1; + } + else + { + dirR = -1; + dirL = 1; + } + + if (!psc->GSUB_Table) + psc->GSUB_Table = load_gsub_table(hdc); + + if (!psc->GSUB_Table) + return; + + context_type = HeapAlloc(GetProcessHeap(),0,cChars); + context_shape = HeapAlloc(GetProcessHeap(),0,sizeof(INT) * cChars); + + for (i = 0; i < cChars; i++) + context_type[i] = wine_shaping_table[wine_shaping_table[pwcChars[i] >> 8] + (pwcChars[i] & 0xff)]; + + for (i = 0; i < cChars; i++) + { + if (pwcChars[i] == ALAPH) + { + WCHAR rchar = neighbour_char(i,dirR,pwcChars,cChars); + + if (left_join_causing(neighbour_joining_type(i,dirR,context_type,cChars,psa)) && word_break_causing(neighbour_char(i,dirL,pwcChars,cChars))) + context_shape[i] = Afj; + else if ( rchar != DALATH && rchar != RISH && +!left_join_causing(neighbour_joining_type(i,dirR,context_type,cChars,psa)) && +word_break_causing(neighbour_char(i,dirL,pwcChars,cChars))) + context_shape[i] = Afn; + else if ( (rchar == DALATH || rchar == RISH) && word_break_causing(neighbour_char(i,dirL,pwcChars,cChars))) + context_shape[i] = Afx; + } + else if (context_type[i] == jtR && +right_join_causing(neighbour_joining_type(i,dirR,context_type,cChars,psa))) + context_shape[i] = Xr; + else if (context_type[i] == jtL && left_join_causing(neighbour_joining_type(i,dirL,context_type,cChars,psa))) + context_shape[i] = Xl; + else if (context_type[i] == jtD && left_join_causing(neighbour_joining_type(i,dirL,context_type,cChars,psa)) && right_join_causing(neighbour_joining_type(i,dirR,context_type,cChars,psa))) + context_shape[i] = Xm; + else if (context_type[i] == jtD && right_join_causing(neighbour_joining_type(i,dirR,context_type,cChars,psa))) + context_shape[i] = Xr; + else if (context_type[i] == jtD && left_join_causing(neighbour_joining_type(i,dirL,context_type,cChars,psa))) + context_shape[i] = Xl; + else + context_shape[i] = Xn; + } + + /* Contextual Shaping */ + i = 0; + while(i < *pcGlyphs) + { + INT nextIndex; + nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc->GSUB_Table, pwOutGlyphs, i, dirL, pcGlyphs, contextual_features[context_shape[i]]); + if (nextIndex > GSUB_E_NOGLYPH) + i = nextIndex; + } + + HeapFree(GetProcessHeap(),0,context_shape); + HeapFree(GetProcessHeap(),0,context_type); +} + void SHAPE_ContextualShaping(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs) { if (ShapingData[psa->eScript].contextProc)

1 0

Aric Stewart : usp10: Update pwLogClust with glyph transformations.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: f4d142e27714fe38d711cff4ce42c2f83778eb1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4d142e27714fe38d711cff4c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Aug 12 14:59:04 2010 -0500 usp10: Update pwLogClust with glyph transformations. --- dlls/usp10/shape.c | 110 +++++++++++++++++++++++++++++++++++++------ dlls/usp10/usp10.c | 35 +++++++------- dlls/usp10/usp10_internal.h | 4 +- 3 files changed, 115 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4d142e27714fe38d711c…

1 0

Aric Stewart : usp10: Have ScriptIsComplex reflect information in our scripts.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: b6f2f10b12587f051ab4755de3230bfb163a892b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6f2f10b12587f051ab4755de… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Aug 12 14:57:50 2010 -0500 usp10: Have ScriptIsComplex reflect information in our scripts. --- dlls/usp10/usp10.c | 174 +++------------------------------------------------- 1 files changed, 10 insertions(+), 164 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 0ea7ac1..cb9b82a 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1095,163 +1095,9 @@ HRESULT WINAPI ScriptBreak(const WCHAR *chars, int count, const SCRIPT_ANALYSIS return S_OK; } -static const struct -{ - WCHAR start; - WCHAR end; - DWORD flag; -} -complex_ranges[] = -{ - { 0, 0x0b, SIC_COMPLEX }, - { 0x0c, 0x0c, SIC_NEUTRAL }, - { 0x0d, 0x1f, SIC_COMPLEX }, - { 0x20, 0x2f, SIC_NEUTRAL }, - { 0x30, 0x39, SIC_ASCIIDIGIT }, - { 0x3a, 0x40, SIC_NEUTRAL }, - { 0x5b, 0x60, SIC_NEUTRAL }, - { 0x7b, 0x7e, SIC_NEUTRAL }, - { 0x7f, 0x9f, SIC_COMPLEX }, - { 0xa0, 0xa5, SIC_NEUTRAL }, - { 0xa7, 0xa8, SIC_NEUTRAL }, - { 0xab, 0xab, SIC_NEUTRAL }, - { 0xad, 0xad, SIC_NEUTRAL }, - { 0xaf, 0xaf, SIC_NEUTRAL }, - { 0xb0, 0xb1, SIC_NEUTRAL }, - { 0xb4, 0xb4, SIC_NEUTRAL }, - { 0xb6, 0xb8, SIC_NEUTRAL }, - { 0xbb, 0xbf, SIC_NEUTRAL }, - { 0xd7, 0xd7, SIC_NEUTRAL }, - { 0xf7, 0xf7, SIC_NEUTRAL }, - { 0x2b9, 0x2ba, SIC_NEUTRAL }, - { 0x2c2, 0x2cf, SIC_NEUTRAL }, - { 0x2d2, 0x2df, SIC_NEUTRAL }, - { 0x2e5, 0x2e9, SIC_COMPLEX }, - { 0x2ea, 0x2ed, SIC_NEUTRAL }, - { 0x300, 0x362, SIC_COMPLEX }, - { 0x530, 0x60b, SIC_COMPLEX }, - { 0x60c, 0x60d, SIC_NEUTRAL }, - { 0x60e, 0x669, SIC_COMPLEX }, - { 0x66a, 0x66a, SIC_NEUTRAL }, - { 0x66b, 0x6e8, SIC_COMPLEX }, - { 0x6e9, 0x6e9, SIC_NEUTRAL }, - { 0x6ea, 0x7bf, SIC_COMPLEX }, - { 0x900, 0x1360, SIC_COMPLEX }, - { 0x137d, 0x137f, SIC_COMPLEX }, - { 0x1680, 0x1680, SIC_NEUTRAL }, - { 0x1780, 0x18af, SIC_COMPLEX }, - { 0x2000, 0x200a, SIC_NEUTRAL }, - { 0x200b, 0x200f, SIC_COMPLEX }, - { 0x2010, 0x2016, SIC_NEUTRAL }, - { 0x2018, 0x2022, SIC_NEUTRAL }, - { 0x2024, 0x2028, SIC_NEUTRAL }, - { 0x2029, 0x202e, SIC_COMPLEX }, - { 0x202f, 0x2037, SIC_NEUTRAL }, - { 0x2039, 0x203c, SIC_NEUTRAL }, - { 0x2044, 0x2046, SIC_NEUTRAL }, - { 0x206a, 0x206f, SIC_COMPLEX }, - { 0x207a, 0x207e, SIC_NEUTRAL }, - { 0x208a, 0x20aa, SIC_NEUTRAL }, - { 0x20ac, 0x20cf, SIC_NEUTRAL }, - { 0x20d0, 0x20ff, SIC_COMPLEX }, - { 0x2103, 0x2103, SIC_NEUTRAL }, - { 0x2105, 0x2105, SIC_NEUTRAL }, - { 0x2109, 0x2109, SIC_NEUTRAL }, - { 0x2116, 0x2116, SIC_NEUTRAL }, - { 0x2121, 0x2122, SIC_NEUTRAL }, - { 0x212e, 0x212e, SIC_NEUTRAL }, - { 0x2153, 0x2154, SIC_NEUTRAL }, - { 0x215b, 0x215e, SIC_NEUTRAL }, - { 0x2190, 0x2199, SIC_NEUTRAL }, - { 0x21b8, 0x21b9, SIC_NEUTRAL }, - { 0x21d2, 0x21d2, SIC_NEUTRAL }, - { 0x21d4, 0x21d4, SIC_NEUTRAL }, - { 0x21e7, 0x21e7, SIC_NEUTRAL }, - { 0x2200, 0x2200, SIC_NEUTRAL }, - { 0x2202, 0x2203, SIC_NEUTRAL }, - { 0x2207, 0x2208, SIC_NEUTRAL }, - { 0x220b, 0x220b, SIC_NEUTRAL }, - { 0x220f, 0x220f, SIC_NEUTRAL }, - { 0x2211, 0x2213, SIC_NEUTRAL }, - { 0x2215, 0x2215, SIC_NEUTRAL }, - { 0x221a, 0x221a, SIC_NEUTRAL }, - { 0x221d, 0x2220, SIC_NEUTRAL }, - { 0x2223, 0x2223, SIC_NEUTRAL }, - { 0x2225, 0x2225, SIC_NEUTRAL }, - { 0x2227, 0x222c, SIC_NEUTRAL }, - { 0x222e, 0x222e, SIC_NEUTRAL }, - { 0x2234, 0x2237, SIC_NEUTRAL }, - { 0x223c, 0x223d, SIC_NEUTRAL }, - { 0x2248, 0x2248, SIC_NEUTRAL }, - { 0x224c, 0x224c, SIC_NEUTRAL }, - { 0x2252, 0x2252, SIC_NEUTRAL }, - { 0x2260, 0x2261, SIC_NEUTRAL }, - { 0x2264, 0x2267, SIC_NEUTRAL }, - { 0x226a, 0x226b, SIC_NEUTRAL }, - { 0x226e, 0x226f, SIC_NEUTRAL }, - { 0x2282, 0x2283, SIC_NEUTRAL }, - { 0x2286, 0x2287, SIC_NEUTRAL }, - { 0x2295, 0x2295, SIC_NEUTRAL }, - { 0x2299, 0x2299, SIC_NEUTRAL }, - { 0x22a5, 0x22a5, SIC_NEUTRAL }, - { 0x22bf, 0x22bf, SIC_NEUTRAL }, - { 0x2312, 0x2312, SIC_NEUTRAL }, - { 0x24ea, 0x24ea, SIC_COMPLEX }, - { 0x2500, 0x254b, SIC_NEUTRAL }, - { 0x2550, 0x256d, SIC_NEUTRAL }, - { 0x256e, 0x2574, SIC_NEUTRAL }, - { 0x2581, 0x258f, SIC_NEUTRAL }, - { 0x2592, 0x2595, SIC_NEUTRAL }, - { 0x25a0, 0x25a1, SIC_NEUTRAL }, - { 0x25a3, 0x25a9, SIC_NEUTRAL }, - { 0x25b2, 0x25b3, SIC_NEUTRAL }, - { 0x25b6, 0x25b7, SIC_NEUTRAL }, - { 0x25bc, 0x25bd, SIC_NEUTRAL }, - { 0x25c0, 0x25c1, SIC_NEUTRAL }, - { 0x25c6, 0x25c8, SIC_NEUTRAL }, - { 0x25cb, 0x25cb, SIC_NEUTRAL }, - { 0x25ce, 0x25d1, SIC_NEUTRAL }, - { 0x25e2, 0x25e5, SIC_NEUTRAL }, - { 0x25ef, 0x25ef, SIC_NEUTRAL }, - { 0x2605, 0x2606, SIC_NEUTRAL }, - { 0x2609, 0x2609, SIC_NEUTRAL }, - { 0x260e, 0x260f, SIC_NEUTRAL }, - { 0x261c, 0x261c, SIC_NEUTRAL }, - { 0x261e, 0x261e, SIC_NEUTRAL }, - { 0x2640, 0x2640, SIC_NEUTRAL }, - { 0x2642, 0x2642, SIC_NEUTRAL }, - { 0x2660, 0x2661, SIC_NEUTRAL }, - { 0x2663, 0x2665, SIC_NEUTRAL }, - { 0x2667, 0x266a, SIC_NEUTRAL }, - { 0x266c, 0x266d, SIC_NEUTRAL }, - { 0x266f, 0x266f, SIC_NEUTRAL }, - { 0x273d, 0x273d, SIC_NEUTRAL }, - { 0x2e80, 0x312f, SIC_COMPLEX }, - { 0x3190, 0x31bf, SIC_COMPLEX }, - { 0x31f0, 0x31ff, SIC_COMPLEX }, - { 0x3220, 0x325f, SIC_COMPLEX }, - { 0x3280, 0xa4ff, SIC_COMPLEX }, - { 0xd800, 0xdfff, SIC_COMPLEX }, - { 0xe000, 0xf8ff, SIC_NEUTRAL }, - { 0xf900, 0xfaff, SIC_COMPLEX }, - { 0xfb13, 0xfb28, SIC_COMPLEX }, - { 0xfb29, 0xfb29, SIC_NEUTRAL }, - { 0xfb2a, 0xfb4f, SIC_COMPLEX }, - { 0xfd3e, 0xfd3f, SIC_NEUTRAL }, - { 0xfdd0, 0xfdef, SIC_COMPLEX }, - { 0xfe20, 0xfe6f, SIC_COMPLEX }, - { 0xfeff, 0xfeff, SIC_COMPLEX }, - { 0xff01, 0xff5e, SIC_COMPLEX }, - { 0xff61, 0xff9f, SIC_COMPLEX }, - { 0xffe0, 0xffe6, SIC_COMPLEX }, - { 0xffe8, 0xffee, SIC_COMPLEX }, - { 0xfff9, 0xfffb, SIC_COMPLEX }, - { 0xfffe, 0xfffe, SIC_COMPLEX } -}; - /*********************************************************************** * ScriptIsComplex (USP10.@) - * + * * Determine if a string is complex. * * PARAMS @@ -1263,24 +1109,24 @@ complex_ranges[] = * Success: S_OK * Failure: S_FALSE * - * NOTES - * Behaviour matches that of WinXP. */ HRESULT WINAPI ScriptIsComplex(const WCHAR *chars, int len, DWORD flag) { int i; - unsigned int j; TRACE("(%s,%d,0x%x)\n", debugstr_wn(chars, len), len, flag); for (i = 0; i < len; i++) { - for (j = 0; j < sizeof(complex_ranges)/sizeof(complex_ranges[0]); j++) - { - if (chars[i] >= complex_ranges[j].start && - chars[i] <= complex_ranges[j].end && - (flag & complex_ranges[j].flag)) return S_OK; - } + int script; + + if ((flag & SIC_ASCIIDIGIT) && chars[i] >= 0x30 && chars[i] <= 0x39) + return S_OK; + + script = get_char_script(chars[i]); + if ((scriptInformation[script].props.fComplex && (flag & SIC_COMPLEX))|| + (!scriptInformation[script].props.fComplex && (flag & SIC_NEUTRAL))) + return S_OK; } return S_FALSE; }

1 0

Aric Stewart : usp10: Report accurate information about our currently known scripts.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: 08c6d79d45eb180eefbb37bba89b30d5fea59779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08c6d79d45eb180eefbb37bba… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Aug 12 14:57:29 2010 -0500 usp10: Report accurate information about our currently known scripts. --- dlls/usp10/tests/usp10.c | 2 +- dlls/usp10/usp10.c | 103 +++------------------------------------------- 2 files changed, 7 insertions(+), 98 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index efc0569..815c943 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -407,7 +407,7 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 trace("number of script properties %d\n", iMaxProps); ok (iMaxProps > 0, "Number of scripts returned should not be 0\n"); if (iMaxProps > 0) - ok( ppSp[5]->langid == 9, "Langid[5] not = to 9\n"); /* Check a known value to ensure */ + ok( ppSp[0]->langid == 0, "Langid[0] not = to 0\n"); /* Check a known value to ensure */ /* ptrs work */ /* This is a valid test that will cause parsing to take place */ diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index ccdd874..0ea7ac1 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -122,105 +122,14 @@ static const scriptData scriptInformation[] = { {LANG_PERSIAN, 1, 1, 0, 0, ARABIC_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, }; -static const SCRIPT_PROPERTIES props[] = -{ - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 9, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 8, 0, 0, 0, 0, 161, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 25, 0, 0, 0, 0, 204, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 42, 0, 0, 0, 0, 163, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 9, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 18, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 18, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 13, 0, 1, 0, 1, 177, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 13, 0, 1, 0, 0, 177, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 1, 0, 1, 0, 0, 178, 0, 0, 0, 0, 0, 0, 1, 1, 0 }, - { 1, 1, 1, 0, 0, 178, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 41, 1, 1, 0, 0, 178, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 32, 1, 1, 0, 0, 178, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 90, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0 }, - { 30, 0, 1, 1, 1, 222, 0, 0, 1, 0, 1, 0, 0, 0, 1 }, - { 30, 1, 1, 0, 0, 222, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 30, 0, 1, 0, 0, 222, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 57, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 57, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 73, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 73, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 69, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 69, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 69, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 70, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 70, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 71, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 71, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 72, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 72, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 74, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 74, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 75, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 75, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 76, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 76, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 81, 0, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0 }, - { 81, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 84, 0, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0 }, - { 84, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 83, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 83, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 85, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 85, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 80, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 80, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 94, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 94, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 101, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 93, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 92, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 9, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 91, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 9, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0 }, - { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, -}; - static const SCRIPT_PROPERTIES *script_props[] = { - &props[0], &props[1], &props[2], &props[3], - &props[4], &props[5], &props[6], &props[7], - &props[8], &props[9], &props[11], &props[12], - &props[13], &props[14], &props[15], &props[16], - &props[17], &props[18], &props[19], &props[20], - &props[21], &props[22], &props[23], &props[24], - &props[25], &props[26], &props[27], &props[28], - &props[29], &props[30], &props[31], &props[32], - &props[33], &props[34], &props[35], &props[36], - &props[37], &props[38], &props[39], &props[40], - &props[41], &props[42], &props[43], &props[44], - &props[45], &props[46], &props[47], &props[48], - &props[49], &props[50], &props[51], &props[52], - &props[53], &props[54], &props[55], &props[56], - &props[57], &props[58], &props[59], &props[60], - &props[61], &props[62], &props[63], &props[64], - &props[65], &props[66], &props[67], &props[68], - &props[69], &props[70], &props[71], &props[72], - &props[73] + &scriptInformation[0].props, &scriptInformation[1].props, + &scriptInformation[2].props, &scriptInformation[3].props, + &scriptInformation[4].props, &scriptInformation[5].props, + &scriptInformation[6].props, &scriptInformation[7].props, + &scriptInformation[8].props, &scriptInformation[9].props, + &scriptInformation[10].props }; typedef struct {

1 0

Aric Stewart : usp10: Factor out script ranges in an more expandable way.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: 8c0e5483d815c7349552cbe5f03f1cf9901500d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c0e5483d815c7349552cbe5f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Aug 12 14:57:06 2010 -0500 usp10: Factor out script ranges in an more expandable way. --- dlls/usp10/shape.c | 7 +- dlls/usp10/usp10.c | 205 ++++++++++++++++++++++++++----------------- dlls/usp10/usp10_internal.h | 15 ++-- 3 files changed, 139 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c0e5483d815c7349552c…

1 0

Thomas Mullaly : urlmon: Implemented IUri_GetAbsoluteUri.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: 16dd03ba3e024bd2b9913addb9fd0ad178c19bda URL: http://source.winehq.org/git/wine.git/?a=commit;h=16dd03ba3e024bd2b9913addb… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Jul 29 18:24:07 2010 -0400 urlmon: Implemented IUri_GetAbsoluteUri. --- dlls/urlmon/tests/uri.c | 266 +++++++++++++++++++++++------------------------ dlls/urlmon/uri.c | 22 +++-- 2 files changed, 145 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=16dd03ba3e024bd2b9913…

1 0

Thomas Mullaly : urlmon: Implemented IUri_GetDisplayUri.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: e403053d5edcb277eb45dd5aac0a23ff31f8bd5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e403053d5edcb277eb45dd5aa… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Jul 29 19:35:11 2010 -0400 urlmon: Implemented IUri_GetDisplayUri. --- dlls/urlmon/tests/uri.c | 276 +++++++++++++++++++++++------------------------ dlls/urlmon/uri.c | 41 ++++++-- 2 files changed, 168 insertions(+), 149 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e403053d5edcb277eb45d…

1 0

Thomas Mullaly : urlmon: Implemented IUri_GetProperties and IUri_HasProperty.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: ebc0de1e024ee251ac3e5ee6bab75b757915a775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebc0de1e024ee251ac3e5ee6b… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Jul 29 20:55:59 2010 -0400 urlmon: Implemented IUri_GetProperties and IUri_HasProperty. --- dlls/urlmon/tests/uri.c | 238 ++++++++++++++++++++++------------------------- dlls/urlmon/uri.c | 101 +++++++++++++++++++- 2 files changed, 210 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ebc0de1e024ee251ac3e5…

1 0