wine-commits July 2015

wine-commits@winehq.org

2 participants
567 discussions

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_FillRoundedRectangle ().
by Alexandre Julliard 21 Jul '15

21 Jul '15

Module: wine Branch: master Commit: 9afd280d2659bcc0c4fc091467dbccaadfe9e02e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9afd280d2659bcc0c4fc09146… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 21 08:39:06 2015 +0200 d2d1: Implement d2d_d3d_render_target_FillRoundedRectangle(). --- dlls/d2d1/render_target.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 850cd01..55d81b2 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -573,7 +573,20 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawRoundedRectangle(ID2D1Re static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRoundedRectangle(ID2D1RenderTarget *iface, const D2D1_ROUNDED_RECT *rect, ID2D1Brush *brush) { - FIXME("iface %p, rect %p, brush %p stub!\n", iface, rect, brush); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + ID2D1RoundedRectangleGeometry *geometry; + HRESULT hr; + + TRACE("iface %p, rect %p, brush %p.\n", iface, rect, brush); + + if (FAILED(hr = ID2D1Factory_CreateRoundedRectangleGeometry(render_target->factory, rect, &geometry))) + { + ERR("Failed to create geometry, hr %#x.\n", hr); + return; + } + + ID2D1RenderTarget_FillGeometry(iface, (ID2D1Geometry *)geometry, brush, NULL); + ID2D1RoundedRectangleGeometry_Release(geometry); } static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawEllipse(ID2D1RenderTarget *iface,

1 0

Henri Verbeet : d2d1: Add a missing TRACE to d2d_d3d_render_target_FillRectangle().
by Alexandre Julliard 21 Jul '15

21 Jul '15

Module: wine Branch: master Commit: d1e14292188e57130d4bdb9984b524c577850235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e14292188e57130d4bdb998… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 21 08:39:05 2015 +0200 d2d1: Add a missing TRACE to d2d_d3d_render_target_FillRectangle(). This accidentally got lost in b92a05c84ed92f8ebe618991315f95af3189a47b. --- dlls/d2d1/render_target.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index ac6a0fa..850cd01 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -551,6 +551,8 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar ID2D1RectangleGeometry *geometry; HRESULT hr; + TRACE("iface %p, rect %p, brush %p.\n", iface, rect, brush); + if (FAILED(hr = ID2D1Factory_CreateRectangleGeometry(render_target->factory, rect, &geometry))) { ERR("Failed to create geometry, hr %#x.\n", hr);

1 0

Hugh McMaster : kernel32: Enabling/ disabling Insert Mode via the user dialog should take effect immediately.
by Alexandre Julliard 21 Jul '15

21 Jul '15

Module: wine Branch: master Commit: c8069af616331e9d97d470a69ad1fbda55880288 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8069af616331e9d97d470a69… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 20 21:10:10 2015 +1000 kernel32: Enabling/disabling Insert Mode via the user dialog should take effect immediately. --- dlls/kernel32/editline.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 7664b55..802bfe0 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -987,6 +987,10 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) } } + GetConsoleMode(hConsoleIn, &mode); + ctx.insert = (mode & (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS)) == + (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS); + if (func) (func)(&ctx); else if (!(ir.Event.KeyEvent.dwControlKeyState & LEFT_ALT_PRESSED))

1 0

Piotr Caban : mshtml: Test body.offsetHeight value in quirks mode.
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: 1a0c4efba9430382e3427cb3f355906bc2a66861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a0c4efba9430382e3427cb3f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 20 16:52:34 2015 +0200 mshtml: Test body.offsetHeight value in quirks mode. --- dlls/mshtml/tests/dom.c | 412 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 412 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a0c4efba9430382e3427…

1 0

Jacek Caban : ieframe: Fixed invalid COM object usage.
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: 088192a9aa205ff22bacd516c54d454a19530f3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=088192a9aa205ff22bacd516c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 20 15:25:00 2015 +0200 ieframe: Fixed invalid COM object usage. --- dlls/ieframe/tests/webbrowser.c | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index a70428f..9ceed46 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -3842,43 +3842,24 @@ static void test_FileProtocol(void) DeleteFileA(file_path); } -struct sink -{ - IAdviseSink IAdviseSink_iface; -}; - -static inline struct sink *impl_from_IAdviseSink(IAdviseSink *iface) -{ - return CONTAINING_RECORD(iface, struct sink, IAdviseSink_iface); -} - static HRESULT WINAPI sink_QueryInterface( IAdviseSink *iface, REFIID riid, void **obj) { - struct sink *sink = impl_from_IAdviseSink(iface); - - trace("%p, %p, %p\n", iface, riid, obj); - - if (IsEqualGUID(riid, &IID_IAdviseSink) || IsEqualGUID(riid, &IID_IUnknown)) - { - *obj = &sink->IAdviseSink_iface; - } - else - { - return E_NOINTERFACE; + if (IsEqualGUID(riid, &IID_IAdviseSink) || IsEqualGUID(riid, &IID_IUnknown)) { + *obj = iface; + return S_OK; } - IAdviseSink_AddRef(iface); - return S_OK; + + ok(0, "unexpected call QI(%s)\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; } static ULONG WINAPI sink_AddRef(IAdviseSink *iface) { - trace("%p\n", iface); return 2; } static ULONG WINAPI sink_Release(IAdviseSink *iface) { - trace("%p\n", iface); return 1; }

1 0

Nikolay Sivov : dwrite/tests: Some tests for isNewline clusters.
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: 491e84a7718b06cdc7ec60b8efe4c029ed0a617b URL: http://source.winehq.org/git/wine.git/?a=commit;h=491e84a7718b06cdc7ec60b8e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 20 15:15:30 2015 +0300 dwrite/tests: Some tests for isNewline clusters. --- dlls/dwrite/tests/layout.c | 80 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 77 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 0e8404c..9e2aaea 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1630,12 +1630,14 @@ static void test_typography(void) static void test_GetClusterMetrics(void) { + 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}; 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[4]; + DWRITE_CLUSTER_METRICS metrics[20]; IDWriteTextLayout1 *layout1; IDWriteInlineObject *trimm; IDWriteTextFormat *format; @@ -1918,6 +1920,44 @@ todo_wine IDWriteTextLayout_Release(layout); + /* isNewline tests */ + hr = IDWriteFactory_CreateTextLayout(factory, str5W, 20, format, 100.0, 200.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 0; + memset(metrics, 0, sizeof(metrics)); + hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics, 20, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 20, "got %u\n", count); + +todo_wine { + ok(metrics[1].isNewline == 1, "got %d\n", metrics[1].isNewline); + ok(metrics[3].isNewline == 1, "got %d\n", metrics[3].isNewline); + ok(metrics[5].isNewline == 1, "got %d\n", metrics[5].isNewline); + ok(metrics[6].isNewline == 1, "got %d\n", metrics[6].isNewline); + ok(metrics[9].isNewline == 1, "got %d\n", metrics[9].isNewline); + ok(metrics[11].isNewline == 1, "got %d\n", metrics[11].isNewline); + ok(metrics[13].isNewline == 1, "got %d\n", metrics[13].isNewline); + ok(metrics[15].isNewline == 1, "got %d\n", metrics[15].isNewline); + ok(metrics[17].isNewline == 1, "got %d\n", metrics[17].isNewline); + ok(metrics[19].isNewline == 1, "got %d\n", metrics[19].isNewline); +} + ok(metrics[0].isNewline == 0, "got %d\n", metrics[0].isNewline); + ok(metrics[2].isNewline == 0, "got %d\n", metrics[2].isNewline); + ok(metrics[4].isNewline == 0, "got %d\n", metrics[4].isNewline); + ok(metrics[7].isNewline == 0, "got %d\n", metrics[7].isNewline); + ok(metrics[8].isNewline == 0, "got %d\n", metrics[8].isNewline); + ok(metrics[10].isNewline == 0, "got %d\n", metrics[10].isNewline); + ok(metrics[12].isNewline == 0, "got %d\n", metrics[12].isNewline); + ok(metrics[14].isNewline == 0, "got %d\n", metrics[14].isNewline); + 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++) + ok(metrics[i].length == 1, "%d: got %d\n", i, metrics[i].length); + + IDWriteTextLayout_Release(layout); + IDWriteInlineObject_Release(trimm); IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); @@ -2975,10 +3015,11 @@ static IDWriteFontFace *get_fontface_from_format(IDWriteTextFormat *format) static void test_GetLineMetrics(void) { + static const WCHAR str3W[] = {'a','\r','b','\n','c','\n','\r','d','\r','\n',0}; static const WCHAR strW[] = {'a','b','c','d',' ',0}; static const WCHAR str2W[] = {'a','b','\r','c','d',0}; DWRITE_FONT_METRICS fontmetrics; - DWRITE_LINE_METRICS metrics[2]; + DWRITE_LINE_METRICS metrics[6]; IDWriteTextFormat *format; IDWriteTextLayout *layout; IDWriteFontFace *fontface; @@ -3035,9 +3076,42 @@ todo_wine { metrics[1].baseline); } IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); - IDWriteFontFace_Release(fontface); + /* line breaks */ + 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); + + hr = IDWriteFactory_CreateTextLayout(factory, str3W, 10, format, 100.0, 300.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + memset(metrics, 0xcc, sizeof(metrics)); + hr = IDWriteTextLayout_GetLineMetrics(layout, metrics, 6, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(count == 6, "got %u\n", count); + +todo_wine { + ok(metrics[0].length == 2, "got %u\n", metrics[0].length); + ok(metrics[1].length == 2, "got %u\n", metrics[1].length); + ok(metrics[2].length == 2, "got %u\n", metrics[2].length); + ok(metrics[3].length == 1, "got %u\n", metrics[3].length); + ok(metrics[4].length == 3, "got %u\n", metrics[4].length); + ok(metrics[5].length == 0, "got %u\n", metrics[5].length); +} + +todo_wine { + ok(metrics[0].newlineLength == 1, "got %u\n", metrics[0].newlineLength); + ok(metrics[1].newlineLength == 1, "got %u\n", metrics[1].newlineLength); + ok(metrics[2].newlineLength == 1, "got %u\n", metrics[2].newlineLength); + ok(metrics[3].newlineLength == 1, "got %u\n", metrics[3].newlineLength); + ok(metrics[4].newlineLength == 2, "got %u\n", metrics[4].newlineLength); + ok(metrics[5].newlineLength == 0, "got %u\n", metrics[5].newlineLength); +} + IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format); + IDWriteFontFace_Release(fontface); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Round centered alignment shift for compatible layouts.
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: c8b0c803653e3a126b059f8f0ef280dba2eecd0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8b0c803653e3a126b059f8f0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 20 15:15:01 2015 +0300 dwrite: Round centered alignment shift for compatible layouts. --- dlls/dwrite/layout.c | 83 +++++++++++++++++++++++++++++++++++++--------- dlls/dwrite/tests/layout.c | 44 ++++++++++++++++++++++++ 2 files changed, 112 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8b0c803653e3a126b059…

1 0

Nikolay Sivov : dwrite/tests: Some tests for bounds returned by GetAlphaTextureBounds().
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: a718a9a5ca3ff014db5c685d3747e9c442bfbe09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a718a9a5ca3ff014db5c685d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 20 15:14:32 2015 +0300 dwrite/tests: Some tests for bounds returned by GetAlphaTextureBounds(). --- dlls/dwrite/tests/font.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 94dccdd..c85193a 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3403,6 +3403,7 @@ static void test_CreateGlyphRunAnalysis(void) RECT rect; DWRITE_GLYPH_OFFSET offset; DWRITE_GLYPH_METRICS metrics; + DWRITE_FONT_METRICS fm; int i; factory = create_factory(); @@ -3492,6 +3493,41 @@ static void test_CreateGlyphRunAnalysis(void) IDWriteGlyphRunAnalysis_Release(analysis); } + IDWriteFontFace_GetMetrics(run.fontFace, &fm); + + /* check bbox for a single glyph run */ + for (run.fontEmSize = 1.0; run.fontEmSize <= 100.0; run.fontEmSize += 1.0) { + DWRITE_GLYPH_METRICS gm; + LONG bboxX, bboxY; + + hr = IDWriteFactory_CreateGlyphRunAnalysis(factory, &run, 1.0, NULL, + DWRITE_RENDERING_MODE_ALIASED, DWRITE_MEASURING_MODE_GDI_CLASSIC, + 0.0, 0.0, &analysis); + ok(hr == S_OK, "got 0x%08x\n", hr); + + memset(&rect, 0, sizeof(rect)); + hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_ALIASED_1x1, &rect); + todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr != S_OK) + break; + + hr = IDWriteFontFace_GetGdiCompatibleGlyphMetrics(run.fontFace, run.fontEmSize, 1.0, NULL, + DWRITE_MEASURING_MODE_GDI_CLASSIC, run.glyphIndices, 1, &gm, run.isSideways); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* metrics are in design units */ + bboxX = (int)floorf((gm.advanceWidth - gm.leftSideBearing - gm.rightSideBearing) * run.fontEmSize / fm.designUnitsPerEm + 0.5f); + bboxY = (int)floorf((gm.advanceHeight - gm.topSideBearing - gm.bottomSideBearing) * run.fontEmSize / fm.designUnitsPerEm + 0.5f); + + rect.right -= rect.left; + rect.bottom -= rect.top; + ok(abs(bboxX - rect.right) <= 1, "%.0f: bbox width %d, from metrics %d\n", run.fontEmSize, rect.right, bboxX); + ok(abs(bboxY - rect.bottom) <= 1, "%.0f: bbox height %d, from metrics %d\n", run.fontEmSize, rect.bottom, bboxY); + + IDWriteGlyphRunAnalysis_Release(analysis); + } + IDWriteFontFace_Release(face); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Improve parameter validation in GetGdiCompatibleGlyphAdvances(), add some tests.
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: 5231715d31cc1f7ebbfca64247383b1aa7fdc2ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=5231715d31cc1f7ebbfca6424… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 20 15:13:58 2015 +0300 dwrite: Improve parameter validation in GetGdiCompatibleGlyphAdvances(), add some tests. --- dlls/dwrite/font.c | 13 +++++- dlls/dwrite/tests/font.c | 116 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 127 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 11ff9d0..2d01574 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -771,10 +771,19 @@ static HRESULT WINAPI dwritefontface1_GetGdiCompatibleGlyphAdvances(IDWriteFontF TRACE("(%p)->(%.2f %.2f %p %d %d %u %p %p)\n", This, em_size, ppdip, m, use_gdi_natural, is_sideways, glyph_count, glyphs, advances); - if (m && memcmp(m, &identity, sizeof(*m))) - FIXME("transform is not supported, %s\n", debugstr_matrix(m)); + if (em_size < 0.0 || ppdip <= 0.0) { + memset(advances, 0, sizeof(*advances) * glyph_count); + return E_INVALIDARG; + } scale = em_size * ppdip / This->metrics.designUnitsPerEm; + if (scale == 0.0) { + memset(advances, 0, sizeof(*advances) * glyph_count); + return S_OK; + } + + if (m && memcmp(m, &identity, sizeof(*m))) + FIXME("transform is not supported, %s\n", debugstr_matrix(m)); for (i = 0; i < glyph_count; i++) { hr = IDWriteFontFace2_GetDesignGlyphAdvances(iface, 1, glyphs + i, advances + i, is_sideways); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 7dc6077..94dccdd 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3905,6 +3905,121 @@ static void test_GetPanose(void) IDWriteFactory_Release(factory); } +static INT32 get_gdi_font_advance(HDC hdc, FLOAT emsize) +{ + LOGFONTW logfont; + HFONT hfont; + BOOL ret; + ABC abc; + + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = (LONG)-emsize; + logfont.lfWeight = FW_NORMAL; + logfont.lfQuality = CLEARTYPE_QUALITY; + lstrcpyW(logfont.lfFaceName, tahomaW); + + hfont = CreateFontIndirectW(&logfont); + SelectObject(hdc, hfont); + + ret = GetCharABCWidthsW(hdc, 'A', 'A', &abc); + ok(ret, "got %d\n", ret); + + DeleteObject(hfont); + + return abc.abcA + abc.abcB + abc.abcC; +} + +static void test_GetGdiCompatibleGlyphAdvances(void) +{ + IDWriteFontFace1 *fontface1; + IDWriteFontFace *fontface; + IDWriteFactory *factory; + IDWriteFont *font; + HRESULT hr; + HDC hdc; + UINT32 codepoint; + UINT16 glyph; + FLOAT emsize; + DWRITE_FONT_METRICS1 fm; + INT32 advance; + + factory = create_factory(); + font = get_tahoma_instance(factory, DWRITE_FONT_STYLE_NORMAL); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFont_Release(font); + + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void**)&fontface1); + IDWriteFontFace_Release(fontface); + + if (hr != S_OK) { + IDWriteFactory_Release(factory); + win_skip("GetGdiCompatibleGlyphAdvances() is not supported\n"); + return; + } + + codepoint = 'A'; + glyph = 0; + hr = IDWriteFontFace1_GetGlyphIndices(fontface1, &codepoint, 1, &glyph); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(glyph > 0, "got %u\n", glyph); + + /* zero emsize */ + advance = 1; + hr = IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, 0.0, + 1.0, NULL, FALSE, FALSE, 1, &glyph, &advance); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(advance == 0, "got %d\n", advance); + + /* negative emsize */ + advance = 1; + hr = IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, -1.0, + 1.0, NULL, FALSE, FALSE, 1, &glyph, &advance); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(advance == 0, "got %d\n", advance); + + /* zero ppdip */ + advance = 1; + hr = IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, 1.0, + 0.0, NULL, FALSE, FALSE, 1, &glyph, &advance); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(advance == 0, "got %d\n", advance); + + /* negative ppdip */ + advance = 1; + hr = IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, 1.0, + -1.0, NULL, FALSE, FALSE, 1, &glyph, &advance); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(advance == 0, "got %d\n", advance); + + IDWriteFontFace1_GetMetrics(fontface1, &fm); + + hdc = CreateCompatibleDC(0); + + for (emsize = 1.0; emsize <= fm.designUnitsPerEm; emsize += 1.0) { + INT32 gdi_advance; + + gdi_advance = get_gdi_font_advance(hdc, emsize); + hr = IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, emsize, + 1.0, NULL, FALSE, FALSE, 1, &glyph, &advance); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* advance is in design units */ + advance = (int)floorf(emsize * advance / fm.designUnitsPerEm + 0.5f); + + /* allow 1 pixel difference for large sizes, for Tahoma this happens for 16 sizes in [1, 2048] range */ + if (emsize > 150.0) + ok((advance - gdi_advance) <= 1, "%.0f: got advance %d, expected %d\n", emsize, advance, gdi_advance); + else + ok(gdi_advance == advance, "%.0f: got advance %d, expected %d\n", emsize, advance, gdi_advance); + } + + DeleteObject(hdc); + + IDWriteFactory_Release(factory); +} + START_TEST(font) { IDWriteFactory *factory; @@ -3950,6 +4065,7 @@ START_TEST(font) test_CreateGlyphRunAnalysis(); test_GetGdiCompatibleMetrics(); test_GetPanose(); + test_GetGdiCompatibleGlyphAdvances(); IDWriteFactory_Release(factory); }

1 0

Jacek Caban : ieframe: Allow travellog buffer to grow even if we' re loading from the history.
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: 5f2d2c146c27d4ee98fe1b00a03d50220bc48f10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f2d2c146c27d4ee98fe1b00a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 20 14:01:13 2015 +0200 ieframe: Allow travellog buffer to grow even if we're loading from the history. Spotted by Marcus Meissner. --- dlls/ieframe/dochost.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index c76e91c..b0d713b 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -395,25 +395,25 @@ static void update_travellog(DocHost *This) { travellog_entry_t *new_entry; - if(This->travellog.loading_pos == -1) { - /* Clear forward history. */ - if(!This->travellog.log) { - This->travellog.log = heap_alloc(4 * sizeof(*This->travellog.log)); - if(!This->travellog.log) - return; + if(!This->travellog.log) { + This->travellog.log = heap_alloc(4 * sizeof(*This->travellog.log)); + if(!This->travellog.log) + return; - This->travellog.size = 4; - }else if(This->travellog.size < This->travellog.position+1) { - travellog_entry_t *new_travellog; + This->travellog.size = 4; + }else if(This->travellog.size < This->travellog.position+1) { + travellog_entry_t *new_travellog; - new_travellog = heap_realloc(This->travellog.log, This->travellog.size*2*sizeof(*This->travellog.log)); - if(!new_travellog) - return; + new_travellog = heap_realloc(This->travellog.log, This->travellog.size*2*sizeof(*This->travellog.log)); + if(!new_travellog) + return; - This->travellog.log = new_travellog; - This->travellog.size *= 2; - } + This->travellog.log = new_travellog; + This->travellog.size *= 2; + } + if(This->travellog.loading_pos == -1) { + /* Clear forward history. */ while(This->travellog.length > This->travellog.position) free_travellog_entry(This->travellog.log + --This->travellog.length); }

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2015