February 2016 - Wine-Commits

Alexandre Julliard : Wine release 1.9.4
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: website Branch: master Commit: 71f016f9ef45db60c6f7e4bb19eaf2d636e2cc40 URL: http://source.winehq.org/git/website.git/?a=commit;h=71f016f9ef45db60c6f7e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 19 23:56:31 2016 +0900 Wine release 1.9.4 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016021901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2016021901.xml b/news/en/2016021901.xml new file mode 100644 index 0000000..1882eda --- /dev/null +++ b/news/en/2016021901.xml @@ -0,0 +1,16 @@ +<news> +<date>February 19, 2016</date> +<title>Wine 1.9.4 Released</title> +<body> + The Wine development release 1.9.4 is now available. + <a href="{$root}/announce/1.9.4">What's new</a> in this release: +<ul> + <li>Support for color glyphs and font fallbacks in DirectWrite.</li> + <li>Improvements to the WebServices reader.</li> + <li>Support for more formats in Direct3D 11.</li> + <li>Simplified syntax and clean up of tests marked todo.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.4.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.9.4 : Alexandre Julliard : Release 1.9.4
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: refs/tags/wine-1.9.4 Tag: 76bf0852f246e2ae69d050f5036fd12b224c96c1 URL: http://source.winehq.org/git/wine.git/?a=tag;h=76bf0852f246e2ae69d050f5036f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 19 23:54:19 2016 +0900 Release 1.9.4

1 0

Alexandre Julliard : Release 1.9.4.
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: c26284168ccf53e657bdfbedffd4ef13698688c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c26284168ccf53e657bdfbedf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 19 23:54:19 2016 +0900 Release 1.9.4. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 899 +++++++++++++++++++++++++++++++++++--------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 523 insertions(+), 396 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c26284168ccf53e657bdf…

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: d2680d69f6ccdceb859b05a2c1cc076511baea8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2680d69f6ccdceb859b05a2c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Feb 19 23:14:15 2016 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 64 ++++++++++++++++------------------------------------------------ 1 file changed, 16 insertions(+), 48 deletions(-) diff --git a/po/ja.po b/po/ja.po index 849d712..b9b5ab6 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-11-22 13:05+0900\n" +"PO-Revision-Date: 2016-02-19 21:25+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -1044,7 +1044,7 @@ msgstr "フォルダの選択" #: comdlg32.rc:148 msgid "Font size has to be a number." -msgstr "" +msgstr "フォントサイズは数値で指定してください。" #: comdlg32.rc:83 oleview.rc:98 msgid "Ready" @@ -11555,90 +11555,61 @@ msgid "The operation completed successfully\n" msgstr "操作は正常に完了しました\n" #: reg.rc:35 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid key name\n" -msgstr "エラー: キー名が無効です\n" +msgstr "reg: キー名が無効です\n" #: reg.rc:36 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "reg: Invalid command line parameters\n" -msgstr "エラー: コマンドライン引数が無効です\n" +msgstr "reg: コマンドライン引数が無効です\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to access remote machine\n" msgid "reg: Unable to access remote machine\n" -msgstr "エラー: リモートマシンにアクセスできませんでした\n" +msgstr "reg: リモートマシンにアクセスできませんでした\n" #: reg.rc:38 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "" "reg: The system was unable to find the specified registry key or value\n" -msgstr "エラー: システムは指定されたキーまたは値を見つけられませんでした\n" +msgstr "reg: システムは指定されたキーまたは値を見つけられませんでした\n" #: reg.rc:39 -#, fuzzy -#| msgid "Error: Unsupported type\n" msgid "reg: Unsupported registry data type [%1]\n" -msgstr "エラー: サポートされていない種類です\n" +msgstr "reg: サポートされていないレジストリのデータ型 [%1]\n" #: reg.rc:40 -#, fuzzy -#| msgid "" -#| "uninstaller: The option '--remove' must be followed by an application " -#| "GUID\n" msgid "reg: The option [/d] must be followed by a valid integer\n" -msgstr "" -"uninstaller: --remove オプションはアプリケーション GUID の指定が必要です\n" +msgstr "reg: /d オプションのあとに正しい整数値を指定してください\n" #: reg.rc:41 -#, fuzzy -#| msgid "" -#| "uninstaller: The option '--remove' must be followed by an application " -#| "GUID\n" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" -msgstr "" -"uninstaller: --remove オプションはアプリケーション GUID の指定が必要です\n" +msgstr "reg: /d オプションのあとに正しい16進数値を指定してください\n" #: reg.rc:42 msgid "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" -msgstr "" +msgstr "reg: 取り扱えないレジストリのデータ型 [/t 0x%1!x!, /d %2]\n" #: reg.rc:43 -#, fuzzy -#| msgid "The specified file already exists. Do you want to replace it?" msgid "The registry value '%1' already exists. Do you want to overwrite it?" -msgstr "指定した名前はすでに存在します。ファイルを置き換えますか?" +msgstr "レジストリ値 '%1' はすでに存在します。上書きしますか?" #: reg.rc:47 msgid "The registry operation was cancelled\n" -msgstr "" +msgstr "レジストリ操作は取り消されました\n" #: reg.rc:48 regedit.rc:204 msgid "(Default)" msgstr "(既定)" #: reg.rc:49 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "これらの値を削除しますか?" +msgstr "本当にレジストリ値 '%1' を削除しますか?" #: reg.rc:50 -#, fuzzy -#| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "本当に '%s'を削除しますか?" +msgstr "本当に '%1' にあるすべてのレジストリ値を削除しますか?" #: reg.rc:51 -#, fuzzy -#| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" -msgstr "'%1' を削除しますか?" +msgstr "本当にレジストリキー '%1' を削除しますか?" #: regedit.rc:34 msgid "&Registry" @@ -13771,13 +13742,10 @@ msgid "Configuration error" msgstr "構成エラー" #: wineconsole.rc:42 -#, fuzzy -#| msgid "Screen buffer size must be greater or equal to the window's one" msgid "" "The size of the screen buffer must be greater than or equal to the size of " "the window." -msgstr "" -"スクリーンバッファサイズはウィンドウバッファサイズ以上にしてください" +msgstr "スクリーンバッファのサイズはウィンドウのサイズ以上にしてください" #: wineconsole.rc:37 msgid "Each character is %1!u! pixels wide and %2!u! pixels high"

1 0

Joachim Priesner : comctl32: Treeview: Set visible = TRUE when deleting first visible item.
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: 71a4ac73e29a5fe05d73bb4ddfba579be500a195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71a4ac73e29a5fe05d73bb4dd… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Sun Feb 14 21:58:14 2016 +0100 comctl32: Treeview: Set visible = TRUE when deleting first visible item. This fixes a crash when deleting the first visible item if it has visibleOrder < 0 and thus the ISVISIBLE macro returns false (this happens when both insertion and deletion happened while bRedraw == false). Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 6 +++--- dlls/comctl32/treeview.c | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index bd030d6..7e6c731 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1910,6 +1910,9 @@ static void test_delete_items(void) /* Regression test for a crash when deleting the first visible item while bRedraw == false. */ hTree = create_treeview_control(0); + ret = SendMessageA(hTree, WM_SETREDRAW, FALSE, 0); + ok(ret == 0, "got %d\n", ret); + ins.hParent = TVI_ROOT; ins.hInsertAfter = TVI_ROOT; U(ins).item.mask = TVIF_TEXT; @@ -1924,9 +1927,6 @@ static void test_delete_items(void) hItem2 = TreeView_InsertItemA(hTree, &ins); ok(hItem2 != NULL, "InsertItem failed\n"); - ret = SendMessageA(hTree, WM_SETREDRAW, FALSE, 0); - ok(ret == 0, "got %d\n", ret); - ret = SendMessageA(hTree, TVM_DELETEITEM, 0, (LPARAM)hItem1); ok(ret == TRUE, "got %d\n", ret); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 5938b29..ae17413 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1545,6 +1545,7 @@ TREEVIEW_DeleteItem(TREEVIEW_INFO *infoPtr, HTREEITEM item) if (infoPtr->firstVisible == item) { + visible = TRUE; if (item->nextSibling) newFirstVisible = item->nextSibling; else if (item->prevSibling)

1 0

Alistair Leslie-Hughes : gdi32/tests: Check values returned from GetPath.
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: 9ac1744b8020b258885e35653eb51984ce78718f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ac1744b8020b258885e35653… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 18 17:54:09 2016 +1100 gdi32/tests: Check values returned from GetPath. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 6804a96..f464720 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3361,6 +3361,41 @@ static void test_emf_polybezier(void) DeleteEnhMetaFile(hemf); } +static const unsigned char EMF_PATH_BITS[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xe6, 0xff, 0xff, 0xff, 0xe6, 0xff, 0xff, 0xff, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0xf8, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0xd3, 0x03, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x03, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, + 0xd3, 0xf3, 0x03, 0x00, 0x3b, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, + 0x32, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, + 0x96, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, 0x00, + 0x96, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, 0x00, + 0x32, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, + 0x32, 0x00, 0x00, 0x00, 0x2b, 0x00, 0x00, 0x00, + 0x18, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, + 0x13, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 +}; + static void test_emf_GetPath(void) { HDC hdcMetafile; @@ -3383,14 +3418,21 @@ static void test_emf_GetPath(void) ok( ret, "LineTo error %d.\n", GetLastError()); ret = LineTo(hdcMetafile, 50, 50); ok( ret, "LineTo error %d.\n", GetLastError()); + Rectangle(hdcMetafile, 10, 10, 20, 20); EndPath(hdcMetafile); size = GetPath(hdcMetafile, NULL, NULL, 0); - todo_wine ok( size == 5, "GetPath returned %d.\n", size); + todo_wine ok( size == 9, "GetPath returned %d.\n", size); hemf = CloseEnhMetaFile(hdcMetafile); ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError()); + if (compare_emf_bits(hemf, EMF_PATH_BITS, sizeof(EMF_PATH_BITS), "test_emf_GetPath", FALSE) != 0) + { + dump_emf_bits(hemf, "test_emf_GetPath"); + dump_emf_records(hemf, "test_emf_GetPath"); + } + DeleteEnhMetaFile(hemf); }

1 0

Charles Davis : winemac.drv: Actually make the GL context current even if no drawables were given.
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: 02416314ab6fb7238b28f0047089adfee4a52abd URL: http://source.winehq.org/git/wine.git/?a=commit;h=02416314ab6fb7238b28f0047… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Feb 18 17:40:54 2016 -0700 winemac.drv: Actually make the GL context current even if no drawables were given. The spec for GL_ARB_framebuffer_object (and thus, OpenGL 3.x and up) is quite clear on what happens when a context is made current with no drawable(s). In fact, the WGL_ARB_create_context extension amends WGL_ARB_make_current_read (as well as the base spec for wglMakeCurrent) specifically to allow this. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_opengl.m | 3 +++ dlls/winemac.drv/opengl.c | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index ec2b191..4694dfd 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -235,7 +235,10 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) } if (context) + { [context removeFromViews:YES]; + [context makeCurrentContext]; + } } [pool release]; diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index ab79a82..f0c7048 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -3057,7 +3057,13 @@ static BOOL macdrv_wglMakeContextCurrentARB(HDC draw_hdc, HDC read_hdc, struct w return TRUE; } - if ((hwnd = WindowFromDC(draw_hdc))) + if (!draw_hdc && !read_hdc) + { + context->draw_hwnd = NULL; + context->draw_view = NULL; + context->draw_pbuffer = NULL; + } + else if ((hwnd = WindowFromDC(draw_hdc))) { if (!(data = get_win_data(hwnd))) {

1 0

Nikolay Sivov : dwrite: Fix Unknown/Common/ Inherited script categories handling.
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: 7dd90faaa3061609a806feeba9858d02b7ff8a61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dd90faaa3061609a806feeba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 19 01:56:18 2016 +0300 dwrite: Fix Unknown/Common/Inherited script categories handling. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 50 +++-- dlls/dwrite/scripts.c | 446 ++++++++++++++++++++++++++------------------- dlls/dwrite/tests/layout.c | 3 +- tools/make_unicode | 15 +- 4 files changed, 299 insertions(+), 215 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7dd90faaa3061609a806f…

1 0

Nikolay Sivov : dwrite: Make SetBidiLevel() calls relative to initial text source position.
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: 6992f86591f36ff6f5fc2e708778506385070bea URL: http://source.winehq.org/git/wine.git/?a=commit;h=6992f86591f36ff6f5fc2e708… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 19 01:56:17 2016 +0300 dwrite: Make SetBidiLevel() calls relative to initial text source position. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 891ace4..9dc9df3 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -244,19 +244,19 @@ static inline UINT16 get_char_script(WCHAR c) return script; } -static HRESULT analyze_script(const WCHAR *text, UINT32 position, UINT32 len, IDWriteTextAnalysisSink *sink) +static HRESULT analyze_script(const WCHAR *text, UINT32 position, UINT32 length, IDWriteTextAnalysisSink *sink) { DWRITE_SCRIPT_ANALYSIS sa; - UINT32 pos, i, length; + UINT32 pos, i, seq_length; - if (!len) return S_OK; + if (!length) return S_OK; sa.script = get_char_script(*text); pos = position; - length = 1; + seq_length = 1; - for (i = 1; i < len; i++) + for (i = 1; i < length; i++) { UINT16 script = get_char_script(text[i]); @@ -264,24 +264,24 @@ static HRESULT analyze_script(const WCHAR *text, UINT32 position, UINT32 len, ID if (sa.script == Script_Unknown) sa.script = script; if (script == Script_Unknown && sa.script != Script_Common) script = sa.script; /* this is a length of a sequence to be reported next */ - if (sa.script == script) length++; + if (sa.script == script) seq_length++; if (sa.script != script) { HRESULT hr; sa.shapes = sa.script != Script_Common ? DWRITE_SCRIPT_SHAPES_DEFAULT : DWRITE_SCRIPT_SHAPES_NO_VISUAL; - hr = IDWriteTextAnalysisSink_SetScriptAnalysis(sink, pos, length, &sa); + hr = IDWriteTextAnalysisSink_SetScriptAnalysis(sink, pos, seq_length, &sa); if (FAILED(hr)) return hr; pos = position + i; - length = 1; + seq_length = 1; sa.script = script; } } - /* 1 length case or normal completion call */ + /* one char length case or normal completion call */ sa.shapes = sa.script != Script_Common ? DWRITE_SCRIPT_SHAPES_DEFAULT : DWRITE_SCRIPT_SHAPES_NO_VISUAL; - return IDWriteTextAnalysisSink_SetScriptAnalysis(sink, pos, length, &sa); + return IDWriteTextAnalysisSink_SetScriptAnalysis(sink, pos, seq_length, &sa); } struct linebreaking_state { @@ -793,14 +793,14 @@ static HRESULT WINAPI dwritetextanalyzer_AnalyzeBidi(IDWriteTextAnalyzer2 *iface { UINT8 *levels = NULL, *explicit = NULL; UINT8 baselevel, level, explicit_level; + UINT32 pos, i, seq_length; WCHAR *buff = NULL; const WCHAR *text; - UINT32 pos, i; HRESULT hr; TRACE("(%p %u %u %p)\n", source, position, length, sink); - if (length == 0) + if (!length) return S_OK; hr = get_text_source_ptr(source, position, length, &text, &buff); @@ -822,20 +822,25 @@ static HRESULT WINAPI dwritetextanalyzer_AnalyzeBidi(IDWriteTextAnalyzer2 *iface level = levels[0]; explicit_level = explicit[0]; - pos = 0; + pos = position; + seq_length = 1; + for (i = 1; i < length; i++) { - if (levels[i] != level || explicit[i] != explicit_level) { - hr = IDWriteTextAnalysisSink_SetBidiLevel(sink, pos, i - pos, explicit_level, level); + if (levels[i] == level && explicit[i] == explicit_level) + seq_length++; + else { + hr = IDWriteTextAnalysisSink_SetBidiLevel(sink, pos, seq_length, explicit_level, level); if (FAILED(hr)) - break; + goto done; + + pos += seq_length; + seq_length = 1; level = levels[i]; explicit_level = explicit[i]; - pos = i; } - - if (i == length - 1) - hr = IDWriteTextAnalysisSink_SetBidiLevel(sink, pos, length - pos, explicit_level, level); } + /* one char length case or normal completion call */ + hr = IDWriteTextAnalysisSink_SetBidiLevel(sink, pos, seq_length, explicit_level, level); done: heap_free(explicit);

1 0

Nikolay Sivov : kernel32/tests: Additional test for GetStringTypeW() and Zl/Zp categories.
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: 10caa6295c2e9e80eba6f376dda863a6f0bd360a URL: http://source.winehq.org/git/wine.git/?a=commit;h=10caa6295c2e9e80eba6f376d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 19 01:39:07 2016 +0300 kernel32/tests: Additional test for GetStringTypeW() and Zl/Zp categories. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 0117a39..57dc418 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3667,8 +3667,8 @@ static void test_GetStringTypeW(void) static const WCHAR space_special[] = {0x09, 0x0d, 0x85}; WORD types[20]; + WCHAR ch[2]; BOOL ret; - WCHAR ch; int i; /* NULL src */ @@ -3743,19 +3743,27 @@ static void test_GetStringTypeW(void) ok(types[i] & C1_SPACE || broken(types[i] == C1_CNTRL) || broken(types[i] == 0), "incorrect types returned for %x -> (%x does not have %x)\n",space_special[i], types[i], C1_SPACE ); /* surrogate pairs */ - ch = 0xd800; + ch[0] = 0xd800; memset(types, 0, sizeof(types)); - GetStringTypeW(CT_CTYPE3, &ch, 1, types); + GetStringTypeW(CT_CTYPE3, ch, 1, types); if (types[0] == C3_NOTAPPLICABLE) win_skip("C3_HIGHSURROGATE/C3_LOWSURROGATE are not supported.\n"); else { ok(types[0] == C3_HIGHSURROGATE, "got %x\n", types[0]); - ch = 0xdc00; + ch[0] = 0xdc00; memset(types, 0, sizeof(types)); - GetStringTypeW(CT_CTYPE3, &ch, 1, types); + GetStringTypeW(CT_CTYPE3, ch, 1, types); ok(types[0] == C3_LOWSURROGATE, "got %x\n", types[0]); } + + /* Zl, Zp categories */ + ch[0] = 0x2028; + ch[1] = 0x2029; + memset(types, 0, sizeof(types)); + GetStringTypeW(CT_CTYPE1, ch, 2, types); + ok(types[0] == (C1_DEFINED|C1_SPACE), "got %x\n", types[0]); + ok(types[1] == (C1_DEFINED|C1_SPACE), "got %x\n", types[1]); } static void test_IdnToNameprepUnicode(void)

1 0