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

Jacek Caban : wininet: Always use drain_content specific to stream type.
by Alexandre Julliard Aug. 17, 2017

Aug. 17, 2017

Module: wine Branch: master Commit: 752d078a426d64c7717b0bbbf4983bfca9ceb412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=752d078a426d64c7717b0bbbf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 17 19:09:31 2017 +0200 wininet: Always use drain_content specific to stream type. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index eae2d4d..6a7b6db 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -383,7 +383,7 @@ static WCHAR *get_host_header( http_request_t *req ) struct data_stream_vtbl_t { BOOL (*end_of_data)(data_stream_t*,http_request_t*); DWORD (*read)(data_stream_t*,http_request_t*,BYTE*,DWORD,DWORD*,BOOL); - DWORD (*drain_content)(data_stream_t*,http_request_t*); + DWORD (*drain_content)(data_stream_t*,http_request_t*,BOOL); void (*destroy)(data_stream_t*); }; @@ -509,10 +509,10 @@ static DWORD gzip_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DW return res; } -static DWORD gzip_drain_content(data_stream_t *stream, http_request_t *req) +static DWORD gzip_drain_content(data_stream_t *stream, http_request_t *req, BOOL allow_blocking) { gzip_stream_t *gzip_stream = (gzip_stream_t*)stream; - return gzip_stream->parent_stream->vtbl->drain_content(gzip_stream->parent_stream, req); + return gzip_stream->parent_stream->vtbl->drain_content(gzip_stream->parent_stream, req, allow_blocking); } static void gzip_destroy(data_stream_t *stream) @@ -2635,7 +2635,7 @@ static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf, return res; } -static DWORD netconn_drain_content(data_stream_t *stream, http_request_t *req) +static DWORD netconn_drain_content(data_stream_t *stream, http_request_t *req, BOOL allow_blocking) { netconn_stream_t *netconn_stream = (netconn_stream_t*)stream; BYTE buf[1024]; @@ -2647,7 +2647,7 @@ static DWORD netconn_drain_content(data_stream_t *stream, http_request_t *req) while(netconn_stream->content_read < netconn_stream->content_length) { size = min(sizeof(buf), netconn_stream->content_length-netconn_stream->content_read); - res = NETCON_recv(req->netconn, buf, size, FALSE, &len); + res = NETCON_recv(req->netconn, buf, size, allow_blocking, &len); if(res) return res; if(!len) @@ -2820,14 +2820,14 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, return ERROR_SUCCESS; } -static DWORD chunked_drain_content(data_stream_t *stream, http_request_t *req) +static DWORD chunked_drain_content(data_stream_t *stream, http_request_t *req, BOOL allow_blocking) { chunked_stream_t *chunked_stream = (chunked_stream_t*)stream; BYTE buf[1024]; DWORD size, res; while(chunked_stream->state != CHUNKED_STREAM_STATE_END_OF_STREAM) { - res = chunked_read(stream, req, buf, sizeof(buf), &size, FALSE); + res = chunked_read(stream, req, buf, sizeof(buf), &size, allow_blocking); if(res != ERROR_SUCCESS) return res; } @@ -3006,22 +3006,10 @@ static BOOL drain_content(http_request_t *req, BOOL blocking) if(!strcmpW(req->verb, szHEAD)) return TRUE; - if(!blocking) - return req->data_stream->vtbl->drain_content(req->data_stream, req) == ERROR_SUCCESS; - EnterCriticalSection( &req->read_section ); - - while(1) { - DWORD bytes_read; - BYTE buf[4096]; - - res = HTTPREQ_Read(req, buf, sizeof(buf), &bytes_read, TRUE); - if(res != ERROR_SUCCESS || !bytes_read) - break; - } - + res = req->data_stream->vtbl->drain_content(req->data_stream, req, blocking); LeaveCriticalSection( &req->read_section ); - return res; + return res == ERROR_SUCCESS; } typedef struct {

1 0

Hans Leidekker : include: Add BCRYPT_KEY_LENGTHS_STRUCT declaration.
by Alexandre Julliard Aug. 17, 2017

Aug. 17, 2017

Module: wine Branch: master Commit: ab575f3d2bddd52affbe083b9e543fb66af61ab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab575f3d2bddd52affbe083b9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 17 13:36:38 2017 +0200 include: Add BCRYPT_KEY_LENGTHS_STRUCT declaration. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/bcrypt.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/bcrypt.h b/include/bcrypt.h index 9e193da..c71b1e8 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -82,6 +82,13 @@ typedef struct _BCRYPT_ALGORITHM_IDENTIFIER ULONG dwFlags; } BCRYPT_ALGORITHM_IDENTIFIER; +typedef struct __BCRYPT_KEY_LENGTHS_STRUCT +{ + ULONG dwMinLength; + ULONG dwMaxLength; + ULONG dwIncrement; +} BCRYPT_KEY_LENGTHS_STRUCT; + typedef PVOID BCRYPT_ALG_HANDLE; typedef PVOID BCRYPT_KEY_HANDLE; typedef PVOID BCRYPT_HANDLE;

1 0

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

Aug. 17, 2017

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

Nikolay Sivov : kernel32/nls: Added LOCALE_SNAN entries.
by Alexandre Julliard Aug. 17, 2017

Aug. 17, 2017

1 0

Andrew Eikum : gdiplus: GdipCreateMetafileFromWmfFile will also load EMFs.
by Alexandre Julliard Aug. 17, 2017

Aug. 17, 2017

Module: wine Branch: master Commit: a4ab858a960800f3bc7c1ff7571c78d93196f8be URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4ab858a960800f3bc7c1ff75… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 16 14:32:00 2017 -0500 gdiplus: GdipCreateMetafileFromWmfFile will also load EMFs. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 13 ++++++++++--- dlls/gdiplus/tests/metafile.c | 17 +++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 41355bc..0bd3033 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2361,13 +2361,20 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, GpStatus WINGDIPAPI GdipCreateMetafileFromWmfFile(GDIPCONST WCHAR *file, GDIPCONST WmfPlaceableFileHeader * placeable, GpMetafile **metafile) { - HMETAFILE hmf = GetMetaFileW(file); + HMETAFILE hmf; + HENHMETAFILE emf; TRACE("(%s, %p, %p)\n", debugstr_w(file), placeable, metafile); - if(!hmf) return InvalidParameter; + hmf = GetMetaFileW(file); + if(hmf) + return GdipCreateMetafileFromWmf(hmf, TRUE, placeable, metafile); - return GdipCreateMetafileFromWmf(hmf, TRUE, placeable, metafile); + emf = GetEnhMetaFileW(file); + if(emf) + return GdipCreateMetafileFromEmf(emf, TRUE, metafile); + + return GenericError; } GpStatus WINGDIPAPI GdipCreateMetafileFromFile(GDIPCONST WCHAR *file, diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 1d36d9e..9770a8f 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2702,6 +2702,7 @@ static void test_fillpath(void) { static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + static const WCHAR winetestemfW[] = {'w','i','n','e','t','e','s','t','.','e','m','f',0}; GpMetafile *metafile; GpGraphics *graphics; @@ -2745,10 +2746,26 @@ static void test_fillpath(void) expect(Ok, stat); check_emfplus(hemf, fill_path_records, "fill path"); + + /* write to disk */ + DeleteEnhMetaFile(CopyEnhMetaFileW(hemf, winetestemfW)); + DeleteEnhMetaFile(hemf); stat = GdipDisposeImage((GpImage*)metafile); expect(Ok, stat); + + /* should succeed when given path to an EMF */ + stat = GdipCreateMetafileFromWmfFile(winetestemfW, NULL, &metafile); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); + + DeleteFileW(winetestemfW); + + stat = GdipCreateMetafileFromWmfFile(winetestemfW, NULL, &metafile); + expect(GenericError, stat); } START_TEST(metafile)

1 0

Henri Verbeet : wined3d: Explicitly check for "Radeon" and "FirePro" in wined3d_guess_card_vendor().
by Alexandre Julliard Aug. 17, 2017

Aug. 17, 2017

Module: wine Branch: master Commit: 57c0d98d11a31f85bb3265c630220508eb82af2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=57c0d98d11a31f85bb3265c63… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 16 21:58:27 2017 +0200 wined3d: Explicitly check for "Radeon" and "FirePro" in wined3d_guess_card_vendor(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 919b997..e30430a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1813,6 +1813,8 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s || strstr(gl_vendor_string, "Advanced Micro Devices, Inc.") || strstr(gl_vendor_string, "X.Org R300 Project") || strstr(gl_renderer, "AMD") + || strstr(gl_renderer, "FirePro") + || strstr(gl_renderer, "Radeon") || strstr(gl_renderer, "R100") || strstr(gl_renderer, "R200") || strstr(gl_renderer, "R300")

1 0

Henri Verbeet : d2d1: Split overlapping bezier control triangles.
by Alexandre Julliard Aug. 17, 2017

Aug. 17, 2017

Module: wine Branch: master Commit: 2187a1edb394dac7cfbb0f23b6b7d58d59c49333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2187a1edb394dac7cfbb0f23b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 16 21:58:26 2017 +0200 d2d1: Split overlapping bezier control triangles. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 160 ++++++++++++++++++++++++++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 2 +- 2 files changed, 160 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 8796323..8c66881 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2641,9 +2641,138 @@ static BOOL d2d_geometry_get_next_bezier_segment_idx(struct d2d_geometry *geomet return d2d_geometry_get_bezier_segment_idx(geometry, idx, TRUE); } +static BOOL d2d_geometry_check_bezier_overlap(struct d2d_geometry *geometry, + const struct d2d_segment_idx *idx_p, const struct d2d_segment_idx *idx_q) +{ + const D2D1_POINT_2F *a[3], *b[3], *p[2], *q; + const struct d2d_figure *figure; + D2D1_POINT_2F v_q[3], v_p, v_qp; + unsigned int i, j, score; + float det, t; + + figure = &geometry->u.path.figures[idx_p->figure_idx]; + a[0] = &figure->vertices[idx_p->vertex_idx]; + a[1] = &figure->bezier_controls[idx_p->control_idx]; + if (idx_p->vertex_idx == figure->vertex_count - 1) + a[2] = &figure->vertices[0]; + else + a[2] = &figure->vertices[idx_p->vertex_idx + 1]; + + figure = &geometry->u.path.figures[idx_q->figure_idx]; + b[0] = &figure->vertices[idx_q->vertex_idx]; + b[1] = &figure->bezier_controls[idx_q->control_idx]; + if (idx_q->vertex_idx == figure->vertex_count - 1) + b[2] = &figure->vertices[0]; + else + b[2] = &figure->vertices[idx_q->vertex_idx + 1]; + + if (d2d_point_ccw(a[0], a[1], a[2]) == 0.0f || d2d_point_ccw(b[0], b[1], b[2]) == 0.0f) + return FALSE; + + d2d_point_subtract(&v_q[0], b[1], b[0]); + d2d_point_subtract(&v_q[1], b[2], b[0]); + d2d_point_subtract(&v_q[2], b[1], b[2]); + + /* Check for intersections between the edges. Strictly speaking we'd only + * need to check 8 of the 9 possible intersections, since if there's any + * intersection there has to be a second intersection as well. */ + for (i = 0; i < 3; ++i) + { + d2d_point_subtract(&v_p, a[(i & 1) + 1], a[i & 2]); + for (j = 0; j < 3; ++j) + { + det = v_p.x * v_q[j].y - v_p.y * v_q[j].x; + if (det == 0.0f) + continue; + + d2d_point_subtract(&v_qp, a[i & 2], b[j & 2]); + t = (v_q[j].x * v_qp.y - v_q[j].y * v_qp.x) / det; + if (t <= 0.0f || t >= 1.0f) + continue; + + t = (v_p.x * v_qp.y - v_p.y * v_qp.x) / det; + if (t <= 0.0f || t >= 1.0f) + continue; + + return TRUE; + } + } + + /* Check if one triangle is contained within the other. */ + for (j = 0, score = 0, q = a[1], p[0] = b[2]; j < 3; ++j) + { + p[1] = b[j]; + d2d_point_subtract(&v_p, p[1], p[0]); + d2d_point_subtract(&v_qp, q, p[0]); + + if ((q->y < p[0]->y) != (q->y < p[1]->y) && v_qp.x < v_p.x * (v_qp.y / v_p.y)) + ++score; + + p[0] = p[1]; + } + + if (score & 1) + return TRUE; + + for (j = 0, score = 0, q = b[1], p[0] = a[2]; j < 3; ++j) + { + p[1] = a[j]; + d2d_point_subtract(&v_p, p[1], p[0]); + d2d_point_subtract(&v_qp, q, p[0]); + + if ((q->y < p[0]->y) != (q->y < p[1]->y) && v_qp.x < v_p.x * (v_qp.y / v_p.y)) + ++score; + + p[0] = p[1]; + } + + return score & 1; +} + +static float d2d_geometry_bezier_ccw(struct d2d_geometry *geometry, const struct d2d_segment_idx *idx) +{ + const struct d2d_figure *figure = &geometry->u.path.figures[idx->figure_idx]; + size_t next = idx->vertex_idx + 1; + + if (next == figure->vertex_count) + next = 0; + + return d2d_point_ccw(&figure->vertices[idx->vertex_idx], + &figure->bezier_controls[idx->control_idx], &figure->vertices[next]); +} + +static BOOL d2d_geometry_split_bezier(struct d2d_geometry *geometry, const struct d2d_segment_idx *idx) +{ + const D2D1_POINT_2F *p[3]; + struct d2d_figure *figure; + D2D1_POINT_2F q[3]; + size_t next; + + figure = &geometry->u.path.figures[idx->figure_idx]; + p[0] = &figure->vertices[idx->vertex_idx]; + p[1] = &figure->bezier_controls[idx->control_idx]; + next = idx->vertex_idx + 1; + if (next == figure->vertex_count) + next = 0; + p[2] = &figure->vertices[next]; + + d2d_point_lerp(&q[0], p[0], p[1], 0.5f); + d2d_point_lerp(&q[1], p[1], p[2], 0.5f); + d2d_point_lerp(&q[2], &q[0], &q[1], 0.5f); + + figure->bezier_controls[idx->control_idx] = q[0]; + if (!(d2d_figure_insert_bezier_control(figure, idx->control_idx + 1, &q[1]))) + return FALSE; + if (!(d2d_figure_insert_vertex(figure, idx->vertex_idx + 1, q[2]))) + return FALSE; + figure->vertex_types[idx->vertex_idx + 1] = D2D_VERTEX_TYPE_SPLIT_BEZIER; + + return TRUE; +} + static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) { - struct d2d_segment_idx idx_p; + struct d2d_segment_idx idx_p, idx_q; struct d2d_bezier_vertex *b; const D2D1_POINT_2F *p[3]; struct d2d_figure *figure; @@ -2652,6 +2781,34 @@ static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) if (!d2d_geometry_get_first_bezier_segment_idx(geometry, &idx_p)) return S_OK; + /* Split overlapping bezier control triangles. */ + while (d2d_geometry_get_next_bezier_segment_idx(geometry, &idx_p)) + { + d2d_geometry_get_first_bezier_segment_idx(geometry, &idx_q); + while (idx_q.figure_idx < idx_p.figure_idx || idx_q.vertex_idx < idx_p.vertex_idx) + { + while (d2d_geometry_check_bezier_overlap(geometry, &idx_p, &idx_q)) + { + if (fabsf(d2d_geometry_bezier_ccw(geometry, &idx_q)) > fabsf(d2d_geometry_bezier_ccw(geometry, &idx_p))) + { + if (!d2d_geometry_split_bezier(geometry, &idx_q)) + return E_OUTOFMEMORY; + if (idx_p.figure_idx == idx_q.figure_idx) + { + ++idx_p.vertex_idx; + ++idx_p.control_idx; + } + } + else + { + if (!d2d_geometry_split_bezier(geometry, &idx_p)) + return E_OUTOFMEMORY; + } + } + d2d_geometry_get_next_bezier_segment_idx(geometry, &idx_q); + } + } + for (i = 0; i < geometry->u.path.figure_count; ++i) { geometry->fill.bezier_vertex_count += 3 * geometry->u.path.figures[i].bezier_control_count; @@ -2666,6 +2823,7 @@ static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) } bezier_idx = 0; + d2d_geometry_get_first_bezier_segment_idx(geometry, &idx_p); for (;;) { float sign = -1.0f; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index ade5743..c1ca98d 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -5696,7 +5696,7 @@ static void test_bezier_intersect(void) "sQGRAbEBkAGyAZABsgGPAbMBjwG0AY4BtAGNAbUBjQG2AYwBtgGLAbgBigG4AYoBuQGJAboBhwG7" "AYcBvAGGAb0BhQG+AYQBvwGDAcABggHBAYIBwgGAAcMBf8QBfsYBfMgBe8gBesoBeMwBd80BddAB" "c9EBcdQBb9YBbNkBatsBaN0BZeEBYuQBX+gBW+0BVvEBUvUBTvwBR4QCQIoCOZgCK6oCGQIA"); - todo_wine ok(match, "Figure does not match.\n"); + ok(match, "Figure does not match.\n"); ID2D1SolidColorBrush_Release(brush); ID2D1RenderTarget_Release(rt);

1 0

Henri Verbeet : d2d1: Use segment indices in d2d_geometry_resolve_beziers( ).
by Alexandre Julliard Aug. 17, 2017

Aug. 17, 2017

Module: wine Branch: master Commit: 3895f07c4b45dae038d4d8424abc31c1030ebaf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3895f07c4b45dae038d4d8424… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 16 21:58:25 2017 +0200 d2d1: Use segment indices 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 | 105 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 71 insertions(+), 34 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 537f57f..8796323 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2603,9 +2603,54 @@ static void d2d_path_geometry_free_figures(struct d2d_geometry *geometry) geometry->u.path.figures_size = 0; } +static BOOL d2d_geometry_get_bezier_segment_idx(struct d2d_geometry *geometry, struct d2d_segment_idx *idx, BOOL next) +{ + if (next) + { + ++idx->vertex_idx; + ++idx->control_idx; + } + + for (; idx->figure_idx < geometry->u.path.figure_count; ++idx->figure_idx, idx->vertex_idx = idx->control_idx = 0) + { + struct d2d_figure *figure = &geometry->u.path.figures[idx->figure_idx]; + + if (!figure->bezier_control_count) + continue; + + for (; idx->vertex_idx < figure->vertex_count; ++idx->vertex_idx) + { + if (figure->vertex_types[idx->vertex_idx] == D2D_VERTEX_TYPE_BEZIER + || figure->vertex_types[idx->vertex_idx] == D2D_VERTEX_TYPE_SPLIT_BEZIER) + return TRUE; + } + } + + return FALSE; +} + +static BOOL d2d_geometry_get_first_bezier_segment_idx(struct d2d_geometry *geometry, struct d2d_segment_idx *idx) +{ + memset(idx, 0, sizeof(*idx)); + + return d2d_geometry_get_bezier_segment_idx(geometry, idx, FALSE); +} + +static BOOL d2d_geometry_get_next_bezier_segment_idx(struct d2d_geometry *geometry, struct d2d_segment_idx *idx) +{ + return d2d_geometry_get_bezier_segment_idx(geometry, idx, TRUE); +} + static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) { - size_t bezier_idx, control_idx, i, j; + struct d2d_segment_idx idx_p; + struct d2d_bezier_vertex *b; + const D2D1_POINT_2F *p[3]; + struct d2d_figure *figure; + size_t bezier_idx, i; + + if (!d2d_geometry_get_first_bezier_segment_idx(geometry, &idx_p)) + return S_OK; for (i = 0; i < geometry->u.path.figure_count; ++i) { @@ -2620,45 +2665,37 @@ static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) return E_OUTOFMEMORY; } - for (i = 0, bezier_idx = 0; i < geometry->u.path.figure_count; ++i) + bezier_idx = 0; + for (;;) { - struct d2d_figure *figure = &geometry->u.path.figures[i]; - if (figure->bezier_control_count) - { - for (j = 0, control_idx = 0; j < figure->vertex_count; ++j) - { - const D2D1_POINT_2F *p0, *p1, *p2; - struct d2d_bezier_vertex *b; - float sign = -1.0f; + float sign = -1.0f; - if (figure->vertex_types[j] != D2D_VERTEX_TYPE_BEZIER - && figure->vertex_types[j] != D2D_VERTEX_TYPE_SPLIT_BEZIER) - continue; + figure = &geometry->u.path.figures[idx_p.figure_idx]; + p[0] = &figure->vertices[idx_p.vertex_idx]; + p[1] = &figure->bezier_controls[idx_p.control_idx]; - b = &geometry->fill.bezier_vertices[bezier_idx * 3]; - p0 = &figure->vertices[j]; - p1 = &figure->bezier_controls[control_idx++]; + i = idx_p.vertex_idx + 1; + if (d2d_path_geometry_point_inside(geometry, p[1], FALSE)) + { + sign = 1.0f; + d2d_figure_insert_vertex(figure, i, *p[1]); + /* Inserting a vertex potentially invalidates p[0]. */ + p[0] = &figure->vertices[idx_p.vertex_idx]; + ++i; + } - if (d2d_path_geometry_point_inside(geometry, p1, FALSE)) - { - sign = 1.0f; - d2d_figure_insert_vertex(figure, j + 1, *p1); - /* Inserting a vertex potentially invalidates p0. */ - p0 = &figure->vertices[j]; - ++j; - } + if (i == figure->vertex_count) + i = 0; + p[2] = &figure->vertices[i]; - if (j == figure->vertex_count - 1) - p2 = &figure->vertices[0]; - else - p2 = &figure->vertices[j + 1]; + b = &geometry->fill.bezier_vertices[bezier_idx * 3]; + d2d_bezier_vertex_set(&b[0], p[0], 0.0f, 0.0f, sign); + d2d_bezier_vertex_set(&b[1], p[1], 0.5f, 0.0f, sign); + d2d_bezier_vertex_set(&b[2], p[2], 1.0f, 1.0f, sign); - d2d_bezier_vertex_set(&b[0], p0, 0.0f, 0.0f, sign); - d2d_bezier_vertex_set(&b[1], p1, 0.5f, 0.0f, sign); - d2d_bezier_vertex_set(&b[2], p2, 1.0f, 1.0f, sign); - ++bezier_idx; - } - } + if (!d2d_geometry_get_next_bezier_segment_idx(geometry, &idx_p)) + break; + ++bezier_idx; } return S_OK;

1 0

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

Aug. 17, 2017

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: Introduce a separate function for calculating line/ line intersections.
by Alexandre Julliard Aug. 17, 2017

Aug. 17, 2017

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