June 2015 - Wine-Commits - list.winehq.org

Iván Matellanes : msvcirt: Add implementation of streambuf::pbackfail.
by Alexandre Julliard June 29, 2015

June 29, 2015

Module: wine Branch: master Commit: 6cca77bf2a9b26fc0496876699b0f9b75d8e28bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cca77bf2a9b26fc049687669… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jun 29 10:01:48 2015 +0200 msvcirt: Add implementation of streambuf::pbackfail. --- dlls/msvcirt/msvcirt.c | 6 ++++-- dlls/msvcirt/tests/msvcirt.c | 27 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 66858de..70e92e7 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -367,8 +367,10 @@ int __thiscall streambuf_overflow(streambuf *this, int c) DEFINE_THISCALL_WRAPPER(streambuf_pbackfail, 8) int __thiscall streambuf_pbackfail(streambuf *this, int c) { - FIXME("(%p %d): stub\n", this, c); - return 0; + TRACE("(%p %d)\n", this, c); + if (this->gptr <= this->eback) + return EOF; + return *--this->gptr = c; } /* ?seekoff(a)streambuf@@UAEJJW4seek_dir(a)ios@@H(a)Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 42c0e3a..eca0304 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -57,6 +57,7 @@ static void (*__thiscall p_streambuf_clrclock)(streambuf*); static int (*__thiscall p_streambuf_doallocate)(streambuf*); static void (*__thiscall p_streambuf_gbump)(streambuf*, int); static void (*__thiscall p_streambuf_lock)(streambuf*); +static int (*__thiscall p_streambuf_pbackfail)(streambuf*, int); static void (*__thiscall p_streambuf_pbump)(streambuf*, int); static int (*__thiscall p_streambuf_sbumpc)(streambuf*); static void (*__thiscall p_streambuf_setb)(streambuf*, char*, char*, int); @@ -148,6 +149,7 @@ static BOOL init(void) SET(p_streambuf_doallocate, "?doallocate(a)streambuf@@MEAAHXZ"); SET(p_streambuf_gbump, "?gbump(a)streambuf@@IEAAXH(a)Z"); SET(p_streambuf_lock, "?lock(a)streambuf@@QEAAXXZ"); + SET(p_streambuf_pbackfail, "?pbackfail(a)streambuf@@UEAAHH(a)Z"); SET(p_streambuf_pbump, "?pbump(a)streambuf@@IEAAXH(a)Z"); SET(p_streambuf_sbumpc, "?sbumpc(a)streambuf@@QEAAHXZ"); SET(p_streambuf_setb, "?setb(a)streambuf@@IEAAXPEAD0H(a)Z"); @@ -170,6 +172,7 @@ static BOOL init(void) SET(p_streambuf_doallocate, "?doallocate(a)streambuf@@MAEHXZ"); SET(p_streambuf_gbump, "?gbump(a)streambuf@@IAEXH(a)Z"); SET(p_streambuf_lock, "?lock(a)streambuf@@QAEXXZ"); + SET(p_streambuf_pbackfail, "?pbackfail(a)streambuf@@UAEHH(a)Z"); SET(p_streambuf_pbump, "?pbump(a)streambuf@@IAEXH(a)Z"); SET(p_streambuf_sbumpc, "?sbumpc(a)streambuf@@QAEHXZ"); SET(p_streambuf_setb, "?setb(a)streambuf@@IAEXPAD0H(a)Z"); @@ -689,6 +692,30 @@ static void test_streambuf(void) ok(sb3.stored_char == EOF, "wrong stored character, expected EOF got %c\n", sb3.stored_char); ok(underflow_count == 57, "no call to underflow expected\n"); + /* pbackfail */ + ret = (int) call_func2(p_streambuf_pbackfail, &sb, 'A'); + ok(ret == 'A', "expected 'A' got '%c'\n", ret); + ok(sb.gptr == sb.eback + 2, "wrong get pointer, expected %p got %p\n", sb.eback + 2, sb.gptr); + ok(*sb.gptr == 'A', "expected 'A' in the get area, got %c\n", *sb.gptr); + ret = (int) call_func2(p_streambuf_pbackfail, &sb, EOF); + ok(ret == EOF, "expected EOF got '%c'\n", ret); + ok(sb.gptr == sb.eback + 1, "wrong get pointer, expected %p got %p\n", sb.eback + 1, sb.gptr); + ok(*sb.gptr == EOF, "expected EOF in the get area, got %c\n", *sb.gptr); + sb.gptr = sb.eback; + ret = (int) call_func2(p_streambuf_pbackfail, &sb, 'Z'); + ok(ret == EOF, "expected EOF got '%c'\n", ret); + ok(sb.gptr == sb.eback, "wrong get pointer, expected %p got %p\n", sb.eback, sb.gptr); + ok(*sb.gptr == 'T', "expected 'T' in the get area, got %c\n", *sb.gptr); + ret = (int) call_func2(p_streambuf_pbackfail, &sb, EOF); + ok(ret == EOF, "expected EOF got '%c'\n", ret); + ok(sb.gptr == sb.eback, "wrong get pointer, expected %p got %p\n", sb.eback, sb.gptr); + ok(*sb.gptr == 'T', "expected 'T' in the get area, got %c\n", *sb.gptr); + sb2.gptr = sb2.egptr + 1; + ret = (int) call_func2(p_streambuf_pbackfail, &sb2, 'X'); + ok(ret == 'X', "expected 'X' got '%c'\n", ret); + ok(sb2.gptr == sb2.egptr, "wrong get pointer, expected %p got %p\n", sb2.egptr, sb2.gptr); + ok(*sb2.gptr == 'X', "expected 'X' in the get area, got %c\n", *sb2.gptr); + SetEvent(lock_arg.test[3]); WaitForSingleObject(thread, INFINITE);

1 0

Nikolay Sivov : qmgr: Fix WINHTTP_OPTION_CONTEXT_VALUE data pointer ( Coverity).
by Alexandre Julliard June 29, 2015

June 29, 2015

Module: wine Branch: master Commit: c3e4dff9f7cb8aaab6c1bb3cfcc17408ddff4cdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3e4dff9f7cb8aaab6c1bb3cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 27 10:50:01 2015 +0300 qmgr: Fix WINHTTP_OPTION_CONTEXT_VALUE data pointer (Coverity). --- dlls/qmgr/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index c132c7e..4dccbfd 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -378,7 +378,7 @@ static BOOL transfer_file_http(BackgroundCopyFileImpl *file, URL_COMPONENTSW *uc if (!(ses = WinHttpOpen(NULL, 0, NULL, NULL, WINHTTP_FLAG_ASYNC))) return FALSE; WinHttpSetStatusCallback(ses, progress_callback_http, WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS, 0); - if (!WinHttpSetOption(ses, WINHTTP_OPTION_CONTEXT_VALUE, file, sizeof(file))) goto done; + if (!WinHttpSetOption(ses, WINHTTP_OPTION_CONTEXT_VALUE, &file, sizeof(file))) goto done; if (!(con = WinHttpConnect(ses, uc->lpszHostName, uc->nPort, 0))) goto done; if (!(req = WinHttpOpenRequest(con, NULL, uc->lpszUrlPath, NULL, NULL, NULL, flags))) goto done;

1 0

Ken Thomases : dbghelp: Don' t parse the DWARF info from Mach-O files if we were requested to only provide public symbols.
by Alexandre Julliard June 29, 2015

June 29, 2015

Module: wine Branch: master Commit: 70565f1b8bd789412aad46743a6c3f9cab95f03f URL: http://source.winehq.org/git/wine.git/?a=commit;h=70565f1b8bd789412aad46743… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Jun 28 20:45:10 2015 -0500 dbghelp: Don't parse the DWARF info from Mach-O files if we were requested to only provide public symbols. This now works more like how the ELF and PE support works. --- dlls/dbghelp/macho_module.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index f39b4b6..6be0018 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1002,9 +1002,12 @@ BOOL macho_load_debug_info(struct module* module) macho_finish_stabs(module, &mdi.ht_symtab); - if (dwarf2_parse(module, module->reloc_delta, NULL /* FIXME: some thunks to deal with ? */, - &module->format_info[DFI_MACHO]->u.macho_info->file_map)) - ret = TRUE; + if (!(dbghelp_options & SYMOPT_PUBLICS_ONLY)) + { + if (dwarf2_parse(module, module->reloc_delta, NULL /* FIXME: some thunks to deal with ? */, + &module->format_info[DFI_MACHO]->u.macho_info->file_map)) + ret = TRUE; + } pool_destroy(&mdi.pool); return ret;

1 0

Ken Thomases : dbghelp: Fix mapping of DWARF register numbers on x86 OS X.
by Alexandre Julliard June 29, 2015

June 29, 2015

Module: wine Branch: master Commit: 83c1255f660e13ee07d1529a7ef0dde7820ad808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83c1255f660e13ee07d1529a7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Jun 28 20:45:09 2015 -0500 dbghelp: Fix mapping of DWARF register numbers on x86 OS X. For backward compatibility with old, buggy GCC, Apple uses a different register numbering scheme for the eh_frame section. See, for reference, the comments near the top of this file from LLDB's source: https://github.com/llvm-mirror/lldb/blob/release_36/source/Plugins/Process/… --- dlls/dbghelp/cpu_arm.c | 2 +- dlls/dbghelp/cpu_arm64.c | 2 +- dlls/dbghelp/cpu_i386.c | 15 ++++++++++++--- dlls/dbghelp/cpu_ppc.c | 2 +- dlls/dbghelp/cpu_x86_64.c | 2 +- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/dwarf.c | 34 +++++++++++++++++----------------- 7 files changed, 34 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83c1255f660e13ee07d15…

1 0

Michael Müller : kernel32: Implement GetNumaProcessorNode.
by Alexandre Julliard June 29, 2015

June 29, 2015

Module: wine Branch: master Commit: d0ae2b0d3d9689b682a76821bf3737eb934ec131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0ae2b0d3d9689b682a76821b… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Jun 29 06:27:34 2015 +0200 kernel32: Implement GetNumaProcessorNode. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 21 +++++++++++++++++++++ dlls/kernel32/tests/process.c | 2 +- include/winbase.h | 1 + 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 0070c98..3c40975 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -746,7 +746,7 @@ @ stdcall GetNumaNodeProcessorMask(long ptr) # @ stub GetNumaNodeProcessorMaskEx # @ stub GetNumaProcessorMap -# @ stub GetNumaProcessorNode +@ stdcall GetNumaProcessorNode(long ptr) # @ stub GetNumaProcessorNodeEx # @ stub GetNumaProximityNode # @ stub GetNumaProximityNodeEx diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 2c8074b..1cd6e47 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3957,6 +3957,27 @@ BOOL WINAPI GetNumaAvailableMemoryNode(UCHAR node, PULONGLONG available_bytes) return FALSE; } +/*********************************************************************** + * GetNumaProcessorNode (KERNEL32.@) + */ +BOOL WINAPI GetNumaProcessorNode(UCHAR processor, PUCHAR node) +{ + SYSTEM_INFO si; + + TRACE("(%d, %p)\n", processor, node); + + GetSystemInfo( &si ); + if (processor < si.dwNumberOfProcessors) + { + *node = 0; + return TRUE; + } + + *node = 0xFF; + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; +} + /********************************************************************** * GetProcessDEPPolicy (KERNEL32.@) */ diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index b4a435b..4145dce 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2704,7 +2704,7 @@ static void test_GetNumaProcessorNode(void) if (!pGetNumaProcessorNode) { - skip("GetNumaProcessorNode is missing\n"); + win_skip("GetNumaProcessorNode is missing\n"); return; } diff --git a/include/winbase.h b/include/winbase.h index cc1081e..a1859b0 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2052,6 +2052,7 @@ WINBASEAPI BOOL WINAPI GetNamedPipeHandleStateW(HANDLE,LPDWORD,LPDWORD,LP #define GetNamedPipeHandleState WINELIB_NAME_AW(GetNamedPipeHandleState) WINBASEAPI BOOL WINAPI GetNamedPipeInfo(HANDLE,LPDWORD,LPDWORD,LPDWORD,LPDWORD); WINBASEAPI VOID WINAPI GetNativeSystemInfo(LPSYSTEM_INFO); +WINBASEAPI BOOL WINAPI GetNumaProcessorNode(UCHAR,PUCHAR); WINADVAPI BOOL WINAPI GetNumberOfEventLogRecords(HANDLE,PDWORD); WINADVAPI BOOL WINAPI GetOldestEventLogRecord(HANDLE,PDWORD); WINBASEAPI BOOL WINAPI GetOverlappedResult(HANDLE,LPOVERLAPPED,LPDWORD,BOOL);

1 0

Sebastian Lackner : msvcrt: Set *end to NULL when strtod is called with NULL pointer string.
by Alexandre Julliard June 29, 2015

June 29, 2015

Module: wine Branch: master Commit: abbb361733f8d266132144f391d2d3d7a6a65d4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=abbb361733f8d266132144f39… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jun 29 03:42:34 2015 +0200 msvcrt: Set *end to NULL when strtod is called with NULL pointer string. --- dlls/msvcrt/string.c | 7 +++++-- dlls/msvcrt/tests/string.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index fdeb4e0..980d492 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -317,8 +317,11 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale if(err) *err = 0; - else - if(!MSVCRT_CHECK_PMT(str != NULL)) return 0; + else if(!MSVCRT_CHECK_PMT(str != NULL)) { + if (end) + *end = NULL; + return 0; + } if(!locale) locinfo = get_locinfo(); diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index e8cafc8..5768c0f 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1694,7 +1694,7 @@ static void test__strtod(void) d = strtod(NULL, &end); ok(almost_equal(d, 0.0), "d = %lf\n", d); ok(errno == EINVAL, "errno = %x\n", errno); - todo_wine ok(!end, "incorrect end ptr %p\n", end); + ok(!end, "incorrect end ptr %p\n", end); errno = EBADF; d = p__strtod_l(NULL, NULL, NULL);

1 0

Thomas Faber : shell32/tests: Do not leak shell folder references.
by Alexandre Julliard June 29, 2015

June 29, 2015

Module: wine Branch: master Commit: 9353a36d8fc8bb400bc2227914db0f2e60a19c24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9353a36d8fc8bb400bc222791… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Jun 26 20:43:22 2015 +0200 shell32/tests: Do not leak shell folder references. --- dlls/shell32/tests/shfldr_special.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index cfb31be..8f97347 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -77,6 +77,7 @@ static void test_parse_for_entire_network(void) attr = ~0; hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, entire_network_path, &eaten, &pidl, &attr); + IShellFolder_Release(psfDesktop); if (hr == HRESULT_FROM_WIN32(ERROR_BAD_NET_NAME) || hr == HRESULT_FROM_WIN32(ERROR_NO_NET_OR_BAD_PATH) || hr == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER)) @@ -125,6 +126,7 @@ static void test_parse_for_control_panel(void) "Unexpected attributes : %08x\n", attr); ILFree(pidl); + IShellFolder_Release(psfDesktop); } static void test_printers_folder(void)

1 0

Nikolay Sivov : dwrite: Clip range length to text length when updating breakpoints.
by Alexandre Julliard June 29, 2015

June 29, 2015

Module: wine Branch: master Commit: 1002119a6082a8bce118bec4190d0b54c99778de URL: http://source.winehq.org/git/wine.git/?a=commit;h=1002119a6082a8bce118bec41… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 29 12:52:04 2015 +0300 dwrite: Clip range length to text length when updating breakpoints. --- dlls/dwrite/layout.c | 25 +++++++++++++------------ dlls/dwrite/tests/layout.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 9f3b9c4..3863e5c 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -423,12 +423,21 @@ static inline DWRITE_BREAK_CONDITION override_break_condition(DWRITE_BREAK_CONDI return existingbreak; } +/* This helper should be used to get effective range length, in other words it returns number of text + positions from range starting point to the end of the range, limited by layout text length */ +static inline UINT32 get_clipped_range_length(const struct dwrite_textlayout *layout, const struct layout_range *range) +{ + if (range->h.range.startPosition + range->h.range.length <= layout->len) + return range->h.range.length; + return layout->len - range->h.range.startPosition; +} + /* Actual breakpoint data gets updated with break condition required by inline object set for range 'cur'. */ static HRESULT layout_update_breakpoints_range(struct dwrite_textlayout *layout, const struct layout_range *cur) { DWRITE_BREAK_CONDITION before, after; + UINT32 i, length; HRESULT hr; - UINT32 i; /* ignore returned conditions if failed */ hr = IDWriteInlineObject_GetBreakConditions(cur->object, &before, &after); @@ -442,7 +451,8 @@ static HRESULT layout_update_breakpoints_range(struct dwrite_textlayout *layout, memcpy(layout->actual_breakpoints, layout->nominal_breakpoints, sizeof(DWRITE_LINE_BREAKPOINT)*layout->len); } - for (i = cur->h.range.startPosition; i < cur->h.range.length + cur->h.range.startPosition; i++) { + length = get_clipped_range_length(layout, cur); + for (i = cur->h.range.startPosition; i < length + cur->h.range.startPosition; i++) { /* for first codepoint check if there's anything before it and update accordingly */ if (i == cur->h.range.startPosition) { if (i > 0) @@ -453,7 +463,7 @@ static HRESULT layout_update_breakpoints_range(struct dwrite_textlayout *layout, layout->actual_breakpoints[i].breakConditionAfter = DWRITE_BREAK_CONDITION_MAY_NOT_BREAK; } /* similar check for last codepoint */ - else if (i == cur->h.range.startPosition + cur->h.range.length - 1) { + else if (i == cur->h.range.startPosition + length - 1) { if (i == layout->len - 1) layout->actual_breakpoints[i].breakConditionAfter = after; else @@ -568,15 +578,6 @@ static void layout_set_cluster_metrics(struct dwrite_textlayout *layout, const s } } -/* This helper should be used to get effective range length, in other words it returns number of text - positions from range starting point to the end of the range, limited by layout text length */ -static inline UINT32 get_clipped_range_length(const struct dwrite_textlayout *layout, const struct layout_range *range) -{ - if (range->h.range.startPosition + range->h.range.length <= layout->len) - return range->h.range.length; - return layout->len - range->h.range.startPosition; -} - static inline FLOAT get_scaled_font_metric(UINT32 metric, FLOAT emSize, const DWRITE_FONT_METRICS *metrics) { return (FLOAT)metric * emSize / (FLOAT)metrics->designUnitsPerEm; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index ecf4183..c7ca5b7 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -591,6 +591,13 @@ static HRESULT WINAPI testinlineobj_GetBreakConditions(IDWriteInlineObject *ifac return 0x8feacafe; } +static HRESULT WINAPI testinlineobj2_GetBreakConditions(IDWriteInlineObject *iface, DWRITE_BREAK_CONDITION *before, + DWRITE_BREAK_CONDITION *after) +{ + *before = *after = DWRITE_BREAK_CONDITION_MAY_NOT_BREAK; + return S_OK; +} + static IDWriteInlineObjectVtbl testinlineobjvtbl = { testinlineobj_QI, testinlineobj_AddRef, @@ -601,8 +608,19 @@ static IDWriteInlineObjectVtbl testinlineobjvtbl = { testinlineobj_GetBreakConditions }; +static IDWriteInlineObjectVtbl testinlineobjvtbl2 = { + testinlineobj_QI, + testinlineobj_AddRef, + testinlineobj_Release, + testinlineobj_Draw, + testinlineobj_GetMetrics, + testinlineobj_GetOverhangMetrics, + testinlineobj2_GetBreakConditions +}; + static IDWriteInlineObject testinlineobj = { &testinlineobjvtbl }; static IDWriteInlineObject testinlineobj2 = { &testinlineobjvtbl }; +static IDWriteInlineObject testinlineobj3 = { &testinlineobjvtbl2 }; static HRESULT WINAPI testeffect_QI(IUnknown *iface, REFIID riid, void **obj) { @@ -1728,6 +1746,26 @@ todo_wine ok(count == 2, "got %u\n", count); ok(metrics[0].isWhitespace == 0, "got %d\n", metrics[0].isWhitespace); 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); + + /* layout is fully covered by inline object with after condition DWRITE_BREAK_CONDITION_MAY_NOT_BREAK */ + hr = IDWriteFactory_CreateTextLayout(factory, str4W, 2, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + range.startPosition = 0; + range.length = ~0u; + hr = IDWriteTextLayout_SetInlineObject(layout, &testinlineobj3, range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 0; + memset(metrics, 0, sizeof(metrics)); + hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics, 2, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 1, "got %u\n", count); +todo_wine + ok(metrics[0].canWrapLineAfter == 1, "got %d\n", metrics[0].canWrapLineAfter); + IDWriteTextLayout_Release(layout); IDWriteInlineObject_Release(trimm);

1 0

Nikolay Sivov : dwrite: Fix number of clusters effective run is built on.
by Alexandre Julliard June 29, 2015

June 29, 2015

Module: wine Branch: master Commit: 9c54176f5c34c211cb26235789e471cfb515fd36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c54176f5c34c211cb2623578… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 29 12:51:43 2015 +0300 dwrite: Fix number of clusters effective run is built on. --- dlls/dwrite/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 2fe1c41..9f3b9c4 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1131,7 +1131,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) last_cluster = i ? i - 1 : i; if (i >= start) { - hr = layout_add_effective_run(layout, run, start, i - start + 1, line, origin_x, s[0]); + hr = layout_add_effective_run(layout, run, start, last_cluster - start + 1, line, origin_x, s[0]); if (FAILED(hr)) return hr; /* we don't need to update origin for next run as we're going to wrap */

1 0

Iván Matellanes : msvcirt: Add implementation of streambuf::sputbackc.
by Alexandre Julliard June 29, 2015

June 29, 2015

Module: wine Branch: master Commit: 56f150b1c47c9781275b01543fd78fdffac273d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56f150b1c47c9781275b01543… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jun 29 10:01:53 2015 +0200 msvcirt: Add implementation of streambuf::sputbackc. --- dlls/msvcirt/msvcirt.c | 10 ++++++++++ dlls/msvcirt/msvcirt.spec | 4 ++-- dlls/msvcrt20/msvcrt20.spec | 4 ++-- dlls/msvcrt40/msvcrt40.spec | 4 ++-- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 70e92e7..a56fd61 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -365,6 +365,7 @@ int __thiscall streambuf_overflow(streambuf *this, int c) /* ?pbackfail(a)streambuf@@UAEHH(a)Z */ /* ?pbackfail(a)streambuf@@UEAAHH(a)Z */ DEFINE_THISCALL_WRAPPER(streambuf_pbackfail, 8) +#define call_streambuf_pbackfail(this, c) CALL_VTBL_FUNC(this, 36, int, (streambuf*, int), (this, c)) int __thiscall streambuf_pbackfail(streambuf *this, int c) { TRACE("(%p %d)\n", this, c); @@ -657,6 +658,15 @@ void __thiscall streambuf_stossc(streambuf *this) } } +/* ?sputbackc(a)streambuf@@QAEHD(a)Z */ +/* ?sputbackc(a)streambuf@@QEAAHD(a)Z */ +DEFINE_THISCALL_WRAPPER(streambuf_sputbackc, 8) +int __thiscall streambuf_sputbackc(streambuf *this, char ch) +{ + TRACE("(%p %d)\n", this, ch); + return call_streambuf_pbackfail(this, ch); +} + /****************************************************************** * ??1ios@@UAE(a)XZ (MSVCRTI.@) * class ios & __thiscall ios::-ios<<(void) diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index 913f186..f14821e 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -702,8 +702,8 @@ # @ extern ?sh_write(a)filebuf@@2HB # static int const filebuf::sh_write @ thiscall -arch=win32 ?snextc(a)streambuf@@QAEHXZ(ptr) streambuf_snextc @ cdecl -arch=win64 ?snextc(a)streambuf@@QEAAHXZ(ptr) streambuf_snextc -@ stub -arch=win32 ?sputbackc(a)streambuf@@QAEHD(a)Z # int __thiscall streambuf::sputbackc(char) -@ stub -arch=win64 ?sputbackc(a)streambuf@@QEAAHD(a)Z +@ thiscall -arch=win32 ?sputbackc(a)streambuf@@QAEHD(a)Z(ptr long) streambuf_sputbackc +@ cdecl -arch=win64 ?sputbackc(a)streambuf@@QEAAHD(a)Z(ptr long) streambuf_sputbackc @ thiscall -arch=win32 ?sputc(a)streambuf@@QAEHH(a)Z(ptr long) streambuf_sputc @ cdecl -arch=win64 ?sputc(a)streambuf@@QEAAHH(a)Z(ptr long) streambuf_sputc @ thiscall -arch=win32 ?sputn(a)streambuf@@QAEHPBDH(a)Z(ptr str long) streambuf_sputn diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index f37d876..c7dd035 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -690,8 +690,8 @@ # @ extern ?sh_write(a)filebuf@@2HB @ thiscall -arch=win32 ?snextc(a)streambuf@@QAEHXZ(ptr) msvcirt.?snextc(a)streambuf@@QAEHXZ @ cdecl -arch=win64 ?snextc(a)streambuf@@QEAAHXZ(ptr) msvcirt.?snextc(a)streambuf@@QEAAHXZ -@ stub -arch=win32 ?sputbackc(a)streambuf@@QAEHD(a)Z -@ stub -arch=win64 ?sputbackc(a)streambuf@@QEAAHD(a)Z +@ thiscall -arch=win32 ?sputbackc(a)streambuf@@QAEHD(a)Z(ptr long) msvcirt.?sputbackc(a)streambuf@@QAEHD(a)Z +@ cdecl -arch=win64 ?sputbackc(a)streambuf@@QEAAHD(a)Z(ptr long) msvcirt.?sputbackc(a)streambuf@@QEAAHD(a)Z @ thiscall -arch=win32 ?sputc(a)streambuf@@QAEHH(a)Z(ptr long) msvcirt.?sputc(a)streambuf@@QAEHH(a)Z @ cdecl -arch=win64 ?sputc(a)streambuf@@QEAAHH(a)Z(ptr long) msvcirt.?sputc(a)streambuf@@QEAAHH(a)Z @ thiscall -arch=win32 ?sputn(a)streambuf@@QAEHPBDH(a)Z(ptr str long) msvcirt.?sputn(a)streambuf@@QAEHPBDH(a)Z diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 9173aef..bda6e2c 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -762,8 +762,8 @@ # @ extern ?sh_write(a)filebuf@@2HB @ thiscall -arch=win32 ?snextc(a)streambuf@@QAEHXZ(ptr) msvcirt.?snextc(a)streambuf@@QAEHXZ @ cdecl -arch=win64 ?snextc(a)streambuf@@QEAAHXZ(ptr) msvcirt.?snextc(a)streambuf@@QEAAHXZ -@ stub -arch=win32 ?sputbackc(a)streambuf@@QAEHD(a)Z -@ stub -arch=win64 ?sputbackc(a)streambuf@@QEAAHD(a)Z +@ thiscall -arch=win32 ?sputbackc(a)streambuf@@QAEHD(a)Z(ptr long) msvcirt.?sputbackc(a)streambuf@@QAEHD(a)Z +@ cdecl -arch=win64 ?sputbackc(a)streambuf@@QEAAHD(a)Z(ptr long) msvcirt.?sputbackc(a)streambuf@@QEAAHD(a)Z @ thiscall -arch=win32 ?sputc(a)streambuf@@QAEHH(a)Z(ptr long) msvcirt.?sputc(a)streambuf@@QAEHH(a)Z @ cdecl -arch=win64 ?sputc(a)streambuf@@QEAAHH(a)Z(ptr long) msvcirt.?sputc(a)streambuf@@QEAAHH(a)Z @ thiscall -arch=win32 ?sputn(a)streambuf@@QAEHPBDH(a)Z(ptr str long) msvcirt.?sputn(a)streambuf@@QAEHPBDH(a)Z

1 0