May 2016 - Wine-Commits - list.winehq.org

Vincent Povirk : user32: Also change rcUpdate when scrolling by more than the window size.
by Alexandre Julliard May 20, 2016

May 20, 2016

Module: wine Branch: master Commit: 1383012395810e503ef5728a7ead24189e66fee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1383012395810e503ef5728a7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 19 15:17:20 2016 -0500 user32: Also change rcUpdate when scrolling by more than the window size. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 7 +++++++ dlls/user32/tests/win.c | 16 +++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 5855314..9e5bc0a 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -1501,6 +1501,13 @@ static INT scroll_window( HWND hwnd, INT dx, INT dy, const RECT *rect, const REC CombineRgn( hrgnTemp, hrgnTemp, hrgnClip, RGN_AND ); CombineRgn( hrgnUpdate, hrgnUpdate, hrgnTemp, RGN_OR ); + if (rcUpdate) + { + RECT rcTemp; + GetRgnBox( hrgnTemp, &rcTemp ); + UnionRect( rcUpdate, rcUpdate, &rcTemp ); + } + if( !bOwnRgn) CombineRgn( hrgnWinupd, hrgnWinupd, hrgnTemp, RGN_OR ); } diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 991ea66..138a6f1 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4841,11 +4841,25 @@ static void test_scrollvalidate( HWND parent) rcu.left,rcu.top,rcu.right,rcu.bottom); ReleaseDC( hwnd1, hdc); - /* test scrolling a window with an update region */ + /* test scrolling a rect by more than its size */ DestroyWindow( hwnd2); ValidateRect( hwnd1, NULL); SetRect( &rc, 40,40, 50,50); InvalidateRect( hwnd1, &rc, 1); + ScrollWindowEx( hwnd1, -20, 0, &rc, NULL, hrgn, &rcu, + SW_SCROLLCHILDREN | SW_INVALIDATE); + if (winetest_debug > 0) dump_region(hrgn); + SetRectRgn( exprgn, 20, 40, 30, 50); + SetRectRgn( tmprgn, 40, 40, 50, 50); + CombineRgn( exprgn, exprgn, tmprgn, RGN_OR); + ok( EqualRgn( exprgn, hrgn), "wrong update region\n"); + ok( rcu.left == 20 && rcu.top == 40 && rcu.right == 50 && rcu.bottom == 50, + "unexpected update rect: %d,%d - %d,%d\n", rcu.left,rcu.top,rcu.right,rcu.bottom); + + /* test scrolling a window with an update region */ + ValidateRect( hwnd1, NULL); + SetRect( &rc, 40,40, 50,50); + InvalidateRect( hwnd1, &rc, 1); GetClientRect( hwnd1, &rc); cliprc=rc; ScrollWindowEx( hwnd1, -10, 0, &rc, &cliprc, hrgn, &rcu,

1 0

Frédéric Delanoy : comctl32/tests: Fix a couple typos in ok() calls.
by Alexandre Julliard May 20, 2016

May 20, 2016

Module: wine Branch: master Commit: 778717673e6ae97ffa90b9cbb840b45bb165ed07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=778717673e6ae97ffa90b9cbb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu May 19 22:48:48 2016 +0200 comctl32/tests: Fix a couple typos in ok() calls. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/header.c | 6 +++--- dlls/comctl32/tests/toolbar.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 3dc102d..c828465 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1718,17 +1718,17 @@ static void check_orderarray(HWND hwnd, DWORD start, DWORD set, DWORD expected, order[i-1] = start>>(4*(count-i)) & 0xf; ret = SendMessageA(hwnd, HDM_SETORDERARRAY, count, (LPARAM)order); - ok_(__FILE__, line)(ret, "Expected HDM_SETORDERARAY to succeed, got %d\n", ret); + ok_(__FILE__, line)(ret, "Expected HDM_SETORDERARRAY to succeed, got %d\n", ret); /* new order */ for(i = 1; i<=count; i++) order[i-1] = set>>(4*(count-i)) & 0xf; ret = SendMessageA(hwnd, HDM_SETORDERARRAY, count, (LPARAM)order); - ok_(__FILE__, line)(ret, "Expected HDM_SETORDERARAY to succeed, got %d\n", ret); + ok_(__FILE__, line)(ret, "Expected HDM_SETORDERARRAY to succeed, got %d\n", ret); /* check actual order */ ret = SendMessageA(hwnd, HDM_GETORDERARRAY, count, (LPARAM)order); - ok_(__FILE__, line)(ret, "Expected HDM_GETORDERARAY to succeed, got %d\n", ret); + ok_(__FILE__, line)(ret, "Expected HDM_GETORDERARRAY to succeed, got %d\n", ret); for(i = 1; i<=count; i++) array |= order[i-1]<<(4*(count-i)); diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index bab746b..5e18126 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -399,7 +399,7 @@ static void basic_test(void) ok(SendMessageA(hToolbar, TB_ISBUTTONCHECKED, 1005, 0), "A6 pressed\n"); ok(!SendMessageA(hToolbar, TB_ISBUTTONCHECKED, 1004, 0), "A5 not pressed anymore\n"); - /* test for inter-group crosstalk, ie. two radio groups interfering with each other */ + /* test for inter-group crosstalk, i.e. two radio groups interfering with each other */ SendMessageA(hToolbar, TB_CHECKBUTTON, 1007, 1); /* press B2 */ ok(SendMessageA(hToolbar, TB_ISBUTTONCHECKED, 1005, 0), "A6 still pressed, no inter-group crosstalk\n"); ok(!SendMessageA(hToolbar, TB_ISBUTTONCHECKED, 1000, 0), "A1 still not pressed\n");

1 0

Henri Verbeet : kernel32/nls: Fix LOCALE_SMONTHNAME5/ LOCALE_SABBREVMONTHNAME5 for LANG_PERSIAN.
by Alexandre Julliard May 20, 2016

May 20, 2016

Module: wine Branch: master Commit: 362e6f86148f6c866dd7655450c56654443f1585 URL: http://source.winehq.org/git/wine.git/?a=commit;h=362e6f86148f6c866dd765545… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 19 18:02:48 2016 +0200 kernel32/nls: Fix LOCALE_SMONTHNAME5/LOCALE_SABBREVMONTHNAME5 for LANG_PERSIAN. ‎می may be correct for LANG_DARI though. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/far.nls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/nls/far.nls b/dlls/kernel32/nls/far.nls index 7718d50..0f5b170 100644 --- a/dlls/kernel32/nls/far.nls +++ b/dlls/kernel32/nls/far.nls @@ -77,7 +77,7 @@ STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT LOCALE_SABBREVMONTHNAME2 "فوریه" LOCALE_SABBREVMONTHNAME3 "مارس" LOCALE_SABBREVMONTHNAME4 "آوریل" - LOCALE_SABBREVMONTHNAME5 "می" + LOCALE_SABBREVMONTHNAME5 "مه" LOCALE_SABBREVMONTHNAME6 "ژوئن" LOCALE_SABBREVMONTHNAME7 "ژوئیه" LOCALE_SABBREVMONTHNAME8 "اوت" @@ -113,7 +113,7 @@ STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT LOCALE_SMONTHNAME2 "فوریه" LOCALE_SMONTHNAME3 "مارس" LOCALE_SMONTHNAME4 "آوریل" - LOCALE_SMONTHNAME5 "می" + LOCALE_SMONTHNAME5 "مه" LOCALE_SMONTHNAME6 "ژوئن" LOCALE_SMONTHNAME7 "ژوئیه" LOCALE_SMONTHNAME8 "اوت"

1 0

Henri Verbeet : kernel32/nls: Return CAL_GREGORIAN_XLIT_FRENCH for LOCALE_ICALENDARTYPE for LANG_PERSIAN.
by Alexandre Julliard May 20, 2016

May 20, 2016

Module: wine Branch: master Commit: 9a93d21681ad5318280eb693e6f7d804ffd0ae0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a93d21681ad5318280eb693e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 19 18:02:47 2016 +0200 kernel32/nls: Return CAL_GREGORIAN_XLIT_FRENCH for LOCALE_ICALENDARTYPE for LANG_PERSIAN. The (Gregorian) month names are transliterated from French. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/far.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/far.nls b/dlls/kernel32/nls/far.nls index cd1d0d8..7718d50 100644 --- a/dlls/kernel32/nls/far.nls +++ b/dlls/kernel32/nls/far.nls @@ -23,7 +23,7 @@ STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT { LOCALE_FONTSIGNATURE L"\x60af\x8000\x3848\x1000\x0008\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" - LOCALE_ICALENDARTYPE "2" + LOCALE_ICALENDARTYPE "12" LOCALE_ICENTURY "1" LOCALE_ICOUNTRY "981" LOCALE_ICURRDIGITS "2"

1 0

Henri Verbeet : kernel32/nls: Store LOCALE_SNATIVEDIGITS as UTF-8 in far.nls.
by Alexandre Julliard May 20, 2016

May 20, 2016

Module: wine Branch: master Commit: 39fdd439b3f013ca127c332bfd5268b359f47607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39fdd439b3f013ca127c332bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 19 18:02:44 2016 +0200 kernel32/nls: Store LOCALE_SNATIVEDIGITS as UTF-8 in far.nls. CP1256 can't represent these, but it's fine in UTF-8. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/far.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/far.nls b/dlls/kernel32/nls/far.nls index 652c78f..631f93b 100644 --- a/dlls/kernel32/nls/far.nls +++ b/dlls/kernel32/nls/far.nls @@ -126,7 +126,7 @@ STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT LOCALE_SNAME "fa-IR" LOCALE_SNATIVECTRYNAME "ایران" LOCALE_SNATIVECURRNAME "ریال" - LOCALE_SNATIVEDIGITS L"\x06f0\x06f1\x06f2\x06f3\x06f4\x06f5\x06f6\x06f7\x06f8\x06f9" + LOCALE_SNATIVEDIGITS "۰۱۲۳۴۵۶۷۸۹" LOCALE_SNATIVEDISPLAYNAME "فارسی (ایران)" LOCALE_SNATIVELANGNAME "فارسی" LOCALE_SNEGATIVESIGN "-"

1 0

Henri Verbeet : kernel32/nls: Use Persian punctuation for LANG_PERSIAN.
by Alexandre Julliard May 20, 2016

May 20, 2016

Module: wine Branch: master Commit: 53643d3b6030c74a88d1c2bd4d1fe7b6cfe48ec8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53643d3b6030c74a88d1c2bd4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 19 18:02:45 2016 +0200 kernel32/nls: Use Persian punctuation for LANG_PERSIAN. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/far.nls | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/nls/far.nls b/dlls/kernel32/nls/far.nls index 631f93b..114088b 100644 --- a/dlls/kernel32/nls/far.nls +++ b/dlls/kernel32/nls/far.nls @@ -96,7 +96,7 @@ STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT LOCALE_SDAYNAME5 "جمعه" LOCALE_SDAYNAME6 "شنبه" LOCALE_SDAYNAME7 "یک‌شنبه" - LOCALE_SDECIMAL "." + LOCALE_SDECIMAL "٫" LOCALE_SENGCOUNTRY "Iran" LOCALE_SENGCURRNAME "Iranian Rial" LOCALE_SENGLANGUAGE "Persian" @@ -105,9 +105,9 @@ STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT LOCALE_SISO3166CTRYNAME "IR" LOCALE_SISO639LANGNAME "fa" LOCALE_SLANGUAGE "Persian (Iran)" - LOCALE_SLIST ";" + LOCALE_SLIST "؛" LOCALE_SLONGDATE "yyyy/MM/dd" - LOCALE_SMONDECIMALSEP "/" + LOCALE_SMONDECIMALSEP "٫" LOCALE_SMONGROUPING "3;0" LOCALE_SMONTHNAME1 "ژانویه" LOCALE_SMONTHNAME2 "فوریه" @@ -122,7 +122,7 @@ STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT LOCALE_SMONTHNAME11 "نوامبر" LOCALE_SMONTHNAME12 "دسامبر" LOCALE_SMONTHNAME13 "" - LOCALE_SMONTHOUSANDSEP "," + LOCALE_SMONTHOUSANDSEP "٬" LOCALE_SNAME "fa-IR" LOCALE_SNATIVECTRYNAME "ایران" LOCALE_SNATIVECURRNAME "ریال" @@ -143,7 +143,7 @@ STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT LOCALE_SSHORTESTDAYNAME7 "ی" LOCALE_SSHORTTIME "hh:mm tt" LOCALE_SSORTNAME "Default" - LOCALE_STHOUSAND "," + LOCALE_STHOUSAND "٬" LOCALE_STIME ":" LOCALE_STIMEFORMAT "hh:mm:ss tt" LOCALE_SYEARMONTH "yyyy/MM"

1 0

Józef Kucia : d3d11/tests: Add create_buffer() helper.
by Alexandre Julliard May 20, 2016

May 20, 2016

Module: wine Branch: master Commit: 4c8f89d37d36a6e2ab6cfa1435320562e97615cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c8f89d37d36a6e2ab6cfa143… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 20 11:47:28 2016 +0200 d3d11/tests: Add create_buffer() helper. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 245 +++++++++-------------------------------------- 1 file changed, 45 insertions(+), 200 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c8f89d37d36a6e2ab6cf…

1 0

Jacek Caban : wininet: Return NULL instead of FALSE in get_proxy_autoconfig_url.
by Alexandre Julliard May 20, 2016

May 20, 2016

Module: wine Branch: master Commit: b72c2e85b45ce37ffea8980d859bf9ec12aed41b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b72c2e85b45ce37ffea8980d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 20 14:10:14 2016 +0200 wininet: Return NULL instead of FALSE in get_proxy_autoconfig_url. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index bd380dc..5c41664 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2292,12 +2292,12 @@ static WCHAR *get_proxy_autoconfig_url(void) SIZE_T len; const void *ref; - if (!settings) return FALSE; + if (!settings) return NULL; if (!(ref = CFDictionaryGetValue( settings, kCFNetworkProxiesProxyAutoConfigURLString ))) { CFRelease( settings ); - return FALSE; + return NULL; } len = CFStringGetLength( ref ); if (len)

1 0

Nikolay Sivov : dwrite: Resolve BNs and embedding and override formatting characters to preceding level.
by Alexandre Julliard May 20, 2016

May 20, 2016

Module: wine Branch: master Commit: a940ab325a543e24d1bde7a5e336400bbd1f75bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a940ab325a543e24d1bde7a5e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 20 12:50:22 2016 +0300 dwrite: Resolve BNs and embedding and override formatting characters to preceding level. Mirrors commit 71cabaa4b93f040e16519c6f8253673480995ac7. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/bidi.c | 4 ++ dlls/dwrite/tests/analyzer.c | 157 +++++++++++++++++++++++++++++++++++++------ 2 files changed, 142 insertions(+), 19 deletions(-) diff --git a/dlls/dwrite/bidi.c b/dlls/dwrite/bidi.c index 3deabfc..32c4075 100644 --- a/dlls/dwrite/bidi.c +++ b/dlls/dwrite/bidi.c @@ -946,6 +946,10 @@ static void bidi_resolve_resolved(UINT8 baselevel, const UINT8 *classes, UINT8 * levels[j--] = baselevel; levels[i] = baselevel; } + else if (classes[i] == LRE || classes[i] == RLE || classes[i] == LRO || classes[i] == RLO || + classes[i] == PDF || classes[i] == BN) { + levels[i] = i ? levels[i - 1] : baselevel; + } if (i == eos && is_rule_L1_reset_class(classes[i])) { int j = i; while (j >= sos && is_rule_L1_reset_class(classes[j])) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 90d7f6f..d008178 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -284,14 +284,22 @@ static HRESULT WINAPI analysissink_SetLineBreakpoints(IDWriteTextAnalysisSink *i return S_OK; } +#define BIDI_LEVELS_COUNT 10 +static UINT8 g_explicit_levels[BIDI_LEVELS_COUNT]; +static UINT8 g_resolved_levels[BIDI_LEVELS_COUNT]; static HRESULT WINAPI analysissink_SetBidiLevel(IDWriteTextAnalysisSink *iface, UINT32 position, UINT32 length, UINT8 explicitLevel, UINT8 resolvedLevel) { - ok(0, "unexpected\n"); - return E_NOTIMPL; + if (position + length > BIDI_LEVELS_COUNT) { + ok(0, "SetBidiLevel: reported pos=%u, len=%u overflows expected length %d\n", position, length, BIDI_LEVELS_COUNT); + return E_FAIL; + } + memset(g_explicit_levels + position, explicitLevel, length); + memset(g_resolved_levels + position, resolvedLevel, length); + return S_OK; } static HRESULT WINAPI analysissink_SetNumberSubstitution(IDWriteTextAnalysisSink *iface, @@ -345,20 +353,32 @@ static ULONG WINAPI analysissource_Release(IDWriteTextAnalysisSource *iface) return 1; } -static const WCHAR *g_source; +struct testanalysissource +{ + IDWriteTextAnalysisSource IDWriteTextAnalysisSource_iface; + const WCHAR *text; + DWRITE_READING_DIRECTION direction; +}; + +static inline struct testanalysissource *impl_from_IDWriteTextAnalysisSource(IDWriteTextAnalysisSource *iface) +{ + return CONTAINING_RECORD(iface, struct testanalysissource, IDWriteTextAnalysisSource_iface); +} static HRESULT WINAPI analysissource_GetTextAtPosition(IDWriteTextAnalysisSource *iface, UINT32 position, WCHAR const** text, UINT32* text_len) { - if (position >= lstrlenW(g_source)) + struct testanalysissource *source = impl_from_IDWriteTextAnalysisSource(iface); + + if (position >= lstrlenW(source->text)) { *text = NULL; *text_len = 0; } else { - *text = &g_source[position]; - *text_len = lstrlenW(g_source) - position; + *text = source->text + position; + *text_len = lstrlenW(source->text) - position; } return S_OK; @@ -374,8 +394,8 @@ static HRESULT WINAPI analysissource_GetTextBeforePosition(IDWriteTextAnalysisSo static DWRITE_READING_DIRECTION WINAPI analysissource_GetParagraphReadingDirection( IDWriteTextAnalysisSource *iface) { - ok(0, "unexpected\n"); - return DWRITE_READING_DIRECTION_RIGHT_TO_LEFT; + struct testanalysissource *source = impl_from_IDWriteTextAnalysisSource(iface); + return source->direction; } static HRESULT WINAPI analysissource_GetLocaleName(IDWriteTextAnalysisSource *iface, @@ -404,7 +424,7 @@ static IDWriteTextAnalysisSourceVtbl analysissourcevtbl = { analysissource_GetNumberSubstitution }; -static IDWriteTextAnalysisSource analysissource = { &analysissourcevtbl }; +static struct testanalysissource analysissource = { { &analysissourcevtbl } }; static IDWriteFontFace *create_fontface(void) { @@ -918,12 +938,12 @@ static void get_script_analysis(const WCHAR *str, DWRITE_SCRIPT_ANALYSIS *sa) IDWriteTextAnalyzer *analyzer; HRESULT hr; - g_source = str; - + analysissource.text = str; hr = IDWriteFactory_CreateTextAnalyzer(factory, &analyzer); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteTextAnalyzer_AnalyzeScript(analyzer, &analysissource, 0, lstrlenW(g_source), &analysissink2); + hr = IDWriteTextAnalyzer_AnalyzeScript(analyzer, &analysissource.IDWriteTextAnalysisSource_iface, 0, + lstrlenW(analysissource.text), &analysissink2); ok(hr == S_OK, "got 0x%08x\n", hr); *sa = g_sa; @@ -940,10 +960,11 @@ static void test_AnalyzeScript(void) while (*ptr->string) { - g_source = ptr->string; + analysissource.text = ptr->string; init_expected_sa(expected_seq, ptr); - hr = IDWriteTextAnalyzer_AnalyzeScript(analyzer, &analysissource, 0, lstrlenW(g_source), &analysissink); + hr = IDWriteTextAnalyzer_AnalyzeScript(analyzer, &analysissource.IDWriteTextAnalysisSource_iface, 0, + lstrlenW(ptr->string), &analysissink); ok(hr == S_OK, "got 0x%08x\n", hr); ok_sequence(sequences, ANALYZER_ID, expected_seq[0]->sequence, wine_dbgstr_w(ptr->string), FALSE); ptr++; @@ -1041,16 +1062,17 @@ static void test_AnalyzeLineBreakpoints(void) hr = IDWriteFactory_CreateTextAnalyzer(factory, &analyzer); ok(hr == S_OK, "got 0x%08x\n", hr); - g_source = emptyW; - hr = IDWriteTextAnalyzer_AnalyzeLineBreakpoints(analyzer, &analysissource, 0, 0, &analysissink); + analysissource.text = emptyW; + hr = IDWriteTextAnalyzer_AnalyzeLineBreakpoints(analyzer, &analysissource.IDWriteTextAnalysisSource_iface, 0, 0, + &analysissink); ok(hr == S_OK, "got 0x%08x\n", hr); while (*ptr->text) { UINT32 len; - g_source = ptr->text; - len = lstrlenW(g_source); + analysissource.text = ptr->text; + len = lstrlenW(ptr->text); if (len > BREAKPOINT_COUNT) { ok(0, "test %u: increase BREAKPOINT_COUNT to at least %u\n", i, len); @@ -1060,7 +1082,8 @@ static void test_AnalyzeLineBreakpoints(void) } memset(g_actual_bp, 0, sizeof(g_actual_bp)); - hr = IDWriteTextAnalyzer_AnalyzeLineBreakpoints(analyzer, &analysissource, 0, len, &analysissink); + hr = IDWriteTextAnalyzer_AnalyzeLineBreakpoints(analyzer, &analysissource.IDWriteTextAnalysisSource_iface, + 0, len, &analysissink); ok(hr == S_OK, "got 0x%08x\n", hr); compare_breakpoints(ptr, g_actual_bp); @@ -2130,6 +2153,101 @@ static void test_GetGdiCompatibleGlyphPlacements(void) IDWriteTextAnalyzer_Release(analyzer); } +struct bidi_test +{ + const WCHAR text[BIDI_LEVELS_COUNT]; + DWRITE_READING_DIRECTION direction; + UINT8 explicit[BIDI_LEVELS_COUNT]; + UINT8 resolved[BIDI_LEVELS_COUNT]; +}; + +static const struct bidi_test bidi_tests[] = { + { + { 0x645, 0x6cc, 0x200c, 0x6a9, 0x646, 0x645, 0 }, + DWRITE_READING_DIRECTION_RIGHT_TO_LEFT, + { 1, 1, 1, 1, 1, 1 }, + { 1, 1, 1, 1, 1, 1 } + }, + { + { 0x645, 0x6cc, 0x200c, 0x6a9, 0x646, 0x645, 0 }, + DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, + { 0, 0, 0, 0, 0, 0 }, + { 1, 1, 1, 1, 1, 1 } + }, + { + { 0x200c, 0x645, 0x6cc, 0x6a9, 0x646, 0x645, 0 }, + DWRITE_READING_DIRECTION_RIGHT_TO_LEFT, + { 1, 1, 1, 1, 1, 1 }, + { 1, 1, 1, 1, 1, 1 } + }, + { + { 0x200c, 0x645, 0x6cc, 0x6a9, 0x646, 0x645, 0 }, + DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, + { 0, 0, 0, 0, 0, 0 }, + { 0, 1, 1, 1, 1, 1 } + }, + { + { 'A', 0x200c, 'B', 0 }, + DWRITE_READING_DIRECTION_RIGHT_TO_LEFT, + { 1, 1, 1 }, + { 2, 2, 2 } + }, + { + { 'A', 0x200c, 'B', 0 }, + DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, + { 0, 0, 0 }, + { 0, 0, 0 } + }, + { + { 0 } + } +}; + +static void compare_bidi_levels(const struct bidi_test *test, UINT32 len, UINT8 *explicit, UINT8 *resolved) +{ + ok(!memcmp(explicit, test->explicit, len), "wrong explicit levels\n"); + ok(!memcmp(resolved, test->resolved, len), "wrong resolved levels\n"); +} + +static void test_AnalyzeBidi(void) +{ + const struct bidi_test *ptr = bidi_tests; + IDWriteTextAnalyzer *analyzer; + UINT32 i = 0; + HRESULT hr; + + hr = IDWriteFactory_CreateTextAnalyzer(factory, &analyzer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + while (*ptr->text) + { + UINT32 len; + + analysissource.text = ptr->text; + len = lstrlenW(ptr->text); + analysissource.direction = ptr->direction; + + if (len > BIDI_LEVELS_COUNT) { + ok(0, "test %u: increase BIDI_LEVELS_COUNT to at least %u\n", i, len); + i++; + ptr++; + continue; + } + + memset(g_explicit_levels, 0, sizeof(g_explicit_levels)); + memset(g_resolved_levels, 0, sizeof(g_resolved_levels)); + hr = IDWriteTextAnalyzer_AnalyzeBidi(analyzer, &analysissource.IDWriteTextAnalysisSource_iface, 0, + len, &analysissink); + ok(hr == S_OK, "%u: got 0x%08x\n", i, hr); + compare_bidi_levels(ptr, len, g_explicit_levels, g_resolved_levels); + + i++; + ptr++; + } + + IDWriteTextAnalyzer_Release(analyzer); +} + START_TEST(analyzer) { HRESULT hr; @@ -2147,6 +2265,7 @@ START_TEST(analyzer) test_AnalyzeScript(); test_AnalyzeLineBreakpoints(); + test_AnalyzeBidi(); test_GetScriptProperties(); test_GetTextComplexity(); test_GetGlyphs();

1 0

Nikolay Sivov : comctl32/syslink: Use wine list to keep items.
by Alexandre Julliard May 20, 2016

May 20, 2016

Module: wine Branch: master Commit: 986306cddb69dd2fd267d32b82c5d1b41a5ebec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=986306cddb69dd2fd267d32b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 20 08:04:22 2016 +0300 comctl32/syslink: Use wine list to keep items. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/syslink.c | 119 ++++++++++++++++++------------------------------ 1 file changed, 44 insertions(+), 75 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index f7655b6..08e5230 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -38,6 +38,7 @@ #include "comctl32.h" #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(syslink); @@ -61,7 +62,7 @@ typedef enum typedef struct _DOC_ITEM { - struct _DOC_ITEM *Next; /* Address to the next item */ + struct list entry; UINT nText; /* Number of characters of the text */ SL_ITEM_TYPE Type; /* type of the item */ PDOC_TEXTBLOCK Blocks; /* Array of text blocks */ @@ -86,7 +87,7 @@ typedef struct HWND Self; /* The window handle for this control */ HWND Notify; /* The parent handle to receive notifications */ DWORD Style; /* Styles for this control */ - PDOC_ITEM Items; /* Address to the first document item */ + struct list Items; /* Document items list */ BOOL HasFocus; /* Whether the control has the input focus */ int MouseDownID; /* ID of the link that the mouse button first selected */ HFONT Font; /* Handle to the font for text */ @@ -147,22 +148,15 @@ static PDOC_ITEM SYSLINK_AppendDocItem (SYSLINK_INFO *infoPtr, LPCWSTR Text, UIN return NULL; } - Item->Next = NULL; Item->nText = textlen; Item->Type = type; Item->Blocks = NULL; - - if(LastItem != NULL) - { - LastItem->Next = Item; - } - else - { - infoPtr->Items = Item; - } - lstrcpynW(Item->Text, Text, textlen + 1); - + if (LastItem) + list_add_after(&LastItem->entry, &Item->entry); + else + list_add_tail(&infoPtr->Items, &Item->entry); + return Item; } @@ -172,17 +166,13 @@ static PDOC_ITEM SYSLINK_AppendDocItem (SYSLINK_INFO *infoPtr, LPCWSTR Text, UIN */ static VOID SYSLINK_ClearDoc (SYSLINK_INFO *infoPtr) { - PDOC_ITEM Item, Next; - - Item = infoPtr->Items; - while(Item != NULL) + DOC_ITEM *Item, *Item2; + + LIST_FOR_EACH_ENTRY_SAFE(Item, Item2, &infoPtr->Items, DOC_ITEM, entry) { - Next = Item->Next; + list_remove(&Item->entry); SYSLINK_FreeDocItem(Item); - Item = Next; } - - infoPtr->Items = NULL; } /*********************************************************************** @@ -526,15 +516,12 @@ static VOID SYSLINK_RepaintLink (const SYSLINK_INFO *infoPtr, const DOC_ITEM *Do */ static PDOC_ITEM SYSLINK_GetLinkItemByIndex (const SYSLINK_INFO *infoPtr, int iLink) { - PDOC_ITEM Current = infoPtr->Items; + DOC_ITEM *Current; - while(Current != NULL) + LIST_FOR_EACH_ENTRY(Current, &infoPtr->Items, DOC_ITEM, entry) { - if((Current->Type == slLink) && (iLink-- <= 0)) - { + if ((Current->Type == slLink) && (iLink-- <= 0)) return Current; - } - Current = Current->Next; } return NULL; } @@ -545,10 +532,10 @@ static PDOC_ITEM SYSLINK_GetLinkItemByIndex (const SYSLINK_INFO *infoPtr, int iL */ static PDOC_ITEM SYSLINK_GetFocusLink (const SYSLINK_INFO *infoPtr, int *LinkId) { - PDOC_ITEM Current = infoPtr->Items; + DOC_ITEM *Current; int id = 0; - while(Current != NULL) + LIST_FOR_EACH_ENTRY(Current, &infoPtr->Items, DOC_ITEM, entry) { if(Current->Type == slLink) { @@ -560,8 +547,8 @@ static PDOC_ITEM SYSLINK_GetFocusLink (const SYSLINK_INFO *infoPtr, int *LinkId) } id++; } - Current = Current->Next; } + return NULL; } @@ -571,13 +558,13 @@ static PDOC_ITEM SYSLINK_GetFocusLink (const SYSLINK_INFO *infoPtr, int *LinkId) */ static PDOC_ITEM SYSLINK_GetNextLink (const SYSLINK_INFO *infoPtr, PDOC_ITEM Current) { - for(Current = (Current != NULL ? Current->Next : infoPtr->Items); - Current != NULL; - Current = Current->Next) + DOC_ITEM *Next; + + LIST_FOR_EACH_ENTRY(Next, Current ? &Current->entry : &infoPtr->Items, DOC_ITEM, entry) { - if(Current->Type == slLink) + if (Next->Type == slLink) { - return Current; + return Next; } } return NULL; @@ -589,38 +576,17 @@ static PDOC_ITEM SYSLINK_GetNextLink (const SYSLINK_INFO *infoPtr, PDOC_ITEM Cur */ static PDOC_ITEM SYSLINK_GetPrevLink (const SYSLINK_INFO *infoPtr, PDOC_ITEM Current) { - if(Current == NULL) - { - /* returns the last link */ - PDOC_ITEM Last = NULL; - - for(Current = infoPtr->Items; Current != NULL; Current = Current->Next) - { - if(Current->Type == slLink) - { - Last = Current; - } - } - return Last; - } - else + DOC_ITEM *Prev; + + LIST_FOR_EACH_ENTRY_REV(Prev, Current ? &Current->entry : list_tail(&infoPtr->Items), DOC_ITEM, entry) { - /* returns the previous link */ - PDOC_ITEM Cur, Prev = NULL; - - for(Cur = infoPtr->Items; Cur != NULL; Cur = Cur->Next) + if (Prev->Type == slLink) { - if(Cur == Current) - { - break; - } - if(Cur->Type == slLink) - { - Prev = Cur; - } + return Prev; } - return Prev; } + + return NULL; } /*********************************************************************** @@ -684,7 +650,7 @@ static VOID SYSLINK_Render (const SYSLINK_INFO *infoPtr, HDC hdc, PRECT pRect) GetTextMetricsW( hdc, &tm ); LineHeight = tm.tmHeight + tm.tmExternalLeading; - for(Current = infoPtr->Items; Current != NULL; Current = Current->Next) + LIST_FOR_EACH_ENTRY(Current, &infoPtr->Items, DOC_ITEM, entry) { int n, nBlocks; LPWSTR tx; @@ -861,7 +827,7 @@ static LRESULT SYSLINK_Draw (const SYSLINK_INFO *infoPtr, HDC hdc) DeleteObject(hBrush); - for(Current = infoPtr->Items; Current != NULL; Current = Current->Next) + LIST_FOR_EACH_ENTRY(Current, &infoPtr->Items, DOC_ITEM, entry) { int n; LPWSTR tx; @@ -1025,8 +991,8 @@ static LRESULT SYSLINK_SetText (SYSLINK_INFO *infoPtr, LPCWSTR Text) static PDOC_ITEM SYSLINK_SetFocusLink (const SYSLINK_INFO *infoPtr, const DOC_ITEM *DocItem) { PDOC_ITEM Current, PrevFocus = NULL; - - for(Current = infoPtr->Items; Current != NULL; Current = Current->Next) + + LIST_FOR_EACH_ENTRY(Current, &infoPtr->Items, DOC_ITEM, entry) { if(Current->Type == slLink) { @@ -1234,7 +1200,7 @@ static LRESULT SYSLINK_HitTest (const SYSLINK_INFO *infoPtr, PLHITTESTINFO HitTe PDOC_ITEM Current; int id = 0; - for(Current = infoPtr->Items; Current != NULL; Current = Current->Next) + LIST_FOR_EACH_ENTRY(Current, &infoPtr->Items, DOC_ITEM, entry) { if(Current->Type == slLink) { @@ -1383,7 +1349,7 @@ static PDOC_ITEM SYSLINK_LinkAtPt (const SYSLINK_INFO *infoPtr, const POINT *pt, PDOC_ITEM Current; int id = 0; - for(Current = infoPtr->Items; Current != NULL; Current = Current->Next) + LIST_FOR_EACH_ENTRY(Current, &infoPtr->Items, DOC_ITEM, entry) { if((Current->Type == slLink) && SYSLINK_PtInDocItem(Current, *pt) && (!MustBeEnabled || (Current->u.Link.state & LIS_ENABLED))) @@ -1749,6 +1715,9 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, return 0; case WM_CREATE: + { + CREATESTRUCTW *cs = (CREATESTRUCTW*)lParam; + /* allocate memory for info struct */ infoPtr = Alloc (sizeof(SYSLINK_INFO)); if (!infoPtr) return -1; @@ -1756,11 +1725,11 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, /* initialize the info struct */ infoPtr->Self = hwnd; - infoPtr->Notify = ((LPCREATESTRUCTW)lParam)->hwndParent; - infoPtr->Style = ((LPCREATESTRUCTW)lParam)->style; + infoPtr->Notify = cs->hwndParent; + infoPtr->Style = cs->style; infoPtr->Font = 0; infoPtr->LinkFont = 0; - infoPtr->Items = NULL; + list_init(&infoPtr->Items); infoPtr->HasFocus = FALSE; infoPtr->MouseDownID = -1; infoPtr->TextColor = comctl32_color.clrWindowText; @@ -1769,9 +1738,9 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, infoPtr->BreakChar = ' '; infoPtr->IgnoreReturn = infoPtr->Style & LWS_IGNORERETURN; TRACE("SysLink Ctrl creation, hwnd=%p\n", hwnd); - SYSLINK_SetText(infoPtr, ((LPCREATESTRUCTW)lParam)->lpszName); + SYSLINK_SetText(infoPtr, cs->lpszName); return 0; - + } case WM_DESTROY: TRACE("SysLink Ctrl destruction, hwnd=%p\n", hwnd); SYSLINK_ClearDoc(infoPtr);

1 0