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

Alexandre Julliard : Wine release 1.7.47
by Alexandre Julliard July 10, 2015

July 10, 2015

Module: website Branch: master Commit: b787cecf4fb23f55a734610b7ce1a8a963ab4945 URL: http://source.winehq.org/git/website.git/?a=commit;h=b787cecf4fb23f55a73461… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 10 22:51:00 2015 +0900 Wine release 1.7.47 --- news/en/2015071001.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2015071001.xml b/news/en/2015071001.xml new file mode 100644 index 0000000..5237d96 --- /dev/null +++ b/news/en/2015071001.xml @@ -0,0 +1,17 @@ +<news> +<date>July 10, 2015</date> +<title>Wine 1.7.47 Released</title> +<body> + The Wine development release 1.7.47 is now available. + <a href="{$root}/announce/1.7.47">What's new</a> in this release: +<ul> + <li>Text drawing in Direct2D.</li> + <li>Support for the new thread pool API.</li> + <li>Toolbar state saving.</li> + <li>Beginnings of an implementation for proper HID support.</li> + <li>Support for file objects in device drivers.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.47.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_DrawText().
by Alexandre Julliard July 10, 2015

July 10, 2015

Module: wine Branch: master Commit: aed042d4dc68ab11918ddc90c280f372b1f2b374 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aed042d4dc68ab11918ddc90c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 10 15:03:46 2015 +0200 d2d1: Implement d2d_d3d_render_target_DrawText(). --- dlls/d2d1/Makefile.in | 1 + dlls/d2d1/render_target.c | 38 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index c5f5523..d938210 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -1,6 +1,7 @@ MODULE = d2d1.dll IMPORTLIB = d2d1 IMPORTS = d3d10_1 dxguid uuid +DELAYIMPORTS = dwrite C_SRCS = \ bitmap.c \ diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 79de9e7..b7ca78c 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -44,6 +44,12 @@ static void d2d_matrix_multiply(D2D_MATRIX_3X2_F *a, const D2D_MATRIX_3X2_F *b) a->_32 = tmp._31 * b->_12 + tmp._32 * b->_22 + b->_32; } +static void d2d_point_set(D2D1_POINT_2F *dst, float x, float y) +{ + dst->x = x; + dst->y = y; +} + static void d2d_point_transform(D2D1_POINT_2F *dst, const D2D1_MATRIX_3X2_F *matrix, float x, float y) { dst->x = x * matrix->_11 + y * matrix->_21 + matrix->_31; @@ -798,10 +804,38 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawText(ID2D1RenderTarget * const WCHAR *string, UINT32 string_len, IDWriteTextFormat *text_format, const D2D1_RECT_F *layout_rect, ID2D1Brush *brush, D2D1_DRAW_TEXT_OPTIONS options, DWRITE_MEASURING_MODE measuring_mode) { - FIXME("iface %p, string %s, string_len %u, text_format %p, layout_rect %p, " - "brush %p, options %#x, measuring_mode %#x stub!\n", + IDWriteTextLayout *text_layout; + IDWriteFactory *dwrite_factory; + D2D1_POINT_2F origin; + HRESULT hr; + + TRACE("iface %p, string %s, string_len %u, text_format %p, layout_rect %p, " + "brush %p, options %#x, measuring_mode %#x.\n", iface, debugstr_wn(string, string_len), string_len, text_format, layout_rect, brush, options, measuring_mode); + + if (measuring_mode != DWRITE_MEASURING_MODE_NATURAL) + FIXME("Ignoring measuring mode %#x.\n", measuring_mode); + + if (FAILED(hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, + &IID_IDWriteFactory, (IUnknown **)&dwrite_factory))) + { + ERR("Failed to create dwrite factory, hr %#x.\n", hr); + return; + } + + hr = IDWriteFactory_CreateTextLayout(dwrite_factory, string, string_len, text_format, + layout_rect->right - layout_rect->left, layout_rect->bottom - layout_rect->top, &text_layout); + IDWriteFactory_Release(dwrite_factory); + if (FAILED(hr)) + { + ERR("Failed to create text layout, hr %#x.\n", hr); + return; + } + + d2d_point_set(&origin, layout_rect->left, layout_rect->top); + ID2D1RenderTarget_DrawTextLayout(iface, origin, text_layout, brush, options); + IDWriteTextLayout_Release(text_layout); } static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawTextLayout(ID2D1RenderTarget *iface,

1 0

Tag wine-1.7.47 : Alexandre Julliard : Release 1.7.47
by Alexandre Julliard July 10, 2015

July 10, 2015

Module: wine Branch: refs/tags/wine-1.7.47 Tag: 774f6511371a3dde0d41e0dbb9be5e4b86866647 URL: http://source.winehq.org/git/wine.git/?a=tag;h=774f6511371a3dde0d41e0dbb9be… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 10 22:49:14 2015 +0900 Release 1.7.47

1 0

Alexandre Julliard : Release 1.7.47.
by Alexandre Julliard July 10, 2015

July 10, 2015

Module: wine Branch: master Commit: 744f7b69bf4692265588e10650090ca2f5129ccd URL: http://source.winehq.org/git/wine.git/?a=commit;h=744f7b69bf4692265588e1065… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 10 22:49:14 2015 +0900 Release 1.7.47. --- ANNOUNCE | 845 +++++++++++++++++++++++++++++++------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 438 insertions(+), 427 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=744f7b69bf4692265588e…

1 0

Henri Verbeet : d2d1: Implement d2d_path_geometry_GetSegmentCount().
by Alexandre Julliard July 10, 2015

July 10, 2015

Module: wine Branch: master Commit: b108a2ff78c4e2e49a144b4bb5e340390a0da127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b108a2ff78c4e2e49a144b4bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 10 15:03:45 2015 +0200 d2d1: Implement d2d_path_geometry_GetSegmentCount(). --- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/geometry.c | 32 ++++++++++++++++++++++++++++++-- dlls/d2d1/tests/d2d1.c | 25 +++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 96507b3..7519ab4 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -205,7 +205,7 @@ struct d2d_geometry LONG refcount; enum d2d_geometry_state state; - UINT32 figure_count; + UINT32 figure_count, segment_count; }; void d2d_path_geometry_init(struct d2d_geometry *geometry) DECLSPEC_HIDDEN; diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 4128f67..78d3beb 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -90,6 +90,7 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_BeginFigure(ID2D1GeometrySink *i } geometry->state = D2D_GEOMETRY_STATE_FIGURE; ++geometry->figure_count; + ++geometry->segment_count; } static void STDMETHODCALLTYPE d2d_geometry_sink_AddLines(ID2D1GeometrySink *iface, @@ -100,7 +101,12 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_AddLines(ID2D1GeometrySink *ifac FIXME("iface %p, points %p, count %u stub!\n", iface, points, count); if (geometry->state != D2D_GEOMETRY_STATE_FIGURE) + { geometry->state = D2D_GEOMETRY_STATE_ERROR; + return; + } + + geometry->segment_count += count; } static void STDMETHODCALLTYPE d2d_geometry_sink_AddBeziers(ID2D1GeometrySink *iface, @@ -111,7 +117,12 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_AddBeziers(ID2D1GeometrySink *if FIXME("iface %p, beziers %p, count %u stub!\n", iface, beziers, count); if (geometry->state != D2D_GEOMETRY_STATE_FIGURE) + { geometry->state = D2D_GEOMETRY_STATE_ERROR; + return; + } + + geometry->segment_count += count; } static void STDMETHODCALLTYPE d2d_geometry_sink_EndFigure(ID2D1GeometrySink *iface, D2D1_FIGURE_END figure_end) @@ -175,7 +186,12 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_AddQuadraticBeziers(ID2D1Geometr FIXME("iface %p, beziers %p, bezier_count %u stub!\n", iface, beziers, bezier_count); if (geometry->state != D2D_GEOMETRY_STATE_FIGURE) + { geometry->state = D2D_GEOMETRY_STATE_ERROR; + return; + } + + geometry->segment_count += bezier_count; } static void STDMETHODCALLTYPE d2d_geometry_sink_AddArc(ID2D1GeometrySink *iface, const D2D1_ARC_SEGMENT *arc) @@ -185,7 +201,12 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_AddArc(ID2D1GeometrySink *iface, FIXME("iface %p, arc %p stub!\n", iface, arc); if (geometry->state != D2D_GEOMETRY_STATE_FIGURE) + { geometry->state = D2D_GEOMETRY_STATE_ERROR; + return; + } + + ++geometry->segment_count; } struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl = @@ -405,9 +426,16 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Stream(ID2D1PathGeometry *ifa static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetSegmentCount(ID2D1PathGeometry *iface, UINT32 *count) { - FIXME("iface %p, count %p stub!\n", iface, count); + struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface); - return E_NOTIMPL; + TRACE("iface %p, count %p.\n", iface, count); + + if (geometry->state != D2D_GEOMETRY_STATE_CLOSED) + return D2DERR_WRONG_STATE; + + *count = geometry->segment_count; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetFigureCount(ID2D1PathGeometry *iface, UINT32 *count) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 6611385..4e94407 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -907,21 +907,31 @@ static void test_path_geometry(void) ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr); hr = ID2D1PathGeometry_GetFigureCount(geometry, &count); ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); + hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); hr = ID2D1PathGeometry_Open(geometry, &sink); ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr); hr = ID2D1PathGeometry_GetFigureCount(geometry, &count); ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); + hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); hr = ID2D1GeometrySink_Close(sink); ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr); hr = ID2D1PathGeometry_GetFigureCount(geometry, &count); ok(SUCCEEDED(hr), "Failed to get figure count, hr %#x.\n", hr); ok(!count, "Got unexpected figure count %u.\n", count); + hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count); + ok(SUCCEEDED(hr), "Failed to get segment count, hr %#x.\n", hr); + ok(!count, "Got unexpected segment count %u.\n", count); hr = ID2D1GeometrySink_Close(sink); ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); ID2D1GeometrySink_Release(sink); hr = ID2D1PathGeometry_GetFigureCount(geometry, &count); ok(SUCCEEDED(hr), "Failed to get figure count, hr %#x.\n", hr); ok(!count, "Got unexpected figure count %u.\n", count); + hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count); + ok(SUCCEEDED(hr), "Failed to get segment count, hr %#x.\n", hr); + ok(!count, "Got unexpected segment count %u.\n", count); ID2D1PathGeometry_Release(geometry); /* Open() when closed. */ @@ -937,6 +947,9 @@ static void test_path_geometry(void) hr = ID2D1PathGeometry_GetFigureCount(geometry, &count); ok(SUCCEEDED(hr), "Failed to get figure count, hr %#x.\n", hr); ok(!count, "Got unexpected figure count %u.\n", count); + hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count); + ok(SUCCEEDED(hr), "Failed to get segment count, hr %#x.\n", hr); + ok(!count, "Got unexpected segment count %u.\n", count); ID2D1PathGeometry_Release(geometry); /* Open() when open. */ @@ -952,6 +965,9 @@ static void test_path_geometry(void) hr = ID2D1PathGeometry_GetFigureCount(geometry, &count); ok(SUCCEEDED(hr), "Failed to get figure count, hr %#x.\n", hr); ok(!count, "Got unexpected figure count %u.\n", count); + hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count); + ok(SUCCEEDED(hr), "Failed to get segment count, hr %#x.\n", hr); + ok(!count, "Got unexpected segment count %u.\n", count); ID2D1PathGeometry_Release(geometry); /* BeginFigure() without EndFigure(). */ @@ -968,6 +984,8 @@ static void test_path_geometry(void) ID2D1GeometrySink_Release(sink); hr = ID2D1PathGeometry_GetFigureCount(geometry, &count); ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); + hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); ID2D1PathGeometry_Release(geometry); /* EndFigure() without BeginFigure(). */ @@ -981,6 +999,8 @@ static void test_path_geometry(void) ID2D1GeometrySink_Release(sink); hr = ID2D1PathGeometry_GetFigureCount(geometry, &count); ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); + hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); ID2D1PathGeometry_Release(geometry); /* BeginFigure()/EndFigure() mismatch. */ @@ -1012,6 +1032,8 @@ static void test_path_geometry(void) ID2D1GeometrySink_Release(sink); hr = ID2D1PathGeometry_GetFigureCount(geometry, &count); ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); + hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); ID2D1PathGeometry_Release(geometry); /* Empty figure. */ @@ -1027,6 +1049,9 @@ static void test_path_geometry(void) hr = ID2D1PathGeometry_GetFigureCount(geometry, &count); ok(SUCCEEDED(hr), "Failed to get figure count, hr %#x.\n", hr); ok(count == 1, "Got unexpected figure count %u.\n", count); + hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count); + ok(SUCCEEDED(hr), "Failed to get segment count, hr %#x.\n", hr); + ok(count == 1, "Got unexpected segment count %u.\n", count); ID2D1PathGeometry_Release(geometry); ID2D1RenderTarget_Release(rt);

1 0

Henri Verbeet : d2d1: Implement d2d_path_geometry_GetFigureCount().
by Alexandre Julliard July 10, 2015

July 10, 2015

Module: wine Branch: master Commit: dfe1486e4b0c7fabe65fc64f70c039db90da6289 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfe1486e4b0c7fabe65fc64f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 10 15:03:44 2015 +0200 d2d1: Implement d2d_path_geometry_GetFigureCount(). --- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/geometry.c | 12 ++++++++++-- dlls/d2d1/tests/d2d1.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 58462de..96507b3 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -205,6 +205,7 @@ struct d2d_geometry LONG refcount; enum d2d_geometry_state state; + UINT32 figure_count; }; void d2d_path_geometry_init(struct d2d_geometry *geometry) DECLSPEC_HIDDEN; diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 9a94f77..4128f67 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -89,6 +89,7 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_BeginFigure(ID2D1GeometrySink *i return; } geometry->state = D2D_GEOMETRY_STATE_FIGURE; + ++geometry->figure_count; } static void STDMETHODCALLTYPE d2d_geometry_sink_AddLines(ID2D1GeometrySink *iface, @@ -411,9 +412,16 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetSegmentCount(ID2D1PathGeom static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetFigureCount(ID2D1PathGeometry *iface, UINT32 *count) { - FIXME("iface %p, count %p stub!\n", iface, count); + struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface); - return E_NOTIMPL; + TRACE("iface %p, count %p.\n", iface, count); + + if (geometry->state != D2D_GEOMETRY_STATE_CLOSED) + return D2DERR_WRONG_STATE; + + *count = geometry->figure_count; + + return S_OK; } static const struct ID2D1PathGeometryVtbl d2d_path_geometry_vtbl = diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 8b3ffde..6611385 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -884,6 +884,7 @@ static void test_path_geometry(void) IDXGISurface *surface; ID2D1Factory *factory; ULONG refcount; + UINT32 count; HWND window; HRESULT hr; @@ -904,13 +905,23 @@ static void test_path_geometry(void) /* Close() when closed. */ hr = ID2D1Factory_CreatePathGeometry(factory, &geometry); ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr); + hr = ID2D1PathGeometry_GetFigureCount(geometry, &count); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); hr = ID2D1PathGeometry_Open(geometry, &sink); ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr); + hr = ID2D1PathGeometry_GetFigureCount(geometry, &count); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); hr = ID2D1GeometrySink_Close(sink); ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr); + hr = ID2D1PathGeometry_GetFigureCount(geometry, &count); + ok(SUCCEEDED(hr), "Failed to get figure count, hr %#x.\n", hr); + ok(!count, "Got unexpected figure count %u.\n", count); hr = ID2D1GeometrySink_Close(sink); ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); ID2D1GeometrySink_Release(sink); + hr = ID2D1PathGeometry_GetFigureCount(geometry, &count); + ok(SUCCEEDED(hr), "Failed to get figure count, hr %#x.\n", hr); + ok(!count, "Got unexpected figure count %u.\n", count); ID2D1PathGeometry_Release(geometry); /* Open() when closed. */ @@ -923,6 +934,9 @@ static void test_path_geometry(void) ID2D1GeometrySink_Release(sink); hr = ID2D1PathGeometry_Open(geometry, &sink); ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); + hr = ID2D1PathGeometry_GetFigureCount(geometry, &count); + ok(SUCCEEDED(hr), "Failed to get figure count, hr %#x.\n", hr); + ok(!count, "Got unexpected figure count %u.\n", count); ID2D1PathGeometry_Release(geometry); /* Open() when open. */ @@ -935,6 +949,9 @@ static void test_path_geometry(void) hr = ID2D1GeometrySink_Close(sink); ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr); ID2D1GeometrySink_Release(sink); + hr = ID2D1PathGeometry_GetFigureCount(geometry, &count); + ok(SUCCEEDED(hr), "Failed to get figure count, hr %#x.\n", hr); + ok(!count, "Got unexpected figure count %u.\n", count); ID2D1PathGeometry_Release(geometry); /* BeginFigure() without EndFigure(). */ @@ -949,6 +966,8 @@ static void test_path_geometry(void) hr = ID2D1GeometrySink_Close(sink); ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); ID2D1GeometrySink_Release(sink); + hr = ID2D1PathGeometry_GetFigureCount(geometry, &count); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); ID2D1PathGeometry_Release(geometry); /* EndFigure() without BeginFigure(). */ @@ -960,6 +979,8 @@ static void test_path_geometry(void) hr = ID2D1GeometrySink_Close(sink); ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); ID2D1GeometrySink_Release(sink); + hr = ID2D1PathGeometry_GetFigureCount(geometry, &count); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); ID2D1PathGeometry_Release(geometry); /* BeginFigure()/EndFigure() mismatch. */ @@ -989,6 +1010,23 @@ static void test_path_geometry(void) ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); ID2D1GeometrySink_AddLine(sink, point); ID2D1GeometrySink_Release(sink); + hr = ID2D1PathGeometry_GetFigureCount(geometry, &count); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); + ID2D1PathGeometry_Release(geometry); + + /* Empty figure. */ + hr = ID2D1Factory_CreatePathGeometry(factory, &geometry); + ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr); + hr = ID2D1PathGeometry_Open(geometry, &sink); + ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + hr = ID2D1GeometrySink_Close(sink); + ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr); + ID2D1GeometrySink_Release(sink); + hr = ID2D1PathGeometry_GetFigureCount(geometry, &count); + ok(SUCCEEDED(hr), "Failed to get figure count, hr %#x.\n", hr); + ok(count == 1, "Got unexpected figure count %u.\n", count); ID2D1PathGeometry_Release(geometry); ID2D1RenderTarget_Release(rt);

1 0

Henri Verbeet : d2d1: Implement d2d_geometry_sink_BeginFigure() and d2d_geometry_sink_EndFigure().
by Alexandre Julliard July 10, 2015

July 10, 2015

Module: wine Branch: master Commit: ddec784aee768332f3e912f697c43e9e78e4cfe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddec784aee768332f3e912f69… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 10 15:03:43 2015 +0200 d2d1: Implement d2d_geometry_sink_BeginFigure() and d2d_geometry_sink_EndFigure(). --- dlls/d2d1/d2d1_private.h | 2 ++ dlls/d2d1/geometry.c | 42 ++++++++++++++++++++++++++++++++++++ dlls/d2d1/tests/d2d1.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 99 insertions(+) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index b018a24..58462de 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -192,8 +192,10 @@ struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStat enum d2d_geometry_state { D2D_GEOMETRY_STATE_INITIAL = 0, + D2D_GEOMETRY_STATE_ERROR, D2D_GEOMETRY_STATE_OPEN, D2D_GEOMETRY_STATE_CLOSED, + D2D_GEOMETRY_STATE_FIGURE, }; struct d2d_geometry diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 8e04976..9a94f77 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -78,25 +78,53 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_SetSegmentFlags(ID2D1GeometrySin static void STDMETHODCALLTYPE d2d_geometry_sink_BeginFigure(ID2D1GeometrySink *iface, D2D1_POINT_2F start_point, D2D1_FIGURE_BEGIN figure_begin) { + struct d2d_geometry *geometry = impl_from_ID2D1GeometrySink(iface); + FIXME("iface %p, start_point {%.8e, %.8e}, figure_begin %#x stub!\n", iface, start_point.x, start_point.y, figure_begin); + + if (geometry->state != D2D_GEOMETRY_STATE_OPEN) + { + geometry->state = D2D_GEOMETRY_STATE_ERROR; + return; + } + geometry->state = D2D_GEOMETRY_STATE_FIGURE; } static void STDMETHODCALLTYPE d2d_geometry_sink_AddLines(ID2D1GeometrySink *iface, const D2D1_POINT_2F *points, UINT32 count) { + struct d2d_geometry *geometry = impl_from_ID2D1GeometrySink(iface); + FIXME("iface %p, points %p, count %u stub!\n", iface, points, count); + + if (geometry->state != D2D_GEOMETRY_STATE_FIGURE) + geometry->state = D2D_GEOMETRY_STATE_ERROR; } static void STDMETHODCALLTYPE d2d_geometry_sink_AddBeziers(ID2D1GeometrySink *iface, const D2D1_BEZIER_SEGMENT *beziers, UINT32 count) { + struct d2d_geometry *geometry = impl_from_ID2D1GeometrySink(iface); + FIXME("iface %p, beziers %p, count %u stub!\n", iface, beziers, count); + + if (geometry->state != D2D_GEOMETRY_STATE_FIGURE) + geometry->state = D2D_GEOMETRY_STATE_ERROR; } static void STDMETHODCALLTYPE d2d_geometry_sink_EndFigure(ID2D1GeometrySink *iface, D2D1_FIGURE_END figure_end) { + struct d2d_geometry *geometry = impl_from_ID2D1GeometrySink(iface); + FIXME("iface %p, figure_end %#x stub!\n", iface, figure_end); + + if (geometry->state != D2D_GEOMETRY_STATE_FIGURE) + { + geometry->state = D2D_GEOMETRY_STATE_ERROR; + return; + } + geometry->state = D2D_GEOMETRY_STATE_OPEN; } static HRESULT STDMETHODCALLTYPE d2d_geometry_sink_Close(ID2D1GeometrySink *iface) @@ -106,7 +134,11 @@ static HRESULT STDMETHODCALLTYPE d2d_geometry_sink_Close(ID2D1GeometrySink *ifac TRACE("iface %p.\n", iface); if (geometry->state != D2D_GEOMETRY_STATE_OPEN) + { + if (geometry->state != D2D_GEOMETRY_STATE_CLOSED) + geometry->state = D2D_GEOMETRY_STATE_ERROR; return D2DERR_WRONG_STATE; + } geometry->state = D2D_GEOMETRY_STATE_CLOSED; return S_OK; @@ -137,12 +169,22 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_AddQuadraticBezier(ID2D1Geometry static void STDMETHODCALLTYPE d2d_geometry_sink_AddQuadraticBeziers(ID2D1GeometrySink *iface, const D2D1_QUADRATIC_BEZIER_SEGMENT *beziers, UINT32 bezier_count) { + struct d2d_geometry *geometry = impl_from_ID2D1GeometrySink(iface); + FIXME("iface %p, beziers %p, bezier_count %u stub!\n", iface, beziers, bezier_count); + + if (geometry->state != D2D_GEOMETRY_STATE_FIGURE) + geometry->state = D2D_GEOMETRY_STATE_ERROR; } static void STDMETHODCALLTYPE d2d_geometry_sink_AddArc(ID2D1GeometrySink *iface, const D2D1_ARC_SEGMENT *arc) { + struct d2d_geometry *geometry = impl_from_ID2D1GeometrySink(iface); + FIXME("iface %p, arc %p stub!\n", iface, arc); + + if (geometry->state != D2D_GEOMETRY_STATE_FIGURE) + geometry->state = D2D_GEOMETRY_STATE_ERROR; } struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl = diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index b80f28e..8b3ffde 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -876,6 +876,7 @@ static void test_bitmap_brush(void) static void test_path_geometry(void) { ID2D1GeometrySink *sink, *tmp_sink; + D2D1_POINT_2F point = {0.0f, 0.0f}; ID2D1PathGeometry *geometry; IDXGISwapChain *swapchain; ID2D1RenderTarget *rt; @@ -936,6 +937,60 @@ static void test_path_geometry(void) ID2D1GeometrySink_Release(sink); ID2D1PathGeometry_Release(geometry); + /* BeginFigure() without EndFigure(). */ + hr = ID2D1Factory_CreatePathGeometry(factory, &geometry); + ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr); + hr = ID2D1PathGeometry_Open(geometry, &sink); + ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); + hr = ID2D1GeometrySink_Close(sink); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + hr = ID2D1GeometrySink_Close(sink); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); + ID2D1GeometrySink_Release(sink); + ID2D1PathGeometry_Release(geometry); + + /* EndFigure() without BeginFigure(). */ + hr = ID2D1Factory_CreatePathGeometry(factory, &geometry); + ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr); + hr = ID2D1PathGeometry_Open(geometry, &sink); + ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + hr = ID2D1GeometrySink_Close(sink); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); + ID2D1GeometrySink_Release(sink); + ID2D1PathGeometry_Release(geometry); + + /* BeginFigure()/EndFigure() mismatch. */ + hr = ID2D1Factory_CreatePathGeometry(factory, &geometry); + ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr); + hr = ID2D1PathGeometry_Open(geometry, &sink); + ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + hr = ID2D1GeometrySink_Close(sink); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + hr = ID2D1GeometrySink_Close(sink); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); + ID2D1GeometrySink_Release(sink); + ID2D1PathGeometry_Release(geometry); + + /* AddLine() outside BeginFigure()/EndFigure(). */ + hr = ID2D1Factory_CreatePathGeometry(factory, &geometry); + ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr); + hr = ID2D1PathGeometry_Open(geometry, &sink); + ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr); + ID2D1GeometrySink_AddLine(sink, point); + hr = ID2D1GeometrySink_Close(sink); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); + ID2D1GeometrySink_AddLine(sink, point); + ID2D1GeometrySink_Release(sink); + ID2D1PathGeometry_Release(geometry); + ID2D1RenderTarget_Release(rt); refcount = ID2D1Factory_Release(factory); ok(!refcount, "Factory has %u references left.\n", refcount);

1 0

Henri Verbeet : d2d1: Only allow path geometries to be opened once.
by Alexandre Julliard July 10, 2015

July 10, 2015

Module: wine Branch: master Commit: 2f6f8f1242233bc365d4e94c4d326e65bc94011f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f6f8f1242233bc365d4e94c4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 10 15:03:42 2015 +0200 d2d1: Only allow path geometries to be opened once. --- dlls/d2d1/d2d1_private.h | 9 ++++++ dlls/d2d1/geometry.c | 15 ++++++++-- dlls/d2d1/tests/d2d1.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 7d82b90..b018a24 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -189,11 +189,20 @@ void d2d_state_block_init(struct d2d_state_block *state_block, const D2D1_DRAWIN IDWriteRenderingParams *text_rendering_params) DECLSPEC_HIDDEN; struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStateBlock *iface) DECLSPEC_HIDDEN; +enum d2d_geometry_state +{ + D2D_GEOMETRY_STATE_INITIAL = 0, + D2D_GEOMETRY_STATE_OPEN, + D2D_GEOMETRY_STATE_CLOSED, +}; + struct d2d_geometry { ID2D1Geometry ID2D1Geometry_iface; ID2D1GeometrySink ID2D1GeometrySink_iface; LONG refcount; + + enum d2d_geometry_state state; }; void d2d_path_geometry_init(struct d2d_geometry *geometry) DECLSPEC_HIDDEN; diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 2f3a6cc..8e04976 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -101,9 +101,15 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_EndFigure(ID2D1GeometrySink *ifa static HRESULT STDMETHODCALLTYPE d2d_geometry_sink_Close(ID2D1GeometrySink *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_geometry *geometry = impl_from_ID2D1GeometrySink(iface); - return E_NOTIMPL; + TRACE("iface %p.\n", iface); + + if (geometry->state != D2D_GEOMETRY_STATE_OPEN) + return D2DERR_WRONG_STATE; + geometry->state = D2D_GEOMETRY_STATE_CLOSED; + + return S_OK; } static void STDMETHODCALLTYPE d2d_geometry_sink_AddLine(ID2D1GeometrySink *iface, D2D1_POINT_2F point) @@ -336,9 +342,14 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Open(ID2D1PathGeometry *iface TRACE("iface %p, sink %p.\n", iface, sink); + if (geometry->state != D2D_GEOMETRY_STATE_INITIAL) + return D2DERR_WRONG_STATE; + *sink = &geometry->ID2D1GeometrySink_iface; ID2D1GeometrySink_AddRef(*sink); + geometry->state = D2D_GEOMETRY_STATE_OPEN; + return S_OK; } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 29e1bc6..b80f28e 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -873,10 +873,83 @@ static void test_bitmap_brush(void) DestroyWindow(window); } +static void test_path_geometry(void) +{ + ID2D1GeometrySink *sink, *tmp_sink; + ID2D1PathGeometry *geometry; + IDXGISwapChain *swapchain; + ID2D1RenderTarget *rt; + ID3D10Device1 *device; + IDXGISurface *surface; + ID2D1Factory *factory; + ULONG refcount; + HWND window; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + rt = create_render_target(surface); + ok(!!rt, "Failed to create render target.\n"); + ID2D1RenderTarget_GetFactory(rt, &factory); + + /* Close() when closed. */ + hr = ID2D1Factory_CreatePathGeometry(factory, &geometry); + ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr); + hr = ID2D1PathGeometry_Open(geometry, &sink); + ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr); + hr = ID2D1GeometrySink_Close(sink); + ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr); + hr = ID2D1GeometrySink_Close(sink); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); + ID2D1GeometrySink_Release(sink); + ID2D1PathGeometry_Release(geometry); + + /* Open() when closed. */ + hr = ID2D1Factory_CreatePathGeometry(factory, &geometry); + ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr); + hr = ID2D1PathGeometry_Open(geometry, &sink); + ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr); + hr = ID2D1GeometrySink_Close(sink); + ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr); + ID2D1GeometrySink_Release(sink); + hr = ID2D1PathGeometry_Open(geometry, &sink); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); + ID2D1PathGeometry_Release(geometry); + + /* Open() when open. */ + hr = ID2D1Factory_CreatePathGeometry(factory, &geometry); + ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr); + hr = ID2D1PathGeometry_Open(geometry, &sink); + ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr); + hr = ID2D1PathGeometry_Open(geometry, &tmp_sink); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); + hr = ID2D1GeometrySink_Close(sink); + ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr); + ID2D1GeometrySink_Release(sink); + ID2D1PathGeometry_Release(geometry); + + ID2D1RenderTarget_Release(rt); + refcount = ID2D1Factory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); + IDXGISurface_Release(surface); + IDXGISwapChain_Release(swapchain); + ID3D10Device1_Release(device); + DestroyWindow(window); +} + START_TEST(d2d1) { test_clip(); test_state_block(); test_color_brush(); test_bitmap_brush(); + test_path_geometry(); }

1 0

Alistair Leslie-Hughes : gdiplus: GdipConvertToEmfPlus parameter succ is optional.
by Alexandre Julliard July 10, 2015

July 10, 2015

Module: wine Branch: master Commit: 94f6d069f2b639ffb24f95cc02f250dccfa2a054 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94f6d069f2b639ffb24f95cc0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jul 9 16:10:24 2015 +1000 gdiplus: GdipConvertToEmfPlus parameter succ is optional. --- dlls/gdiplus/metafile.c | 5 +-- dlls/gdiplus/tests/metafile.c | 79 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 24ab6be..d9bc337 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1127,10 +1127,11 @@ GpStatus WINGDIPAPI GdipConvertToEmfPlus(const GpGraphics* ref, TRACE("(%p,%p,%p,%u,%s,%p)\n", ref, metafile, succ, emfType, debugstr_w(description), out_metafile); - if(!ref || !metafile || !out_metafile) + if(!ref || !metafile || !out_metafile || emfType < EmfTypeEmfOnly || emfType > EmfTypeEmfPlusDual) return InvalidParameter; - *succ = FALSE; + if(succ) + *succ = FALSE; *out_metafile = NULL; if(!(calls++)) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index f9a5092..3df4ae5 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -946,6 +946,84 @@ static void test_pagetransform(void) expect(Ok, stat); } +static void test_converttoemfplus(void) +{ + GpStatus (WINAPI *pGdipConvertToEmfPlus)( const GpGraphics *graphics, GpMetafile *metafile, BOOL *succ, + EmfType emfType, const WCHAR *description, GpMetafile **outmetafile); + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + GpStatus stat; + GpMetafile *metafile, *metafile2 = NULL, *emhmeta; + GpGraphics *graphics; + HDC hdc; + BOOL succ; + HMODULE mod = GetModuleHandleA("gdiplus.dll"); + + pGdipConvertToEmfPlus = (void*)GetProcAddress( mod, "GdipConvertToEmfPlus"); + if(!pGdipConvertToEmfPlus) + { + /* GdipConvertToEmfPlus was introduced in Windows Vista. */ + win_skip("GDIPlus version 1.1 not available\n"); + return; + } + + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(hdc, MetafileTypeEmf, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &emhmeta); + expect(Ok, stat); + + DeleteDC(hdc); + + if (stat != Ok) + return; + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + /* Invalid Parameters */ + stat = pGdipConvertToEmfPlus(NULL, metafile, &succ, EmfTypeEmfPlusOnly, description, &metafile2); + expect(InvalidParameter, stat); + + stat = pGdipConvertToEmfPlus(graphics, NULL, &succ, EmfTypeEmfPlusOnly, description, &metafile2); + expect(InvalidParameter, stat); + + stat = pGdipConvertToEmfPlus(graphics, metafile, &succ, EmfTypeEmfPlusOnly, description, NULL); + expect(InvalidParameter, stat); + + stat = pGdipConvertToEmfPlus(graphics, metafile, NULL, MetafileTypeInvalid, NULL, &metafile2); + expect(InvalidParameter, stat); + + stat = pGdipConvertToEmfPlus(graphics, metafile, NULL, MetafileTypeEmfPlusDual+1, NULL, &metafile2); + expect(InvalidParameter, stat); + + /* If we are already an Enhanced Metafile then the conversion fails. */ + stat = pGdipConvertToEmfPlus(graphics, emhmeta, NULL, EmfTypeEmfPlusOnly, NULL, &metafile2); + todo_wine expect(InvalidParameter, stat); + + stat = pGdipConvertToEmfPlus(graphics, metafile, NULL, EmfTypeEmfPlusOnly, NULL, &metafile2); + todo_wine expect(Ok, stat); + if(metafile2) + GdipDisposeImage((GpImage*)metafile2); + + succ = FALSE; + stat = pGdipConvertToEmfPlus(graphics, metafile, &succ, EmfTypeEmfPlusOnly, NULL, &metafile2); + todo_wine expect(Ok, stat); + if(metafile2) + GdipDisposeImage((GpImage*)metafile2); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)emhmeta); + expect(Ok, stat); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -970,6 +1048,7 @@ START_TEST(metafile) test_emfonly(); test_fillrect(); test_pagetransform(); + test_converttoemfplus(); GdiplusShutdown(gdiplusToken); }

1 0

Hans Leidekker : msi/tests: Avoid test failures on win2k3.
by Alexandre Julliard July 10, 2015

July 10, 2015

Module: wine Branch: master Commit: b71075ad9bfdd19c9731521eb62c6eada0f96aa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b71075ad9bfdd19c9731521eb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 10 12:53:55 2015 +0200 msi/tests: Avoid test failures on win2k3. --- dlls/msi/tests/install.c | 151 ++--------------------------------------------- 1 file changed, 5 insertions(+), 146 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b71075ad9bfdd19c97315…

1 0