July 2015 - Wine-commits - list.winehq.org

Sebastian Lackner : ntdll: Fix incorrect assignment in assert statement ( Coverity).
by Alexandre Julliard 13 Jul '15

13 Jul '15

Module: wine Branch: master Commit: b687fee66f0926a1e9c852082495d69e857524da URL: http://source.winehq.org/git/wine.git/?a=commit;h=b687fee66f0926a1e9c852082… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Jul 11 15:33:04 2015 +0200 ntdll: Fix incorrect assignment in assert statement (Coverity). --- dlls/ntdll/threadpool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index a4e0619..23091f3 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1598,7 +1598,7 @@ static NTSTATUS tp_waitqueue_lock( struct threadpool_object *wait ) struct waitqueue_bucket *bucket; NTSTATUS status; HANDLE thread; - assert( wait->type = TP_OBJECT_TYPE_WAIT ); + assert( wait->type == TP_OBJECT_TYPE_WAIT ); wait->u.wait.signaled = 0; wait->u.wait.bucket = NULL;

1 0

Sebastian Lackner : dwrite: Avoid dereferencing NULL pointer for fonts without VDMX.
by Alexandre Julliard 13 Jul '15

13 Jul '15

Module: wine Branch: master Commit: 402caa632b1d022a2aac15e214e3b9e31faece13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=402caa632b1d022a2aac15e21… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jul 12 03:46:20 2015 +0200 dwrite: Avoid dereferencing NULL pointer for fonts without VDMX. --- dlls/dwrite/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 63e1b74..8d90c04 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1347,7 +1347,7 @@ static const struct VDMX_group *find_vdmx_group(const struct VDMX_Header *hdr) BOOL opentype_get_vdmx_size(const void *data, INT emsize, UINT16 *ascent, UINT16 *descent) { const struct VDMX_Header *hdr = (const struct VDMX_Header*)data; - const struct VDMX_group *group = find_vdmx_group(hdr); + const struct VDMX_group *group; const struct VDMX_vTable *tables; WORD recs, i;

1 0

Nikolay Sivov : dwrite: Implement pixel snapping in Draw().
by Alexandre Julliard 13 Jul '15

13 Jul '15

Module: wine Branch: master Commit: 66efbbbae24ce696141be74e64011951a7c7b177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66efbbbae24ce696141be74e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 12 23:22:50 2015 +0300 dwrite: Implement pixel snapping in Draw(). --- dlls/dwrite/layout.c | 65 ++++++++++++++- dlls/dwrite/tests/layout.c | 203 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 256 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=66efbbbae24ce696141be…

1 0

Nikolay Sivov : dwrite: Check GetGdiCompatibleMetrics() return value ( Coverity).
by Alexandre Julliard 13 Jul '15

13 Jul '15

Module: wine Branch: master Commit: cf5d9848d800706cd2ba8dc5544f0414f0ac8f37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf5d9848d800706cd2ba8dc55… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 12 23:35:10 2015 +0300 dwrite: Check GetGdiCompatibleMetrics() return value (Coverity). --- dlls/dwrite/analyzer.c | 7 ++++++- dlls/dwrite/layout.c | 5 +++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 8c2a801..3417109 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1090,7 +1090,12 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite return hr; } - IDWriteFontFace_GetGdiCompatibleMetrics(fontface, emSize, pixels_per_dip, transform, &metrics); + hr = IDWriteFontFace_GetGdiCompatibleMetrics(fontface, emSize, pixels_per_dip, transform, &metrics); + if (FAILED(hr)) { + IDWriteFontFace1_Release(fontface1); + WARN("failed to get compat metrics, 0x%08x\n", hr); + return hr; + } for (i = 0; i < glyph_count; i++) { INT32 a; diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 8b4c2cd..70e2095 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -828,12 +828,13 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) /* baseline derived from font metrics */ if (layout->gdicompatible) { - /* FIXME: check return value when it's actually implemented */ - IDWriteFontFace_GetGdiCompatibleMetrics(run->run.fontFace, + hr = IDWriteFontFace_GetGdiCompatibleMetrics(run->run.fontFace, run->run.fontEmSize, layout->pixels_per_dip, &layout->transform, &fontmetrics); + if (FAILED(hr)) + WARN("failed to get compat metrics, 0x%08x\n", hr); } else IDWriteFontFace_GetMetrics(run->run.fontFace, &fontmetrics);

1 0

Nikolay Sivov : dwrite: Implement SetWordWrapping() for layout.
by Alexandre Julliard 13 Jul '15

13 Jul '15

Module: wine Branch: master Commit: 2f79a876f917c1664fb9e5728a5f14ad3a4c45bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f79a876f917c1664fb9e5728… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 12 23:35:32 2015 +0300 dwrite: Implement SetWordWrapping() for layout. --- dlls/dwrite/layout.c | 34 ++++++++++++++++++++++++---------- dlls/dwrite/tests/layout.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 70e2095..398c4ee 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -363,6 +363,16 @@ static inline HRESULT format_set_readingdirection(struct dwrite_textformat_data return S_OK; } +static inline HRESULT format_set_wordwrapping(struct dwrite_textformat_data *format, + DWRITE_WORD_WRAPPING wrapping, BOOL *changed) +{ + if ((UINT32)wrapping > DWRITE_WORD_WRAPPING_CHARACTER) + return E_INVALIDARG; + if (changed) *changed = format->wrapping != wrapping; + format->wrapping = wrapping; + return S_OK; +} + static HRESULT get_fontfallback_from_format(const struct dwrite_textformat_data *format, IDWriteFontFallback **fallback) { *fallback = format->fallback; @@ -2199,7 +2209,6 @@ static HRESULT WINAPI dwritetextlayout_SetParagraphAlignment(IDWriteTextLayout2 static HRESULT WINAPI dwritetextlayout_SetWordWrapping(IDWriteTextLayout2 *iface, DWRITE_WORD_WRAPPING wrapping) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)->(%d)\n", This, wrapping); return IDWriteTextFormat1_SetWordWrapping(&This->IDWriteTextFormat1_iface, wrapping); } @@ -3296,8 +3305,19 @@ static HRESULT WINAPI dwritetextformat1_layout_SetParagraphAlignment(IDWriteText static HRESULT WINAPI dwritetextformat1_layout_SetWordWrapping(IDWriteTextFormat1 *iface, DWRITE_WORD_WRAPPING wrapping) { struct dwrite_textlayout *This = impl_layout_form_IDWriteTextFormat1(iface); - FIXME("(%p)->(%d): stub\n", This, wrapping); - return E_NOTIMPL; + BOOL changed; + HRESULT hr; + + TRACE("(%p)->(%d)\n", This, wrapping); + + hr = format_set_wordwrapping(&This->format, wrapping, &changed); + if (FAILED(hr)) + return hr; + + if (changed) + This->recompute |= RECOMPUTE_EFFECTIVE_RUNS; + + return S_OK; } static HRESULT WINAPI dwritetextformat1_layout_SetReadingDirection(IDWriteTextFormat1 *iface, DWRITE_READING_DIRECTION direction) @@ -4181,14 +4201,8 @@ static HRESULT WINAPI dwritetextformat_SetParagraphAlignment(IDWriteTextFormat1 static HRESULT WINAPI dwritetextformat_SetWordWrapping(IDWriteTextFormat1 *iface, DWRITE_WORD_WRAPPING wrapping) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); - TRACE("(%p)->(%d)\n", This, wrapping); - - if ((UINT32)wrapping > DWRITE_WORD_WRAPPING_CHARACTER) - return E_INVALIDARG; - - This->format.wrapping = wrapping; - return S_OK; + return format_set_wordwrapping(&This->format, wrapping, NULL); } static HRESULT WINAPI dwritetextformat_SetReadingDirection(IDWriteTextFormat1 *iface, DWRITE_READING_DIRECTION direction) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 76bcdff..fa8d03a 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -3396,6 +3396,44 @@ static void test_pixelsnapping(void) IDWriteFactory_Release(factory); } +static void test_SetWordWrapping(void) +{ + static const WCHAR strW[] = {'a',0}; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + IDWriteFactory *factory; + DWRITE_WORD_WRAPPING v; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 12.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + v = IDWriteTextFormat_GetWordWrapping(format); + ok(v == DWRITE_WORD_WRAPPING_WRAP, "got %d\n", v); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 1, format, 500.0, 100.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + v = IDWriteTextLayout_GetWordWrapping(layout); + ok(v == DWRITE_WORD_WRAPPING_WRAP, "got %d\n", v); + + hr = IDWriteTextLayout_SetWordWrapping(layout, DWRITE_WORD_WRAPPING_NO_WRAP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextLayout_SetWordWrapping(layout, DWRITE_WORD_WRAPPING_NO_WRAP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + v = IDWriteTextFormat_GetWordWrapping(format); + ok(v == DWRITE_WORD_WRAPPING_WRAP, "got %d\n", v); + + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); + IDWriteFactory_Release(factory); +} + START_TEST(layout) { static const WCHAR ctrlstrW[] = {0x202a,0}; @@ -3440,6 +3478,7 @@ START_TEST(layout) test_SetParagraphAlignment(); test_SetReadingDirection(); test_pixelsnapping(); + test_SetWordWrapping(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Handle negative emsize in GetGdiCompatibleMetrics( ).
by Alexandre Julliard 13 Jul '15

13 Jul '15

Module: wine Branch: master Commit: e6d5c03fdeaafb1c82f21aa77c1c38acb67dcb04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6d5c03fdeaafb1c82f21aa77… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 12 23:35:52 2015 +0300 dwrite: Handle negative emsize in GetGdiCompatibleMetrics(). --- dlls/dwrite/font.c | 2 +- dlls/dwrite/tests/font.c | 82 +++++++++++++++++++++++++++++------------------- 2 files changed, 50 insertions(+), 34 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 13d3ff5..41b0250 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -632,7 +632,7 @@ static HRESULT WINAPI dwritefontface1_GetGdiCompatibleMetrics(IDWriteFontFace2 * TRACE("(%p)->(%.2f %.2f %p %p)\n", This, em_size, pixels_per_dip, m, metrics); - if (pixels_per_dip <= 0.0) { + if (em_size <= 0.0 || pixels_per_dip <= 0.0) { memset(metrics, 0, sizeof(*metrics)); return E_INVALIDARG; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 9e33a1a..9524d6a 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3602,6 +3602,33 @@ if (0) emsize, metrics->hasTypographicMetrics, expected->hasTypographicMetrics); } +struct compatmetrics_test { + DWRITE_MATRIX m; + FLOAT ppdip; + FLOAT emsize; +}; + +static struct compatmetrics_test compatmetrics_tests[] = { + { { 0.0, 0.0, 0.0, 1.0, 0.0, 0.0 }, 1.0, 5.0 }, + { { 0.0, 0.0, 0.0, -1.0, 0.0, 0.0 }, 1.0, 5.0 }, + { { 0.0, 0.0, 0.0, -1.0, 0.0, 0.0 }, 2.0, 5.0 }, + { { 0.0, 0.0, 0.0, 3.0, 0.0, 0.0 }, 2.0, 5.0 }, + { { 0.0, 0.0, 0.0, -3.0, 0.0, 0.0 }, 2.0, 5.0 }, + { { 1.0, 0.0, 0.0, 1.0, 0.0, 0.0 }, 2.0, 5.0 }, + { { 1.0, 0.0, 0.0, 1.0, 5.0, 0.0 }, 2.0, 5.0 }, + { { 1.0, 0.0, 0.0, 1.0, 0.0, 5.0 }, 2.0, 5.0 }, +}; + +static void get_expected_metrics(IDWriteFontFace *fontface, struct compatmetrics_test *ptr, + DWRITE_FONT_METRICS *expected) +{ + HRESULT hr; + + memset(expected, 0, sizeof(*expected)); + hr = IDWriteFontFace_GetGdiCompatibleMetrics(fontface, ptr->ppdip * fabsf(ptr->m.m22) * ptr->emsize, 1.0, NULL, expected); + ok(hr == S_OK, "got %08x\n", hr); +} + static void test_GetGdiCompatibleMetrics_face(IDWriteFontFace *face) { IDWriteFontFace1 *fontface1 = NULL; @@ -3615,7 +3642,7 @@ static void test_GetGdiCompatibleMetrics_face(IDWriteFontFace *face) void *vdmx_ctx; BOOL exists; const struct VDMX_group *vdmx_group = NULL; - DWRITE_MATRIX m; + int i; hr = IDWriteFontFace_QueryInterface(face, &IID_IDWriteFontFace1, (void**)&fontface1); if (hr != S_OK) @@ -3635,6 +3662,20 @@ static void test_GetGdiCompatibleMetrics_face(IDWriteFontFace *face) else vdmx_group = find_vdmx_group(vdmx); + /* negative emsize */ + memset(&comp_metrics, 0xcc, sizeof(comp_metrics)); + memset(&expected, 0, sizeof(expected)); + hr = IDWriteFontFace_GetGdiCompatibleMetrics(face, -10.0, 1.0, NULL, &comp_metrics); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + test_metrics_cmp(0.0, &comp_metrics, &expected); + + /* zero emsize */ + memset(&comp_metrics, 0xcc, sizeof(comp_metrics)); + memset(&expected, 0, sizeof(expected)); + hr = IDWriteFontFace_GetGdiCompatibleMetrics(face, 0.0, 1.0, NULL, &comp_metrics); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + test_metrics_cmp(0.0, &comp_metrics, &expected); + /* zero pixels per dip */ memset(&comp_metrics, 0xcc, sizeof(comp_metrics)); memset(&expected, 0, sizeof(expected)); @@ -3647,39 +3688,14 @@ static void test_GetGdiCompatibleMetrics_face(IDWriteFontFace *face) ok(hr == E_INVALIDARG, "got %08x\n", hr); test_metrics_cmp(5.0, &comp_metrics, &expected); - memset(&m, 0, sizeof(m)); - /* zero matrix m22 */ - m.m22 = 1.0; - hr = IDWriteFontFace_GetGdiCompatibleMetrics(face, 5.0, 1.0, NULL, (DWRITE_FONT_METRICS*)&expected); - ok(hr == S_OK, "got %08x\n", hr); - hr = IDWriteFontFace_GetGdiCompatibleMetrics(face, 5.0, 1.0, &m, &comp_metrics); - ok(hr == S_OK, "got %08x\n", hr); - test_metrics_cmp(5.0, &comp_metrics, &expected); - - m.m22 = -1.0; - hr = IDWriteFontFace_GetGdiCompatibleMetrics(face, 5.0, 1.0, &m, &comp_metrics); - ok(hr == S_OK, "got %08x\n", hr); - test_metrics_cmp(5.0, &comp_metrics, &expected); + for (i = 0; i < sizeof(compatmetrics_tests)/sizeof(compatmetrics_tests[0]); i++) { + struct compatmetrics_test *ptr = &compatmetrics_tests[i]; - /* pixels per dip == 2 */ - hr = IDWriteFontFace_GetGdiCompatibleMetrics(face, 10.0, 1.0, NULL, (DWRITE_FONT_METRICS*)&expected); - ok(hr == S_OK, "got %08x\n", hr); - hr = IDWriteFontFace_GetGdiCompatibleMetrics(face, 5.0, 2.0, NULL, &comp_metrics); - ok(hr == S_OK, "got %08x\n", hr); - test_metrics_cmp(5.0, &comp_metrics, &expected); - - /* pixels per dip == 2, m22 == 3.0 */ - hr = IDWriteFontFace_GetGdiCompatibleMetrics(face, 30.0, 1.0, NULL, (DWRITE_FONT_METRICS*)&expected); - ok(hr == S_OK, "got %08x\n", hr); - - m.m22 = 3.0; - hr = IDWriteFontFace_GetGdiCompatibleMetrics(face, 5.0, 2.0, &m, &comp_metrics); - ok(hr == S_OK, "got %08x\n", hr); - test_metrics_cmp(5.0, &comp_metrics, &expected); - m.m22 = -3.0; - hr = IDWriteFontFace_GetGdiCompatibleMetrics(face, 5.0, 2.0, &m, &comp_metrics); - ok(hr == S_OK, "got %08x\n", hr); - test_metrics_cmp(5.0, &comp_metrics, &expected); + get_expected_metrics(face, ptr, (DWRITE_FONT_METRICS*)&expected); + hr = IDWriteFontFace_GetGdiCompatibleMetrics(face, ptr->emsize, ptr->ppdip, &ptr->m, &comp_metrics); + ok(hr == S_OK, "got %08x\n", hr); + test_metrics_cmp(ptr->emsize, &comp_metrics, &expected); + } for (emsize = 5; emsize <= design_metrics.designUnitsPerEm; emsize++) {

1 0

Nikolay Sivov : dwrite: Implement GetMetrics() for trimming sign.
by Alexandre Julliard 13 Jul '15

13 Jul '15

Module: wine Branch: master Commit: 04ae4bfb2c24befc997ea465cda7014b87f7a7e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04ae4bfb2c24befc997ea465c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 12 23:36:15 2015 +0300 dwrite: Implement GetMetrics() for trimming sign. --- dlls/dwrite/layout.c | 19 ++++++++++++++++--- dlls/dwrite/tests/layout.c | 16 +++++++++++++++- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 398c4ee..5e26b7c 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -4042,11 +4042,24 @@ static HRESULT WINAPI dwritetrimmingsign_Draw(IDWriteInlineObject *iface, void * return IDWriteTextLayout_Draw(This->layout, context, renderer, originX, originY); } -static HRESULT WINAPI dwritetrimmingsign_GetMetrics(IDWriteInlineObject *iface, DWRITE_INLINE_OBJECT_METRICS *metrics) +static HRESULT WINAPI dwritetrimmingsign_GetMetrics(IDWriteInlineObject *iface, DWRITE_INLINE_OBJECT_METRICS *ret) { struct dwrite_trimmingsign *This = impl_from_IDWriteInlineObject(iface); - FIXME("(%p)->(%p): stub\n", This, metrics); - memset(metrics, 0, sizeof(*metrics)); + DWRITE_TEXT_METRICS metrics; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, ret); + + hr = IDWriteTextLayout_GetMetrics(This->layout, &metrics); + if (FAILED(hr)) { + memset(ret, 0, sizeof(*ret)); + return hr; + } + + ret->width = metrics.width; + ret->height = 0.0; + ret->baseline = 0.0; + ret->supportsSideways = FALSE; return S_OK; } diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index fa8d03a..a2150d9 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -980,6 +980,7 @@ static const struct drawcall_entry drawellipsis_seq[] = { static void test_CreateEllipsisTrimmingSign(void) { + DWRITE_INLINE_OBJECT_METRICS metrics; DWRITE_BREAK_CONDITION before, after; IDWriteTextFormat *format; IDWriteInlineObject *sign; @@ -1001,8 +1002,21 @@ static void test_CreateEllipsisTrimmingSign(void) hr = IDWriteInlineObject_QueryInterface(sign, &IID_IDWriteTextLayout, (void**)&unk); ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); -if (0) /* crashes on native */ +if (0) {/* crashes on native */ hr = IDWriteInlineObject_GetBreakConditions(sign, NULL, NULL); + hr = IDWriteInlineObject_GetMetrics(sign, NULL); +} + metrics.width = 0.0; + metrics.height = 123.0; + metrics.baseline = 123.0; + metrics.supportsSideways = TRUE; + hr = IDWriteInlineObject_GetMetrics(sign, &metrics); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(metrics.width > 0.0, "got %.2f\n", metrics.width); + ok(metrics.height == 0.0, "got %.2f\n", metrics.height); + ok(metrics.baseline == 0.0, "got %.2f\n", metrics.baseline); + ok(!metrics.supportsSideways, "got %d\n", metrics.supportsSideways); before = after = DWRITE_BREAK_CONDITION_CAN_BREAK; hr = IDWriteInlineObject_GetBreakConditions(sign, &before, &after);

1 0

Nikolay Sivov : dwrite: Remove excessive tracing when forwarding to IDWriteTextFormat1.
by Alexandre Julliard 13 Jul '15

13 Jul '15

Module: wine Branch: master Commit: fda08897e43b7feee02ef50cf247936c797fa34a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fda08897e43b7feee02ef50cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 12 23:36:36 2015 +0300 dwrite: Remove excessive tracing when forwarding to IDWriteTextFormat1. --- dlls/dwrite/layout.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 5e26b7c..1f7beb4 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2257,35 +2257,30 @@ static DWRITE_TEXT_ALIGNMENT WINAPI dwritetextlayout_GetTextAlignment(IDWriteTex static DWRITE_PARAGRAPH_ALIGNMENT WINAPI dwritetextlayout_GetParagraphAlignment(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)\n", This); return IDWriteTextFormat1_GetParagraphAlignment(&This->IDWriteTextFormat1_iface); } static DWRITE_WORD_WRAPPING WINAPI dwritetextlayout_GetWordWrapping(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)\n", This); return IDWriteTextFormat1_GetWordWrapping(&This->IDWriteTextFormat1_iface); } static DWRITE_READING_DIRECTION WINAPI dwritetextlayout_GetReadingDirection(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)\n", This); return IDWriteTextFormat1_GetReadingDirection(&This->IDWriteTextFormat1_iface); } static DWRITE_FLOW_DIRECTION WINAPI dwritetextlayout_GetFlowDirection(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)\n", This); return IDWriteTextFormat1_GetFlowDirection(&This->IDWriteTextFormat1_iface); } static FLOAT WINAPI dwritetextlayout_GetIncrementalTabStop(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)\n", This); return IDWriteTextFormat1_GetIncrementalTabStop(&This->IDWriteTextFormat1_iface); } @@ -2293,7 +2288,6 @@ static HRESULT WINAPI dwritetextlayout_GetTrimming(IDWriteTextLayout2 *iface, DW IDWriteInlineObject **trimming_sign) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)->(%p %p)\n", This, options, trimming_sign); return IDWriteTextFormat1_GetTrimming(&This->IDWriteTextFormat1_iface, options, trimming_sign); } @@ -2301,70 +2295,60 @@ static HRESULT WINAPI dwritetextlayout_GetLineSpacing(IDWriteTextLayout2 *iface, FLOAT *spacing, FLOAT *baseline) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)->(%p %p %p)\n", This, method, spacing, baseline); return IDWriteTextFormat1_GetLineSpacing(&This->IDWriteTextFormat1_iface, method, spacing, baseline); } static HRESULT WINAPI dwritetextlayout_GetFontCollection(IDWriteTextLayout2 *iface, IDWriteFontCollection **collection) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)->(%p)\n", This, collection); return IDWriteTextFormat1_GetFontCollection(&This->IDWriteTextFormat1_iface, collection); } static UINT32 WINAPI dwritetextlayout_GetFontFamilyNameLength(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)\n", This); return IDWriteTextFormat1_GetFontFamilyNameLength(&This->IDWriteTextFormat1_iface); } static HRESULT WINAPI dwritetextlayout_GetFontFamilyName(IDWriteTextLayout2 *iface, WCHAR *name, UINT32 size) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)->(%p %u)\n", This, name, size); return IDWriteTextFormat1_GetFontFamilyName(&This->IDWriteTextFormat1_iface, name, size); } static DWRITE_FONT_WEIGHT WINAPI dwritetextlayout_GetFontWeight(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)\n", This); return IDWriteTextFormat1_GetFontWeight(&This->IDWriteTextFormat1_iface); } static DWRITE_FONT_STYLE WINAPI dwritetextlayout_GetFontStyle(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)\n", This); return IDWriteTextFormat1_GetFontStyle(&This->IDWriteTextFormat1_iface); } static DWRITE_FONT_STRETCH WINAPI dwritetextlayout_GetFontStretch(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)\n", This); return IDWriteTextFormat1_GetFontStretch(&This->IDWriteTextFormat1_iface); } static FLOAT WINAPI dwritetextlayout_GetFontSize(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)\n", This); return IDWriteTextFormat1_GetFontSize(&This->IDWriteTextFormat1_iface); } static UINT32 WINAPI dwritetextlayout_GetLocaleNameLength(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)\n", This); return IDWriteTextFormat1_GetLocaleNameLength(&This->IDWriteTextFormat1_iface); } static HRESULT WINAPI dwritetextlayout_GetLocaleName(IDWriteTextLayout2 *iface, WCHAR *name, UINT32 size) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)->(%p %u)\n", This, name, size); return IDWriteTextFormat1_GetLocaleName(&This->IDWriteTextFormat1_iface, name, size); } @@ -3385,7 +3369,7 @@ static DWRITE_PARAGRAPH_ALIGNMENT WINAPI dwritetextformat1_layout_GetParagraphAl static DWRITE_WORD_WRAPPING WINAPI dwritetextformat1_layout_GetWordWrapping(IDWriteTextFormat1 *iface) { struct dwrite_textlayout *This = impl_layout_form_IDWriteTextFormat1(iface); - FIXME("(%p): stub\n", This); + TRACE("(%p)\n", This); return This->format.wrapping; }

1 0

Nikolay Sivov : dwrite: Fix EndFigure notification in GetGlyphRunOutline() .
by Alexandre Julliard 13 Jul '15

13 Jul '15

Module: wine Branch: master Commit: 2b59cf84be0049fe3bf75badc6698495c0519973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b59cf84be0049fe3bf75badc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 12 23:37:05 2015 +0300 dwrite: Fix EndFigure notification in GetGlyphRunOutline(). --- dlls/dwrite/freetype.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index bf6c866..778f9cf 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -297,12 +297,6 @@ static void get_cubic_glyph_outline(const FT_Outline *outline, short point, shor cubic_control[2].y += (cubic_control[3].y + 1) / 3; } -static inline void set_outline_end_tag(short point, short endpoint, UINT8 *tag) -{ - if (point == endpoint) - *tag |= OUTLINE_POINT_END; -} - static short get_outline_data(const FT_Outline *outline, struct glyph_outline *ret) { short contour, point = 0, first_pt, count; @@ -312,6 +306,8 @@ static short get_outline_data(const FT_Outline *outline, struct glyph_outline *r if (ret) { ft_vector_to_d2d_point(&outline->points[point], &ret->points[count]); ret->tags[count] = OUTLINE_POINT_START; + if (count) + ret->tags[count-1] |= OUTLINE_POINT_END; } point++; @@ -323,7 +319,6 @@ static short get_outline_data(const FT_Outline *outline, struct glyph_outline *r if (ret) { ft_vector_to_d2d_point(&outline->points[point], &ret->points[count]); ret->tags[count] |= OUTLINE_POINT_LINE; - set_outline_end_tag(point, outline->contours[contour], &ret->tags[count]); } point++; @@ -341,7 +336,6 @@ static short get_outline_data(const FT_Outline *outline, struct glyph_outline *r ret->tags[count] = OUTLINE_POINT_BEZIER; ret->tags[count+1] = OUTLINE_POINT_BEZIER; ret->tags[count+2] = OUTLINE_POINT_BEZIER; - set_outline_end_tag(point, outline->contours[contour], &ret->tags[count+2]); } count += 3; @@ -361,6 +355,9 @@ static short get_outline_data(const FT_Outline *outline, struct glyph_outline *r } } + if (ret) + ret->tags[count-1] |= OUTLINE_POINT_END; + return count; }

1 0

Erich E. Hoover : ntoskrnl.exe: Improve IoGetDeviceObjectPointer stub to appease SecuROM 5.x.
by Alexandre Julliard 13 Jul '15

13 Jul '15

Module: wine Branch: master Commit: 68f23a1138ed697257c348011d77ec8519b44294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68f23a1138ed697257c348011… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Sun Jun 14 18:58:20 2015 -0600 ntoskrnl.exe: Improve IoGetDeviceObjectPointer stub to appease SecuROM 5.x. --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c2ffdf3..a4a37d9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1009,10 +1009,16 @@ NTSTATUS WINAPI IoGetDeviceInterfaces( const GUID *InterfaceClassGuid, */ NTSTATUS WINAPI IoGetDeviceObjectPointer( UNICODE_STRING *name, ACCESS_MASK access, PFILE_OBJECT *file, PDEVICE_OBJECT *device ) { + static DEVICE_OBJECT stub_device; + static DRIVER_OBJECT stub_driver; + FIXME( "stub: %s %x %p %p\n", debugstr_us(name), access, file, device ); + stub_device.StackSize = 0x80; /* minimum value to appease SecuROM 5.x */ + stub_device.DriverObject = &stub_driver; + *file = NULL; - *device = NULL; + *device = &stub_device; return STATUS_SUCCESS; }

1 0