January 2012 - Wine-commits

Piotr Caban : msvcp60: Fix _Lockit class implementation.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: e3174d93d8c898ea6ecd9c8d8f9bb5b9ff41b9b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3174d93d8c898ea6ecd9c8d8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 30 17:47:36 2012 +0100 msvcp60: Fix _Lockit class implementation. --- dlls/msvcp60/misc.c | 59 ++++++------------------------------------------- dlls/msvcp60/msvcp.h | 2 +- 2 files changed, 9 insertions(+), 52 deletions(-) diff --git a/dlls/msvcp60/misc.c b/dlls/msvcp60/misc.c index 94b673b..61cf4a5 100644 --- a/dlls/msvcp60/misc.c +++ b/dlls/msvcp60/misc.c @@ -89,56 +89,21 @@ void CDECL mutex_mutex_dtor(mutex *m) mutex_dtor(m); } -static CRITICAL_SECTION lockit_cs[_MAX_LOCK]; - -/* ?_Lockit_ctor(a)_Lockit@std@@SAXH(a)Z */ -void __cdecl _Lockit_init(int locktype) { - InitializeCriticalSection(&lockit_cs[locktype]); - lockit_cs[locktype].DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Lockit critical section"); -} - -/* ?_Lockit_dtor(a)_Lockit@std@@SAXH(a)Z */ -void __cdecl _Lockit_free(int locktype) -{ - lockit_cs[locktype].DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&lockit_cs[locktype]); -} +static CRITICAL_SECTION lockit_cs; void init_lockit(void) { - int i; - - for(i=0; i<_MAX_LOCK; i++) - _Lockit_init(i); + InitializeCriticalSection(&lockit_cs); + lockit_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Lockit critical section"); } void free_lockit(void) { - int i; - - for(i=0; i<_MAX_LOCK; i++) - _Lockit_free(i); + lockit_cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&lockit_cs); } -/* ?_Lockit_ctor(a)_Lockit@std@@CAXPAV12(a)H@Z */ -/* ?_Lockit_ctor(a)_Lockit@std@@CAXPEAV12(a)H@Z */ -void __cdecl _Lockit__Lockit_ctor_locktype(_Lockit *lockit, int locktype) -{ - lockit->locktype = locktype; - EnterCriticalSection(&lockit_cs[locktype]); -} - -/* ?_Lockit_ctor(a)_Lockit@std@@CAXPAV12@@Z */ -/* ?_Lockit_ctor(a)_Lockit@std@@CAXPEAV12@@Z */ -void __cdecl _Lockit__Lockit_ctor(_Lockit *lockit) -{ - _Lockit__Lockit_ctor_locktype(lockit, 0); -} - -/* ??0_Lockit(a)std@@QAE(a)H@Z */ -/* ??0_Lockit(a)std@@QEAA(a)H@Z */ -DEFINE_THISCALL_WRAPPER(_Lockit_ctor_locktype, 8) _Lockit* __thiscall _Lockit_ctor_locktype(_Lockit *this, int locktype) { - _Lockit__Lockit_ctor_locktype(this, locktype); + EnterCriticalSection(&lockit_cs); return this; } @@ -147,15 +112,7 @@ _Lockit* __thiscall _Lockit_ctor_locktype(_Lockit *this, int locktype) DEFINE_THISCALL_WRAPPER(_Lockit_ctor, 4) _Lockit* __thiscall _Lockit_ctor(_Lockit *this) { - _Lockit__Lockit_ctor_locktype(this, 0); - return this; -} - -/* ?_Lockit_dtor(a)_Lockit@std@@CAXPAV12@@Z */ -/* ?_Lockit_dtor(a)_Lockit@std@@CAXPEAV12@@Z */ -void __cdecl _Lockit__Lockit_dtor(_Lockit *lockit) -{ - LeaveCriticalSection(&lockit_cs[lockit->locktype]); + return _Lockit_ctor_locktype(this, 0); } /* ??1_Lockit(a)std@@QAE(a)XZ */ @@ -163,7 +120,7 @@ void __cdecl _Lockit__Lockit_dtor(_Lockit *lockit) DEFINE_THISCALL_WRAPPER(_Lockit_dtor, 4) void __thiscall _Lockit_dtor(_Lockit *this) { - _Lockit__Lockit_dtor(this); + LeaveCriticalSection(&lockit_cs); } /* wctype */ diff --git a/dlls/msvcp60/msvcp.h b/dlls/msvcp60/msvcp.h index ed31419..ef6f864 100644 --- a/dlls/msvcp60/msvcp.h +++ b/dlls/msvcp60/msvcp.h @@ -256,7 +256,7 @@ void __thiscall locale_dtor(locale*); /* class _Lockit */ typedef struct { - int locktype; + char empty_struct; } _Lockit; #define _LOCK_LOCALE 0

1 0

Andrew Eikum : mmdevapi: Correctly convert UINT32 to LONG32.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: 5860a5b386a5d3c0acbe0d5e59f94e8a259cb490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5860a5b386a5d3c0acbe0d5e5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 30 11:04:17 2012 -0600 mmdevapi: Correctly convert UINT32 to LONG32. --- dlls/winealsa.drv/mmdevdrv.c | 2 +- dlls/wineoss.drv/mmdevdrv.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index ba29fde..0bedcc5 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -117,7 +117,7 @@ struct ACImpl { HANDLE timer; BYTE *local_buffer, *tmp_buffer; - long getbuf_last; /* <0 when using tmp_buffer */ + LONG32 getbuf_last; /* <0 when using tmp_buffer */ CRITICAL_SECTION lock; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 650c46d..22ee924 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -121,7 +121,7 @@ struct ACImpl { BYTE *local_buffer, *tmp_buffer; int buf_state; - long getbuf_last; /* <0 when using tmp_buffer */ + LONG32 getbuf_last; /* <0 when using tmp_buffer */ HANDLE timer; CRITICAL_SECTION lock;

1 0

Thomas Faber : comctl32: Fix MSVC build in imagelist.c.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: 2fb139ffe750e57942acd78e8ec915ee0d40e531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb139ffe750e57942acd78e8… Author: Thomas Faber <thfabba(a)gmx.de> Date: Mon Jan 30 18:26:43 2012 +0100 comctl32: Fix MSVC build in imagelist.c. --- dlls/comctl32/imagelist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index ccc594f..28e2968 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3094,7 +3094,7 @@ static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count) if ((ilc >= ILC_COLOR4 && ilc <= ILC_COLOR32) || ilc == ILC_COLOR) { - char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + char buffer[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)]; BITMAPINFO *bmi = (BITMAPINFO *)buffer; TRACE("Creating DIBSection %d x %d, %d Bits per Pixel\n",

1 0

Piotr Caban : urlmon: Fix debug message in canonicalize_scheme.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: 01947e08dabd0cb9305ba845cb381de9d4a6d32c URL: http://source.winehq.org/git/wine.git/?a=commit;h=01947e08dabd0cb9305ba845c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 30 18:36:53 2012 +0100 urlmon: Fix debug message in canonicalize_scheme. --- dlls/urlmon/uri.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 1e25952..4cefaa0 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3301,7 +3301,7 @@ static BOOL canonicalize_scheme(const parse_data *data, Uri *uri, DWORD flags, B uri->scheme_start = pos; TRACE("(%p %p %x): Canonicalized scheme=%s, len=%d.\n", data, uri, flags, - debugstr_wn(uri->canon_uri, uri->scheme_len), data->scheme_len); + debugstr_wn(uri->canon_uri+uri->scheme_start, data->scheme_len), data->scheme_len); } /* This happens in both computation modes. */

1 0

Alexandre Julliard : wordpad: Use virtkeys for all accelerators.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: 974e27e6faf9843824b9e4721399eb32089b8363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=974e27e6faf9843824b9e4721… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 30 12:13:43 2012 +0100 wordpad: Use virtkeys for all accelerators. --- po/ar.po | 78 +++++++++--------------------------- po/bg.po | 78 +++++++++--------------------------- po/ca.po | 80 +++++++++---------------------------- po/cs.po | 79 +++++++++---------------------------- po/da.po | 83 +++++++++----------------------------- po/de.po | 87 ++++++++++------------------------------ po/el.po | 78 +++++++++--------------------------- po/en.po | 80 +++++++++---------------------------- po/en_US.po | 92 ++++++++++++------------------------------- po/eo.po | 78 +++++++++--------------------------- po/es.po | 82 +++++++++----------------------------- po/fa.po | 78 +++++++++--------------------------- po/fi.po | 78 +++++++++--------------------------- po/fr.po | 92 ++++++++++++------------------------------- po/he.po | 81 +++++++++----------------------------- po/hi.po | 78 +++++++++--------------------------- po/hu.po | 79 +++++++++---------------------------- po/it.po | 82 ++++++++++---------------------------- po/ja.po | 83 +++++++++----------------------------- po/ko.po | 92 ++++++++++++------------------------------- po/lt.po | 92 ++++++++++++------------------------------- po/ml.po | 78 +++++++++--------------------------- po/nb_NO.po | 83 +++++++++----------------------------- po/nl.po | 87 ++++++++++------------------------------ po/or.po | 78 +++++++++--------------------------- po/pa.po | 78 +++++++++--------------------------- po/pl.po | 92 ++++++++++++------------------------------- po/pt_BR.po | 87 ++++++++++------------------------------ po/pt_PT.po | 80 +++++++++---------------------------- po/rm.po | 78 +++++++++--------------------------- po/ro.po | 83 +++++++++----------------------------- po/ru.po | 83 +++++++++----------------------------- po/sk.po | 78 +++++++++--------------------------- po/sl.po | 85 ++++++++++------------------------------ po/sr_RS(a)cyrillic.po | 80 +++++++++---------------------------- po/sr_RS(a)latin.po | 80 +++++++++---------------------------- po/sv.po | 83 +++++++++----------------------------- po/te.po | 78 +++++++++--------------------------- po/th.po | 78 +++++++++--------------------------- po/tr.po | 78 +++++++++--------------------------- po/uk.po | 79 +++++++++---------------------------- po/wa.po | 78 +++++++++--------------------------- po/wine.pot | 78 +++++++++--------------------------- po/zh_CN.po | 78 +++++++++--------------------------- po/zh_TW.po | 78 +++++++++--------------------------- programs/wordpad/wordpad.rc | 34 ++++++++-------- 46 files changed, 931 insertions(+), 2771 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=974e27e6faf9843824b9e…

1 0

Alexandre Julliard : regedit: Use virtkeys for all accelerators.
by Alexandre Julliard 30 Jan '12

30 Jan '12

1 0

Aric Stewart : user32: Check return code from ScriptStringAnalyse.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: 4bc418b3568ebc8000976674ac069124147396e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bc418b3568ebc8000976674a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 30 07:30:00 2012 -0600 user32: Check return code from ScriptStringAnalyse. --- dlls/user32/edit.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 81cb6cc..ab58145 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -403,6 +403,7 @@ static SCRIPT_STRING_ANALYSIS EDIT_UpdateUniscribeData_linedef(EDITSTATE *es, HD HFONT old_font = NULL; HDC udc = dc; SCRIPT_TABDEF tabdef; + HRESULT hr; if (!udc) udc = GetDC(es->hwndSelf); @@ -414,7 +415,15 @@ static SCRIPT_STRING_ANALYSIS EDIT_UpdateUniscribeData_linedef(EDITSTATE *es, HD tabdef.pTabStops = es->tabs; tabdef.iTabOrigin = 0; - ScriptStringAnalyse(udc, &es->text[index], line_def->net_length, (1.5*line_def->net_length+16), -1, SSA_LINK|SSA_FALLBACK|SSA_GLYPHS|SSA_TAB, -1, NULL, NULL, NULL, &tabdef, NULL, &line_def->ssa); + hr = ScriptStringAnalyse(udc, &es->text[index], line_def->net_length, + (1.5*line_def->net_length+16), -1, + SSA_LINK|SSA_FALLBACK|SSA_GLYPHS|SSA_TAB, -1, + NULL, NULL, NULL, &tabdef, NULL, &line_def->ssa); + if (FAILED(hr)) + { + WARN("ScriptStringAnalyse failed (%x)\n",hr); + line_def->ssa = NULL; + } if (es->font) SelectObject(udc, old_font);

1 0

Aric Stewart : user32: Have a fallback in linebreaking if uniscribe fails to analyse a string.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: 1967fae847abff72ac1ccd415a15ec11b5af6527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1967fae847abff72ac1ccd415… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 30 07:30:12 2012 -0600 user32: Have a fallback in linebreaking if uniscribe fails to analyse a string. --- dlls/user32/edit.c | 39 ++++++++++++++++++++++++--------------- 1 files changed, 24 insertions(+), 15 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index ab58145..ab87418 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -598,9 +598,13 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta const SIZE *sz; EDIT_InvalidateUniscribeData_linedef(current_line); EDIT_UpdateUniscribeData_linedef(es, NULL, current_line); - sz = ScriptString_pSize(current_line->ssa); - /* Calculate line width */ - current_line->width = sz->cx; + if (current_line->ssa) + { + sz = ScriptString_pSize(current_line->ssa); + /* Calculate line width */ + current_line->width = sz->cx; + } + else current_line->width = es->char_width * current_line->net_length; } else current_line->width = 0; @@ -644,18 +648,23 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta EDIT_InvalidateUniscribeData_linedef(current_line); EDIT_UpdateUniscribeData_linedef(es, NULL, current_line); - count = ScriptString_pcOutChars(current_line->ssa); - piDx = HeapAlloc(GetProcessHeap(),0,sizeof(INT) * (*count)); - ScriptStringGetLogicalWidths(current_line->ssa,piDx); - - prev = current_line->net_length-1; - do { - current_line->width -= piDx[prev]; - prev--; - } while ( prev > 0 && current_line->width > fw); - if (prev<=0) - prev = 1; - HeapFree(GetProcessHeap(),0,piDx); + if (current_line->ssa) + { + count = ScriptString_pcOutChars(current_line->ssa); + piDx = HeapAlloc(GetProcessHeap(),0,sizeof(INT) * (*count)); + ScriptStringGetLogicalWidths(current_line->ssa,piDx); + + prev = current_line->net_length-1; + do { + current_line->width -= piDx[prev]; + prev--; + } while ( prev > 0 && current_line->width > fw); + if (prev<=0) + prev = 1; + HeapFree(GetProcessHeap(),0,piDx); + } + else + prev = (fw / es->char_width); } /* If the first line we are calculating, wrapped before istart, we must

1 0

Aric Stewart : usp10: pwLogClust is ordered so its max will be on one end.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: 2ab625bf2f0a17134d30ea42e4b66314713b95fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ab625bf2f0a17134d30ea42e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 30 07:30:05 2012 -0600 usp10: pwLogClust is ordered so its max will be on one end. --- dlls/usp10/usp10.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 3c1887a..ef8a7ac 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -2309,16 +2309,14 @@ static inline int get_cluster_size(const WORD *pwLogClust, int cChars, int item, static inline int get_glyph_cluster_advance(const int* piAdvance, const SCRIPT_VISATTR *pva, const WORD *pwLogClust, int cGlyphs, int cChars, int glyph, int direction) { int advance; - int log_clust_max = 0; - int i; + int log_clust_max; advance = piAdvance[glyph]; - for (i = 0; i < cChars; i++) - { - if (pwLogClust[i] > log_clust_max) - log_clust_max = pwLogClust[i]; - } + if (pwLogClust[0] > pwLogClust[cChars-1]) + log_clust_max = pwLogClust[0]; + else + log_clust_max = pwLogClust[cChars-1]; if (glyph > log_clust_max) return advance;

1 0

Aric Stewart : usp10: Use a bsearch function to find a glyph in the LogClust array.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: 4df4929198696161e1daf7ee006997e425654a15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4df4929198696161e1daf7ee0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 30 07:30:08 2012 -0600 usp10: Use a bsearch function to find a glyph in the LogClust array. --- dlls/usp10/opentype.c | 7 +++- dlls/usp10/shape.c | 60 +++++++++++++++++------------------------- dlls/usp10/usp10.c | 52 +++++++++++++++++++++++++++++++++--- dlls/usp10/usp10_internal.h | 2 + 4 files changed, 78 insertions(+), 43 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index c30d513..3c0af41 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -438,9 +438,12 @@ void OpenType_GDEF_UpdateGlyphProps(HDC hdc, ScriptCache *psc, const WORD *pwGly int char_count = 0; int k; - for (k = 0; k < cChars; k++) - if (pwLogClust[k] == i) + k = USP10_FindGlyphInLogClust(pwLogClust, cChars, i); + if (k >= 0) + { + for (; k < cChars && pwLogClust[k] == i; k++) char_count++; + } class = GDEF_get_glyph_class(psc->GDEF_Table, pwGlyphs[i]); diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index a893f7e..5ba6e6f 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -2359,13 +2359,11 @@ static void ShapeCharGlyphProp_Default( HDC hdc, ScriptCache* psc, SCRIPT_ANALYS int char_index[20]; int char_count = 0; - for (k = 0; k < cChars; k++) + k = USP10_FindGlyphInLogClust(pwLogClust, cChars, i); + if (k>=0) { - if (pwLogClust[k] == i) - { - char_index[char_count] = k; - char_count++; - } + for (; k < cChars && pwLogClust[k] == i; k++) + char_index[char_count++] = k; } if (char_count == 0) @@ -2425,13 +2423,11 @@ static void ShapeCharGlyphProp_Arabic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSI int char_count = 0; BOOL isInit, isFinal; - for (k = 0; k < cChars; k++) + k = USP10_FindGlyphInLogClust(pwLogClust, cChars, i); + if (k>=0) { - if (pwLogClust[k] == i) - { - char_index[char_count] = k; - char_count++; - } + for (; k < cChars && pwLogClust[k] == i; k++) + char_index[char_count++] = k; } isInit = (i == initGlyph || (i+dirR > 0 && i+dirR < cGlyphs && spaces[i+dirR])); @@ -2534,13 +2530,11 @@ static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS int char_index[20]; int char_count = 0; - for (k = 0; k < cChars; k++) + k = USP10_FindGlyphInLogClust(pwLogClust, cChars, i); + if (k>=0) { - if (pwLogClust[k] == i) - { - char_index[char_count] = k; - char_count++; - } + for (; k < cChars && pwLogClust[k] == i; k++) + char_index[char_count++] = k; } if (char_count == 0) @@ -2581,13 +2575,11 @@ static void ShapeCharGlyphProp_None( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS* int char_index[20]; int char_count = 0; - for (k = 0; k < cChars; k++) + k = USP10_FindGlyphInLogClust(pwLogClust, cChars, i); + if (k>=0) { - if (pwLogClust[k] == i) - { - char_index[char_count] = k; - char_count++; - } + for (; k < cChars && pwLogClust[k] == i; k++) + char_index[char_count++] = k; } if (char_count == 0) @@ -2614,13 +2606,11 @@ static void ShapeCharGlyphProp_Tibet( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS int char_index[20]; int char_count = 0; - for (k = 0; k < cChars; k++) + k = USP10_FindGlyphInLogClust(pwLogClust, cChars, i); + if (k>=0) { - if (pwLogClust[k] == i) - { - char_index[char_count] = k; - char_count++; - } + for (; k < cChars && pwLogClust[k] == i; k++) + char_index[char_count++] = k; } if (char_count == 0) @@ -2658,13 +2648,11 @@ static void ShapeCharGlyphProp_BaseIndic( HDC hdc, ScriptCache *psc, SCRIPT_ANAL int char_index[20]; int char_count = 0; - for (k = 0; k < cChars; k++) + k = USP10_FindGlyphInLogClust(pwLogClust, cChars, i); + if (k>=0) { - if (pwLogClust[k] == i) - { - char_index[char_count] = k; - char_count++; - } + for (; k < cChars && pwLogClust[k] == i; k++) + char_index[char_count++] = k; } if (override_gsub) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index ef8a7ac..beecce9 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -25,6 +25,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" @@ -703,6 +704,11 @@ typedef struct { int* logical2visual; } StringAnalysis; +typedef struct { + BOOL ascending; + WORD target; +} FindGlyph_struct; + static inline void *heap_alloc(SIZE_T size) { return HeapAlloc(GetProcessHeap(), 0, size); @@ -881,6 +887,46 @@ static WORD get_char_script( LPCWSTR str, INT index, INT end, INT *consumed) return SCRIPT_UNDEFINED; } +static int compare_FindGlyph(const void *a, const void* b) +{ + const FindGlyph_struct *find = (FindGlyph_struct*)a; + const WORD *idx= (WORD*)b; + int rc = 0; + + if ( find->target > *idx) + rc = 1; + else if (find->target < *idx) + rc = -1; + + if (!find->ascending) + rc *= -1; + return rc; +} + +int USP10_FindGlyphInLogClust(const WORD* pwLogClust, int cChars, WORD target) +{ + FindGlyph_struct fgs; + WORD *ptr; + INT k; + + if (pwLogClust[0] < pwLogClust[cChars-1]) + fgs.ascending = TRUE; + else + fgs.ascending = FALSE; + + fgs.target = target; + ptr = bsearch(&fgs, pwLogClust, cChars, sizeof(WORD), compare_FindGlyph); + + if (!ptr) + return -1; + + for (k = (ptr - pwLogClust)-1; k >= 0 && pwLogClust[k] == target; k--) + ; + k++; + + return k; +} + /*********************************************************************** * DllMain * @@ -1873,13 +1919,9 @@ error: static inline BOOL does_glyph_start_cluster(const SCRIPT_VISATTR *pva, const WORD *pwLogClust, int cChars, int glyph, int direction) { - int i; - if (pva[glyph].fClusterStart) return TRUE; - for (i = 0; i < cChars; i++) - if (pwLogClust[i] == glyph) break; - if (i != cChars) + if (USP10_FindGlyphInLogClust(pwLogClust, cChars, glyph) >= 0) return TRUE; return FALSE; diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 02beaf6..558eb55 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -204,6 +204,8 @@ typedef void (*reorder_function)(LPWSTR pwChar, IndicSyllable *syllable, lexical #define BIDI_WEAK 2 #define BIDI_NEUTRAL 0 +int USP10_FindGlyphInLogClust(const WORD* pwLogClust, int cChars, WORD target) DECLSPEC_HIDDEN; + BOOL BIDI_DetermineLevels( LPCWSTR lpString, INT uCount, const SCRIPT_STATE *s, const SCRIPT_CONTROL *c, WORD *lpOutLevels ) DECLSPEC_HIDDEN; BOOL BIDI_GetStrengths(LPCWSTR lpString, INT uCount, const SCRIPT_CONTROL *c,

1 0