January 2016 - Wine-Commits

Rosanne DiMesio : Fix links in help.template
by Jeremy Newman Jan. 27, 2016

Jan. 27, 2016

Module: website Branch: master Commit: 5226a86137ad81ed9e6ea1c5cd9adaff5ce4cca5 URL: http://source.winehq.org/git/website.git/?a=commit;h=5226a86137ad81ed9e6ea1… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Jan 27 10:08:55 2016 -0600 Fix links in help.template This fixes the two broken links mentioned in bug 40018 and a link to the wiki ("HowTo" is now "Wine Installation and Configuration"). Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/en/help.template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/en/help.template b/templates/en/help.template index 1358d98..ede1f77 100644 --- a/templates/en/help.template +++ b/templates/en/help.template @@ -36,9 +36,9 @@ <a href="{$root}/documentation"><img src="{$root}/images/docs.png"><br>Docs</a> </div> <div class="col-xs-10 col-md-11"> - We recommend that you read our online <a href="{$root}/site/documentation">Documentation</a> + We recommend that you read our online <a href="{$root}/documentation">Documentation</a> to find the answer to your question. Also of interest is our - <a href="https://wiki.winehq.org/HowTo">HowTo</a> which contains some useful information for + <a href="https://wiki.winehq.org/Wine_Installation_and_Configuration">Wine Installation and Configuration</a> wiki page, which contains some useful information for the first time user. </div> </div> @@ -58,10 +58,10 @@ <a href="//forums.winehq.org/"><img src="{$root}/images/forum.png"><br>Forum</a> </div> <div class="col-xs-10 col-md-11"> - We have a <a href="//forums.winehq.org/">web</a>/<a href="{$root}/site/forums">email</a> based community for + We have a <a href="//forums.winehq.org/">web</a>/<a href="{$root}/forums">email</a> based community for Wine users, which is a place that Wine users can visit to ask questions and connect with each other. - You may also wish to explore the <a href="{$root}/site/forums">mailing lists</a> + You may also wish to explore the <a href="{$root}/forums">mailing lists</a> that make up that community as well. </div> </div>

1 0

André Hentschel : wpcap: Forward pcap_strerror to msvcrt.strerror.
by Alexandre Julliard Jan. 26, 2016

Jan. 26, 2016

Module: wine Branch: master Commit: b0140f8ee22ad0f4a627f396b760e4a7833e474a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0140f8ee22ad0f4a627f396b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 25 21:52:37 2016 +0100 wpcap: Forward pcap_strerror to msvcrt.strerror. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/wpcap.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 0e1e208..66303b4 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -74,5 +74,5 @@ @ cdecl pcap_snapshot(ptr) wine_pcap_snapshot @ cdecl pcap_stats(ptr ptr) wine_pcap_stats @ stub pcap_stats_ex -@ stub pcap_strerror +@ cdecl pcap_strerror(long) msvcrt.strerror @ cdecl wsockinit() wine_wsockinit

1 0

Piotr Caban : server: Avoid infinite loop when we' re out of timers in set_win_timer server call.
by Alexandre Julliard Jan. 26, 2016

Jan. 26, 2016

Module: wine Branch: master Commit: cefdbd59b7ff189f058782021b746c33a975b5e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cefdbd59b7ff189f058782021… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 25 09:59:46 2016 +0100 server: Avoid infinite loop when we're out of timers in set_win_timer server call. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/queue.c | 12 ++++++++++-- server/trace.c | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/server/queue.c b/server/queue.c index 7fe0d03..771a2e3 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2581,13 +2581,21 @@ DECL_HANDLER(set_win_timer) } else { + lparam_t end_id = queue->next_timer_id; + /* find a free id for it */ - do + while (1) { id = queue->next_timer_id; if (--queue->next_timer_id <= 0x100) queue->next_timer_id = 0x7fff; + + if (!find_timer( queue, 0, req->msg, id )) break; + if (queue->next_timer_id == end_id) + { + set_win32_error( ERROR_NO_MORE_USER_HANDLES ); + return; + } } - while (find_timer( queue, 0, req->msg, id )); } } diff --git a/server/trace.c b/server/trace.c index 1b63894..2a3aba9 100644 --- a/server/trace.c +++ b/server/trace.c @@ -5136,6 +5136,7 @@ static const struct { "DIRECTORY_NOT_EMPTY", STATUS_DIRECTORY_NOT_EMPTY }, { "DISK_FULL", STATUS_DISK_FULL }, { "DLL_NOT_FOUND", STATUS_DLL_NOT_FOUND }, + { "ERROR_NO_MORE_USER_HANDLES", 0xc0010000 | ERROR_NO_MORE_USER_HANDLES }, { "ERROR_CLASS_ALREADY_EXISTS", 0xc0010000 | ERROR_CLASS_ALREADY_EXISTS }, { "ERROR_CLASS_DOES_NOT_EXIST", 0xc0010000 | ERROR_CLASS_DOES_NOT_EXIST }, { "ERROR_CLASS_HAS_WINDOWS", 0xc0010000 | ERROR_CLASS_HAS_WINDOWS },

1 0

Hugh McMaster : kernel32: Apply the new background colour to the active line.
by Alexandre Julliard Jan. 26, 2016

Jan. 26, 2016

Module: wine Branch: master Commit: 0311c6adb2c73fc900850a81601c4384c4d95ae1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0311c6adb2c73fc900850a816… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jan 25 21:01:01 2016 +1100 kernel32: Apply the new background colour to the active line. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/editline.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 78ea789..b436a50 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -916,6 +916,7 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) void (*func)(struct WCEL_Context* ctx); DWORD mode, input_mode, ks; int use_emacs; + CONSOLE_SCREEN_BUFFER_INFO csbi; memset(&ctx, 0, sizeof(ctx)); ctx.hConIn = hConsoleIn; @@ -994,6 +995,10 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) if (ctx.insertkey) ctx.insert = !ctx.insert; + GetConsoleScreenBufferInfo(ctx.hConOut, &csbi); + if (ctx.csbi.wAttributes != csbi.wAttributes) + ctx.csbi.wAttributes = csbi.wAttributes; + if (func) (func)(&ctx); else if (!(ir.Event.KeyEvent.dwControlKeyState & LEFT_ALT_PRESSED))

1 0

Hugh McMaster : wineconsole: Apply the selected background colour to the entire font preview dialog.
by Alexandre Julliard Jan. 26, 2016

Jan. 26, 2016

Module: wine Branch: master Commit: 969151755afa1e3889be7652c75d79c68b441250 URL: http://source.winehq.org/git/wine.git/?a=commit;h=969151755afa1e3889be7652c… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jan 25 21:01:02 2016 +1100 wineconsole: Apply the selected background colour to the entire font preview dialog. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/dialog.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/programs/wineconsole/dialog.c b/programs/wineconsole/dialog.c index 4f73a3a..cae02cb 100644 --- a/programs/wineconsole/dialog.c +++ b/programs/wineconsole/dialog.c @@ -190,12 +190,15 @@ static LRESULT WINAPI WCUSER_FontPreviewProc(HWND hWnd, UINT msg, WPARAM wParam, hFont = (HFONT)GetWindowLongPtrW(hWnd, 0); if (hFont) { + COLORREF bkcolor; WCHAR ascii[] = {'A','S','C','I','I',':',' ','a','b','c','X','Y','Z','\0'}; WCHAR buf[256]; int len; hOldFont = SelectObject(ps.hdc, hFont); - SetBkColor(ps.hdc, WCUSER_ColorMap[GetWindowLongW(GetDlgItem(di->hDlg, IDC_FNT_COLOR_BK), 0)]); + bkcolor = WCUSER_ColorMap[GetWindowLongW(GetDlgItem(di->hDlg, IDC_FNT_COLOR_BK), 0)]; + FillRect(ps.hdc, &ps.rcPaint, CreateSolidBrush(bkcolor)); + SetBkColor(ps.hdc, bkcolor); SetTextColor(ps.hdc, WCUSER_ColorMap[GetWindowLongW(GetDlgItem(di->hDlg, IDC_FNT_COLOR_FG), 0)]); len = LoadStringW(GetModuleHandleW(NULL), IDS_FNT_PREVIEW, buf, sizeof(buf) / sizeof(buf[0]));

1 0

Piotr Caban : user32: Test error returned in out of timers case.
by Alexandre Julliard Jan. 26, 2016

Jan. 26, 2016

Module: wine Branch: master Commit: 7b3c7af8134506479498df8ef343e67fd2e9d919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b3c7af8134506479498df8ef… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 25 09:59:57 2016 +0100 user32: Test error returned in out of timers case. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 7d6c99a..cdc0364 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8763,9 +8763,11 @@ static void test_timers(void) static void test_timers_no_wnd(void) { + static UINT_PTR ids[0xffff]; UINT_PTR id, id2; DWORD start; MSG msg; + int i; count = 0; id = SetTimer(NULL, 0, 100, callback_count); @@ -8800,6 +8802,18 @@ static void test_timers_no_wnd(void) count, TIMER_COUNT_EXPECTED); KillTimer(NULL, id); /* Note: SetSystemTimer doesn't support a NULL window, see test_timers */ + + /* Check what happens when we're running out of timers */ + for (i=0; i<sizeof(ids)/sizeof(ids[0]); i++) + { + SetLastError(0xdeadbeef); + ids[i] = SetTimer(NULL, 0, USER_TIMER_MAXIMUM, tfunc); + if (!ids[i]) break; + } + ok(i != sizeof(ids)/sizeof(ids[0]), "all timers were created successfully\n"); + ok(GetLastError()==ERROR_NO_MORE_USER_HANDLES || broken(GetLastError()==0xdeadbeef), + "GetLastError() = %d\n", GetLastError()); + while (i > 0) KillTimer(NULL, ids[--i]); } static void test_timers_exception(DWORD code)

1 0

Hugh McMaster : wineconsole: Apply the new background colour to the visible screen buffer.
by Alexandre Julliard Jan. 26, 2016

Jan. 26, 2016

Module: wine Branch: master Commit: 1948104cc93b545a1b2432283617ce72f21963c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1948104cc93b545a1b2432283… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jan 25 21:01:00 2016 +1100 wineconsole: Apply the new background colour to the visible screen buffer. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 729416f..f9027a4 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -441,7 +441,12 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf } if (data->curcfg.def_attr != cfg->def_attr) { + DWORD screen_size, written; + COORD top_left = {0,0}; + data->curcfg.def_attr = cfg->def_attr; + screen_size = cfg->win_width * (cfg->win_height + 1); + FillConsoleOutputAttribute(data->hConOut, cfg->def_attr, screen_size, top_left, &written); SetConsoleTextAttribute(data->hConOut, cfg->def_attr); } /* now let's look at the window / sb size changes...

1 0

Pierre Schweitzer : mpr: Add support for REG_EXPAND_SZ for providers path.
by Alexandre Julliard Jan. 26, 2016

Jan. 26, 2016

Module: wine Branch: master Commit: 80eb2fa08eb21ba9504438493fa66097ed03faf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80eb2fa08eb21ba9504438493… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Mon Jan 25 08:17:48 2016 +0100 mpr: Add support for REG_EXPAND_SZ for providers path. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 2b53f2a..01e49e7 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -133,11 +133,17 @@ static void _tryLoadProvider(PCWSTR provider) DWORD type, size = sizeof(providerPath); if (RegQueryValueExW(hKey, szProviderPath, NULL, &type, - (LPBYTE)providerPath, &size) == ERROR_SUCCESS && type == REG_SZ) + (LPBYTE)providerPath, &size) == ERROR_SUCCESS && (type == REG_SZ || type == REG_EXPAND_SZ)) { static const WCHAR szProviderName[] = { 'N','a','m','e',0 }; PWSTR name = NULL; - + + if (type == REG_EXPAND_SZ) + { + WCHAR path[MAX_PATH]; + if (ExpandEnvironmentStringsW(providerPath, path, MAX_PATH)) lstrcpyW( providerPath, path ); + } + size = 0; RegQueryValueExW(hKey, szProviderName, NULL, NULL, NULL, &size); if (size)

1 0

Nikolay Sivov : dwrite: Fix setting canWrapLineAfter cluster flag.
by Alexandre Julliard Jan. 26, 2016

Jan. 26, 2016

Module: wine Branch: master Commit: 2975ae9cbf6d07988da686f99f03b26fbd9bb925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2975ae9cbf6d07988da686f99… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 26 15:44:47 2016 +0300 dwrite: Fix setting canWrapLineAfter cluster flag. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 6 +++--- dlls/dwrite/tests/layout.c | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 27b02dc..da08b39 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -603,10 +603,10 @@ static inline void init_cluster_metrics(const struct dwrite_textlayout *layout, position = run->descr.textPosition + stop_position; if (stop_glyph == run->glyphcount) - breakcondition = get_effective_breakpoint(layout, stop_position).breakConditionAfter; + breakcondition = get_effective_breakpoint(layout, position).breakConditionAfter; else { - breakcondition = get_effective_breakpoint(layout, stop_position).breakConditionBefore; - if (stop_position) position = stop_position - 1; + breakcondition = get_effective_breakpoint(layout, position).breakConditionBefore; + if (stop_position) position -= 1; } metrics->canWrapLineAfter = breakcondition == DWRITE_BREAK_CONDITION_CAN_BREAK || diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 00da357..c04e73a 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1907,6 +1907,7 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); ok(count == 2, "got %u\n", count); ok(metrics[0].isWhitespace == 0, "got %d\n", metrics[0].isWhitespace); + ok(metrics[0].canWrapLineAfter == 0, "got %d\n", metrics[0].canWrapLineAfter); ok(metrics[1].isWhitespace == 1, "got %d\n", metrics[1].isWhitespace); ok(metrics[1].canWrapLineAfter == 1, "got %d\n", metrics[1].canWrapLineAfter); IDWriteTextLayout_Release(layout); @@ -1990,6 +1991,10 @@ todo_wine { for (i = 0; i < count; i++) { ok(metrics[i].length == 1, "%d: got %d\n", i, metrics[i].length); ok(metrics[i].isSoftHyphen == (i == count - 1), "%d: got %d\n", i, metrics[i].isSoftHyphen); + if (metrics[i].isNewline) { + ok(metrics[i].width == 0.0f, "%u: got width %f\n", i, metrics[i].width); + ok(metrics[i].canWrapLineAfter == 1, "%u: got %d\n", i, metrics[i].canWrapLineAfter); + } } IDWriteTextLayout_Release(layout);

1 0

Nikolay Sivov : dwrite: Reuse linebreaking isSoftHyphen flag for cluster metrics.
by Alexandre Julliard Jan. 26, 2016

Jan. 26, 2016

Module: wine Branch: master Commit: d171185062e89ecfb9ffb01f545ae12a37694d53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d171185062e89ecfb9ffb01f5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 26 15:44:46 2016 +0300 dwrite: Reuse linebreaking isSoftHyphen flag for cluster metrics. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 2 +- dlls/dwrite/layout.c | 5 +++-- dlls/dwrite/tests/analyzer.c | 18 ++++++++++++++++++ dlls/dwrite/tests/layout.c | 14 ++++++++------ 4 files changed, 30 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 885cd76..2eb495e 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -348,7 +348,7 @@ static HRESULT analyze_linebreaks(const WCHAR *text, UINT32 count, DWRITE_LINE_B breakpoints[i].breakConditionBefore = DWRITE_BREAK_CONDITION_CAN_BREAK; breakpoints[i].breakConditionAfter = DWRITE_BREAK_CONDITION_CAN_BREAK; breakpoints[i].isWhitespace = !!isspaceW(text[i]); - breakpoints[i].isSoftHyphen = FALSE; + breakpoints[i].isSoftHyphen = text[i] == 0x00ad /* Unicode Soft Hyphen */; breakpoints[i].padding = 0; /* LB1 - resolve some classes. TODO: use external algorithms for these classes. */ diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 241616b..27b02dc 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -612,9 +612,10 @@ static inline void init_cluster_metrics(const struct dwrite_textlayout *layout, metrics->canWrapLineAfter = breakcondition == DWRITE_BREAK_CONDITION_CAN_BREAK || breakcondition == DWRITE_BREAK_CONDITION_MUST_BREAK; if (metrics->length == 1) { - metrics->isWhitespace = get_effective_breakpoint(layout, position).isWhitespace; + DWRITE_LINE_BREAKPOINT bp = get_effective_breakpoint(layout, position); + metrics->isWhitespace = bp.isWhitespace; metrics->isNewline = FALSE /* FIXME */; - metrics->isSoftHyphen = layout->str[position] == 0x00ad /* Unicode Soft Hyphen */; + metrics->isSoftHyphen = bp.isSoftHyphen; } else { metrics->isWhitespace = FALSE; diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 1519289..fa0d7eb 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -988,6 +988,24 @@ static struct linebreaks_test linebreaks_tests[] = { { DWRITE_BREAK_CONDITION_MUST_BREAK, DWRITE_BREAK_CONDITION_CAN_BREAK, 0, 0 }, } }, + /* Soft hyphen, visible word dividers */ + { {'A',0xad,'B',0x5be,'C',0xf0b,'D',0x1361,'E',0x17d8,'F',0x17da,'G',0}, + { + { DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, 0, 0 }, + { DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, DWRITE_BREAK_CONDITION_CAN_BREAK, 0, 1 }, + { DWRITE_BREAK_CONDITION_CAN_BREAK, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, 0, 0 }, + { DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, DWRITE_BREAK_CONDITION_CAN_BREAK, 0, 0 }, + { DWRITE_BREAK_CONDITION_CAN_BREAK, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, 0, 0 }, + { DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, DWRITE_BREAK_CONDITION_CAN_BREAK, 0, 0 }, + { DWRITE_BREAK_CONDITION_CAN_BREAK, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, 0, 0 }, + { DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, DWRITE_BREAK_CONDITION_CAN_BREAK, 0, 0 }, + { DWRITE_BREAK_CONDITION_CAN_BREAK, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, 0, 0 }, + { DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, DWRITE_BREAK_CONDITION_CAN_BREAK, 0, 0 }, + { DWRITE_BREAK_CONDITION_CAN_BREAK, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, 0, 0 }, + { DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, DWRITE_BREAK_CONDITION_CAN_BREAK, 0, 0 }, + { DWRITE_BREAK_CONDITION_CAN_BREAK, DWRITE_BREAK_CONDITION_CAN_BREAK, 0, 0 }, + } + }, { { 0 } } }; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index f036633..00da357 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1666,13 +1666,13 @@ static void test_GetClusterMetrics(void) /* SP - SPACE */ 0x20 }; static const WCHAR str5W[] = {'a','\r','b','\n','c','\n','\r','d','\r','\n','e',0xb,'f',0xc, - 'g',0x0085,'h',0x2028,'i',0x2029,0}; + 'g',0x0085,'h',0x2028,'i',0x2029,0xad,0}; static const WCHAR str3W[] = {0x2066,')',')',0x661,'(',0x627,')',0}; static const WCHAR str2W[] = {0x202a,0x202c,'a',0}; static const WCHAR strW[] = {'a','b','c','d',0}; static const WCHAR str4W[] = {'a',' ',0}; DWRITE_INLINE_OBJECT_METRICS inline_metrics; - DWRITE_CLUSTER_METRICS metrics[20]; + DWRITE_CLUSTER_METRICS metrics[21]; IDWriteTextLayout1 *layout1; IDWriteInlineObject *trimm; IDWriteTextFormat *format; @@ -1955,14 +1955,14 @@ todo_wine IDWriteTextLayout_Release(layout); /* isNewline tests */ - hr = IDWriteFactory_CreateTextLayout(factory, str5W, 20, format, 100.0, 200.0, &layout); + hr = IDWriteFactory_CreateTextLayout(factory, str5W, lstrlenW(str5W), format, 100.0f, 200.0f, &layout); ok(hr == S_OK, "got 0x%08x\n", hr); count = 0; memset(metrics, 0, sizeof(metrics)); - hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics, 20, &count); + hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics, sizeof(metrics)/sizeof(metrics[0]), &count); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(count == 20, "got %u\n", count); + ok(count == 21, "got %u\n", count); todo_wine { ok(metrics[1].isNewline == 1, "got %d\n", metrics[1].isNewline); @@ -1987,8 +1987,10 @@ todo_wine { ok(metrics[16].isNewline == 0, "got %d\n", metrics[16].isNewline); ok(metrics[18].isNewline == 0, "got %d\n", metrics[18].isNewline); - for (i = 0; i < count; i++) + for (i = 0; i < count; i++) { ok(metrics[i].length == 1, "%d: got %d\n", i, metrics[i].length); + ok(metrics[i].isSoftHyphen == (i == count - 1), "%d: got %d\n", i, metrics[i].isSoftHyphen); + } IDWriteTextLayout_Release(layout);

1 0