February 2020 - Wine-commits

Zebediah Figura : qasf/dmowrapper: Implement source connection.
by Alexandre Julliard 19 Feb '20

19 Feb '20

Module: wine Branch: master Commit: c1b7a334f50f89af7af30d1a27557f8795bc086b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1b7a334f50f89af7af30d1a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 18 23:19:09 2020 -0600 qasf/dmowrapper: Implement source connection. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/dmowrapper.c | 46 +++++++++ dlls/qasf/tests/dmowrapper.c | 240 +++++++++++++++++++++++++++++++++++++++++-- dlls/strmbase/pin.c | 3 + include/wine/strmbase.h | 2 + 4 files changed, 285 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c1b7a334f50f89af7af3…

1 0

Zebediah Figura : qasf/tests: Add tests for filter state.
by Alexandre Julliard 19 Feb '20

19 Feb '20

Module: wine Branch: master Commit: c629eb012090d7d47d68c96f33b4a2a943a905fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=c629eb012090d7d47d68c96f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 18 23:19:10 2020 -0600 qasf/tests: Add tests for filter state. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/tests/dmowrapper.c | 78 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 72 insertions(+), 6 deletions(-) diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index dbb9d9d17f..fe00536364 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -69,6 +69,8 @@ static HRESULT testdmo_GetOutputSizeInfo_hr = S_OK; static DWORD testdmo_output_size = 123; static DWORD testdmo_output_alignment = 1; +static unsigned int got_Flush; + static HRESULT WINAPI dmo_inner_QueryInterface(IUnknown *iface, REFIID iid, void **out) { if (winetest_debug > 1) trace("QueryInterface(%s)\n", wine_dbgstr_guid(iid)); @@ -240,8 +242,9 @@ static HRESULT WINAPI dmo_SetInputMaxLatency(IMediaObject *iface, DWORD index, R static HRESULT WINAPI dmo_Flush(IMediaObject *iface) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + if (winetest_debug > 1) trace("Flush()\n"); + ++got_Flush; + return S_OK; } static HRESULT WINAPI dmo_Discontinuity(IMediaObject *iface, DWORD index) @@ -252,14 +255,14 @@ static HRESULT WINAPI dmo_Discontinuity(IMediaObject *iface, DWORD index) static HRESULT WINAPI dmo_AllocateStreamingResources(IMediaObject *iface) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + if (winetest_debug > 1) trace("AllocateStreamingResources()\n"); + return S_OK; } static HRESULT WINAPI dmo_FreeStreamingResources(IMediaObject *iface) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + if (winetest_debug > 1) trace("FreeStreamingResources()\n"); + return S_OK; } static HRESULT WINAPI dmo_GetInputStatus(IMediaObject *iface, DWORD index, DWORD *flags) @@ -1214,6 +1217,64 @@ static void test_source_allocator(IFilterGraph2 *graph, IPin *source, struct tes } +static void test_filter_state(IMediaControl *control) +{ + OAFilterState state; + HRESULT hr; + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IMediaControl_Pause(control); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %u.\n", state); + + hr = IMediaControl_Run(control); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Running, "Got state %u.\n", state); + + hr = IMediaControl_Pause(control); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %u.\n", state); + + ok(!got_Flush, "Unexpected IMediaObject::Flush().\n"); + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(got_Flush, "Expected IMediaObject::Flush().\n"); + got_Flush = 0; + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IMediaControl_Run(control); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Running, "Got state %u.\n", state); + + ok(!got_Flush, "Unexpected IMediaObject::Flush().\n"); + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(got_Flush, "Expected IMediaObject::Flush().\n"); + got_Flush = 0; + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); +} + static void test_connect_pin(void) { AM_MEDIA_TYPE req_mt = @@ -1225,6 +1286,7 @@ static void test_connect_pin(void) IBaseFilter *filter = create_dmo_wrapper(); struct testfilter testsource, testsink; IPin *sink, *source, *peer; + IMediaControl *control; IMemInputPin *meminput; IFilterGraph2 *graph; AM_MEDIA_TYPE mt; @@ -1235,6 +1297,7 @@ static void test_connect_pin(void) testfilter_init(&testsink); CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (void **)&graph); + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); IFilterGraph2_AddFilter(graph, &testsource.filter.IBaseFilter_iface, L"source"); IFilterGraph2_AddFilter(graph, &testsink.filter.IBaseFilter_iface, L"sink"); IFilterGraph2_AddFilter(graph, filter, L"DMO wrapper"); @@ -1320,6 +1383,8 @@ static void test_connect_pin(void) ok(!testdmo_output_mt_set, "Output type should not be set.\n"); + test_filter_state(control); + req_mt.lSampleSize = 0; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); @@ -1439,6 +1504,7 @@ static void test_connect_pin(void) IPin_Release(sink); IPin_Release(source); IMemInputPin_Release(meminput); + IMediaControl_Release(control); ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); ref = IBaseFilter_Release(filter);

1 0

Zebediah Figura : qasf/dmowrapper: Call IMediaObject::Flush() when cleaning up the stream.
by Alexandre Julliard 19 Feb '20

19 Feb '20

Module: wine Branch: master Commit: 0fddb3f02748da4e2b22cdeafc33ec21b50e1461 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fddb3f02748da4e2b22cdea… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 18 23:19:11 2020 -0600 qasf/dmowrapper: Call IMediaObject::Flush() when cleaning up the stream. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/dmowrapper.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c index 7a18d0ba07..9480d3b95b 100644 --- a/dlls/qasf/dmowrapper.c +++ b/dlls/qasf/dmowrapper.c @@ -358,11 +358,25 @@ static HRESULT dmo_wrapper_query_interface(struct strmbase_filter *iface, REFIID return E_NOINTERFACE; } +static HRESULT dmo_wrapper_cleanup_stream(struct strmbase_filter *iface) +{ + struct dmo_wrapper *filter = impl_from_strmbase_filter(iface); + IMediaObject *dmo; + + IUnknown_QueryInterface(filter->dmo, &IID_IMediaObject, (void **)&dmo); + + IMediaObject_Flush(dmo); + + IMediaObject_Release(dmo); + return S_OK; +} + static struct strmbase_filter_ops filter_ops = { .filter_get_pin = dmo_wrapper_get_pin, .filter_destroy = dmo_wrapper_destroy, .filter_query_interface = dmo_wrapper_query_interface, + .filter_cleanup_stream = dmo_wrapper_cleanup_stream, }; HRESULT dmo_wrapper_create(IUnknown *outer, IUnknown **out)

1 0

Jeff Smith : gdiplus/tests: Test path widening on capped lines.
by Alexandre Julliard 19 Feb '20

19 Feb '20

Module: wine Branch: master Commit: eff15943cee56eb742514a1c06f106142bae9ff2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eff15943cee56eb742514a1c… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Feb 18 23:51:56 2020 -0600 gdiplus/tests: Test path widening on capped lines. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphicspath.c | 179 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 179 insertions(+) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 096fbc600a..e12d9e2c49 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1245,6 +1245,184 @@ static void test_widen(void) GdipDeletePath(path); } +static path_test_t widenline_capflat_path[] = { + {5.0, 5.0, PathPointTypeStart, 0, 0}, /*0*/ + {50.0, 5.0, PathPointTypeLine, 0, 0}, /*1*/ + {50.0, 15.0, PathPointTypeLine, 0, 0}, /*2*/ + {5.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0} /*3*/ + }; + +static path_test_t widenline_capsquare_path[] = { + {0.0, 5.0, PathPointTypeStart, 0, 0}, /*0*/ + {55.0, 5.0, PathPointTypeLine, 0, 0}, /*1*/ + {55.0, 15.0, PathPointTypeLine, 0, 0}, /*2*/ + {0.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0} /*3*/ + }; + +static path_test_t widenline_capround_path[] = { + {5.0, 5.0, PathPointTypeStart, 0, 2}, /*0*/ + {50.0, 5.0, PathPointTypeLine, 0, 1}, /*1*/ + {52.761421, 5.0, PathPointTypeBezier, 0, 0}, /*2*/ + {55.0, 7.238576, PathPointTypeBezier, 0, 0}, /*3*/ + {55.0, 10.0, PathPointTypeBezier, 0, 0}, /*4*/ + {55.0, 12.761423, PathPointTypeBezier, 0, 0}, /*5*/ + {52.761421, 15.0, PathPointTypeBezier, 0, 0}, /*6*/ + {50.0, 15.0, PathPointTypeBezier, 0, 0}, /*7*/ + {5.0, 15.0, PathPointTypeLine, 0, 0}, /*8*/ + {2.238576, 15.0, PathPointTypeBezier, 0, 0}, /*9*/ + {0.0, 12.761423, PathPointTypeBezier, 0, 0}, /*10*/ + {0.0, 10.0, PathPointTypeBezier, 0, 0}, /*11*/ + {0.0, 7.238576, PathPointTypeBezier, 0, 0}, /*12*/ + {2.238576, 5.0, PathPointTypeBezier, 0, 0}, /*13*/ + {5.0, 5.0, PathPointTypeBezier|PathPointTypeCloseSubpath, 0, 0}, /*14*/ + }; + +static path_test_t widenline_captriangle_path[] = { + {5.0, 5.0, PathPointTypeStart, 0, 0}, /*0*/ + {50.0, 5.0, PathPointTypeLine, 0, 0}, /*1*/ + {55.0, 10.0, PathPointTypeLine, 0, 0}, /*2*/ + {50.0, 15.0, PathPointTypeLine, 0, 0}, /*3*/ + {5.0, 15.0, PathPointTypeLine, 0, 0}, /*4*/ + {0.0, 10.0, PathPointTypeLine, 0, 1}, /*5*/ + {5.0, 5.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 2} /*6*/ + }; + +static path_test_t widenline_capsquareanchor_path[] = { + {5.0, 5.0, PathPointTypeStart, 0, 0}, /*0*/ + {50.0, 5.0, PathPointTypeLine, 0, 0}, /*1*/ + {50.0, 15.0, PathPointTypeLine, 0, 0}, /*2*/ + {5.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*3*/ + {12.071068, 2.928932, PathPointTypeStart, 0, 0}, /*4*/ + {12.071068, 17.071066, PathPointTypeLine, 0, 0}, /*5*/ + {-2.071068, 17.071066, PathPointTypeLine, 0, 0}, /*6*/ + {-2.071068, 2.928932, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*7*/ + {42.928928, 17.071068, PathPointTypeStart, 0, 0}, /*8*/ + {42.928928, 2.928932, PathPointTypeLine, 0, 0}, /*9*/ + {57.071068, 2.928932, PathPointTypeLine, 0, 0}, /*10*/ + {57.071068, 17.071068, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*11*/ + }; + +static path_test_t widenline_caproundanchor_path[] = { + {5.0, 5.0, PathPointTypeStart, 0, 0}, /*0*/ + {50.0, 5.0, PathPointTypeLine, 0, 0}, /*1*/ + {50.0, 15.0, PathPointTypeLine, 0, 0}, /*2*/ + {5.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*3*/ + {5.0, 20.0, PathPointTypeStart, 0, 0}, /*4*/ + {-0.522847, 20.0, PathPointTypeBezier, 0, 0}, /*5*/ + {-5.0, 15.522846, PathPointTypeBezier, 0, 0}, /*6*/ + {-5.0, 10.0, PathPointTypeBezier, 0, 0}, /*7*/ + {-5.0, 4.477152, PathPointTypeBezier, 0, 0}, /*8*/ + {-0.522847, 0.0, PathPointTypeBezier, 0, 0}, /*9*/ + {5.0, 0.0, PathPointTypeBezier, 0, 0}, /*10*/ + {10.522847, 0.0, PathPointTypeBezier, 0, 0}, /*11*/ + {15.0, 4.477152, PathPointTypeBezier, 0, 0}, /*12*/ + {15.0, 10.0, PathPointTypeBezier, 0, 0}, /*13*/ + {15.0, 15.522846, PathPointTypeBezier, 0, 0}, /*14*/ + {10.522847, 20.0, PathPointTypeBezier, 0, 0}, /*15*/ + {5.0, 20.0, PathPointTypeBezier|PathPointTypeCloseSubpath, 0, 0}, /*16*/ + {50.0, 0.0, PathPointTypeStart, 0, 0}, /*17*/ + {55.522846, 0.0, PathPointTypeBezier, 0, 0}, /*18*/ + {60.0, 4.477153, PathPointTypeBezier, 0, 0}, /*19*/ + {60.0, 10.0, PathPointTypeBezier, 0, 0}, /*20*/ + {60.0, 15.522847, PathPointTypeBezier, 0, 0}, /*21*/ + {55.522846, 20.0, PathPointTypeBezier, 0, 0}, /*22*/ + {50.0, 20.0, PathPointTypeBezier, 0, 0}, /*23*/ + {44.477150, 20.0, PathPointTypeBezier, 0, 0}, /*24*/ + {40.0, 15.522847, PathPointTypeBezier, 0, 0}, /*25*/ + {40.0, 10.0, PathPointTypeBezier, 0, 0}, /*26*/ + {40.0, 4.477153, PathPointTypeBezier, 0, 0}, /*27*/ + {44.477150, 0.0, PathPointTypeBezier, 0, 0}, /*28*/ + {50.0, 0.0, PathPointTypeBezier|PathPointTypeCloseSubpath, 0, 0}, /*29*/ + }; + +static path_test_t widenline_capdiamondanchor_path[] = { + {5.0, 5.0, PathPointTypeStart, 0, 0}, /*0*/ + {50.0, 5.0, PathPointTypeLine, 0, 0}, /*1*/ + {50.0, 15.0, PathPointTypeLine, 0, 0}, /*2*/ + {5.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*3*/ + {-5.0, 10.0, PathPointTypeStart, 0, 0}, /*4*/ + {5.0, 0.0, PathPointTypeLine, 0, 0}, /*5*/ + {15.0, 10.0, PathPointTypeLine, 0, 0}, /*6*/ + {5.0, 20.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*7*/ + {60.0, 10.0, PathPointTypeStart, 0, 0}, /*8*/ + {50.0, 20.0, PathPointTypeLine, 0, 0}, /*9*/ + {40.0, 10.0, PathPointTypeLine, 0, 0}, /*10*/ + {50.0, 0.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*11*/ + }; + +static path_test_t widenline_caparrowanchor_path[] = { + {15.0, 5.0, PathPointTypeStart, 0, 1}, /*0*/ + {40.0, 5.0, PathPointTypeLine, 0, 1}, /*1*/ + {40.0, 15.0, PathPointTypeLine, 0, 1}, /*2*/ + {15.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 1}, /*3*/ + {5.0, 10.0, PathPointTypeStart, 0, 0}, /*4*/ + {22.320507, 0.0, PathPointTypeLine, 0, 0}, /*5*/ + {22.320507, 20.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*6*/ + {50.0, 10.0, PathPointTypeStart, 0, 0}, /*7*/ + {32.679489, 20.0, PathPointTypeLine, 0, 0}, /*8*/ + {32.679489, 0.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*9*/ + }; + +static void test_widen_cap(void) +{ + struct + { + LineCap type; + const path_test_t *expected; + INT expected_size; + BOOL todo_size; + } + caps[] = + { + { LineCapFlat, widenline_capflat_path, + ARRAY_SIZE(widenline_capflat_path) }, + { LineCapSquare, widenline_capsquare_path, + ARRAY_SIZE(widenline_capsquare_path) }, + { LineCapRound, widenline_capround_path, + ARRAY_SIZE(widenline_capround_path), TRUE }, + { LineCapTriangle, widenline_captriangle_path, + ARRAY_SIZE(widenline_captriangle_path), TRUE }, + { LineCapNoAnchor, widenline_capflat_path, + ARRAY_SIZE(widenline_capflat_path) }, + { LineCapSquareAnchor, widenline_capsquareanchor_path, + ARRAY_SIZE(widenline_capsquareanchor_path), TRUE }, + { LineCapRoundAnchor, widenline_caproundanchor_path, + ARRAY_SIZE(widenline_caproundanchor_path), TRUE }, + { LineCapDiamondAnchor, widenline_capdiamondanchor_path, + ARRAY_SIZE(widenline_capdiamondanchor_path), TRUE }, + { LineCapArrowAnchor, widenline_caparrowanchor_path, + ARRAY_SIZE(widenline_caparrowanchor_path), TRUE }, + }; + GpStatus status; + GpPath *path; + GpPen *pen; + int i; + + status = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, status); + status = GdipCreatePen1(0xffffffff, 10.0, UnitPixel, &pen); + expect(Ok, status); + + for (i = 0; i < ARRAY_SIZE(caps); i++) + { + status = GdipResetPath(path); + expect(Ok, status); + status = GdipAddPathLine(path, 5.0, 10.0, 50.0, 10.0); + expect(Ok, status); + status = GdipSetPenStartCap(pen, caps[i].type); + expect(Ok, status); + status = GdipSetPenEndCap(pen, caps[i].type); + expect(Ok, status); + + status = GdipWidenPath(path, pen, NULL, FlatnessDefault); + expect(Ok, status); + ok_path(path, caps[i].expected, caps[i].expected_size, caps[i].todo_size); + } + + GdipDeletePen(pen); + GdipDeletePath(path); +} + static void test_isvisible(void) { GpPath *path; @@ -1385,6 +1563,7 @@ START_TEST(graphicspath) test_addpie(); test_flatten(); test_widen(); + test_widen_cap(); test_isvisible(); test_empty_rect();

1 0

Jeff Smith : gdiplus: Fix LineCapRound path widening.
by Alexandre Julliard 19 Feb '20

19 Feb '20

Module: wine Branch: master Commit: 26ffbf6b8c8bce461b1387e93e31e2d3aab25581 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26ffbf6b8c8bce461b1387e9… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Feb 18 23:51:57 2020 -0600 gdiplus: Fix LineCapRound path widening. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 2 ++ dlls/gdiplus/tests/graphicspath.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 7ec6061cb4..5ea82f4d0e 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1955,6 +1955,8 @@ static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint, *last_point = add_path_list_node(*last_point, endpoint->X - dy, endpoint->Y + dx, PathPointTypeBezier); } + else if (add_last_point) + add_bevel_point(endpoint, nextpoint, pen, 0, last_point); break; } case LineCapTriangle: diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index e12d9e2c49..91b83166ad 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1260,8 +1260,8 @@ static path_test_t widenline_capsquare_path[] = { }; static path_test_t widenline_capround_path[] = { - {5.0, 5.0, PathPointTypeStart, 0, 2}, /*0*/ - {50.0, 5.0, PathPointTypeLine, 0, 1}, /*1*/ + {5.0, 5.0, PathPointTypeStart, 0, 0}, /*0*/ + {50.0, 5.0, PathPointTypeLine, 0, 0}, /*1*/ {52.761421, 5.0, PathPointTypeBezier, 0, 0}, /*2*/ {55.0, 7.238576, PathPointTypeBezier, 0, 0}, /*3*/ {55.0, 10.0, PathPointTypeBezier, 0, 0}, /*4*/ @@ -1379,7 +1379,7 @@ static void test_widen_cap(void) { LineCapSquare, widenline_capsquare_path, ARRAY_SIZE(widenline_capsquare_path) }, { LineCapRound, widenline_capround_path, - ARRAY_SIZE(widenline_capround_path), TRUE }, + ARRAY_SIZE(widenline_capround_path) }, { LineCapTriangle, widenline_captriangle_path, ARRAY_SIZE(widenline_captriangle_path), TRUE }, { LineCapNoAnchor, widenline_capflat_path,

1 0

Jeff Smith : gdiplus: Fix LineCapTriangle path widening.
by Alexandre Julliard 19 Feb '20

19 Feb '20

Module: wine Branch: master Commit: b3a68db9a0dbb1c1f984a09a1db98bc4205c9ea8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3a68db9a0dbb1c1f984a09a… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Feb 18 23:51:58 2020 -0600 gdiplus: Fix LineCapTriangle path widening. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 2 +- dlls/gdiplus/tests/graphicspath.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 5ea82f4d0e..96078c3da9 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1976,7 +1976,7 @@ static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint, *last_point = add_path_list_node(*last_point, endpoint->X - dx, endpoint->Y - dy, PathPointTypeLine); } - if (add_last_point) + if (add_first_points || add_last_point) add_bevel_point(endpoint, nextpoint, pen, 0, last_point); break; } diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 91b83166ad..b840801739 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1283,8 +1283,8 @@ static path_test_t widenline_captriangle_path[] = { {55.0, 10.0, PathPointTypeLine, 0, 0}, /*2*/ {50.0, 15.0, PathPointTypeLine, 0, 0}, /*3*/ {5.0, 15.0, PathPointTypeLine, 0, 0}, /*4*/ - {0.0, 10.0, PathPointTypeLine, 0, 1}, /*5*/ - {5.0, 5.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 2} /*6*/ + {0.0, 10.0, PathPointTypeLine, 0, 0}, /*5*/ + {5.0, 5.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0} /*6*/ }; static path_test_t widenline_capsquareanchor_path[] = { @@ -1381,7 +1381,7 @@ static void test_widen_cap(void) { LineCapRound, widenline_capround_path, ARRAY_SIZE(widenline_capround_path) }, { LineCapTriangle, widenline_captriangle_path, - ARRAY_SIZE(widenline_captriangle_path), TRUE }, + ARRAY_SIZE(widenline_captriangle_path) }, { LineCapNoAnchor, widenline_capflat_path, ARRAY_SIZE(widenline_capflat_path) }, { LineCapSquareAnchor, widenline_capsquareanchor_path,

1 0

Jeff Smith : gdiplus: Add LineCapSquareAnchor path widening.
by Alexandre Julliard 19 Feb '20

19 Feb '20

Module: wine Branch: master Commit: 1da5cd6a8ff89742a506a52ea785216c73844529 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1da5cd6a8ff89742a506a52e… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Feb 18 23:51:59 2020 -0600 gdiplus: Add LineCapSquareAnchor path widening. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 50 +++++++++++++++++++++++++++++++++++++-- dlls/gdiplus/tests/graphicspath.c | 2 +- 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 96078c3da9..fcb2ed0b9e 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1983,6 +1983,44 @@ static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint, } } +static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, + GpPen *pen, GpLineCap cap, GpCustomLineCap *custom, path_list_node_t **last_point) +{ + switch (cap) + { + default: + case LineCapNoAnchor: + return; + case LineCapSquareAnchor: + { + REAL segment_dy = nextpoint->Y-endpoint->Y; + REAL segment_dx = nextpoint->X-endpoint->X; + REAL segment_length = sqrtf(segment_dy*segment_dy + segment_dx*segment_dx); + REAL distance = pen->width / sqrtf(2.0); + REAL par_dx, par_dy; + REAL perp_dx, perp_dy; + + par_dx = -distance * segment_dx / segment_length; + par_dy = -distance * segment_dy / segment_length; + + perp_dx = -distance * segment_dy / segment_length; + perp_dy = distance * segment_dx / segment_length; + + *last_point = add_path_list_node(*last_point, endpoint->X - par_dx - perp_dx, + endpoint->Y - par_dy - perp_dy, PathPointTypeStart); + *last_point = add_path_list_node(*last_point, endpoint->X - par_dx + perp_dx, + endpoint->Y - par_dy + perp_dy, PathPointTypeLine); + *last_point = add_path_list_node(*last_point, endpoint->X + par_dx + perp_dx, + endpoint->Y + par_dy + perp_dy, PathPointTypeLine); + *last_point = add_path_list_node(*last_point, endpoint->X + par_dx - perp_dx, + endpoint->Y + par_dy - perp_dy, PathPointTypeLine); + break; + } + } + + (*last_point)->type |= PathPointTypeCloseSubpath; +} + static void widen_open_figure(const GpPointF *points, GpPen *pen, int start, int end, GpLineCap start_cap, GpCustomLineCap *start_custom, GpLineCap end_cap, GpCustomLineCap *end_custom, path_list_node_t **last_point) @@ -2014,6 +2052,14 @@ static void widen_open_figure(const GpPointF *points, GpPen *pen, int start, int prev_point->next->type = PathPointTypeStart; (*last_point)->type |= PathPointTypeCloseSubpath; + + if (start_cap & LineCapAnchorMask) + add_anchor(&points[start], &points[start+1], + pen, start_cap, start_custom, last_point); + + if (end_cap & LineCapAnchorMask) + add_anchor(&points[end], &points[end-1], + pen, end_cap, end_custom, last_point); } static void widen_closed_figure(GpPath *path, GpPen *pen, int start, int end, @@ -2225,10 +2271,10 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, { last_point = points; - if (pen->endcap > LineCapTriangle) + if (pen->endcap > LineCapSquareAnchor) FIXME("unimplemented end cap %x\n", pen->endcap); - if (pen->startcap > LineCapTriangle) + if (pen->startcap > LineCapSquareAnchor) FIXME("unimplemented start cap %x\n", pen->startcap); if (pen->dashcap != DashCapFlat) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index b840801739..9ce95a2c74 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1385,7 +1385,7 @@ static void test_widen_cap(void) { LineCapNoAnchor, widenline_capflat_path, ARRAY_SIZE(widenline_capflat_path) }, { LineCapSquareAnchor, widenline_capsquareanchor_path, - ARRAY_SIZE(widenline_capsquareanchor_path), TRUE }, + ARRAY_SIZE(widenline_capsquareanchor_path) }, { LineCapRoundAnchor, widenline_caproundanchor_path, ARRAY_SIZE(widenline_caproundanchor_path), TRUE }, { LineCapDiamondAnchor, widenline_capdiamondanchor_path,

1 0

Jeff Smith : gdiplus: Add LineCapRoundAnchor path widening.
by Alexandre Julliard 19 Feb '20

19 Feb '20

Module: wine Branch: master Commit: 8e7c320df699c5d0f6d724048738599dfbef5839 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e7c320df699c5d0f6d72404… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Feb 18 23:52:00 2020 -0600 gdiplus: Add LineCapRoundAnchor path widening. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 56 +++++++++++++++++++++++++++++++++++++-- dlls/gdiplus/tests/graphicspath.c | 2 +- 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index fcb2ed0b9e..79d99a3eb4 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -2016,6 +2016,58 @@ static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, endpoint->Y + par_dy - perp_dy, PathPointTypeLine); break; } + case LineCapRoundAnchor: + { + REAL segment_dy = nextpoint->Y-endpoint->Y; + REAL segment_dx = nextpoint->X-endpoint->X; + REAL segment_length = sqrtf(segment_dy*segment_dy + segment_dx*segment_dx); + REAL dx, dy, dx2, dy2; + const REAL control_point_distance = 0.55228475; /* 4/3 * (sqrt(2) - 1) */ + + dx = -pen->width * segment_dx / segment_length; + dy = -pen->width * segment_dy / segment_length; + + dx2 = dx * control_point_distance; + dy2 = dy * control_point_distance; + + /* starting point */ + *last_point = add_path_list_node(*last_point, endpoint->X + dy, + endpoint->Y - dx, PathPointTypeStart); + + /* first 90-degree arc */ + *last_point = add_path_list_node(*last_point, endpoint->X + dy + dx2, + endpoint->Y - dx + dy2, PathPointTypeBezier); + *last_point = add_path_list_node(*last_point, endpoint->X + dx + dy2, + endpoint->Y + dy - dx2, PathPointTypeBezier); + *last_point = add_path_list_node(*last_point, endpoint->X + dx, + endpoint->Y + dy, PathPointTypeBezier); + + /* second 90-degree arc */ + *last_point = add_path_list_node(*last_point, endpoint->X + dx - dy2, + endpoint->Y + dy + dx2, PathPointTypeBezier); + *last_point = add_path_list_node(*last_point, endpoint->X - dy + dx2, + endpoint->Y + dx + dy2, PathPointTypeBezier); + *last_point = add_path_list_node(*last_point, endpoint->X - dy, + endpoint->Y + dx, PathPointTypeBezier); + + /* third 90-degree arc */ + *last_point = add_path_list_node(*last_point, endpoint->X - dy - dx2, + endpoint->Y + dx - dy2, PathPointTypeBezier); + *last_point = add_path_list_node(*last_point, endpoint->X - dx - dy2, + endpoint->Y - dy + dx2, PathPointTypeBezier); + *last_point = add_path_list_node(*last_point, endpoint->X - dx, + endpoint->Y - dy, PathPointTypeBezier); + + /* fourth 90-degree arc */ + *last_point = add_path_list_node(*last_point, endpoint->X - dx + dy2, + endpoint->Y - dy - dx2, PathPointTypeBezier); + *last_point = add_path_list_node(*last_point, endpoint->X + dy - dx2, + endpoint->Y - dx - dy2, PathPointTypeBezier); + *last_point = add_path_list_node(*last_point, endpoint->X + dy, + endpoint->Y - dx, PathPointTypeBezier); + + break; + } } (*last_point)->type |= PathPointTypeCloseSubpath; @@ -2271,10 +2323,10 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, { last_point = points; - if (pen->endcap > LineCapSquareAnchor) + if (pen->endcap > LineCapRoundAnchor) FIXME("unimplemented end cap %x\n", pen->endcap); - if (pen->startcap > LineCapSquareAnchor) + if (pen->startcap > LineCapRoundAnchor) FIXME("unimplemented start cap %x\n", pen->startcap); if (pen->dashcap != DashCapFlat) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 9ce95a2c74..6acfddd53e 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1387,7 +1387,7 @@ static void test_widen_cap(void) { LineCapSquareAnchor, widenline_capsquareanchor_path, ARRAY_SIZE(widenline_capsquareanchor_path) }, { LineCapRoundAnchor, widenline_caproundanchor_path, - ARRAY_SIZE(widenline_caproundanchor_path), TRUE }, + ARRAY_SIZE(widenline_caproundanchor_path) }, { LineCapDiamondAnchor, widenline_capdiamondanchor_path, ARRAY_SIZE(widenline_capdiamondanchor_path), TRUE }, { LineCapArrowAnchor, widenline_caparrowanchor_path,

1 0

Jeff Smith : gdiplus: Add LineCapDiamondAnchor path widening.
by Alexandre Julliard 19 Feb '20

19 Feb '20

Module: wine Branch: master Commit: bc49309fe27f832301f36b2c3b6a8d530940c37f URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc49309fe27f832301f36b2c… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Feb 18 23:52:01 2020 -0600 gdiplus: Add LineCapDiamondAnchor path widening. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 28 ++++++++++++++++++++++++++-- dlls/gdiplus/tests/graphicspath.c | 2 +- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 79d99a3eb4..249f584089 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -2068,6 +2068,30 @@ static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, break; } + case LineCapDiamondAnchor: + { + REAL segment_dy = nextpoint->Y-endpoint->Y; + REAL segment_dx = nextpoint->X-endpoint->X; + REAL segment_length = sqrtf(segment_dy*segment_dy + segment_dx*segment_dx); + REAL par_dx, par_dy; + REAL perp_dx, perp_dy; + + par_dx = -pen->width * segment_dx / segment_length; + par_dy = -pen->width * segment_dy / segment_length; + + perp_dx = -pen->width * segment_dy / segment_length; + perp_dy = pen->width * segment_dx / segment_length; + + *last_point = add_path_list_node(*last_point, endpoint->X + par_dx, + endpoint->Y + par_dy, PathPointTypeStart); + *last_point = add_path_list_node(*last_point, endpoint->X - perp_dx, + endpoint->Y - perp_dy, PathPointTypeLine); + *last_point = add_path_list_node(*last_point, endpoint->X - par_dx, + endpoint->Y - par_dy, PathPointTypeLine); + *last_point = add_path_list_node(*last_point, endpoint->X + perp_dx, + endpoint->Y + perp_dy, PathPointTypeLine); + break; + } } (*last_point)->type |= PathPointTypeCloseSubpath; @@ -2323,10 +2347,10 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, { last_point = points; - if (pen->endcap > LineCapRoundAnchor) + if (pen->endcap > LineCapDiamondAnchor) FIXME("unimplemented end cap %x\n", pen->endcap); - if (pen->startcap > LineCapRoundAnchor) + if (pen->startcap > LineCapDiamondAnchor) FIXME("unimplemented start cap %x\n", pen->startcap); if (pen->dashcap != DashCapFlat) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 6acfddd53e..aabacef3aa 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1389,7 +1389,7 @@ static void test_widen_cap(void) { LineCapRoundAnchor, widenline_caproundanchor_path, ARRAY_SIZE(widenline_caproundanchor_path) }, { LineCapDiamondAnchor, widenline_capdiamondanchor_path, - ARRAY_SIZE(widenline_capdiamondanchor_path), TRUE }, + ARRAY_SIZE(widenline_capdiamondanchor_path) }, { LineCapArrowAnchor, widenline_caparrowanchor_path, ARRAY_SIZE(widenline_caparrowanchor_path), TRUE }, };

1 0

Francois Gouget : testbot: Limit chomping of log lines to CR and LF.
by Alexandre Julliard 19 Feb '20

19 Feb '20

Module: tools Branch: master Commit: 89b225b4d421a71f4e0802dbb096b756013d27d2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=89b225b4d421a71f4e0802d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 19 04:17:07 2020 +0100 testbot: Limit chomping of log lines to CR and LF. This fixes handling of failures (and todos, etc) where the message starts with a linefeed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 5ed4563..863cca6 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -254,7 +254,8 @@ sub ParseTaskLog($) foreach my $Line (<$LogFile>) { $LineNo++; - $Line =~ s/\s*$//; # chomp \r, \n and more + chomp $Line; + $Line =~ s/\r+$//; if (GetLogLineCategory($Line) eq "error") { @@ -525,7 +526,8 @@ sub ParseWineTestReport($$$) { $LineNo++; $Cur->{UnitSize} += length($Line); - $Line =~ s/\s*$//; # chomp \r, \n and more + chomp $Line; + $Line =~ s/\r+$//; if (GetReportLineCategory($Line) eq "error") {

1 0