February 2017 - Wine-commits

André Hentschel : iphlpapi/tests: Test ScopeID only for IPv6.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 38bf651bc4efdce9ef296326b7cf40d6ae117e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38bf651bc4efdce9ef296326b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Feb 27 14:05:45 2017 +0100 iphlpapi/tests: Test ScopeID only for IPv6. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index e0701a3..953bbc9 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -2067,8 +2067,6 @@ static void test_GetUnicastIpAddressEntry(void) if (row.Address.si_family == AF_INET6) ok(row.ScopeId.Value == row.Address.Ipv6.sin6_scope_id, "Expected %d, got %d\n", row.Address.Ipv6.sin6_scope_id, row.ScopeId.Value); - else - ok(row.ScopeId.Value == 0, "Expected 0, got %d\n", row.ScopeId.Value); ok(row.CreationTimeStamp.QuadPart, "CreationTimeStamp is 0\n"); } ua = ua->Next;

1 0

Bruno Jesus : winegstreamer: Avoid a magic number for empty offset.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: a8fc94d526e716aa76fdbd75feef57a33bf821ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8fc94d526e716aa76fdbd75f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Feb 22 23:44:48 2017 -0300 winegstreamer: Avoid a magic number for empty offset. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 759a5db..3ef2324 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -700,7 +700,7 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 TRACE("%p %s %i %p\n", pad, wine_dbgstr_longlong(ofs), len, buf); *buf = NULL; - if (ofs == (guint64)-1) + if (ofs == GST_BUFFER_OFFSET_NONE) ofs = This->nextpullofs; if (ofs >= This->filesize) { WARN("Reading past eof: %s, %u\n", wine_dbgstr_longlong(ofs), len);

1 0

Piotr Caban : msvcr100: Add _ReentrantBlockingLock class implementation.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 2682f9e67c78172039de4abc690b33b3a20742f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2682f9e67c78172039de4abc6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 27 18:15:56 2017 +0100 msvcr100: Add _ReentrantBlockingLock class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 20 +++++++------- dlls/msvcr100/msvcr100.spec | 20 +++++++------- dlls/msvcr110/msvcr110.spec | 30 ++++++++++----------- dlls/msvcr120/msvcr120.spec | 30 ++++++++++----------- dlls/msvcr120_app/msvcr120_app.spec | 30 ++++++++++----------- dlls/msvcrt/lock.c | 54 +++++++++++++++++++++++++++++++++++++ 6 files changed, 119 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2682f9e67c78172039de4…

1 0

Piotr Caban : msvcr100: Add _NonReentrantBlockingLock class implementation.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 3d6ec3ea1948f8f1489683e1605aabfdd8e665c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d6ec3ea1948f8f1489683e16… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 27 18:16:07 2017 +0100 msvcr100: Add _NonReentrantBlockingLock class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 20 ++++++++++---------- dlls/msvcr100/msvcr100.spec | 20 ++++++++++---------- dlls/msvcr110/msvcr110.spec | 30 +++++++++++++++--------------- dlls/msvcr120/msvcr120.spec | 30 +++++++++++++++--------------- dlls/msvcr120_app/msvcr120_app.spec | 30 +++++++++++++++--------------- 5 files changed, 65 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d6ec3ea1948f8f148968…

1 0

Piotr Caban : msvcr100: Add _ReentrantBlockingLock tests.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 0e7fa9006807fb95b28bf3ac9088614371463a81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e7fa9006807fb95b28bf3ac9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 27 18:16:17 2017 +0100 msvcr100: Add _ReentrantBlockingLock tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/tests/msvcr100.c | 66 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index 045d698..cdac1b9 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -134,6 +134,10 @@ typedef struct yield_func yield_func; } SpinWait; +typedef struct { + CRITICAL_SECTION cs; +} _ReentrantBlockingLock; + static int* (__cdecl *p_errno)(void); static int (__cdecl *p_wmemcpy_s)(wchar_t *dest, size_t numberOfElements, const wchar_t *src, size_t count); static int (__cdecl *p_wmemmove_s)(wchar_t *dest, size_t numberOfElements, const wchar_t *src, size_t count); @@ -163,6 +167,17 @@ static void (__thiscall *preader_writer_lock_unlock)(void*); static MSVCRT_bool (__thiscall *preader_writer_lock_try_lock)(void*); static MSVCRT_bool (__thiscall *preader_writer_lock_try_lock_read)(void*); +static _ReentrantBlockingLock* (__thiscall *p_ReentrantBlockingLock_ctor)(_ReentrantBlockingLock*); +static void (__thiscall *p_ReentrantBlockingLock_dtor)(_ReentrantBlockingLock*); +static void (__thiscall *p_ReentrantBlockingLock__Acquire)(_ReentrantBlockingLock*); +static void (__thiscall *p_ReentrantBlockingLock__Release)(_ReentrantBlockingLock*); +static MSVCRT_bool (__thiscall *p_ReentrantBlockingLock__TryAcquire)(_ReentrantBlockingLock*); +static _ReentrantBlockingLock* (__thiscall *p_NonReentrantBlockingLock_ctor)(_ReentrantBlockingLock*); +static void (__thiscall *p_NonReentrantBlockingLock_dtor)(_ReentrantBlockingLock*); +static void (__thiscall *p_NonReentrantBlockingLock__Acquire)(_ReentrantBlockingLock*); +static void (__thiscall *p_NonReentrantBlockingLock__Release)(_ReentrantBlockingLock*); +static MSVCRT_bool (__thiscall *p_NonReentrantBlockingLock__TryAcquire)(_ReentrantBlockingLock*); + /* make sure we use the correct errno */ #undef errno #define errno (*p_errno()) @@ -211,6 +226,17 @@ static BOOL init(void) SET(preader_writer_lock_unlock, "?unlock(a)reader_writer_lock@Concurrency@@QEAAXXZ"); SET(preader_writer_lock_try_lock, "?try_lock(a)reader_writer_lock@Concurrency@@QEAA_NXZ"); SET(preader_writer_lock_try_lock_read, "?try_lock_read(a)reader_writer_lock@Concurrency@@QEAA_NXZ"); + + SET(p_ReentrantBlockingLock_ctor, "??0_ReentrantBlockingLock(a)details@Concurrency@@QEAA(a)XZ"); + SET(p_ReentrantBlockingLock_dtor, "??1_ReentrantBlockingLock(a)details@Concurrency@@QEAA(a)XZ"); + SET(p_ReentrantBlockingLock__Acquire, "?_Acquire(a)_ReentrantBlockingLock@details(a)Concurrency@@QEAAXXZ"); + SET(p_ReentrantBlockingLock__Release, "?_Release(a)_ReentrantBlockingLock@details(a)Concurrency@@QEAAXXZ"); + SET(p_ReentrantBlockingLock__TryAcquire, "?_TryAcquire(a)_ReentrantBlockingLock@details(a)Concurrency@@QEAA_NXZ"); + SET(p_NonReentrantBlockingLock_ctor, "??0_NonReentrantBlockingLock(a)details@Concurrency@@QEAA(a)XZ"); + SET(p_NonReentrantBlockingLock_dtor, "??1_NonReentrantBlockingLock(a)details@Concurrency@@QEAA(a)XZ"); + SET(p_NonReentrantBlockingLock__Acquire, "?_Acquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAAXXZ"); + SET(p_NonReentrantBlockingLock__Release, "?_Release(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAAXXZ"); + SET(p_NonReentrantBlockingLock__TryAcquire, "?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAA_NXZ"); } else { SET(pSpinWait_ctor_yield, "??0?$_SpinWait@$00(a)details@Concurrency@@QAE(a)P6AXXZ@Z"); SET(pSpinWait_dtor, "??_F?$_SpinWait@$00(a)details@Concurrency@@QAEXXZ"); @@ -227,6 +253,17 @@ static BOOL init(void) SET(preader_writer_lock_unlock, "?unlock(a)reader_writer_lock@Concurrency@@QAEXXZ"); SET(preader_writer_lock_try_lock, "?try_lock(a)reader_writer_lock@Concurrency@@QAE_NXZ"); SET(preader_writer_lock_try_lock_read, "?try_lock_read(a)reader_writer_lock@Concurrency@@QAE_NXZ"); + + SET(p_ReentrantBlockingLock_ctor, "??0_ReentrantBlockingLock(a)details@Concurrency@@QAE(a)XZ"); + SET(p_ReentrantBlockingLock_dtor, "??1_ReentrantBlockingLock(a)details@Concurrency@@QAE(a)XZ"); + SET(p_ReentrantBlockingLock__Acquire, "?_Acquire(a)_ReentrantBlockingLock@details(a)Concurrency@@QAEXXZ"); + SET(p_ReentrantBlockingLock__Release, "?_Release(a)_ReentrantBlockingLock@details(a)Concurrency@@QAEXXZ"); + SET(p_ReentrantBlockingLock__TryAcquire, "?_TryAcquire(a)_ReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ"); + SET(p_NonReentrantBlockingLock_ctor, "??0_NonReentrantBlockingLock(a)details@Concurrency@@QAE(a)XZ"); + SET(p_NonReentrantBlockingLock_dtor, "??1_NonReentrantBlockingLock(a)details@Concurrency@@QAE(a)XZ"); + SET(p_NonReentrantBlockingLock__Acquire, "?_Acquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAEXXZ"); + SET(p_NonReentrantBlockingLock__Release, "?_Release(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAEXXZ"); + SET(p_NonReentrantBlockingLock__TryAcquire, "?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ"); } init_thiscall_thunk(); @@ -640,6 +677,34 @@ static void test_reader_writer_lock(void) call_func1(preader_writer_lock_dtor, rw_lock); } +static void test__ReentrantBlockingLock(void) +{ + _ReentrantBlockingLock rbl; + MSVCRT_bool ret; + + call_func1(p_ReentrantBlockingLock_ctor, &rbl); + ret = call_func1(p_ReentrantBlockingLock__TryAcquire, &rbl); + ok(ret, "_ReentrantBlockingLock__TryAcquire failed\n"); + call_func1(p_ReentrantBlockingLock__Acquire, &rbl); + ret = call_func1(p_ReentrantBlockingLock__TryAcquire, &rbl); + ok(ret, "_ReentrantBlockingLock__TryAcquire failed\n"); + call_func1(p_ReentrantBlockingLock__Release, &rbl); + call_func1(p_ReentrantBlockingLock__Release, &rbl); + call_func1(p_ReentrantBlockingLock__Release, &rbl); + call_func1(p_ReentrantBlockingLock_dtor, &rbl); + + call_func1(p_NonReentrantBlockingLock_ctor, &rbl); + ret = call_func1(p_NonReentrantBlockingLock__TryAcquire, &rbl); + ok(ret, "_NonReentrantBlockingLock__TryAcquire failed\n"); + call_func1(p_NonReentrantBlockingLock__Acquire, &rbl); + ret = call_func1(p_NonReentrantBlockingLock__TryAcquire, &rbl); + ok(ret, "_NonReentrantBlockingLock__TryAcquire failed\n"); + call_func1(p_NonReentrantBlockingLock__Release, &rbl); + call_func1(p_NonReentrantBlockingLock__Release, &rbl); + call_func1(p_NonReentrantBlockingLock__Release, &rbl); + call_func1(p_NonReentrantBlockingLock_dtor, &rbl); +} + START_TEST(msvcr100) { if (!init()) @@ -652,4 +717,5 @@ START_TEST(msvcr100) test_atoi(); test__SpinWait(); test_reader_writer_lock(); + test__ReentrantBlockingLock(); }

1 0

Nikolay Sivov : gdiplus/tests: Fix region leak (Valgrind).
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 371c43550ca9724e241fa4dc5f12a3b4e7ce9873 URL: http://source.winehq.org/git/wine.git/?a=commit;h=371c43550ca9724e241fa4dc5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 26 16:55:28 2017 +0300 gdiplus/tests: Fix region leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/region.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index e0ad48e..d4d8772 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -147,6 +147,8 @@ static void test_region_data(DWORD *data, UINT size, INT line) /* some Windows versions fail to properly clear the aligned DWORD */ ok_(__FILE__, line)(data[size - 1] == buf[size - 1] || broken(data[size - 1] != buf[size - 1]), "off %u: %#x != %#x\n", size - 1, data[size - 1], buf[size - 1]); + + GdipDeleteRegion(region); } static void test_getregiondata(void)

1 0

Huw Davies : dsound: Correctly update buflen.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 3076192e7de3c988e140da7003bd60c937c6ac8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3076192e7de3c988e140da700… Author: Huw Davies <huw(a)codeweavers.com> Date: Sun Feb 26 17:42:21 2017 +0000 dsound: Correctly update buflen. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/primary.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index f5a1020..ed41a5c 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -250,18 +250,18 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device, WAVEFORMATEX *wfx, } FillMemory(newbuf, new_buflen, (wfx->wBitsPerSample == 8) ? 128 : 0); } else if (!mixfloat) { - DWORD alloc_len = frames * sizeof(float); + new_buflen = frames * sizeof(float); if (device->buffer) - newbuf = HeapReAlloc(GetProcessHeap(), 0, device->buffer, alloc_len); + newbuf = HeapReAlloc(GetProcessHeap(), 0, device->buffer, new_buflen); else - newbuf = HeapAlloc(GetProcessHeap(), 0, alloc_len); + newbuf = HeapAlloc(GetProcessHeap(), 0, new_buflen); if (!newbuf) { ERR("failed to allocate primary buffer\n"); return DSERR_OUTOFMEMORY; } - FillMemory(newbuf, alloc_len, (wfx->wBitsPerSample == 8) ? 128 : 0); + FillMemory(newbuf, new_buflen, (wfx->wBitsPerSample == 8) ? 128 : 0); } else { HeapFree(GetProcessHeap(), 0, device->buffer); newbuf = NULL;

1 0

Huw Davies : dsound: Merge two identical allocation blocks.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: b47487af999f48ba2700b4dd5ff6cd47891d4787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b47487af999f48ba2700b4dd5… Author: Huw Davies <huw(a)codeweavers.com> Date: Sun Feb 26 17:42:22 2017 +0000 dsound: Merge two identical allocation blocks. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/primary.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index ed41a5c..b10ba02 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -238,19 +238,9 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device, WAVEFORMATEX *wfx, mixfloat = TRUE; /* reallocate emulated primary buffer */ - if (forcewave) { - if (device->buffer) - newbuf = HeapReAlloc(GetProcessHeap(), 0, device->buffer, new_buflen); - else - newbuf = HeapAlloc(GetProcessHeap(), 0, new_buflen); - - if (!newbuf) { - ERR("failed to allocate primary buffer\n"); - return DSERR_OUTOFMEMORY; - } - FillMemory(newbuf, new_buflen, (wfx->wBitsPerSample == 8) ? 128 : 0); - } else if (!mixfloat) { - new_buflen = frames * sizeof(float); + if (forcewave || !mixfloat) { + if (!forcewave) + new_buflen = frames * sizeof(float); if (device->buffer) newbuf = HeapReAlloc(GetProcessHeap(), 0, device->buffer, new_buflen);

1 0

Nikolay Sivov : d3d8: Fix debug messages.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 772290bd1fbe681f23874ee00ce265ea4fec0511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=772290bd1fbe681f23874ee00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 26 14:37:58 2017 +0300 d3d8: Fix debug messages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d7a933b..e255392 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1683,7 +1683,7 @@ static HRESULT WINAPI d3d8_device_EndStateBlock(IDirect3DDevice8 *iface, DWORD * hr = wined3d_device_end_stateblock(device->wined3d_device, &stateblock); if (FAILED(hr)) { - WARN("IWineD3DDevice_EndStateBlock returned an error\n"); + WARN("Failed to end the state block, %#x.\n", hr); wined3d_mutex_unlock(); return hr; } @@ -1799,7 +1799,7 @@ static HRESULT WINAPI d3d8_device_CreateStateBlock(IDirect3DDevice8 *iface, if (FAILED(hr)) { wined3d_mutex_unlock(); - ERR("IWineD3DDevice_CreateStateBlock failed, hr %#x\n", hr); + ERR("Failed to create the state block, hr %#x\n", hr); return hr; }

1 0

Nikolay Sivov : d2d1: Support strikethrough in DrawText()/DrawTextLayout() .
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: bfb953894e96bf63badb2e7f73e412b64b743e7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfb953894e96bf63badb2e7f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 26 14:47:14 2017 +0300 d2d1: Support strikethrough in DrawText()/DrawTextLayout(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index cc705ee..c773fdf 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1845,10 +1845,31 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRend static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawStrikethrough(IDWriteTextRenderer *iface, void *ctx, float baseline_origin_x, float baseline_origin_y, const DWRITE_STRIKETHROUGH *strikethrough, IUnknown *effect) { - FIXME("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, strikethrough %p, effect %p stub!\n", + struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); + const D2D1_MATRIX_3X2_F *m = &render_target->drawing_state.transform; + struct d2d_draw_text_layout_ctx *context = ctx; + D2D1_POINT_2F start, end; + ID2D1Brush *brush; + float thickness; + + TRACE("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, strikethrough %p, effect %p.\n", iface, ctx, baseline_origin_x, baseline_origin_y, strikethrough, effect); - return E_NOTIMPL; + /* minimal thickness in DIPs that will result in at least 1 pixel thick line */ + thickness = max(96.0f / (render_target->desc.dpiY * sqrtf(m->_21 * m->_21 + m->_22 * m->_22)), + strikethrough->thickness); + + brush = d2d_draw_get_text_brush(context, effect); + + start.x = baseline_origin_x; + start.y = baseline_origin_y + strikethrough->offset + thickness / 2.0f; + end.x = start.x + strikethrough->width; + end.y = start.y; + d2d_d3d_render_target_DrawLine(&render_target->ID2D1RenderTarget_iface, start, end, brush, thickness, NULL); + + ID2D1Brush_Release(brush); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawInlineObject(IDWriteTextRenderer *iface, void *ctx,

1 0