wine-commits June 2011

wine-commits@winehq.org

2 participants
809 discussions

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

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: 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: 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: 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: 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

Vincas Miliūnas : include: Added raw input constants and a missing function prototype.
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: be5f35534b5e2b4203adee71a192b593e40cda8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=be5f35534b5e2b4203adee71a… Author: Vincas Miliūnas <vincas.miliunas(a)gmail.com> Date: Wed Jun 15 10:44:31 2011 +0300 include: Added raw input constants and a missing function prototype. --- include/winuser.h | 104 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 92 insertions(+), 12 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index a8b2c93..a6ff3db 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -556,6 +556,83 @@ typedef struct tagRID_DEVICE_INFO { } DUMMYUNIONNAME; } RID_DEVICE_INFO, *PRID_DEVICE_INFO, *LPRID_DEVICE_INFO; +#define GET_RAWINPUT_CODE_WPARAM(wParam) ((wParam) & 0xff) + +#define RIM_INPUT 0 +#define RIM_INPUTSINK 1 + +#define RIM_TYPEMOUSE 0 +#define RIM_TYPEKEYBOARD 1 +#define RIM_TYPEHID 2 + +#define RI_MOUSE_LEFT_BUTTON_DOWN 0x0001 +#define RI_MOUSE_LEFT_BUTTON_UP 0x0002 +#define RI_MOUSE_RIGHT_BUTTON_DOWN 0x0004 +#define RI_MOUSE_RIGHT_BUTTON_UP 0x0008 +#define RI_MOUSE_MIDDLE_BUTTON_DOWN 0x0010 +#define RI_MOUSE_MIDDLE_BUTTON_UP 0x0020 + +#define RI_MOUSE_BUTTON_1_DOWN RI_MOUSE_LEFT_BUTTON_DOWN +#define RI_MOUSE_BUTTON_1_UP RI_MOUSE_LEFT_BUTTON_UP +#define RI_MOUSE_BUTTON_2_DOWN RI_MOUSE_RIGHT_BUTTON_DOWN +#define RI_MOUSE_BUTTON_2_UP RI_MOUSE_RIGHT_BUTTON_UP +#define RI_MOUSE_BUTTON_3_DOWN RI_MOUSE_MIDDLE_BUTTON_DOWN +#define RI_MOUSE_BUTTON_3_UP RI_MOUSE_MIDDLE_BUTTON_UP + +#define RI_MOUSE_BUTTON_4_DOWN 0x0040 +#define RI_MOUSE_BUTTON_4_UP 0x0080 +#define RI_MOUSE_BUTTON_5_DOWN 0x0100 +#define RI_MOUSE_BUTTON_5_UP 0x0200 +#define RI_MOUSE_WHEEL 0x0400 +#define RI_MOUSE_HORIZONTAL_WHEEL 0x0800 + +#define MOUSE_MOVE_RELATIVE 0x00 +#define MOUSE_MOVE_ABSOLUTE 0x01 +#define MOUSE_VIRTUAL_DESKTOP 0x02 +#define MOUSE_ATTRIBUTES_CHANGED 0x04 +#define MOUSE_MOVE_NOCOALESCE 0x08 + +#define KEYBOARD_OVERRUN_MAKE_CODE 0xFF + +#define RI_KEY_MAKE 0x00 +#define RI_KEY_BREAK 0x01 +#define RI_KEY_E0 0x02 +#define RI_KEY_E1 0x04 +#define RI_KEY_TERMSRV_SET_LED 0x08 +#define RI_KEY_TERMSRV_SHADOW 0x10 + +#define RAWINPUT_ALIGN(x) (((x) + sizeof(DWORD_PTR) - 1) & ~(sizeof(DWORD_PTR) - 1)) +#define NEXTRAWINPUTBLOCK(ptr) ((PRAWINPUT)RAWINPUT_ALIGN((ULONG_PTR)((PBYTE)(ptr) + (ptr)->header.dwSize))) + +#define RID_INPUT 0x10000003 +#define RID_HEADER 0x10000005 + +#define RIDI_PREPARSEDDATA 0x20000005 +#define RIDI_DEVICENAME 0x20000007 +#define RIDI_DEVICEINFO 0x2000000b + +#define RIDEV_REMOVE 0x00000001 +#define RIDEV_EXCLUDE 0x00000010 +#define RIDEV_PAGEONLY 0x00000020 +#define RIDEV_NOLEGACY 0x00000030 +#define RIDEV_INPUTSINK 0x00000100 +#define RIDEV_CAPTUREMOUSE 0x00000200 +#define RIDEV_NOHOTKEYS 0x00000200 +#define RIDEV_APPKEYS 0x00000400 +#define RIDEV_EXINPUTSINK 0x00001000 +#define RIDEV_DEVNOTIFY 0x00002000 +#define RIDEV_EXMODEMASK 0x000000F0 + +#define RIDEV_EXMODE(mode) ((mode) & RIDEV_EXMODEMASK) + +#define GIDC_ARRIVAL 1 +#define GIDC_REMOVAL 2 + +#if (_WIN32_WINNT >= 0x0601) +#define GET_DEVICE_CHANGE_WPARAM(wParam) (LOWORD(wParam)) +#elif (_WIN32_WINNT >= 0x0501) +#define GET_DEVICE_CHANGE_LPARAM(lParam) (LOWORD(lParam)) +#endif typedef struct tagGUITHREADINFO { @@ -2870,18 +2947,20 @@ typedef struct tagCBTACTIVATESTRUCT #define KEYEVENTF_SCANCODE 0x0008 /* mouse_event flags */ -#define MOUSEEVENTF_MOVE 0x0001 -#define MOUSEEVENTF_LEFTDOWN 0x0002 -#define MOUSEEVENTF_LEFTUP 0x0004 -#define MOUSEEVENTF_RIGHTDOWN 0x0008 -#define MOUSEEVENTF_RIGHTUP 0x0010 -#define MOUSEEVENTF_MIDDLEDOWN 0x0020 -#define MOUSEEVENTF_MIDDLEUP 0x0040 -#define MOUSEEVENTF_XDOWN 0x0080 -#define MOUSEEVENTF_XUP 0x0100 -#define MOUSEEVENTF_WHEEL 0x0800 -#define MOUSEEVENTF_HWHEEL 0x1000 -#define MOUSEEVENTF_ABSOLUTE 0x8000 +#define MOUSEEVENTF_MOVE 0x0001 +#define MOUSEEVENTF_LEFTDOWN 0x0002 +#define MOUSEEVENTF_LEFTUP 0x0004 +#define MOUSEEVENTF_RIGHTDOWN 0x0008 +#define MOUSEEVENTF_RIGHTUP 0x0010 +#define MOUSEEVENTF_MIDDLEDOWN 0x0020 +#define MOUSEEVENTF_MIDDLEUP 0x0040 +#define MOUSEEVENTF_XDOWN 0x0080 +#define MOUSEEVENTF_XUP 0x0100 +#define MOUSEEVENTF_WHEEL 0x0800 +#define MOUSEEVENTF_HWHEEL 0x1000 +#define MOUSEEVENTF_MOVE_NOCOALESCE 0x2000 +#define MOUSEEVENTF_VIRTUALDESK 0x4000 +#define MOUSEEVENTF_ABSOLUTE 0x8000 /* ExitWindows() flags */ #define EW_RESTARTWINDOWS 0x0042 @@ -4688,6 +4767,7 @@ WINUSERAPI UINT WINAPI GetRawInputDeviceInfoA(HANDLE,UINT,LPVOID,PUINT); WINUSERAPI UINT WINAPI GetRawInputDeviceInfoW(HANDLE,UINT,LPVOID,PUINT); #define GetRawInputDeviceInfo WINELIB_NAME_AW(GetRawInputDeviceInfo) WINUSERAPI UINT WINAPI GetRawInputDeviceList(PRAWINPUTDEVICELIST,PUINT,UINT); +WINUSERAPI UINT WINAPI GetRegisteredRawInputDevices(PRAWINPUTDEVICE,PUINT,UINT); WINUSERAPI BOOL WINAPI GetLayeredWindowAttributes(HWND,COLORREF*,BYTE*,DWORD*); WINUSERAPI HMENU WINAPI GetMenu(HWND); WINUSERAPI BOOL WINAPI GetMenuBarInfo(HWND,LONG,LONG,PMENUBARINFO);

1 0

Jay Yang : explorer: Use the command line arguments.
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: fd1bdb14a4eb2a055a1529b2d2abf4239da40167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd1bdb14a4eb2a055a1529b2d… Author: Jay Yang <jkelleyy(a)gmail.com> Date: Sat Jun 11 17:42:21 2011 -0400 explorer: Use the command line arguments. --- programs/explorer/explorer.c | 32 +++++++++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 1 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 91347eb..6411c16 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -160,6 +160,36 @@ static void register_explorer_window_class(void) RegisterClassExW(&window_class); } +static IShellFolder* get_starting_shell_folder(parameters_struct* params) +{ + IShellFolder* desktop,*folder; + LPITEMIDLIST root_pidl; + HRESULT hres; + + SHGetDesktopFolder(&desktop); + if(!params->root || (strlenW(params->root)==0)) + { + return desktop; + } + hres = IShellFolder_ParseDisplayName(desktop,NULL,NULL, + params->root,NULL, + &root_pidl,NULL); + + if(FAILED(hres)) + { + return desktop; + } + hres = IShellFolder_BindToObject(desktop,root_pidl,NULL, + &IID_IShellFolder, + (void**)&folder); + if(FAILED(hres)) + { + return desktop; + } + IShellFolder_Release(desktop); + return folder; +} + static int copy_path_string(LPWSTR target, LPWSTR source) { INT i = 0; @@ -290,7 +320,7 @@ int WINAPI wWinMain(HINSTANCE hinstance, ExitProcess(EXIT_FAILURE); } register_explorer_window_class(); - SHGetDesktopFolder(&folder); + folder = get_starting_shell_folder(&parameters); make_explorer_window(folder); IShellFolder_Release(folder); while(GetMessageW( &msg, NULL, 0, 0 ) != 0)

1 0

Jay Yang : explorer: Implement the explorer using IExplorerBrowser.
by Alexandre Julliard 16 Jun '11

16 Jun '11

1 0

Adam Martinson : msxml3: Create CLSID_XMLHTTP when requested.
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: 0132645ec3c08a1ac0c87ea8a1274ef3e46b3f37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0132645ec3c08a1ac0c87ea8a… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Thu Jun 16 09:17:35 2011 -0500 msxml3: Create CLSID_XMLHTTP when requested. --- dlls/msxml3/factory.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 7c39b39..d3d2692 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -272,6 +272,7 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) cf = &saxreadcf.IClassFactory_iface; } else if( IsEqualCLSID( rclsid, &CLSID_XMLHTTPRequest ) || + IsEqualCLSID( rclsid, &CLSID_XMLHTTP) || IsEqualCLSID( rclsid, &CLSID_XMLHTTP26 ) || IsEqualCLSID( rclsid, &CLSID_XMLHTTP30 ) || IsEqualCLSID( rclsid, &CLSID_XMLHTTP40 ) ||

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2011