July 2017 - Wine-Commits - list.winehq.org

Nikolay Sivov : dwrite: Improve rendering parameters validation.
by Alexandre Julliard July 17, 2017

July 17, 2017

Module: wine Branch: master Commit: e1f191e34376138149d497f3026817f2eabce8fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1f191e34376138149d497f30… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 17 23:18:43 2017 +0300 dwrite: Improve rendering parameters validation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 11 ++++- dlls/dwrite/main.c | 27 ++++++++++- dlls/dwrite/tests/font.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 152 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e1f191e34376138149d49…

1 0

Henri Verbeet : wined3d: Simplify the render target check in ffp_blitter_clear().
by Alexandre Julliard July 17, 2017

July 17, 2017

Module: wine Branch: master Commit: b8e0af67f5443bf123667fb91798b68c251deb94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8e0af67f5443bf123667fb91… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 17 14:01:38 2017 +0200 wined3d: Simplify the render target check in ffp_blitter_clear(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d000e5c..632a42b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2569,7 +2569,6 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) { struct wined3d_rendertarget_view *view; - struct wined3d_resource *resource; struct wined3d_blitter *next; unsigned int i; @@ -2580,22 +2579,13 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de if (!(view = fb->render_targets[i])) continue; - resource = view->resource; - if (!(flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) + if ((!(flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) && ffp_blitter_use_cpu_clear(view)) + || (!(view->resource->usage & WINED3DUSAGE_RENDERTARGET) + && (wined3d_settings.offscreen_rendering_mode != ORM_FBO + || !(view->format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE)))) goto next; - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - if (!((view->format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE) - || (resource->usage & WINED3DUSAGE_RENDERTARGET))) - goto next; - } - else if (!(resource->usage & WINED3DUSAGE_RENDERTARGET)) - { - goto next; - } - /* FIXME: We should reject colour fills on formats with fixups, * but this would break P8 colour fills for example. */ }

1 0

Henri Verbeet : wined3d: Make a FIXME in cpu_blitter_clear() slightly more accurate.
by Alexandre Julliard July 17, 2017

July 17, 2017

Module: wine Branch: master Commit: 864bef4c193276eefc8198ea2b91b5339d210db3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=864bef4c193276eefc8198ea2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 17 14:01:36 2017 +0200 wined3d: Make a FIXME in cpu_blitter_clear() slightly more accurate. The issue isn't so much stencil clears as clearing either depth or stencil on formats that contain both. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c1bb53e..c914e8d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3499,12 +3499,15 @@ static void cpu_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de } } - if ((flags & WINED3DCLEAR_ZBUFFER) && (view = fb->depth_stencil)) + if ((flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) && (view = fb->depth_stencil)) + { + if ((view->format->depth_size && !(flags & WINED3DCLEAR_ZBUFFER)) + || (view->format->stencil_size && !(flags & WINED3DCLEAR_STENCIL))) + FIXME("Clearing %#x on %s.\n", flags, debug_d3dformat(view->format->id)); + surface_cpu_blt_colour_fill(view, &box, &c); + } } - - if (flags & ~(WINED3DCLEAR_TARGET | WINED3DCLEAR_ZBUFFER)) - FIXME("flags %#x not implemented.\n", flags); } static void cpu_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_op op,

1 0

Nikolay Sivov : msacm32/tests: Fix a memory leak in tests (Valgrind).
by Alexandre Julliard July 17, 2017

July 17, 2017

Module: wine Branch: master Commit: f03b8a42f97f87bfaac1e30a37e6e18b9bd48c81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f03b8a42f97f87bfaac1e30a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 14 08:23:37 2017 +0300 msacm32/tests: Fix a memory leak in tests (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/tests/msacm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 337e20c..959ec7f 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -1272,6 +1272,8 @@ static void test_acmFormatChoose(void) rc = acmFormatChooseW(&afc); ok(rc == MMSYSERR_INVALPARAM, "expected 0xb, got 0x%x\n", rc); afc.pwfx = pwfx; + + HeapFree(GetProcessHeap(), 0, pwfx); } static struct

1 0

Alexandre Julliard : user32/tests: Add some tests for WindowFromDC and destroyed windows.
by Alexandre Julliard July 17, 2017

July 17, 2017

Module: wine Branch: master Commit: 52d90e3ce0ed5a35bcb10723379a1702f8706cc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52d90e3ce0ed5a35bcb107233… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 17 09:54:45 2017 +0200 user32/tests: Add some tests for WindowFromDC and destroyed windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dce.c | 103 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 87 insertions(+), 16 deletions(-) diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index 382d10a..25b0153 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -52,11 +52,14 @@ static void test_dc_attributes(void) rop = GetROP2( hdc ); ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); + ok( WindowFromDC( hdc ) == hwnd_cache, "wrong window\n" ); ReleaseDC( hwnd_cache, hdc ); + ok( WindowFromDC( hdc ) == 0, "wrong window\n" ); hdc = GetDC( hwnd_cache ); rop = GetROP2( hdc ); ok( rop == def_rop, "wrong ROP2 %d after release\n", rop ); SetROP2( hdc, R2_WHITE ); + ok( WindowFromDC( hdc ) == hwnd_cache, "wrong window\n" ); ReleaseDC( hwnd_cache, hdc ); old_hdc = hdc; @@ -115,6 +118,7 @@ static void test_dc_attributes(void) ok( rop == 0, "got %d\n", rop ); rop = GetROP2( old_hdc ); ok( rop == 0, "got %d\n", rop ); + ok( WindowFromDC( old_hdc ) == 0, "wrong window\n" ); /* test own DC */ @@ -124,11 +128,14 @@ static void test_dc_attributes(void) ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); old_hdc = hdc; + ok( WindowFromDC( hdc ) == hwnd_owndc, "wrong window\n" ); ReleaseDC( hwnd_owndc, hdc ); + ok( WindowFromDC( hdc ) == hwnd_owndc, "wrong window\n" ); hdc = GetDC( hwnd_owndc ); ok( old_hdc == hdc, "didn't get same DC %p/%p\n", old_hdc, hdc ); rop = GetROP2( hdc ); ok( rop == R2_WHITE, "wrong ROP2 %d after release\n", rop ); + ok( WindowFromDC( hdc ) == hwnd_owndc, "wrong window\n" ); ReleaseDC( hwnd_owndc, hdc ); rop = GetROP2( hdc ); ok( rop == R2_WHITE, "wrong ROP2 %d after second release\n", rop ); @@ -141,11 +148,14 @@ static void test_dc_attributes(void) ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); old_hdc = hdc; + ok( WindowFromDC( hdc ) == hwnd_classdc, "wrong window\n" ); ReleaseDC( hwnd_classdc, hdc ); + ok( WindowFromDC( hdc ) == hwnd_classdc, "wrong window\n" ); hdc = GetDC( hwnd_classdc ); ok( old_hdc == hdc, "didn't get same DC %p/%p\n", old_hdc, hdc ); rop = GetROP2( hdc ); ok( rop == R2_WHITE, "wrong ROP2 %d after release\n", rop ); + ok( WindowFromDC( hdc ) == hwnd_classdc, "wrong window\n" ); ReleaseDC( hwnd_classdc, hdc ); rop = GetROP2( hdc ); ok( rop == R2_WHITE, "wrong ROP2 %d after second release\n", rop ); @@ -154,12 +164,15 @@ static void test_dc_attributes(void) old_hdc = GetDC( hwnd_classdc ); SetROP2( old_hdc, R2_BLACK ); + ok( WindowFromDC( old_hdc ) == hwnd_classdc, "wrong window\n" ); hdc = GetDC( hwnd_classdc2 ); ok( old_hdc == hdc, "didn't get same DC %p/%p\n", old_hdc, hdc ); rop = GetROP2( hdc ); ok( rop == R2_BLACK, "wrong ROP2 %d for other window\n", rop ); + ok( WindowFromDC( hdc ) == hwnd_classdc2, "wrong window\n" ); ReleaseDC( hwnd_classdc, old_hdc ); ReleaseDC( hwnd_classdc, hdc ); + ok( WindowFromDC( hdc ) == hwnd_classdc2, "wrong window\n" ); rop = GetROP2( hdc ); ok( rop == R2_BLACK, "wrong ROP2 %d after release\n", rop ); } @@ -597,19 +610,83 @@ static void test_dc_layout(void) static void test_destroyed_window(void) { - HDC dc; + HDC dc, old_dc; + HDC hdcs[30]; + int i, rop; - dc = GetDCEx(hwnd_cache, 0, DCX_USESTYLE); - ok(!dc, "Got a non-NULL DC (%p) for a destroyed window.\n", dc); + dc = GetDC( hwnd_cache ); + SetROP2( dc, R2_WHITE ); + rop = GetROP2( dc ); + ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); + ok( WindowFromDC( dc ) == hwnd_cache, "wrong window\n" ); + old_dc = dc; + + DestroyWindow( hwnd_cache ); + rop = GetROP2( dc ); + todo_wine ok( rop == 0, "wrong ROP2 %d\n", rop ); + ok( WindowFromDC( dc ) == 0, "wrong window\n" ); + ok( !ReleaseDC( hwnd_cache, dc ), "ReleaseDC succeeded\n" ); + dc = GetDC( hwnd_cache ); + ok( !dc, "Got a non-NULL DC (%p) for a destroyed window\n", dc ); + + for (i = 0; i < 30; i++) + { + dc = hdcs[i] = GetDCEx( hwnd_parent, 0, DCX_CACHE | DCX_USESTYLE ); + if (dc == old_dc) break; + } + ok( i < 30, "DC for destroyed window not reused\n" ); + while (i > 0) ReleaseDC( hwnd_parent, hdcs[--i] ); + + dc = GetDC( hwnd_classdc ); + SetROP2( dc, R2_WHITE ); + rop = GetROP2( dc ); + ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); + ok( WindowFromDC( dc ) == hwnd_classdc, "wrong window\n" ); + old_dc = dc; + + dc = GetDC( hwnd_classdc2 ); + ok( old_dc == dc, "wrong DC\n" ); + rop = GetROP2( dc ); + ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); + ok( WindowFromDC( dc ) == hwnd_classdc2, "wrong window\n" ); + DestroyWindow( hwnd_classdc2 ); - dc = GetDCEx(hwnd_owndc, 0, DCX_USESTYLE); - ok(!dc, "Got a non-NULL DC (%p) for a destroyed window.\n", dc); + rop = GetROP2( dc ); + ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); + ok( WindowFromDC( dc ) == 0, "wrong window\n" ); + todo_wine ok( !ReleaseDC( hwnd_classdc2, dc ), "ReleaseDC succeeded\n" ); + dc = GetDC( hwnd_classdc2 ); + ok( !dc, "Got a non-NULL DC (%p) for a destroyed window\n", dc ); + + dc = GetDC( hwnd_classdc ); + ok( dc != 0, "Got NULL DC\n" ); + rop = GetROP2( dc ); + todo_wine ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); + ok( WindowFromDC( dc ) == hwnd_classdc, "wrong window\n" ); + DestroyWindow( hwnd_classdc ); + + rop = GetROP2( dc ); + todo_wine ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); + ok( WindowFromDC( dc ) == 0, "wrong window\n" ); + todo_wine ok( !ReleaseDC( hwnd_classdc, dc ), "ReleaseDC succeeded\n" ); + dc = GetDC( hwnd_classdc ); + ok( !dc, "Got a non-NULL DC (%p) for a destroyed window\n", dc ); + + dc = GetDC( hwnd_owndc ); + ok( dc != 0, "Got NULL DC\n" ); + rop = GetROP2( dc ); + ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); + ok( WindowFromDC( dc ) == hwnd_owndc, "wrong window\n" ); + DestroyWindow( hwnd_owndc ); - dc = GetDCEx(hwnd_classdc, 0, DCX_USESTYLE); - ok(!dc, "Got a non-NULL DC (%p) for a destroyed window.\n", dc); + rop = GetROP2( dc ); + ok( rop == 0, "wrong ROP2 %d\n", rop ); + ok( WindowFromDC( dc ) == 0, "wrong window\n" ); + ok( !ReleaseDC( hwnd_owndc, dc ), "ReleaseDC succeeded\n" ); + dc = GetDC( hwnd_owndc ); + ok( !dc, "Got a non-NULL DC (%p) for a destroyed window\n", dc ); - dc = GetDCEx(hwnd_classdc2, 0, DCX_USESTYLE); - ok(!dc, "Got a non-NULL DC (%p) for a destroyed window.\n", dc); + DestroyWindow( hwnd_parent ); } START_TEST(dce) @@ -661,12 +738,6 @@ START_TEST(dce) test_scroll_window(); test_invisible_create(); test_dc_layout(); - - DestroyWindow(hwnd_parent); - DestroyWindow(hwnd_classdc2); - DestroyWindow(hwnd_classdc); - DestroyWindow(hwnd_owndc); - DestroyWindow(hwnd_cache); - + /* this should be last */ test_destroyed_window(); }

1 0

Marcus Meissner : gameux: Avoid freeing uninitialized interfaces (Coverity ).
by Alexandre Julliard July 17, 2017

July 17, 2017

Module: wine Branch: master Commit: 08193ed72b2b134a2079d261944f456438460c8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=08193ed72b2b134a2079d2619… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jul 15 10:16:12 2017 +0200 gameux: Avoid freeing uninitialized interfaces (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gameux/gamestatistics.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index b9e913e..0ee449a 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -111,9 +111,9 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) static const WCHAR sValue[] = {'V','a','l','u','e',0}; HRESULT hr = S_OK; - IXMLDOMDocument *document; - IXMLDOMElement *root, *statisticsElement; - IXMLDOMNode *categoryNode, *statisticsNode; + IXMLDOMDocument *document = NULL; + IXMLDOMElement *root = NULL, *statisticsElement = NULL; + IXMLDOMNode *categoryNode = NULL, *statisticsNode = NULL; VARIANT vStatsFilePath, vValue; BSTR bstrStatistics = NULL, bstrCategory = NULL, bstrIndex = NULL, bstrStatistic = NULL, bstrName = NULL, bstrValue = NULL; @@ -209,8 +209,7 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) hr = IXMLDOMElement_setAttribute(categoryElement, bstrName, vValue); } - if (categoryElement) - IXMLDOMElement_Release(categoryElement); + if (categoryElement) IXMLDOMElement_Release(categoryElement); SysFreeString(V_BSTR(&vValue)); @@ -266,15 +265,16 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) if(SUCCEEDED(hr)) hr = IXMLDOMNode_appendChild(categoryNode, statisticsNode, NULL); - IXMLDOMElement_Release(statisticsElement); - IXMLDOMNode_Release(statisticsNode); + if (statisticsElement) IXMLDOMElement_Release(statisticsElement); + if (statisticsNode) IXMLDOMNode_Release(statisticsNode); } } if(SUCCEEDED(hr)) hr = IXMLDOMElement_appendChild(root, categoryNode, &categoryNode); - IXMLDOMNode_Release(categoryNode); + if (categoryNode) + IXMLDOMNode_Release(categoryNode); if(FAILED(hr)) break; @@ -283,7 +283,7 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) if(SUCCEEDED(hr)) hr = IXMLDOMDocument_putref_documentElement(document, root); - IXMLDOMElement_Release(root); + if (root) IXMLDOMElement_Release(root); TRACE("saving game statistics in %s file\n", debugstr_w(stats->sStatsFile)); if(SUCCEEDED(hr)) @@ -292,7 +292,7 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) if(SUCCEEDED(hr)) hr = IXMLDOMDocument_save(document, vStatsFilePath); - IXMLDOMDocument_Release(document); + if (document) IXMLDOMDocument_Release(document); SysFreeString(bstrValue); SysFreeString(bstrName); @@ -426,9 +426,9 @@ static HRESULT GAMEUX_loadStatisticsFromFile(struct GAMEUX_STATS *data) HRESULT hr = S_OK; IXMLDOMDocument *document = NULL; - IXMLDOMElement *root = NULL, *categoryElement, *statisticElement; - IXMLDOMNode *categoryNode, *statisticNode; - IXMLDOMNodeList *rootChildren = NULL, *categoryChildren; + IXMLDOMElement *root = NULL, *categoryElement = NULL, *statisticElement = NULL; + IXMLDOMNode *categoryNode = NULL, *statisticNode = NULL; + IXMLDOMNodeList *rootChildren = NULL, *categoryChildren = NULL; VARIANT vStatsFilePath, vValue; BSTR bstrStatistics = NULL, bstrCategory = NULL, bstrIndex = NULL, bstrStatistic = NULL, bstrName = NULL, bstrValue = NULL; @@ -571,22 +571,22 @@ static HRESULT GAMEUX_loadStatisticsFromFile(struct GAMEUX_STATS *data) debugstr_w(data->categories[i].stats[j].sName), debugstr_w(data->categories[i].stats[j].sValue)); } - IXMLDOMElement_Release(statisticElement); + if (statisticElement) IXMLDOMElement_Release(statisticElement); } - IXMLDOMNode_Release(statisticNode); + if (statisticNode) IXMLDOMNode_Release(statisticNode); } } - IXMLDOMNodeList_Release(categoryChildren); + if (categoryChildren) IXMLDOMNodeList_Release(categoryChildren); if(SUCCEEDED(hr)) hr = S_OK; } - IXMLDOMElement_Release(categoryElement); + if (categoryElement) IXMLDOMElement_Release(categoryElement); } - IXMLDOMNode_Release(categoryNode); + if (categoryNode) IXMLDOMNode_Release(categoryNode); } } if(SUCCEEDED(hr))

1 0

Nikolay Sivov : dwrite: Use antialias mode set for bitmap render target.
by Alexandre Julliard July 17, 2017

July 17, 2017

Module: wine Branch: master Commit: 1e5b9d369bbb312a22b73513b9afc1aaf7041f99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e5b9d369bbb312a22b73513b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 17 23:18:44 2017 +0300 dwrite: Use antialias mode set for bitmap render target. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/gdiinterop.c | 37 +++++++++++++++-------------- dlls/dwrite/tests/font.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 18 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index b870448..aa2e3a6 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -43,7 +43,7 @@ struct rendertarget { ID2D1SimplifiedGeometrySink ID2D1SimplifiedGeometrySink_iface; LONG ref; - IDWriteFactory *factory; + IDWriteFactory5 *factory; DWRITE_TEXT_ANTIALIAS_MODE antialiasmode; FLOAT ppdip; DWRITE_MATRIX m; @@ -243,7 +243,7 @@ static ULONG WINAPI rendertarget_Release(IDWriteBitmapRenderTarget1 *iface) if (!ref) { - IDWriteFactory_Release(This->factory); + IDWriteFactory5_Release(This->factory); DeleteDC(This->hdc); heap_free(This); } @@ -313,8 +313,10 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget1(iface); IDWriteGlyphRunAnalysis *analysis; DWRITE_RENDERING_MODE rendermode; + DWRITE_GRID_FIT_MODE gridfitmode; DWRITE_TEXTURE_TYPE texturetype; - IDWriteFontFace1 *fontface1; + IDWriteFontFace2 *fontface2; + DWRITE_GLYPH_RUN scaled_run; RECT target, bounds; HRESULT hr; @@ -326,17 +328,15 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac if (!This->dib.ptr) return S_OK; - hr = IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace1, (void**)&fontface1); - if (hr == S_OK) { - hr = IDWriteFontFace1_GetRecommendedRenderingMode(fontface1, run->fontEmSize, This->ppdip * 96.0f, - This->ppdip * 96.0f, NULL, run->isSideways, DWRITE_OUTLINE_THRESHOLD_ALIASED, measuring_mode, - &rendermode); - IDWriteFontFace1_Release(fontface1); + if (FAILED(hr = IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace2, (void **)&fontface2))) { + WARN("Failed to get IDWriteFontFace2 interface, hr %#x.\n", hr); + return hr; } - else - hr = IDWriteFontFace_GetRecommendedRenderingMode(run->fontFace, run->fontEmSize, - This->ppdip, measuring_mode, params, &rendermode); + hr = IDWriteFontFace2_GetRecommendedRenderingMode(fontface2, run->fontEmSize, This->ppdip * 96.0f, + This->ppdip * 96.0f, NULL /* FIXME */, run->isSideways, DWRITE_OUTLINE_THRESHOLD_ALIASED, measuring_mode, + params, &rendermode, &gridfitmode); + IDWriteFontFace2_Release(fontface2); if (FAILED(hr)) return hr; @@ -392,9 +392,10 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac return hr; } - hr = IDWriteFactory_CreateGlyphRunAnalysis(This->factory, - run, This->ppdip, &This->m, rendermode, measuring_mode, - originX, originY, &analysis); + scaled_run = *run; + scaled_run.fontEmSize *= This->ppdip; + hr = IDWriteFactory5_CreateGlyphRunAnalysis(This->factory, &scaled_run, &This->m, rendermode, measuring_mode, + gridfitmode, This->antialiasmode, originX, originY, &analysis); if (FAILED(hr)) { WARN("failed to create analysis instance, 0x%08x\n", hr); return hr; @@ -549,7 +550,7 @@ static const IDWriteBitmapRenderTarget1Vtbl rendertargetvtbl = { rendertarget_SetTextAntialiasMode }; -static HRESULT create_rendertarget(IDWriteFactory *factory, HDC hdc, UINT32 width, UINT32 height, IDWriteBitmapRenderTarget **ret) +static HRESULT create_rendertarget(IDWriteFactory5 *factory, HDC hdc, UINT32 width, UINT32 height, IDWriteBitmapRenderTarget **ret) { struct rendertarget *target; HRESULT hr; @@ -575,7 +576,7 @@ static HRESULT create_rendertarget(IDWriteFactory *factory, HDC hdc, UINT32 widt target->ppdip = GetDeviceCaps(target->hdc, LOGPIXELSX) / 96.0f; target->antialiasmode = DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE; target->factory = factory; - IDWriteFactory_AddRef(factory); + IDWriteFactory5_AddRef(factory); *ret = (IDWriteBitmapRenderTarget*)&target->IDWriteBitmapRenderTarget1_iface; @@ -779,7 +780,7 @@ static HRESULT WINAPI gdiinterop_CreateBitmapRenderTarget(IDWriteGdiInterop1 *if { struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); TRACE("(%p)->(%p %u %u %p)\n", This, hdc, width, height, target); - return create_rendertarget((IDWriteFactory*)This->factory, hdc, width, height, target); + return create_rendertarget(This->factory, hdc, width, height, target); } static HRESULT WINAPI gdiinterop1_CreateFontFromLOGFONT(IDWriteGdiInterop1 *iface, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index dc88e2c..52ce9f0 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1053,9 +1053,13 @@ static void test_CreateBitmapRenderTarget(void) { IDWriteBitmapRenderTarget *target, *target2; IDWriteBitmapRenderTarget1 *target1; + IDWriteRenderingParams *params; IDWriteGdiInterop *interop; + IDWriteFontFace *fontface; IDWriteFactory *factory; + DWRITE_GLYPH_RUN run; HBITMAP hbm, hbm2; + UINT16 glyphs[2]; DWRITE_MATRIX m; DIBSECTION ds; XFORM xform; @@ -1064,6 +1068,7 @@ static void test_CreateBitmapRenderTarget(void) FLOAT pdip; SIZE size; ULONG ref; + UINT32 ch; HDC hdc; int ret; @@ -1307,6 +1312,62 @@ static void test_CreateBitmapRenderTarget(void) else win_skip("IDWriteBitmapRenderTarget1 is not supported.\n"); + /* DrawGlyphRun() argument validation. */ + hr = IDWriteBitmapRenderTarget_Resize(target, 16, 16); + ok(hr == S_OK, "Failed to resize target, hr %#x.\n", hr); + + fontface = create_fontface(factory); + + ch = 'A'; + glyphs[0] = 0; + hr = IDWriteFontFace_GetGlyphIndices(fontface, &ch, 1, glyphs); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(glyphs[0] > 0, "got %u\n", glyphs[0]); + glyphs[1] = glyphs[0]; + + memset(&run, 0, sizeof(run)); + run.fontFace = fontface; + run.fontEmSize = 12.0f; + run.glyphCount = 2; + run.glyphIndices = glyphs; + + hr = IDWriteFactory_CreateCustomRenderingParams(factory, 1.0f, 0.0f, 0.0f, DWRITE_PIXEL_GEOMETRY_FLAT, + DWRITE_RENDERING_MODE_DEFAULT, &params); + ok(hr == S_OK, "Failed to create rendering params, hr %#x.\n", hr); + + hr = IDWriteBitmapRenderTarget_DrawGlyphRun(target, 0.0f, 0.0f, DWRITE_MEASURING_MODE_NATURAL, + &run, NULL, RGB(255, 0, 0), NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IDWriteBitmapRenderTarget_DrawGlyphRun(target, 0.0f, 0.0f, DWRITE_MEASURING_MODE_GDI_NATURAL + 1, + &run, NULL, RGB(255, 0, 0), NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IDWriteBitmapRenderTarget_DrawGlyphRun(target, 0.0f, 0.0f, DWRITE_MEASURING_MODE_GDI_NATURAL + 1, + &run, params, RGB(255, 0, 0), NULL); + ok(hr == E_INVALIDARG || broken(hr == S_OK) /* Vista */, "Unexpected hr %#x.\n", hr); + + hr = IDWriteBitmapRenderTarget_DrawGlyphRun(target, 0.0f, 0.0f, DWRITE_MEASURING_MODE_GDI_NATURAL, + &run, params, RGB(255, 0, 0), NULL); + ok(hr == S_OK, "Failed to draw a run, hr %#x.\n", hr); + + IDWriteRenderingParams_Release(params); + + /* Zero sized target returns earlier. */ + hr = IDWriteBitmapRenderTarget_Resize(target, 0, 16); + ok(hr == S_OK, "Failed to resize target, hr %#x.\n", hr); + + hr = IDWriteBitmapRenderTarget_DrawGlyphRun(target, 0.0f, 0.0f, DWRITE_MEASURING_MODE_NATURAL, + &run, NULL, RGB(255, 0, 0), NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDWriteBitmapRenderTarget_DrawGlyphRun(target, 0.0f, 0.0f, DWRITE_MEASURING_MODE_GDI_NATURAL + 1, + &run, params, RGB(255, 0, 0), NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IDWriteFontFace_Release(fontface); + ref = IDWriteBitmapRenderTarget_Release(target); ok(ref == 0, "render target not released, %u\n", ref); ref = IDWriteGdiInterop_Release(interop);

1 0

Henri Verbeet : wined3d: Avoid using the CPU blitter for clearing converted surfaces that aren' t current on the CPU.
by Alexandre Julliard July 17, 2017

July 17, 2017

Module: wine Branch: master Commit: 990be0ba5010def7e9a1f0b5312df6a77c7b6cda URL: http://source.winehq.org/git/wine.git/?a=commit;h=990be0ba5010def7e9a1f0b53… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 17 14:01:41 2017 +0200 wined3d: Avoid using the CPU blitter for clearing converted surfaces that aren't current on the CPU. Since that would imply reading them back, with associated format conversion. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 58a4388..c143256 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2551,17 +2551,14 @@ static BOOL ffp_blitter_use_cpu_clear(struct wined3d_rendertarget_view *view) struct wined3d_texture *texture; resource = view->resource; - if (resource->pool == WINED3D_POOL_SYSTEM_MEM) - return TRUE; - if (resource->type == WINED3D_RTYPE_BUFFER) - return FALSE; + return resource->pool == WINED3D_POOL_SYSTEM_MEM; texture = texture_from_resource(resource); - if (!(texture->flags & WINED3D_TEXTURE_PIN_SYSMEM)) - return FALSE; + if (texture->sub_resources[view->sub_resource_idx].locations & resource->map_binding) + return resource->pool == WINED3D_POOL_SYSTEM_MEM || (texture->flags & WINED3D_TEXTURE_PIN_SYSMEM); - return texture->sub_resources[view->sub_resource_idx].locations & resource->map_binding; + return resource->pool == WINED3D_POOL_SYSTEM_MEM && !(texture->flags & WINED3D_TEXTURE_CONVERTED); } static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Avoid using the CPU blitter for clearing either depth or stencil on combined formats.
by Alexandre Julliard July 17, 2017

July 17, 2017

Module: wine Branch: master Commit: 92d030c41edf15818d8ee4fb9cfd5007cc98e97e URL: http://source.winehq.org/git/wine.git/?a=commit;h=92d030c41edf15818d8ee4fb9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 17 14:01:40 2017 +0200 wined3d: Avoid using the CPU blitter for clearing either depth or stencil on combined formats. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d5820bd..58a4388 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2595,8 +2595,10 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de } } - if ((flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) - && (view = fb->depth_stencil) && ffp_blitter_use_cpu_clear(view)) + if ((flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) && (view = fb->depth_stencil) + && (!view->format->depth_size || (flags & WINED3DCLEAR_ZBUFFER)) + && (!view->format->stencil_size || (flags & WINED3DCLEAR_STENCIL)) + && ffp_blitter_use_cpu_clear(view)) { next_flags |= flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL); flags &= ~(WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL);

1 0

Henri Verbeet : wined3d: Split combined render target and depth/ stencil clears if needed in ffp_blitter_clear().
by Alexandre Julliard July 17, 2017

July 17, 2017

Module: wine Branch: master Commit: a9a5f371aee02d8087f1c16e74c223ad75585102 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9a5f371aee02d8087f1c16e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 17 14:01:39 2017 +0200 wined3d: Split combined render target and depth/stencil clears if needed in ffp_blitter_clear(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 632a42b..d5820bd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2570,6 +2570,7 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de { struct wined3d_rendertarget_view *view; struct wined3d_blitter *next; + DWORD next_flags = 0; unsigned int i; if (flags & WINED3DCLEAR_TARGET) @@ -2579,12 +2580,15 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de if (!(view = fb->render_targets[i])) continue; - if ((!(flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) - && ffp_blitter_use_cpu_clear(view)) + if (ffp_blitter_use_cpu_clear(view) || (!(view->resource->usage & WINED3DUSAGE_RENDERTARGET) && (wined3d_settings.offscreen_rendering_mode != ORM_FBO || !(view->format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE)))) - goto next; + { + next_flags |= WINED3DCLEAR_TARGET; + flags &= ~WINED3DCLEAR_TARGET; + break; + } /* FIXME: We should reject colour fills on formats with fixups, * but this would break P8 colour fills for example. */ @@ -2593,16 +2597,18 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de if ((flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) && (view = fb->depth_stencil) && ffp_blitter_use_cpu_clear(view)) - goto next; + { + next_flags |= flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL); + flags &= ~(WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL); + } - device_clear_render_targets(device, rt_count, fb, rect_count, - clear_rects, draw_rect, flags, colour, depth, stencil); - return; + if (flags) + device_clear_render_targets(device, rt_count, fb, rect_count, + clear_rects, draw_rect, flags, colour, depth, stencil); -next: - if ((next = blitter->next)) + if (next_flags && (next = blitter->next)) next->ops->blitter_clear(next, device, rt_count, fb, rect_count, - clear_rects, draw_rect, flags, colour, depth, stencil); + clear_rects, draw_rect, next_flags, colour, depth, stencil); } static void ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_op op,

1 0