June 2011 - Wine-commits - list.winehq.org

Aric Stewart : usp10: Correct an error with the Telugu lexical function.
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: 88ad318fb80b0fd01792fd4376ae6050acd1a852 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88ad318fb80b0fd01792fd437… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 15 09:53:45 2011 -0500 usp10: Correct an error with the Telugu lexical function. --- dlls/usp10/shape.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 63a9a2f..1da371f 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -2631,7 +2631,7 @@ static int telugu_lex(WCHAR c) case 0x200C: return lex_ZWNJ; case 0x200D: return lex_ZWJ; default: - if (c>=0x0C01 && c<=0x0C03) return lex_Matra_post; + if (c>=0x0C01 && c<=0x0C03) return lex_Modifier; else if (c>=0x0C05 && c<=0x0C14) return lex_Vowel; else if (c>=0x0C15 && c<=0x0C39) return lex_Consonant; else if (c>=0x0C3E && c<=0x0C40) return lex_Matra_above;

1 0

Aric Stewart : usp10: More corrections to the Telugu lexical function.
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: 2a8e004bcf0fc60f11cadc12f6a161d432389f6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a8e004bcf0fc60f11cadc12f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 16 11:28:31 2011 -0500 usp10: More corrections to the Telugu lexical function. --- dlls/usp10/shape.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 1da371f..c8f11db 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -2635,12 +2635,13 @@ static int telugu_lex(WCHAR c) else if (c>=0x0C05 && c<=0x0C14) return lex_Vowel; else if (c>=0x0C15 && c<=0x0C39) return lex_Consonant; else if (c>=0x0C3E && c<=0x0C40) return lex_Matra_above; - else if (c>=0x0C41 && c<=0x0C44) return lex_Matra_post; + else if (c>=0x0C41 && c<=0x0C42) return lex_Matra_post; + else if (c>=0x0C43 && c<=0x0C44) return lex_Modifier; else if (c>=0x0C46 && c<=0x0C47) return lex_Matra_above; else if (c>=0x0C4A && c<=0x0C4C) return lex_Matra_above; else if (c>=0x0C58 && c<=0x0C59) return lex_Consonant; else if (c>=0x0C60 && c<=0x0C61) return lex_Vowel; - else if (c>=0x0C62 && c<=0x0C63) return lex_Matra_below; + else if (c>=0x0C62 && c<=0x0C63) return lex_Modifier; else return lex_Generic; } }

1 0

Aric Stewart : usp10: Refine post-matra Ralf reordering to be post below form consonants as well .
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: 75520505de39555af87b9f4e1911bff224da638f URL: http://source.winehq.org/git/wine.git/?a=commit;h=75520505de39555af87b9f4e1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 16 11:28:43 2011 -0500 usp10: Refine post-matra Ralf reordering to be post below form consonants as well. --- dlls/usp10/indic.c | 9 ++++++++- dlls/usp10/shape.c | 14 ++++++++++++-- dlls/usp10/usp10_internal.h | 1 + 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/indic.c b/dlls/usp10/indic.c index 09de3b5..82ef2c1 100644 --- a/dlls/usp10/indic.c +++ b/dlls/usp10/indic.c @@ -238,6 +238,7 @@ static BOOL Consonent_is_ralf(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, L static int FindBaseConsonant(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPWSTR input, IndicSyllable *s, lexical_function lex) { int i; + BOOL blwf = FALSE; /* remove ralf from consideration */ if (Consonent_is_ralf(hdc, psa, psc, input, s, lex)) @@ -257,8 +258,10 @@ static int FindBaseConsonant(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LP } } - while (Consonent_is_below_base_form(hdc, psa, psc, input, s, lex) || Consonent_is_post_base_form(hdc, psa, psc, input, s, lex) || Consonent_is_pre_base_form(hdc, psa, psc, input, s, lex)) + while ((blwf = Consonent_is_below_base_form(hdc, psa, psc, input, s, lex)) || Consonent_is_post_base_form(hdc, psa, psc, input, s, lex) || Consonent_is_pre_base_form(hdc, psa, psc, input, s, lex)) { + if (blwf && s->blwf == -1) + s->blwf = s->base - 1; for (i = s->base-1; i >= s->start; i--) if (is_consonant( lex(input[i]) )) { @@ -270,6 +273,9 @@ static int FindBaseConsonant(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LP if (s->ralf >= 0) s->start = s->ralf; + if (s->ralf == s->base) + s->ralf = -1; + return s->base; } @@ -303,6 +309,7 @@ void Indic_ReorderCharacters( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, L (*syllables)[*syllable_count].start = index; (*syllables)[*syllable_count].base = center; (*syllables)[*syllable_count].ralf = -1; + (*syllables)[*syllable_count].blwf = -1; (*syllables)[*syllable_count].end = next-1; FindBaseConsonant(hdc, psa, psc, input, &(*syllables)[*syllable_count], lex); reorder_f(input, &(*syllables)[*syllable_count], lex); diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index c8f11db..b114618 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1767,9 +1767,10 @@ static void Reorder_Ra_follows_matra(LPWSTR pwChar, IndicSyllable *s, lexical_fu if (s->ralf >= 0) { int j,loc; + int stop = (s->blwf >=0)? s->blwf+1 : s->base; WORD Ra = pwChar[s->start]; WORD H = pwChar[s->start+1]; - for (loc = s->end; loc > s->base; loc--) + for (loc = s->end; loc > stop; loc--) if (lexical(pwChar[loc]) == lex_Matra_post || lexical(pwChar[loc]) == lex_Matra_below) break; @@ -1781,6 +1782,7 @@ static void Reorder_Ra_follows_matra(LPWSTR pwChar, IndicSyllable *s, lexical_fu s->ralf = loc-1; s->base -= 2; + if (s->blwf >= 0) s->blwf -= 2; } } @@ -1800,6 +1802,7 @@ static void Reorder_Ra_follows_syllable(LPWSTR pwChar, IndicSyllable *s, lexical s->ralf = s->end-1; s->base -= 2; + if (s->blwf >= 0) s->blwf -= 2; } } @@ -1822,6 +1825,7 @@ static void Reorder_Matra_precede_base(LPWSTR pwChar, IndicSyllable *s, lexical_ pwChar[s->base] = c; if (s->ralf >= s->base) s->ralf++; + if (s->blwf >= s->base) s->blwf++; s->base ++; } } @@ -1847,6 +1851,7 @@ static void Reorder_Matra_precede_syllable(LPWSTR pwChar, IndicSyllable *s, lexi pwChar[s->start] = c; if (s->ralf >= 0) s->ralf++; + if (s->blwf >= 0) s->blwf++; s->base ++; } } @@ -1916,6 +1921,8 @@ static inline void shift_syllable_glyph_indexs(IndicSyllable *glyph_index, INT i glyph_index->end+= shift; if (glyph_index->ralf > index) glyph_index->ralf+= shift; + if (glyph_index->blwf > index) + glyph_index->blwf+= shift; } static void Apply_Indic_BasicForm(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwChars, INT cChars, IndicSyllable *syllable, WORD *pwOutGlyphs, INT* pcGlyphs, WORD *pwLogClust, lexical_function lexical, IndicSyllable *glyph_index, const GSUB_Feature *feature ) @@ -2014,7 +2021,10 @@ static void Apply_Indic_PostBase(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa count = syllable->end - syllable->base; - g_offset = 0; + if (syllable->ralf >= syllable->base) + g_offset = -1; + else + g_offset = 0; index = find_halant_consonant(&pwChars[syllable->base], 0, count, lexical); while (index >= 0) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 2b70697..00d9583 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -100,6 +100,7 @@ typedef struct { INT start; INT base; INT ralf; + INT blwf; INT end; } IndicSyllable;

1 0

Aric Stewart : usp10: Enable a second reorder step after basic shaping.
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: 4a6364d3c0e08334a005514c38c967359c4cfc40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a6364d3c0e08334a005514c3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 16 11:28:47 2011 -0500 usp10: Enable a second reorder step after basic shaping. --- dlls/usp10/shape.c | 62 ++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 51 insertions(+), 11 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index b114618..92a5bb6 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -309,6 +309,8 @@ typedef struct tagConsonantComponents WCHAR output; } ConsonantComponents; +typedef void (*second_reorder_function)(LPWSTR pwChar, IndicSyllable *syllable,WORD* pwGlyphs, IndicSyllable* glyph_index, lexical_function lex); + /* the orders of joined_forms and contextual_features need to line up */ static const char* contextual_features[] = { @@ -1858,6 +1860,30 @@ static void Reorder_Matra_precede_syllable(LPWSTR pwChar, IndicSyllable *s, lexi } } +static void SecondReorder_Blwf_follows_matra(LPWSTR pwChar, IndicSyllable *s, WORD *glyphs, IndicSyllable *g, lexical_function lexical) +{ + if (s->blwf >= 0 && g->blwf > g->base) + { + int j,loc; + int g_offset; + for (loc = s->end; loc > s->blwf; loc--) + if (lexical(pwChar[loc]) == lex_Matra_below || lexical(pwChar[loc]) == lex_Matra_above || lexical(pwChar[loc]) == lex_Matra_post) + break; + + g_offset = (loc - s->blwf) - 1; + + if (loc != s->blwf) + { + WORD blwf = glyphs[g->blwf]; + TRACE("Doing reorder of Below-base to %i (glyph offset %i)\n",loc,g_offset); + /* do not care about the pwChar array anymore, just the glyphs */ + for (j = 0; j < g_offset; j++) + glyphs[g->blwf + j] = glyphs[g->blwf + j + 1]; + glyphs[g->blwf + g_offset] = blwf; + } + } +} + static void Reorder_Like_Sinhala(LPWSTR pwChar, IndicSyllable *s, lexical_function lexical) { TRACE("Syllable (%i..%i..%i)\n",s->start,s->base,s->end); @@ -1908,6 +1934,16 @@ static void Reorder_Like_Malayalam(LPWSTR pwChar, IndicSyllable *s, lexical_func Reorder_Matra_precede_base(pwChar, s, lexical); } +static void SecondReorder_Like_Telugu(LPWSTR pwChar, IndicSyllable *s, WORD* pwGlyphs, IndicSyllable *g, lexical_function lexical) +{ + TRACE("Syllable (%i..%i..%i)\n",s->start,s->base,s->end); + TRACE("Glyphs (%i..%i..%i)\n",g->start,g->base,g->end); + if (s->start == s->base && s->base == s->end) return; + if (lexical(pwChar[s->base]) == lex_Vowel) return; + + SecondReorder_Blwf_follows_matra(pwChar, s, pwGlyphs, g, lexical); +} + static inline void shift_syllable_glyph_indexs(IndicSyllable *glyph_index, INT index, INT shift) { if (shift == 0) @@ -2042,7 +2078,7 @@ static void Apply_Indic_PostBase(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa } } -static void ShapeIndicSyllables(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwChars, INT cChars, IndicSyllable *syllables, INT syllable_count, WORD *pwOutGlyphs, INT* pcGlyphs, WORD *pwLogClust, lexical_function lexical) +static void ShapeIndicSyllables(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwChars, INT cChars, IndicSyllable *syllables, INT syllable_count, WORD *pwOutGlyphs, INT* pcGlyphs, WORD *pwLogClust, lexical_function lexical, second_reorder_function second_reorder) { int c; int overall_shift = 0; @@ -2081,6 +2117,7 @@ static void ShapeIndicSyllables(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, TRACE("applying feature akhn\n"); Apply_Indic_BasicForm(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs, akhn); } + if (rphf) Apply_Indic_Rphf(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs); if (rkrf) @@ -2110,6 +2147,9 @@ static void ShapeIndicSyllables(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, Apply_Indic_BasicForm(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs, cjct); } + if (second_reorder) + second_reorder(pwChars, &syllables[c], pwOutGlyphs, &glyph_indexs, lexical); + overall_shift += glyph_indexs.end - old_end; } } @@ -2187,7 +2227,7 @@ static void ContextualShape_Sinhala(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS * /* Step 4: Base Form application to syllables */ GetGlyphIndicesW(hdc, input, cCount, pwOutGlyphs, 0); *pcGlyphs = cCount; - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, sinhala_lex); + ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, sinhala_lex, NULL); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables); @@ -2266,7 +2306,7 @@ static void ContextualShape_Devanagari(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSI *pcGlyphs = cCount; /* Step 3: Base Form application to syllables */ - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, devanagari_lex); + ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, devanagari_lex, NULL); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables); @@ -2356,7 +2396,7 @@ static void ContextualShape_Bengali(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS * } /* Step 4: Base Form application to syllables */ - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, bengali_lex); + ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, bengali_lex, NULL); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables); @@ -2427,7 +2467,7 @@ static void ContextualShape_Gurmukhi(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *pcGlyphs = cCount; /* Step 3: Base Form application to syllables */ - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, gurmukhi_lex); + ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, gurmukhi_lex, NULL); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables); @@ -2482,7 +2522,7 @@ static void ContextualShape_Gujarati(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *pcGlyphs = cCount; /* Step 2: Base Form application to syllables */ - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, gujarati_lex); + ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, gujarati_lex, NULL); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables); @@ -2563,7 +2603,7 @@ static void ContextualShape_Oriya(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps *pcGlyphs = cCount; /* Step 3: Base Form application to syllables */ - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, oriya_lex); + ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, oriya_lex, NULL); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables); @@ -2625,7 +2665,7 @@ static void ContextualShape_Tamil(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps *pcGlyphs = cCount; /* Step 3: Base Form application to syllables */ - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, tamil_lex); + ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, tamil_lex, NULL); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables); @@ -2687,7 +2727,7 @@ static void ContextualShape_Telugu(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p *pcGlyphs = cCount; /* Step 3: Base Form application to syllables */ - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, telugu_lex); + ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, telugu_lex, SecondReorder_Like_Telugu); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables); @@ -2754,7 +2794,7 @@ static void ContextualShape_Kannada(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS * *pcGlyphs = cCount; /* Step 3: Base Form application to syllables */ - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, kannada_lex); + ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, kannada_lex, SecondReorder_Like_Telugu); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables); @@ -2814,7 +2854,7 @@ static void ContextualShape_Malayalam(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *pcGlyphs = cCount; /* Step 3: Base Form application to syllables */ - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, malayalam_lex); + ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, malayalam_lex, NULL); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables);

1 0

Aric Stewart : usp10: Do matra second reorderings for Tamil and Malayalam to prevent blocking consonant ligatures .
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: 9a849038eca854adf87fae7cd302e712912f914d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a849038eca854adf87fae7cd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 16 11:28:53 2011 -0500 usp10: Do matra second reorderings for Tamil and Malayalam to prevent blocking consonant ligatures. --- dlls/usp10/shape.c | 42 +++++++++++++++++++++++++++++++++--------- 1 files changed, 33 insertions(+), 9 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 92a5bb6..7151cd9 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1884,6 +1884,29 @@ static void SecondReorder_Blwf_follows_matra(LPWSTR pwChar, IndicSyllable *s, WO } } +static void SecondReorder_Matra_precede_base(LPWSTR pwChar, IndicSyllable *s, WORD *glyphs, IndicSyllable *g, lexical_function lexical) +{ + int i; + + /* reorder previously moved Matras to correct position*/ + for (i = s->start; i < s->base; i++) + { + if (lexical(pwChar[i]) == lex_Matra_pre) + { + int j; + int g_start = g->start + i - s->start; + if (g_start < g->base -1 ) + { + WCHAR og = glyphs[g_start]; + TRACE("Doing reorder of matra from %i to %i\n",g_start,g->base); + for (j = g_start; j < g->base-1; j++) + glyphs[j] = glyphs[j+1]; + glyphs[g->base-1] = og; + } + } + } +} + static void Reorder_Like_Sinhala(LPWSTR pwChar, IndicSyllable *s, lexical_function lexical) { TRACE("Syllable (%i..%i..%i)\n",s->start,s->base,s->end); @@ -1924,26 +1947,27 @@ static void Reorder_Like_Kannada(LPWSTR pwChar, IndicSyllable *s, lexical_functi Reorder_Matra_precede_syllable(pwChar, s, lexical); } -static void Reorder_Like_Malayalam(LPWSTR pwChar, IndicSyllable *s, lexical_function lexical) +static void SecondReorder_Like_Telugu(LPWSTR pwChar, IndicSyllable *s, WORD* pwGlyphs, IndicSyllable *g, lexical_function lexical) { TRACE("Syllable (%i..%i..%i)\n",s->start,s->base,s->end); + TRACE("Glyphs (%i..%i..%i)\n",g->start,g->base,g->end); if (s->start == s->base && s->base == s->end) return; if (lexical(pwChar[s->base]) == lex_Vowel) return; - Reorder_Ra_follows_matra(pwChar, s, lexical); - Reorder_Matra_precede_base(pwChar, s, lexical); + SecondReorder_Blwf_follows_matra(pwChar, s, pwGlyphs, g, lexical); } -static void SecondReorder_Like_Telugu(LPWSTR pwChar, IndicSyllable *s, WORD* pwGlyphs, IndicSyllable *g, lexical_function lexical) +static void SecondReorder_Like_Tamil(LPWSTR pwChar, IndicSyllable *s, WORD* pwGlyphs, IndicSyllable *g, lexical_function lexical) { TRACE("Syllable (%i..%i..%i)\n",s->start,s->base,s->end); TRACE("Glyphs (%i..%i..%i)\n",g->start,g->base,g->end); if (s->start == s->base && s->base == s->end) return; if (lexical(pwChar[s->base]) == lex_Vowel) return; - SecondReorder_Blwf_follows_matra(pwChar, s, pwGlyphs, g, lexical); + SecondReorder_Matra_precede_base(pwChar, s, pwGlyphs, g, lexical); } + static inline void shift_syllable_glyph_indexs(IndicSyllable *glyph_index, INT index, INT shift) { if (shift == 0) @@ -2659,13 +2683,13 @@ static void ContextualShape_Tamil(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps TRACE("New composed string %s (%i)\n",debugstr_wn(input,cCount),cCount); /* Step 2: Reorder within Syllables */ - Indic_ReorderCharacters( hdc, psa, psc, input, cCount, &syllables, &syllable_count, tamil_lex, Reorder_Like_Sinhala); + Indic_ReorderCharacters( hdc, psa, psc, input, cCount, &syllables, &syllable_count, tamil_lex, Reorder_Like_Bengali); TRACE("reordered string %s\n",debugstr_wn(input,cCount)); GetGlyphIndicesW(hdc, input, cCount, pwOutGlyphs, 0); *pcGlyphs = cCount; /* Step 3: Base Form application to syllables */ - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, tamil_lex, NULL); + ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, tamil_lex, SecondReorder_Like_Tamil); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables); @@ -2848,13 +2872,13 @@ static void ContextualShape_Malayalam(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS TRACE("New composed string %s (%i)\n",debugstr_wn(input,cCount),cCount); /* Step 2: Reorder within Syllables */ - Indic_ReorderCharacters( hdc, psa, psc, input, cCount, &syllables, &syllable_count, malayalam_lex, Reorder_Like_Malayalam); + Indic_ReorderCharacters( hdc, psa, psc, input, cCount, &syllables, &syllable_count, malayalam_lex, Reorder_Like_Devanagari); TRACE("reordered string %s\n",debugstr_wn(input,cCount)); GetGlyphIndicesW(hdc, input, cCount, pwOutGlyphs, 0); *pcGlyphs = cCount; /* Step 3: Base Form application to syllables */ - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, malayalam_lex, NULL); + ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, malayalam_lex, SecondReorder_Like_Tamil); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables);

1 0

Aric Stewart : usp10: Pre-base consonants need to be reordered like pre-base matras for scripts that have them .
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: 520f07a4b0cce8f7431bc00f16d12efc05f8e50f URL: http://source.winehq.org/git/wine.git/?a=commit;h=520f07a4b0cce8f7431bc00f1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 16 11:29:03 2011 -0500 usp10: Pre-base consonants need to be reordered like pre-base matras for scripts that have them. --- dlls/usp10/indic.c | 7 ++++++- dlls/usp10/shape.c | 20 ++++++++++++++++++++ dlls/usp10/usp10_internal.h | 1 + 3 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/indic.c b/dlls/usp10/indic.c index 82ef2c1..3855f0c 100644 --- a/dlls/usp10/indic.c +++ b/dlls/usp10/indic.c @@ -239,6 +239,7 @@ static int FindBaseConsonant(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LP { int i; BOOL blwf = FALSE; + BOOL pref = FALSE; /* remove ralf from consideration */ if (Consonent_is_ralf(hdc, psa, psc, input, s, lex)) @@ -258,10 +259,13 @@ static int FindBaseConsonant(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LP } } - while ((blwf = Consonent_is_below_base_form(hdc, psa, psc, input, s, lex)) || Consonent_is_post_base_form(hdc, psa, psc, input, s, lex) || Consonent_is_pre_base_form(hdc, psa, psc, input, s, lex)) + while ((blwf = Consonent_is_below_base_form(hdc, psa, psc, input, s, lex)) || Consonent_is_post_base_form(hdc, psa, psc, input, s, lex) || (pref = Consonent_is_pre_base_form(hdc, psa, psc, input, s, lex))) { if (blwf && s->blwf == -1) s->blwf = s->base - 1; + if (pref && s->pref == -1) + s->pref = s->base - 1; + for (i = s->base-1; i >= s->start; i--) if (is_consonant( lex(input[i]) )) { @@ -310,6 +314,7 @@ void Indic_ReorderCharacters( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, L (*syllables)[*syllable_count].base = center; (*syllables)[*syllable_count].ralf = -1; (*syllables)[*syllable_count].blwf = -1; + (*syllables)[*syllable_count].pref = -1; (*syllables)[*syllable_count].end = next-1; FindBaseConsonant(hdc, psa, psc, input, &(*syllables)[*syllable_count], lex); reorder_f(input, &(*syllables)[*syllable_count], lex); diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 7151cd9..c1bc18f 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1785,6 +1785,7 @@ static void Reorder_Ra_follows_matra(LPWSTR pwChar, IndicSyllable *s, lexical_fu s->ralf = loc-1; s->base -= 2; if (s->blwf >= 0) s->blwf -= 2; + if (s->pref >= 0) s->pref -= 2; } } @@ -1805,6 +1806,7 @@ static void Reorder_Ra_follows_syllable(LPWSTR pwChar, IndicSyllable *s, lexical s->ralf = s->end-1; s->base -= 2; if (s->blwf >= 0) s->blwf -= 2; + if (s->pref >= 0) s->pref -= 2; } } @@ -1828,6 +1830,7 @@ static void Reorder_Matra_precede_base(LPWSTR pwChar, IndicSyllable *s, lexical_ if (s->ralf >= s->base) s->ralf++; if (s->blwf >= s->base) s->blwf++; + if (s->pref >= s->base) s->pref++; s->base ++; } } @@ -1854,6 +1857,7 @@ static void Reorder_Matra_precede_syllable(LPWSTR pwChar, IndicSyllable *s, lexi if (s->ralf >= 0) s->ralf++; if (s->blwf >= 0) s->blwf++; + if (s->pref >= 0) s->pref++; s->base ++; } } @@ -1907,6 +1911,19 @@ static void SecondReorder_Matra_precede_base(LPWSTR pwChar, IndicSyllable *s, WO } } +static void SecondReorder_Pref_precede_base(LPWSTR pwChar, IndicSyllable *s, WORD *glyphs, IndicSyllable *g, lexical_function lexical) +{ + if (s->pref >= 0 && g->pref > g->base) + { + int j; + WCHAR og = glyphs[g->pref]; + TRACE("Doing reorder of pref from %i to %i\n",g->pref,g->base); + for (j = g->pref; j > g->base; j--) + glyphs[j] = glyphs[j-1]; + glyphs[g->base] = og; + } +} + static void Reorder_Like_Sinhala(LPWSTR pwChar, IndicSyllable *s, lexical_function lexical) { TRACE("Syllable (%i..%i..%i)\n",s->start,s->base,s->end); @@ -1965,6 +1982,7 @@ static void SecondReorder_Like_Tamil(LPWSTR pwChar, IndicSyllable *s, WORD* pwGl if (lexical(pwChar[s->base]) == lex_Vowel) return; SecondReorder_Matra_precede_base(pwChar, s, pwGlyphs, g, lexical); + SecondReorder_Pref_precede_base(pwChar, s, pwGlyphs, g, lexical); } @@ -1983,6 +2001,8 @@ static inline void shift_syllable_glyph_indexs(IndicSyllable *glyph_index, INT i glyph_index->ralf+= shift; if (glyph_index->blwf > index) glyph_index->blwf+= shift; + if (glyph_index->pref > index) + glyph_index->pref+= shift; } static void Apply_Indic_BasicForm(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwChars, INT cChars, IndicSyllable *syllable, WORD *pwOutGlyphs, INT* pcGlyphs, WORD *pwLogClust, lexical_function lexical, IndicSyllable *glyph_index, const GSUB_Feature *feature ) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 00d9583..e4c42f8 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -101,6 +101,7 @@ typedef struct { INT base; INT ralf; INT blwf; + INT pref; INT end; } IndicSyllable;

1 0

Marcus Meissner : sane.ds: Removed 3 array != NULL checks (Coverity).
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: c4703a4aacc985409b7a74b9c37ee73c606030dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4703a4aacc985409b7a74b9c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Jun 16 18:40:39 2011 +0200 sane.ds: Removed 3 array != NULL checks (Coverity). --- dlls/sane.ds/sane_main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index 13422bb..f482098 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -473,13 +473,13 @@ static TW_UINT16 SANE_OpenDS( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { /* To make string as short as above */ lstrcpynA(name, sane_devlist[i]->vendor, sizeof(name)-1); - if (self->Manufacturer && *self->Manufacturer && strcmp(name, self->Manufacturer)) + if (*self->Manufacturer && strcmp(name, self->Manufacturer)) continue; lstrcpynA(name, sane_devlist[i]->model, sizeof(name)-1); - if (self->ProductFamily && *self->ProductFamily && strcmp(name, self->ProductFamily)) + if (*self->ProductFamily && strcmp(name, self->ProductFamily)) continue; copy_sane_short_name(sane_devlist[i]->name, name, sizeof(name) - 1); - if (self->ProductName && *self->ProductName && strcmp(name, self->ProductName)) + if (*self->ProductName && strcmp(name, self->ProductName)) continue; break; }

1 0

Marcus Meissner : usp10: Removed 2 superflous lines of code (Coverity).
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: c2748cfba56866557e3a7d8999c85108cac04732 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2748cfba56866557e3a7d899… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Jun 16 16:58:45 2011 +0200 usp10: Removed 2 superflous lines of code (Coverity). --- dlls/usp10/shape.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index c1bc18f..cbe186a 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -2597,8 +2597,6 @@ static int oriya_lex(WCHAR c) if (c>=0x0B01 && c<=0x0B03) return lex_Modifier; else if (c>=0x0B05 && c<=0x0B14) return lex_Vowel; else if (c>=0x0B15 && c<=0x0B39) return lex_Consonant; - else if (c>=0x0B2C && c<=0x0B2E) return lex_Consonant; - else if (c>=0x0B32 && c<=0x0B33) return lex_Consonant; else if (c>=0x0B41 && c<=0x0B44) return lex_Matra_below; else if (c>=0x0B48 && c<=0x0B4C) return lex_Composed_Vowel; else if (c>=0x0B5C && c<=0x0B5D) return lex_Consonant;

1 0

Marcus Meissner : d3dxof: Check returns of read_bytes (Coverity).
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: 5ba1f867a1f838e9b88b4247e8fc4839a929aaa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ba1f867a1f838e9b88b4247e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Jun 16 17:47:52 2011 +0200 d3dxof: Check returns of read_bytes (Coverity). --- dlls/d3dxof/parsing.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index cbf1761..4acaaba 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -233,8 +233,10 @@ HRESULT parse_header(parse_buffer * buf, BYTE ** decomp_buffer_ptr) buf->rem_bytes -= sizeof(WORD) * 2; buf->buffer += sizeof(WORD) * 2; - read_bytes(buf, &decomp_size, sizeof(decomp_size)); - read_bytes(buf, &comp_size, sizeof(comp_size)); + if (!read_bytes(buf, &decomp_size, sizeof(decomp_size))) + return DXFILEERR_BADFILETYPE; + if (!read_bytes(buf, &comp_size, sizeof(comp_size))) + return DXFILEERR_BADFILETYPE; TRACE("Compressed format %s detected: compressed_size = %x, decompressed_size = %x\n", debugstr_fourcc(header[2]), comp_size, decomp_size); @@ -1049,7 +1051,8 @@ static void go_to_next_definition(parse_buffer * buf) char c; while (buf->rem_bytes) { - read_bytes(buf, &c, 1); + if (!read_bytes(buf, &c, 1)) + return; if ((c == '#') || (c == '/')) { /* Handle comment (# or //) */

1 0

Alexandre Julliard : kernel32: Implement DebugBreak directly in assembly.
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: 5f06809ab3339e2001de57f18be988146915bb7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f06809ab3339e2001de57f18… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 15 20:04:27 2011 +0200 kernel32: Implement DebugBreak directly in assembly. --- dlls/kernel32/debugger.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index 3abffdf..4ac0a72 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" #include <stdio.h> #include <string.h> @@ -363,15 +364,15 @@ void WINAPI OutputDebugStringW( LPCWSTR str ) * * Raises an exception so that a debugger (if attached) * can take some action. - * - * PARAMS - * - * RETURNS */ +#if defined(__i386__) || defined(__x86_64__) +__ASM_STDCALL_FUNC( DebugBreak, 0, "int $3; ret" ) +#else void WINAPI DebugBreak(void) { DbgBreakPoint(); } +#endif /*********************************************************************** * DebugBreakProcess (KERNEL32.@)

1 0