August 2017 - Wine-commits - list.winehq.org

Jacek Caban : wininet: Never do blocking reads in chunked_read if zero chunk size is aready read.
by Alexandre Julliard 17 Aug '17

17 Aug '17

Module: wine Branch: master Commit: 59395d8845931c76dce482fc0c59158138865c1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=59395d8845931c76dce482fc0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 17 19:09:52 2017 +0200 wininet: Never do blocking reads in chunked_read if zero chunk size is aready read. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c5ada87..d6fdedd 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2706,17 +2706,23 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, /* Ensure that we have data in the buffer for states that need it. */ if(!chunked_stream->buf_size) { + BOOL blocking_read = allow_blocking; + switch(chunked_stream->state) { - case CHUNKED_STREAM_STATE_READING_CHUNK_SIZE: + case CHUNKED_STREAM_STATE_DISCARD_EOL_AT_END: case CHUNKED_STREAM_STATE_DISCARD_EOL_AFTER_SIZE: + /* never allow blocking after 0 chunk size */ + if(!chunked_stream->chunk_size) + blocking_read = FALSE; + /* fall through */ + case CHUNKED_STREAM_STATE_READING_CHUNK_SIZE: case CHUNKED_STREAM_STATE_DISCARD_EOL_AFTER_DATA: - case CHUNKED_STREAM_STATE_DISCARD_EOL_AT_END: chunked_stream->buf_pos = 0; - res = NETCON_recv(req->netconn, chunked_stream->buf, sizeof(chunked_stream->buf), allow_blocking, &read_bytes); + res = NETCON_recv(req->netconn, chunked_stream->buf, sizeof(chunked_stream->buf), blocking_read, &read_bytes); if(res == ERROR_SUCCESS && read_bytes) { chunked_stream->buf_size += read_bytes; }else if(res == WSAEWOULDBLOCK) { - if(ret_read) + if(ret_read || allow_blocking) res = ERROR_SUCCESS; continue_read = FALSE; continue;

1 0

Jacek Caban : wininet: Drain content before reusing connection in open_http_connection.
by Alexandre Julliard 17 Aug '17

17 Aug '17

Module: wine Branch: master Commit: 085ce269b13978f081b5dd7b70cd898a9e87fe0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=085ce269b13978f081b5dd7b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 17 19:09:59 2017 +0200 wininet: Drain content before reusing connection in open_http_connection. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d6fdedd..dc106d8 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4745,22 +4745,22 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) netconn_t *netconn = NULL; DWORD res; - reset_data_stream(request); - if (request->netconn) { - if (is_valid_netconn(request->netconn) && NETCON_is_alive(request->netconn)) + if (NETCON_is_alive(request->netconn) && drain_content(request, TRUE) == ERROR_SUCCESS) { + reset_data_stream(request); *reusing = TRUE; return ERROR_SUCCESS; } - else - { - free_netconn(request->netconn); - request->netconn = NULL; - } + + TRACE("freeing netconn\n"); + free_netconn(request->netconn); + request->netconn = NULL; } + reset_data_stream(request); + res = HTTP_ResolveName(request); if(res != ERROR_SUCCESS) return res;

1 0

Jacek Caban : wininet/tests: Added more persistent connection tests.
by Alexandre Julliard 17 Aug '17

17 Aug '17

Module: wine Branch: master Commit: e09155723b916f33f4bd386138e1c209f41b321a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e09155723b916f33f4bd38613… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 17 19:10:10 2017 +0200 wininet/tests: Added more persistent connection tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 204 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 169 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e09155723b916f33f4bd3…

1 0

Aric Stewart : usp10: Fall back to 'dflt' language if shaping language tag isn't found.
by Alexandre Julliard 17 Aug '17

17 Aug '17

Module: wine Branch: master Commit: 9d32c2d31aa036f9e7e49e26ccc800ac848639e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d32c2d31aa036f9e7e49e26c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Aug 16 07:03:14 2017 -0500 usp10: Fall back to 'dflt' language if shaping language tag isn't found. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/shape.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 2f47f89..b75be60 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -638,8 +638,12 @@ static LoadedFeature* load_OT_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache } while(attempt && !feature); /* try in the default (latin) table */ - if (!feature && !script) - OpenType_GetFontFeatureTags(psc, MS_MAKE_TAG('l','a','t','n'), MS_MAKE_TAG('d','f','l','t'), FALSE, MS_MAKE_TAG(feat[0],feat[1],feat[2],feat[3]), tableType, 1, &tags, &cTags, &feature); + if (!feature) + { + if (!script) + script = MS_MAKE_TAG('l','a','t','n'); + OpenType_GetFontFeatureTags(psc, script, MS_MAKE_TAG('d','f','l','t'), FALSE, MS_MAKE_TAG(feat[0],feat[1],feat[2],feat[3]), tableType, 1, &tags, &cTags, &feature); + } } TRACE("Feature %s located at %p\n",debugstr_an(feat,4),feature);

1 0

Jacek Caban : netprofm: Added semi-stub Advise and Unadvise implementation.
by Alexandre Julliard 17 Aug '17

17 Aug '17

Module: wine Branch: master Commit: d53b711f27f15cdeb9700e86526dab13ddf8d731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d53b711f27f15cdeb9700e865… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 17 20:47:16 2017 +0200 netprofm: Added semi-stub Advise and Unadvise implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netprofm/list.c | 54 ++++++++++++++++++++++++++++++---- dlls/netprofm/tests/list.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+), 5 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index d82ae36..d59ee0c 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -91,6 +91,15 @@ struct connection_point IConnectionPointContainer *container; LONG refs; IID iid; + struct list sinks; + DWORD cookie; +}; + +struct sink_entry +{ + struct list entry; + DWORD cookie; + IUnknown *unk; }; static inline struct list_manager *impl_from_IConnectionPointContainer(IConnectionPointContainer *iface) @@ -189,12 +198,33 @@ static HRESULT WINAPI connection_point_Advise( DWORD *cookie ) { struct connection_point *cp = impl_from_IConnectionPoint( iface ); - FIXME( "%p, %p, %p - stub\n", cp, sink, cookie ); + struct sink_entry *sink_entry; + IUnknown *unk; + HRESULT hr; + + FIXME( "%p, %p, %p - semi-stub\n", cp, sink, cookie ); if (!sink || !cookie) return E_POINTER; - return CONNECT_E_CANNOTCONNECT; + hr = IUnknown_QueryInterface( sink, &cp->iid, (void**)&unk ); + if (FAILED(hr)) + { + WARN( "iface %s not implemented by sink\n", debugstr_guid(&cp->iid) ); + return CO_E_FAILEDTOOPENTHREADTOKEN; + } + + sink_entry = heap_alloc( sizeof(*sink_entry) ); + if (!sink_entry) + { + IUnknown_Release( unk ); + return E_OUTOFMEMORY; + } + + sink_entry->unk = unk; + *cookie = sink_entry->cookie = ++cp->cookie; + list_add_tail( &cp->sinks, &sink_entry->entry ); + return S_OK; } static HRESULT WINAPI connection_point_Unadvise( @@ -202,9 +232,21 @@ static HRESULT WINAPI connection_point_Unadvise( DWORD cookie ) { struct connection_point *cp = impl_from_IConnectionPoint( iface ); - FIXME( "%p, %d - stub\n", cp, cookie ); + struct sink_entry *iter; + + TRACE( "%p, %d\n", cp, cookie ); + + LIST_FOR_EACH_ENTRY( iter, &cp->sinks, struct sink_entry, entry ) + { + if (iter->cookie != cookie) continue; + list_remove( &iter->entry ); + IUnknown_Release( iter->unk ); + heap_free( iter ); + return S_OK; + } - return E_POINTER; + WARN( "invalid cookie\n" ); + return OLE_E_NOCONNECTION; } static HRESULT WINAPI connection_point_EnumConnections( @@ -241,8 +283,10 @@ static HRESULT connection_point_create( cp->IConnectionPoint_iface.lpVtbl = &connection_point_vtbl; cp->container = container; cp->refs = 1; + cp->cookie = 0; + cp->iid = *riid; + list_init( &cp->sinks ); - memcpy( &cp->iid, riid, sizeof(*riid) ); IConnectionPointContainer_AddRef( container ); *obj = &cp->IConnectionPoint_iface; diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c index eb8477c..3937b2f 100644 --- a/dlls/netprofm/tests/list.c +++ b/dlls/netprofm/tests/list.c @@ -157,6 +157,64 @@ static void test_INetworkConnection( INetworkConnection *conn ) } } +static HRESULT WINAPI Unknown_QueryInterface(INetworkListManagerEvents *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown)) { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static HRESULT WINAPI NetworkListManagerEvents_QueryInterface(INetworkListManagerEvents *iface, + REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_INetworkListManagerEvents)) { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI NetworkListManagerEvents_AddRef(INetworkListManagerEvents *iface) +{ + return 2; +} + +static ULONG WINAPI NetworkListManagerEvents_Release(INetworkListManagerEvents *iface) +{ + return 1; +} + +static HRESULT WINAPI NetworkListManagerEvents_ConnectivityChanged(INetworkListManagerEvents *iface, + NLM_CONNECTIVITY newConnectivity) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const INetworkListManagerEventsVtbl mgr_sink_vtbl = { + NetworkListManagerEvents_QueryInterface, + NetworkListManagerEvents_AddRef, + NetworkListManagerEvents_Release, + NetworkListManagerEvents_ConnectivityChanged +}; + +static INetworkListManagerEvents mgr_sink = { &mgr_sink_vtbl }; + +static const INetworkListManagerEventsVtbl mgr_sink_unk_vtbl = { + Unknown_QueryInterface, + NetworkListManagerEvents_AddRef, + NetworkListManagerEvents_Release, + NetworkListManagerEvents_ConnectivityChanged +}; + +static INetworkListManagerEvents mgr_sink_unk = { &mgr_sink_unk_vtbl }; + static void test_INetworkListManager( void ) { IConnectionPointContainer *cpc, *cpc2; @@ -169,6 +227,7 @@ static void test_INetworkListManager( void ) INetwork *network; IEnumNetworkConnections *conn_iter; INetworkConnection *conn; + DWORD cookie; HRESULT hr; ULONG ref1, ref2; IID iid; @@ -247,6 +306,19 @@ static void test_INetworkListManager( void ) ok( hr == S_OK, "got %08x\n", hr ); ok( !memcmp( &iid, &IID_INetworkListManagerEvents, sizeof(iid) ), "Expected iid to be IID_INetworkListManagerEvents\n" ); + + hr = IConnectionPoint_Advise( pt, (IUnknown*)&mgr_sink_unk, &cookie); + ok( hr == CO_E_FAILEDTOOPENTHREADTOKEN, "Advise failed: %08x\n", hr ); + + hr = IConnectionPoint_Advise( pt, (IUnknown*)&mgr_sink, &cookie); + ok( hr == S_OK, "Advise failed: %08x\n", hr ); + + hr = IConnectionPoint_Unadvise( pt, 0xdeadbeef ); + ok( hr == OLE_E_NOCONNECTION || hr == CO_E_FAILEDTOIMPERSONATE, "Unadvise failed: %08x\n", hr ); + + hr = IConnectionPoint_Unadvise( pt, cookie ); + ok( hr == S_OK, "Unadvise failed: %08x\n", hr ); + IConnectionPoint_Release( pt ); hr = IConnectionPointContainer_FindConnectionPoint( cpc, &IID_INetworkCostManagerEvents, &pt );

1 0

Henri Verbeet : d2d1/tests: Add a test for bezier intersections.
by Alexandre Julliard 17 Aug '17

17 Aug '17

Module: wine Branch: master Commit: 01d4767aed754983e70bf27e27c03105b5b00789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01d4767aed754983e70bf27e2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 16 21:58:21 2017 +0200 d2d1/tests: Add a test for bezier intersections. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 164 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 2bb13bb..bb1b056 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -196,6 +196,19 @@ static void quadratic_to(ID2D1GeometrySink *sink, float x1, float y1, float x2, ID2D1GeometrySink_AddQuadraticBezier(sink, &quadratic); } +static void cubic_to(ID2D1GeometrySink *sink, float x1, float y1, float x2, float y2, float x3, float y3) +{ + D2D1_BEZIER_SEGMENT b; + + b.point1.x = x1; + b.point1.y = y1; + b.point2.x = x2; + b.point2.y = y2; + b.point3.x = x3; + b.point3.y = y3; + ID2D1GeometrySink_AddBezier(sink, &b); +} + static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -5545,6 +5558,156 @@ static void test_layer(void) DestroyWindow(window); } +static void test_bezier_intersect(void) +{ + D2D1_POINT_2F point = {0.0f, 0.0f}; + ID2D1SolidColorBrush *brush; + ID2D1PathGeometry *geometry; + IDXGISwapChain *swapchain; + ID2D1GeometrySink *sink; + ID2D1RenderTarget *rt; + ID3D10Device1 *device; + IDXGISurface *surface; + ID2D1Factory *factory; + D2D1_COLOR_F color; + ULONG refcount; + HWND window; + HRESULT hr; + BOOL match; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + window = create_window(); + 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); + + ID2D1RenderTarget_SetDpi(rt, 192.0f, 48.0f); + ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED); + set_color(&color, 0.890f, 0.851f, 0.600f, 1.0f); + hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, NULL, &brush); + ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr); + + 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); + + set_point(&point, 160.0f, 720.0f); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); + cubic_to(sink, 119.0f, 720.0f, 83.0f, 600.0f, 80.0f, 474.0f); + cubic_to(sink, 78.0f, 349.0f, 108.0f, 245.0f, 135.0f, 240.0f); + cubic_to(sink, 163.0f, 235.0f, 180.0f, 318.0f, 176.0f, 370.0f); + cubic_to(sink, 171.0f, 422.0f, 149.0f, 422.0f, 144.0f, 370.0f); + cubic_to(sink, 140.0f, 318.0f, 157.0f, 235.0f, 185.0f, 240.0f); + cubic_to(sink, 212.0f, 245.0f, 242.0f, 349.0f, 240.0f, 474.0f); + cubic_to(sink, 238.0f, 600.0f, 201.0f, 720.0f, 160.0f, 720.0f); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + + set_point(&point, 160.0f, 240.0f); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); + line_to(sink, 240.0f, 240.0f); + line_to(sink, 240.0f, 720.0f); + line_to(sink, 160.0f, 720.0f); + 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); + + ID2D1RenderTarget_BeginDraw(rt); + set_color(&color, 0.396f, 0.180f, 0.537f, 1.0f); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, (ID2D1Brush *)brush, NULL); + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + ID2D1PathGeometry_Release(geometry); + + match = compare_figure(surface, 160, 120, 320, 240, 0xff652e89, 2048, + "aRQjIxRpYiIcHCJiXSwXFyxdWTQTEzRZVTsQEDtVUkIMDEJST0cKCkdPTUsICEtNSlEFBVFKSFUD" + "A1VIRlkBAVlGRFsBAVtEQlwCAlxCQFwEBFxAPl0FBV0+PF0HB108Ol4ICF46OV0KCl05N14LC143" + "Nl4MDF42NF8NDV80M14PD14zMV8QEF8xMF8REV8wL18SEl8vLWATE2AtLGAUFGAsK2EUFGErKWIV" + "FWIpKGIWFmIoJ2IXF2InJmIYGGImJWMYGGMlJGMZGWMkI2MaGmMjImQaGmQiIWQbG2QhIGQcHGQg" + "H2UcHGUfHmUdHWUeHWYdHWYdHGcdHWccG2ceHmcbGmgeHmgaGWgfH2gZGWgfH2gZGGkfH2kYF2kg" + "IGkXFmogIGoWFmogIGoWFWsgIGsVFGshIWsUE2whIWwTE2whIWwTEm0hIW0SEW4hIW4REW4hIW4R" + "EG8hIW8QD3AhIXAPD3AhIXAPDnEhIXEODnEhIXEODXIhIXINDHQgIHQMDHQgIHQMC3UgIHULC3Yf" + "H3YLCncfH3cKCngeHngKCXkeHnkJCXodHXoJCXscHHsJCHwcHHwICH0bG30IB38aGn8HB4ABGRmA" + "AQcHgQEYGIEBBwaEARYWhAEGBoUBFRWFAQYFiAETE4gBBQWKARERigEFBYwBDw+MAQUEkAEMDJAB" + "BASTAQkJkwEEBJwBnAEEA50BnQEDA50BnQEDA50BnQEDA50BnQEDAp4BngECAp4BngECAp4BngEC" + "Ap4BngECAp4BngECAZ8BnwEBAZ8BnwEBAZ8BnwEBAZ8BnwEBAZ8BnwEBAZ8BnwEBAZ8BnwGhAaAB" + "oAGgAaABoAGgAaABoAGgAaABoAGgAaABoAGgAaABoAGgAaABoAGgAaABoAGgAaABoAGgAaABoAGg" + "AaABoAGgAaABoAGgAaABoAGhAZ8BoQGfAZ8BAQGfAZ8BAQGfAZ8BAQGfAZ8BAQGfAZ8BAQKeAZ8B" + "AQKeAZ4BAgKeAZ4BAgKeAZ4BAgOdAZ4BAgOdAZ4BAgOdAZ0BAwScAZ0BAwScAZ0BAwScAZ0BAwSc" + "AZwBBAWbAZwBBAWbAZwBBAWbAZsBBQaaAZsBBQaaAZoBBgeZAZoBBgeZAZoBBgeZAZkBBwiYAZkB" + "BwiYAZgBCAmXAZgBCAmXAZgBCAmXAZcBCQqWAZcBCQqWAZYBCguVAZYBCguVAZUBCwyUAZUBCw2T" + "AZQBDA2TAZQBDA6SAZMBDQ6SAZMBDQ+RAZIBDg+RAZIBDhCQAZEBDxCQAZABEBGPAZABEBKOAY8B" + "ERONAY4BEhONAY4BEhSMAY0BExWLAYwBFBWLAYwBFBaKAYsBFReJAYoBFheJAYoBFhiIAYkBFxmH" + "AYgBGBqGAYcBGRuFAYYBGhuFAYUBGxyEAYUBGx2DAYQBHB6CAYMBHR+BAYIBHiCAAYEBHyF/gAEg" + "In5/ISJ+fiIjfX0jJHx8JCV7eyUmenomJ3l5Jyh4eCgpd3cpK3V2Kix0dSstc3QsLnJzLS9xci4w" + "cHAwMm5vMTNtbjI0bG0zNWtrNTdpajY4aGk3OmZnOTtlZjo8ZGQ8PmJjPT9hYj5BX2BAQl5eQkRc" + "XUNGWltFR1lZR0lXWEhLVVZKTVNUTE9RUk5RT1BQUk5OUlRMTFRWSkpWWUdIWFtFRVteQkNdYEBA" + "YGI+PmJlOztlaDg4aGs1NWtuMjJuci4vcXUrK3V6JiZ6fiIifoMBHR2DAYsBFRWLAZUBCwuVAQAA"); + todo_wine ok(match, "Figure does not match.\n"); + + 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); + + set_point(&point, 240.0f, 720.0f); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); + cubic_to(sink, 152.0f, 720.0f, 80.0f, 613.0f, 80.0f, 480.0f); + cubic_to(sink, 80.0f, 347.0f, 152.0f, 240.0f, 240.0f, 240.0f); + cubic_to(sink, 152.0f, 339.0f, 134.0f, 528.0f, 200.0f, 660.0f); + cubic_to(sink, 212.0f, 683.0f, 225.0f, 703.0f, 240.0f, 720.0f); + 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); + + ID2D1RenderTarget_BeginDraw(rt); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, (ID2D1Brush *)brush, NULL); + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + ID2D1PathGeometry_Release(geometry); + + match = compare_figure(surface, 160, 120, 320, 240, 0xff652e89, 2048, + "pQIZkgIrhAI5/QE/9gFH7wFO6wFS5wFW4gFb3gFf2wFi2AFl1gFn1AFp0gFszwFuzQFxywFyyQF1" + "xwF2xgF4xAF5xAF6wgF8wAF+vwF+vwF/vQGBAbwBggG7AYMBugGEAbkBhQG4AYYBtwGHAbcBiAG1" + "AYkBtAGKAbQBigGzAYsBswGMAbEBjQGxAY0BsQGOAa8BjwGvAZABrgGQAa4BkQGtAZEBrQGSAawB" + "kgGsAZMBqwGTAasBlAGrAZQBqgGVAakBlQGqAZUBqQGWAagBlwGoAZYBqAGXAagBlwGnAZgBpwGY" + "AaYBmQGmAZkBpgGZAaUBmgGlAZoBpQGaAaUBmgGkAZsBpAGbAaQBmwGkAZsBpAGcAaMBnAGjAZwB" + "owGcAaMBnAGjAZ0BogGdAaIBnQGiAZ4BoQGeAaEBngGiAZ4BoQGeAaEBnwGgAZ8BoQGeAaEBnwGh" + "AZ4BoQGfAaABnwGhAZ8BoAGgAaABnwGgAaABoAGfAaABoAGgAaABnwGgAaABoAGgAaABnwGgAaAB" + "oAGgAaABnwGhAZ8BoQGfAaABoAGgAaABoAGfAaEBnwGhAZ8BoQGfAaEBnwGhAZ8BoQGfAaABoAGg" + "AaABoAGgAaEBnwGhAZ8BoQGfAaEBnwGhAaABoAGgAaABoAGgAaABoAGgAaEBoAGgAaABoAGgAaAB" + "oQGgAaABoAGgAaABoQGfAaEBoAGhAZ8BoQGfAaIBnwGhAZ8BogGfAaEBnwGiAZ8BogGeAaIBnwGi" + "AZ4BogGfAaIBngGjAZ4BowGdAaMBngGjAZ4BowGdAaQBnQGkAZ0BpAGcAaUBnAGlAZwBpQGcAaUB" + "mwGmAZsBpgGbAaYBmwGmAZsBpgGbAacBmgGnAZkBqAGZAagBmQGpAZgBqQGZAagBmQGpAZgBqQGY" + "AaoBlwGqAZcBqwGWAasBlgGsAZUBrQGVAawBlQGtAZQBrgGUAa0BlAGuAZMBrwGTAa8BkgGwAZEB" + "sQGRAbEBkAGyAZABsgGPAbMBjwG0AY4BtAGNAbUBjQG2AYwBtgGLAbgBigG4AYoBuQGJAboBhwG7" + "AYcBvAGGAb0BhQG+AYQBvwGDAcABggHBAYIBwgGAAcMBf8QBfsYBfMgBe8gBesoBeMwBd80BddAB" + "c9EBcdQBb9YBbNkBatsBaN0BZeEBYuQBX+gBW+0BVvEBUvUBTvwBR4QCQIoCOZgCK6oCGQIA"); + todo_wine ok(match, "Figure does not match.\n"); + + ID2D1SolidColorBrush_Release(brush); + 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(); @@ -5570,4 +5733,5 @@ START_TEST(d2d1) test_draw_geometry(); test_gdi_interop(); test_layer(); + test_bezier_intersect(); }

1 0

Henri Verbeet : d2d1: Return S_OK on success in d2d_geometry_resolve_beziers().
by Alexandre Julliard 17 Aug '17

17 Aug '17

Module: wine Branch: master Commit: 0ede13e1df395f81f6eda53a66aef05e7c3c14f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ede13e1df395f81f6eda53a6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 16 21:58:20 2017 +0200 d2d1: Return S_OK on success in d2d_geometry_resolve_beziers(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 31a3eda..e43477e 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2285,7 +2285,7 @@ static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) } } - return TRUE; + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_geometry_sink_Close(ID2D1GeometrySink *iface)

1 0

Henri Verbeet : d2d1: Introduce a separate function for calculating line/ line intersections.
by Alexandre Julliard 17 Aug '17

17 Aug '17

Module: wine Branch: master Commit: a5f02132d3e773962f8384313ba63a019c07c03a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5f02132d3e773962f8384313… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 16 21:58:22 2017 +0200 d2d1: Introduce a separate function for calculating line/line intersections. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 142 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 92 insertions(+), 50 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index e43477e..b18f680 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -56,6 +56,12 @@ enum d2d_vertex_type D2D_VERTEX_TYPE_BEZIER, }; +struct d2d_segment_idx +{ + size_t figure_idx; + size_t vertex_idx; +}; + struct d2d_figure { D2D1_POINT_2F *vertices; @@ -98,7 +104,7 @@ struct d2d_cdt struct d2d_geometry_intersection { size_t figure_idx; - size_t segment_idx; + size_t vertex_idx; float t; D2D1_POINT_2F p; }; @@ -1542,7 +1548,7 @@ static BOOL d2d_cdt_insert_segments(struct d2d_cdt *cdt, struct d2d_geometry *ge } static BOOL d2d_geometry_intersections_add(struct d2d_geometry_intersections *i, - size_t figure_idx, size_t segment_idx, float t, D2D1_POINT_2F p) + const struct d2d_segment_idx *segment_idx, float t, D2D1_POINT_2F p) { struct d2d_geometry_intersection *intersection; @@ -1554,8 +1560,8 @@ static BOOL d2d_geometry_intersections_add(struct d2d_geometry_intersections *i, } intersection = &i->intersections[i->intersection_count++]; - intersection->figure_idx = figure_idx; - intersection->segment_idx = segment_idx; + intersection->figure_idx = segment_idx->figure_idx; + intersection->vertex_idx = segment_idx->vertex_idx; intersection->t = t; intersection->p = p; @@ -1569,71 +1575,107 @@ static int d2d_geometry_intersections_compare(const void *a, const void *b) if (i0->figure_idx != i1->figure_idx) return i0->figure_idx - i1->figure_idx; - if (i0->segment_idx != i1->segment_idx) - return i0->segment_idx - i1->segment_idx; + if (i0->vertex_idx != i1->vertex_idx) + return i0->vertex_idx - i1->vertex_idx; if (i0->t != i1->t) return i0->t > i1->t ? 1 : -1; return 0; } +static BOOL d2d_geometry_intersect_line_line(struct d2d_geometry *geometry, + struct d2d_geometry_intersections *intersections, const struct d2d_segment_idx *idx_p, + const struct d2d_segment_idx *idx_q) +{ + D2D1_POINT_2F v_p, v_q, v_qp, intersection; + const D2D1_POINT_2F *p[2], *q[2]; + const struct d2d_figure *figure; + float s, t, det; + size_t next; + + figure = &geometry->u.path.figures[idx_p->figure_idx]; + p[0] = &figure->vertices[idx_p->vertex_idx]; + next = idx_p->vertex_idx + 1; + if (next == figure->vertex_count) + next = 0; + p[1] = &figure->vertices[next]; + + figure = &geometry->u.path.figures[idx_q->figure_idx]; + q[0] = &figure->vertices[idx_q->vertex_idx]; + next = idx_q->vertex_idx + 1; + if (next == figure->vertex_count) + next = 0; + q[1] = &figure->vertices[next]; + + d2d_point_subtract(&v_p, p[1], p[0]); + d2d_point_subtract(&v_q, q[1], q[0]); + d2d_point_subtract(&v_qp, p[0], q[0]); + + det = v_p.x * v_q.y - v_p.y * v_q.x; + if (det == 0.0f) + return TRUE; + + s = (v_q.x * v_qp.y - v_q.y * v_qp.x) / det; + t = (v_p.x * v_qp.y - v_p.y * v_qp.x) / det; + + if (s < 0.0f || s > 1.0f || t < 0.0f || t > 1.0f) + return TRUE; + + intersection.x = p[0]->x + v_p.x * s; + intersection.y = p[0]->y + v_p.y * s; + + if (s > 0.0f && s < 1.0f && !d2d_geometry_intersections_add(intersections, idx_p, s, intersection)) + return FALSE; + + if (t > 0.0f && t < 1.0f && !d2d_geometry_intersections_add(intersections, idx_q, t, intersection)) + return FALSE; + + return TRUE; +} + /* Intersect the geometry's segments with themselves. This uses the * straightforward approach of testing everything against everything, but * there certainly exist more scalable algorithms for this. */ /* FIXME: Beziers can't currently self-intersect. */ static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry) { - D2D1_POINT_2F p0, p1, q0, q1, v_p, v_q, v_qp, intersection; struct d2d_geometry_intersections intersections = {0}; - struct d2d_figure *figure_p, *figure_q; - size_t i, j, k, l, max_l; + const struct d2d_figure *figure_p, *figure_q; + struct d2d_segment_idx idx_p, idx_q; + enum d2d_vertex_type type_p, type_q; + size_t i, j, max_q; BOOL ret = FALSE; - float s, t, det; - for (i = 0; i < geometry->u.path.figure_count; ++i) + if (!geometry->u.path.figure_count) + return TRUE; + + for (idx_p.figure_idx = 0; idx_p.figure_idx < geometry->u.path.figure_count; ++idx_p.figure_idx) { - figure_p = &geometry->u.path.figures[i]; - p0 = figure_p->vertices[figure_p->vertex_count - 1]; - for (k = 0; k < figure_p->vertex_count; p0 = p1, ++k) + figure_p = &geometry->u.path.figures[idx_p.figure_idx]; + for (idx_p.vertex_idx = 0; idx_p.vertex_idx < figure_p->vertex_count; ++idx_p.vertex_idx) { - p1 = figure_p->vertices[k]; - d2d_point_subtract(&v_p, &p1, &p0); - for (j = 0; j < i || (j == i && k); ++j) + type_p = figure_p->vertex_types[idx_p.vertex_idx]; + for (idx_q.figure_idx = 0; idx_q.figure_idx <= idx_p.figure_idx; ++idx_q.figure_idx) { - figure_q = &geometry->u.path.figures[j]; - - if (figure_p->bounds.left > figure_q->bounds.right - || figure_q->bounds.left > figure_p->bounds.right - || figure_p->bounds.top > figure_q->bounds.bottom - || figure_q->bounds.top > figure_p->bounds.bottom) - continue; - - max_l = j == i ? k - 1 : figure_q->vertex_count; - q0 = figure_q->vertices[figure_q->vertex_count - 1]; - for (l = 0; l < max_l; q0 = q1, ++l) + figure_q = &geometry->u.path.figures[idx_q.figure_idx]; + if (idx_q.figure_idx != idx_p.figure_idx) { - q1 = figure_q->vertices[l]; - d2d_point_subtract(&v_q, &q1, &q0); - d2d_point_subtract(&v_qp, &p0, &q0); - - det = v_p.x * v_q.y - v_p.y * v_q.x; - if (det == 0.0f) + if (figure_p->bounds.left > figure_q->bounds.right + || figure_q->bounds.left > figure_p->bounds.right + || figure_p->bounds.top > figure_q->bounds.bottom + || figure_q->bounds.top > figure_p->bounds.bottom) continue; + max_q = figure_q->vertex_count; + } + else + { + max_q = idx_p.vertex_idx; + } - s = (v_q.x * v_qp.y - v_q.y * v_qp.x) / det; - t = (v_p.x * v_qp.y - v_p.y * v_qp.x) / det; - - if (s < 0.0f || s > 1.0f || t < 0.0f || t > 1.0f) - continue; - - intersection.x = p0.x + v_p.x * s; - intersection.y = p0.y + v_p.y * s; - - if (t > 0.0f && t < 1.0f - && !d2d_geometry_intersections_add(&intersections, j, l, t, intersection)) - goto done; - - if (s > 0.0f && s < 1.0f - && !d2d_geometry_intersections_add(&intersections, i, k, s, intersection)) + for (idx_q.vertex_idx = 0; idx_q.vertex_idx < max_q; ++idx_q.vertex_idx) + { + type_q = figure_q->vertex_types[idx_q.vertex_idx]; + if (type_p != D2D_VERTEX_TYPE_BEZIER && type_q != D2D_VERTEX_TYPE_BEZIER + && !d2d_geometry_intersect_line_line(geometry, &intersections, &idx_p, &idx_q)) goto done; } } @@ -1650,7 +1692,7 @@ static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry) j = 0; if (!d2d_figure_insert_vertex(&geometry->u.path.figures[inter->figure_idx], - inter->segment_idx + j, inter->p)) + inter->vertex_idx + j + 1, inter->p)) goto done; ++j; }

1 0

Henri Verbeet : d2d1: Implement bezier/line intersections.
by Alexandre Julliard 17 Aug '17

17 Aug '17

Module: wine Branch: master Commit: a4f23ea1488e840dfceec4036b19e6beb235cda1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4f23ea1488e840dfceec4036… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 16 21:58:23 2017 +0200 d2d1: Implement bezier/line intersections. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 264 ++++++++++++++++++++++++++++++++++++++++++++----- dlls/d2d1/tests/d2d1.c | 2 +- 2 files changed, 243 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4f23ea1488e840dfceec…

1 0

Henri Verbeet : d2d1: Implement bezier/bezier intersections.
by Alexandre Julliard 17 Aug '17

17 Aug '17

Module: wine Branch: master Commit: 00fafb27e3f544ea5b4902c45bc746c9d56e1f05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00fafb27e3f544ea5b4902c45… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 16 21:58:24 2017 +0200 d2d1: Implement bezier/bezier intersections. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 141 ++++++++++++++++++++++++++++++++++++++++++++++--- dlls/d2d1/tests/d2d1.c | 8 +-- 2 files changed, 137 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00fafb27e3f544ea5b490…

1 0