February 2013 - Wine-commits

Ken Thomases : winemac: Always use proper z-order when putting a window on screen.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: abb0161c4c06be5e8606811cf51d89ac8950cf00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abb0161c4c06be5e8606811cf… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Feb 18 21:50:19 2013 -0600 winemac: Always use proper z-order when putting a window on screen. --- dlls/winemac.drv/window.c | 103 ++++++++++++++++++++++----------------------- 1 files changed, 50 insertions(+), 53 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index c7513f0..e7ec6c5 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -151,35 +151,6 @@ static void get_mac_rect_offset(struct macdrv_win_data *data, DWORD style, RECT /*********************************************************************** - * show_window - */ -static void show_window(struct macdrv_win_data *data) -{ - TRACE("win %p/%p\n", data->hwnd, data->cocoa_window); - - data->on_screen = macdrv_order_cocoa_window(data->cocoa_window, NULL, NULL); - if (data->on_screen) - { - HWND hwndFocus = GetFocus(); - if (hwndFocus && (data->hwnd == hwndFocus || IsChild(data->hwnd, hwndFocus))) - macdrv_SetFocus(hwndFocus); - } -} - - -/*********************************************************************** - * hide_window - */ -static void hide_window(struct macdrv_win_data *data) -{ - TRACE("win %p/%p\n", data->hwnd, data->cocoa_window); - - macdrv_hide_cocoa_window(data->cocoa_window); - data->on_screen = FALSE; -} - - -/*********************************************************************** * macdrv_window_to_mac_rect * * Convert a rect from client to Mac window coordinates @@ -605,6 +576,55 @@ static struct macdrv_win_data *macdrv_create_win_data(HWND hwnd, const RECT *win /*********************************************************************** + * show_window + */ +static void show_window(struct macdrv_win_data *data) +{ + HWND prev = NULL; + HWND next = NULL; + macdrv_window prev_window = NULL; + macdrv_window next_window = NULL; + + /* find window that this one must be after */ + prev = GetWindow(data->hwnd, GW_HWNDPREV); + while (prev && !((GetWindowLongW(prev, GWL_STYLE) & WS_VISIBLE) && + (prev_window = macdrv_get_cocoa_window(prev, TRUE)))) + prev = GetWindow(prev, GW_HWNDPREV); + if (!prev_window) + { + /* find window that this one must be before */ + next = GetWindow(data->hwnd, GW_HWNDNEXT); + while (next && !((GetWindowLongW(next, GWL_STYLE) & WS_VISIBLE) && + (next_window = macdrv_get_cocoa_window(next, TRUE)))) + next = GetWindow(next, GW_HWNDNEXT); + } + + TRACE("win %p/%p below %p/%p above %p/%p\n", + data->hwnd, data->cocoa_window, prev, prev_window, next, next_window); + + data->on_screen = macdrv_order_cocoa_window(data->cocoa_window, prev_window, next_window); + if (data->on_screen) + { + HWND hwndFocus = GetFocus(); + if (hwndFocus && (data->hwnd == hwndFocus || IsChild(data->hwnd, hwndFocus))) + macdrv_SetFocus(hwndFocus); + } +} + + +/*********************************************************************** + * hide_window + */ +static void hide_window(struct macdrv_win_data *data) +{ + TRACE("win %p/%p\n", data->hwnd, data->cocoa_window); + + macdrv_hide_cocoa_window(data->cocoa_window); + data->on_screen = FALSE; +} + + +/*********************************************************************** * get_region_data * * Calls GetRegionData on the given region and converts the rectangle @@ -692,30 +712,7 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags) wine_dbgstr_rect(&data->whole_rect)); if (data->on_screen && (!(swp_flags & SWP_NOZORDER) || (swp_flags & SWP_SHOWWINDOW))) - { - HWND next = NULL; - macdrv_window prev_window = NULL; - macdrv_window next_window = NULL; - - /* find window that this one must be after */ - HWND prev = GetWindow(data->hwnd, GW_HWNDPREV); - while (prev && !((GetWindowLongW(prev, GWL_STYLE) & WS_VISIBLE) && - (prev_window = macdrv_get_cocoa_window(prev, TRUE)))) - prev = GetWindow(prev, GW_HWNDPREV); - if (!prev_window) - { - /* find window that this one must be before */ - next = GetWindow(data->hwnd, GW_HWNDNEXT); - while (next && !((GetWindowLongW(next, GWL_STYLE) & WS_VISIBLE) && - (next_window = macdrv_get_cocoa_window(next, TRUE)))) - next = GetWindow(next, GW_HWNDNEXT); - } - - data->on_screen = macdrv_order_cocoa_window(data->cocoa_window, prev_window, next_window); - - TRACE("win %p/%p below %p/%p above %p/%p\n", - data->hwnd, data->cocoa_window, prev, prev_window, next, next_window); - } + show_window(data); }

1 0

Ken Thomases : winemac: Call sync_window_position() before show_window() since window frame affects whether it shows.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: 1561fa41267c9605d304f0b9aaf836769cc63203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1561fa41267c9605d304f0b9a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Feb 18 21:50:22 2013 -0600 winemac: Call sync_window_position() before show_window() since window frame affects whether it shows. --- dlls/winemac.drv/window.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index e7ec6c5..3429e7d 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1369,17 +1369,6 @@ void CDECL macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, hide_window(data); } - if (new_style & WS_VISIBLE) - { - if (!data->on_screen || (swp_flags & (SWP_FRAMECHANGED|SWP_STATECHANGED))) - set_cocoa_window_properties(data); - - /* layered windows are not shown until their attributes are set */ - if (!data->on_screen && - (data->layered || !(GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYERED))) - show_window(data); - } - /* check if we are currently processing an event relevant to this window */ if (!thread_data || !thread_data->current_event || thread_data->current_event->window != data->cocoa_window || @@ -1391,6 +1380,17 @@ void CDECL macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, set_cocoa_window_properties(data); } + if (new_style & WS_VISIBLE) + { + if (!data->on_screen || (swp_flags & (SWP_FRAMECHANGED|SWP_STATECHANGED))) + set_cocoa_window_properties(data); + + /* layered windows are not shown until their attributes are set */ + if (!data->on_screen && + (data->layered || !(GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYERED))) + show_window(data); + } + done: release_win_data(data); }

1 0

Ken Thomases : winemac: Don't bring a window onto the screen in SetFocus().
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: 6cfa0a31d8f6436049e0af22918a8e4984bbc954 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cfa0a31d8f6436049e0af229… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Feb 18 21:50:24 2013 -0600 winemac: Don't bring a window onto the screen in SetFocus(). --- dlls/winemac.drv/window.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 3429e7d..3f344df 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -852,11 +852,10 @@ void CDECL macdrv_SetFocus(HWND hwnd) if (!(hwnd = GetAncestor(hwnd, GA_ROOT))) return; if (!(data = get_win_data(hwnd))) return; - if (data->cocoa_window) + if (data->cocoa_window && data->on_screen) { /* Set Mac focus */ macdrv_give_cocoa_window_focus(data->cocoa_window); - data->on_screen = TRUE; } release_win_data(data);

1 0

Dmitry Timoshkov : gdiplus: Forward GdipDrawBezierI to GdipDrawBezier.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: cc54d1eb68f6eeba921b3ce1bd4cc90754c7ad50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc54d1eb68f6eeba921b3ce1b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 11:44:11 2013 +0800 gdiplus: Forward GdipDrawBezierI to GdipDrawBezier. --- dlls/gdiplus/graphics.c | 33 +-------------------------------- 1 files changed, 1 insertions(+), 32 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7d54871..275c93b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2642,41 +2642,10 @@ GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics *graphics, GpPen *pen, REAL x1, GpStatus WINGDIPAPI GdipDrawBezierI(GpGraphics *graphics, GpPen *pen, INT x1, INT y1, INT x2, INT y2, INT x3, INT y3, INT x4, INT y4) { - INT save_state; - GpPointF pt[4]; - GpStatus retval; - TRACE("(%p, %p, %d, %d, %d, %d, %d, %d, %d, %d)\n", graphics, pen, x1, y1, x2, y2, x3, y3, x4, y4); - if(!graphics || !pen) - return InvalidParameter; - - if(graphics->busy) - return ObjectBusy; - - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - pt[0].X = x1; - pt[0].Y = y1; - pt[1].X = x2; - pt[1].Y = y2; - pt[2].X = x3; - pt[2].Y = y3; - pt[3].X = x4; - pt[3].Y = y4; - - save_state = prepare_dc(graphics, pen); - - retval = draw_polybezier(graphics, pen, pt, 4, TRUE); - - restore_dc(graphics, save_state); - - return retval; + return GdipDrawBezier(graphics, pen, (REAL)x1, (REAL)y1, (REAL)x2, (REAL)y2, (REAL)x3, (REAL)y3, (REAL)x4, (REAL)y4); } GpStatus WINGDIPAPI GdipDrawBeziers(GpGraphics *graphics, GpPen *pen,

1 0

Dmitry Timoshkov : gdiplus: Slightly simplify GdipDrawClosedCurve2 implementation.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: 4233b82872ac56112567b3dbaa6d1e309c487409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4233b82872ac56112567b3dba… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 11:44:35 2013 +0800 gdiplus: Slightly simplify GdipDrawClosedCurve2 implementation. --- dlls/gdiplus/graphics.c | 18 +++++++----------- 1 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 275c93b..c48ed2d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2726,7 +2726,7 @@ GpStatus WINGDIPAPI GdipDrawClosedCurve2(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, INT count, REAL tension) { GpPath *path; - GpStatus stat; + GpStatus status; TRACE("(%p, %p, %p, %d, %.2f)\n", graphics, pen, points, count, tension); @@ -2736,20 +2736,16 @@ GpStatus WINGDIPAPI GdipDrawClosedCurve2(GpGraphics *graphics, GpPen *pen, if(graphics->busy) return ObjectBusy; - if((stat = GdipCreatePath(FillModeAlternate, &path)) != Ok) - return stat; + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; - stat = GdipAddPathClosedCurve2(path, points, count, tension); - if(stat != Ok){ - GdipDeletePath(path); - return stat; - } - - stat = GdipDrawPath(graphics, pen, path); + status = GdipAddPathClosedCurve2(path, points, count, tension); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); GdipDeletePath(path); - return stat; + return status; } GpStatus WINGDIPAPI GdipDrawClosedCurve2I(GpGraphics *graphics, GpPen *pen,

1 0

Dmitry Timoshkov : gdiplus: Reimplement GdipDrawCurve2 using GdipDrawPath.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: 03228b1784c6d7b66aed6d106fdb5bae120cdb66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03228b1784c6d7b66aed6d106… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 11:44:57 2013 +0800 gdiplus: Reimplement GdipDrawCurve2 using GdipDrawPath. --- dlls/gdiplus/graphics.c | 59 +++++++--------------------------------------- 1 files changed, 9 insertions(+), 50 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c48ed2d..7f221bb 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2815,11 +2815,8 @@ GpStatus WINGDIPAPI GdipDrawCurveI(GpGraphics *graphics, GpPen *pen, GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, INT count, REAL tension) { - /* PolyBezier expects count*3-2 points. */ - INT i, len_pt = count*3-2, save_state; - GpPointF *pt; - REAL x1, x2, y1, y2; - GpStatus retval; + GpPath *path; + GpStatus status; TRACE("(%p, %p, %p, %d, %.2f)\n", graphics, pen, points, count, tension); @@ -2832,53 +2829,15 @@ GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics *graphics, GpPen *pen, if(count < 2) return InvalidParameter; - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - pt = GdipAlloc(len_pt * sizeof(GpPointF)); - if(!pt) - return OutOfMemory; - - tension = tension * TENSION_CONST; - - calc_curve_bezier_endp(points[0].X, points[0].Y, points[1].X, points[1].Y, - tension, &x1, &y1); - - pt[0].X = points[0].X; - pt[0].Y = points[0].Y; - pt[1].X = x1; - pt[1].Y = y1; - - for(i = 0; i < count-2; i++){ - calc_curve_bezier(&(points[i]), tension, &x1, &y1, &x2, &y2); - - pt[3*i+2].X = x1; - pt[3*i+2].Y = y1; - pt[3*i+3].X = points[i+1].X; - pt[3*i+3].Y = points[i+1].Y; - pt[3*i+4].X = x2; - pt[3*i+4].Y = y2; - } - - calc_curve_bezier_endp(points[count-1].X, points[count-1].Y, - points[count-2].X, points[count-2].Y, tension, &x1, &y1); - - pt[len_pt-2].X = x1; - pt[len_pt-2].Y = y1; - pt[len_pt-1].X = points[count-1].X; - pt[len_pt-1].Y = points[count-1].Y; - - save_state = prepare_dc(graphics, pen); - - retval = draw_polybezier(graphics, pen, pt, len_pt, TRUE); + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; - GdipFree(pt); - restore_dc(graphics, save_state); + status = GdipAddPathCurve2(path, points, count, tension); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); - return retval; + GdipDeletePath(path); + return status; } GpStatus WINGDIPAPI GdipDrawCurve2I(GpGraphics *graphics, GpPen *pen,

1 0

Dmitry Timoshkov : gdiplus: Reimplement GdipDrawLines using GdipDrawPath.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: 2fd1bf60aef8ab14ab128963eb5c009cac9f58e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fd1bf60aef8ab14ab128963e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 11:45:02 2013 +0800 gdiplus: Reimplement GdipDrawLines using GdipDrawPath. --- dlls/gdiplus/graphics.c | 79 +++++----------------------------------------- 1 files changed, 9 insertions(+), 70 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7f221bb..738a54c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1713,63 +1713,6 @@ static void shorten_line_amt(REAL x1, REAL y1, REAL *x2, REAL *y2, REAL amt) shorten_line_percent(x1, y1, x2, y2, percent); } -/* Draws lines between the given points, and if caps is true then draws an endcap - * at the end of the last line. */ -static GpStatus draw_polyline(GpGraphics *graphics, GpPen *pen, - GDIPCONST GpPointF * pt, INT count, BOOL caps) -{ - POINT *pti = NULL; - GpPointF *ptcopy = NULL; - GpStatus status = GenericError; - - if(!count) - return Ok; - - pti = GdipAlloc(count * sizeof(POINT)); - ptcopy = GdipAlloc(count * sizeof(GpPointF)); - - if(!pti || !ptcopy){ - status = OutOfMemory; - goto end; - } - - memcpy(ptcopy, pt, count * sizeof(GpPointF)); - - if(caps){ - if(pen->endcap == LineCapArrowAnchor) - shorten_line_amt(ptcopy[count-2].X, ptcopy[count-2].Y, - &ptcopy[count-1].X, &ptcopy[count-1].Y, pen->width); - else if((pen->endcap == LineCapCustom) && pen->customend) - shorten_line_amt(ptcopy[count-2].X, ptcopy[count-2].Y, - &ptcopy[count-1].X, &ptcopy[count-1].Y, - pen->customend->inset * pen->width); - - if(pen->startcap == LineCapArrowAnchor) - shorten_line_amt(ptcopy[1].X, ptcopy[1].Y, - &ptcopy[0].X, &ptcopy[0].Y, pen->width); - else if((pen->startcap == LineCapCustom) && pen->customstart) - shorten_line_amt(ptcopy[1].X, ptcopy[1].Y, - &ptcopy[0].X, &ptcopy[0].Y, - pen->customstart->inset * pen->width); - - draw_cap(graphics, get_gdi_brush_color(pen->brush), pen->endcap, pen->width, pen->customend, - pt[count - 2].X, pt[count - 2].Y, pt[count - 1].X, pt[count - 1].Y); - draw_cap(graphics, get_gdi_brush_color(pen->brush), pen->startcap, pen->width, pen->customstart, - pt[1].X, pt[1].Y, pt[0].X, pt[0].Y); - } - - transform_and_round_points(graphics, pti, ptcopy, count); - - if(Polyline(graphics->hdc, pti, count)) - status = Ok; - -end: - GdipFree(pti); - GdipFree(ptcopy); - - return status; -} - /* Conducts a linear search to find the bezier points that will back off * the endpoint of the curve by a distance of amt. Linear search works * better than binary in this case because there are multiple solutions, @@ -3473,8 +3416,8 @@ GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics *graphics, GpPen *pen, INT x1, GpStatus WINGDIPAPI GdipDrawLines(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, INT count) { - INT save_state; - GpStatus retval; + GpStatus status; + GpPath *path; TRACE("(%p, %p, %p, %d)\n", graphics, pen, points, count); @@ -3484,19 +3427,15 @@ GpStatus WINGDIPAPI GdipDrawLines(GpGraphics *graphics, GpPen *pen, GDIPCONST if(graphics->busy) return ObjectBusy; - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - save_state = prepare_dc(graphics, pen); - - retval = draw_polyline(graphics, pen, points, count, TRUE); + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; - restore_dc(graphics, save_state); + status = GdipAddPathLine2(path, points, count); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); - return retval; + GdipDeletePath(path); + return status; } GpStatus WINGDIPAPI GdipDrawLinesI(GpGraphics *graphics, GpPen *pen, GDIPCONST

1 0

Dmitry Timoshkov : gdiplus: Reimplement GdipDrawArc using GdipDrawPath.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: 89f380f69b36680cba2bc16ea03ee60231a73230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89f380f69b36680cba2bc16ea… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 11:45:08 2013 +0800 gdiplus: Reimplement GdipDrawArc using GdipDrawPath. --- dlls/gdiplus/graphics.c | 25 +++++++++---------------- 1 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 738a54c..b408db4 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2503,9 +2503,8 @@ GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) GpStatus WINGDIPAPI GdipDrawArc(GpGraphics *graphics, GpPen *pen, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) { - INT save_state, num_pts; - GpPointF points[MAX_ARC_PTS]; - GpStatus retval; + GpStatus status; + GpPath *path; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f)\n", graphics, pen, x, y, width, height, startAngle, sweepAngle); @@ -2516,21 +2515,15 @@ GpStatus WINGDIPAPI GdipDrawArc(GpGraphics *graphics, GpPen *pen, REAL x, if(graphics->busy) return ObjectBusy; - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - num_pts = arc2polybezier(points, x, y, width, height, startAngle, sweepAngle); - - save_state = prepare_dc(graphics, pen); - - retval = draw_polybezier(graphics, pen, points, num_pts, TRUE); + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; - restore_dc(graphics, save_state); + status = GdipAddPathArc(path, x, y, width, height, startAngle, sweepAngle); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); - return retval; + GdipDeletePath(path); + return status; } GpStatus WINGDIPAPI GdipDrawArcI(GpGraphics *graphics, GpPen *pen, INT x,

1 0

Dmitry Timoshkov : gdiplus: Reimplement GdipDrawBeziers using GdipDrawPath.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: ae8826c43ef782b34cabc8ac38080f21387b4d9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae8826c43ef782b34cabc8ac3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 11:45:12 2013 +0800 gdiplus: Reimplement GdipDrawBeziers using GdipDrawPath. --- dlls/gdiplus/graphics.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b408db4..3253221 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2587,8 +2587,8 @@ GpStatus WINGDIPAPI GdipDrawBezierI(GpGraphics *graphics, GpPen *pen, INT x1, GpStatus WINGDIPAPI GdipDrawBeziers(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, INT count) { - INT i; - GpStatus ret; + GpStatus status; + GpPath *path; TRACE("(%p, %p, %p, %d)\n", graphics, pen, points, count); @@ -2598,17 +2598,15 @@ GpStatus WINGDIPAPI GdipDrawBeziers(GpGraphics *graphics, GpPen *pen, if(graphics->busy) return ObjectBusy; - for(i = 0; i < floor(count / 4); i++){ - ret = GdipDrawBezier(graphics, pen, - points[4*i].X, points[4*i].Y, - points[4*i + 1].X, points[4*i + 1].Y, - points[4*i + 2].X, points[4*i + 2].Y, - points[4*i + 3].X, points[4*i + 3].Y); - if(ret != Ok) - return ret; - } + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; - return Ok; + status = GdipAddPathBeziers(path, points, count); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); + + GdipDeletePath(path); + return status; } GpStatus WINGDIPAPI GdipDrawBeziersI(GpGraphics *graphics, GpPen *pen,

1 0

Dmitry Timoshkov : gdiplus: Forward GdipDrawBezier to GdipDrawBeziers.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: ad49f83c7dbcd60abd60c80409495e2ddb4cfde7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad49f83c7dbcd60abd60c8040… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 11:45:18 2013 +0800 gdiplus: Forward GdipDrawBezier to GdipDrawBeziers. --- dlls/gdiplus/graphics.c | 77 +---------------------------------------------- 1 files changed, 1 insertions(+), 76 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3253221..997dd28 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1756,66 +1756,6 @@ static void shorten_bezier_amt(GpPointF * pt, REAL amt, BOOL rev) } } -/* Draws bezier curves between given points, and if caps is true then draws an - * endcap at the end of the last line. */ -static GpStatus draw_polybezier(GpGraphics *graphics, GpPen *pen, - GDIPCONST GpPointF * pt, INT count, BOOL caps) -{ - POINT *pti; - GpPointF *ptcopy; - GpStatus status = GenericError; - - if(!count) - return Ok; - - pti = GdipAlloc(count * sizeof(POINT)); - ptcopy = GdipAlloc(count * sizeof(GpPointF)); - - if(!pti || !ptcopy){ - status = OutOfMemory; - goto end; - } - - memcpy(ptcopy, pt, count * sizeof(GpPointF)); - - if(caps){ - if(pen->endcap == LineCapArrowAnchor) - shorten_bezier_amt(&ptcopy[count-4], pen->width, FALSE); - else if((pen->endcap == LineCapCustom) && pen->customend) - shorten_bezier_amt(&ptcopy[count-4], pen->width * pen->customend->inset, - FALSE); - - if(pen->startcap == LineCapArrowAnchor) - shorten_bezier_amt(ptcopy, pen->width, TRUE); - else if((pen->startcap == LineCapCustom) && pen->customstart) - shorten_bezier_amt(ptcopy, pen->width * pen->customstart->inset, TRUE); - - /* the direction of the line cap is parallel to the direction at the - * end of the bezier (which, if it has been shortened, is not the same - * as the direction from pt[count-2] to pt[count-1]) */ - draw_cap(graphics, get_gdi_brush_color(pen->brush), pen->endcap, pen->width, pen->customend, - pt[count - 1].X - (ptcopy[count - 1].X - ptcopy[count - 2].X), - pt[count - 1].Y - (ptcopy[count - 1].Y - ptcopy[count - 2].Y), - pt[count - 1].X, pt[count - 1].Y); - - draw_cap(graphics, get_gdi_brush_color(pen->brush), pen->startcap, pen->width, pen->customstart, - pt[0].X - (ptcopy[0].X - ptcopy[1].X), - pt[0].Y - (ptcopy[0].Y - ptcopy[1].Y), pt[0].X, pt[0].Y); - } - - transform_and_round_points(graphics, pti, ptcopy, count); - - PolyBezier(graphics->hdc, pti, count); - - status = Ok; - -end: - GdipFree(pti); - GdipFree(ptcopy); - - return status; -} - /* Draws a combination of bezier curves and lines between points. */ static GpStatus draw_poly(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF * pt, GDIPCONST BYTE * types, INT count, BOOL caps) @@ -2538,9 +2478,7 @@ GpStatus WINGDIPAPI GdipDrawArcI(GpGraphics *graphics, GpPen *pen, INT x, GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics *graphics, GpPen *pen, REAL x1, REAL y1, REAL x2, REAL y2, REAL x3, REAL y3, REAL x4, REAL y4) { - INT save_state; GpPointF pt[4]; - GpStatus retval; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f)\n", graphics, pen, x1, y1, x2, y2, x3, y3, x4, y4); @@ -2551,12 +2489,6 @@ GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics *graphics, GpPen *pen, REAL x1, if(graphics->busy) return ObjectBusy; - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - pt[0].X = x1; pt[0].Y = y1; pt[1].X = x2; @@ -2565,14 +2497,7 @@ GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics *graphics, GpPen *pen, REAL x1, pt[2].Y = y3; pt[3].X = x4; pt[3].Y = y4; - - save_state = prepare_dc(graphics, pen); - - retval = draw_polybezier(graphics, pen, pt, 4, TRUE); - - restore_dc(graphics, save_state); - - return retval; + return GdipDrawBeziers(graphics, pen, pt, 4); } GpStatus WINGDIPAPI GdipDrawBezierI(GpGraphics *graphics, GpPen *pen, INT x1,

1 0