wine-commits December 2011

wine-commits@winehq.org

2 participants
810 discussions

Alexandre Julliard : gdi32: Use a region to render geometric and wide pens in Rectangle.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: da8ae113001051d8118b7dd7acb5e17f3b5a2334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da8ae113001051d8118b7dd7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 29 00:18:44 2011 +0100 gdi32: Use a region to render geometric and wide pens in Rectangle. --- dlls/gdi32/dibdrv/graphics.c | 40 ++++++++++++++++++++++++++++++++-------- 1 files changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index d43b30b..00d0e2a 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -579,6 +579,9 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) dibdrv_physdev *pdev = get_dibdrv_pdev(dev); RECT rect = get_device_rect( dev->hdc, left, top, right, bottom, TRUE ); POINT pts[4]; + BOOL ret; + INT rop = GetROP2( dev->hdc ); + HRGN outline = 0; TRACE("(%p, %d, %d, %d, %d)\n", dev, left, top, right, bottom); @@ -595,22 +598,43 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) rect.bottom -= (pdev->pen_width - 1) / 2; } + if (pdev->pen_uses_region && !(outline = CreateRectRgn( 0, 0, 0, 0 ))) return FALSE; + + rect.right--; + rect.bottom--; reset_dash_origin(pdev); /* 4 pts going anti-clockwise starting from top-right */ - pts[0].x = pts[3].x = rect.right - 1; + pts[0].x = pts[3].x = rect.right; pts[0].y = pts[1].y = rect.top; pts[1].x = pts[2].x = rect.left; - pts[2].y = pts[3].y = rect.bottom - 1; + pts[2].y = pts[3].y = rect.bottom; - pdev->pen_lines(pdev, 4, pts, TRUE, 0); + pdev->pen_lines(pdev, 4, pts, TRUE, outline); - rect.left += (pdev->pen_width + 1) / 2; - rect.top += (pdev->pen_width + 1) / 2; - rect.right -= (pdev->pen_width + 2) / 2; - rect.bottom -= (pdev->pen_width + 2) / 2; + if (outline) + { + HRGN interior = CreateRectRgnIndirect( &rect ); - return brush_rect( pdev, &rect, pdev->clip, GetROP2(dev->hdc) ); + CombineRgn( interior, interior, outline, RGN_DIFF ); + if (pdev->clip) + { + CombineRgn( outline, outline, pdev->clip, RGN_AND ); + CombineRgn( interior, interior, pdev->clip, RGN_AND ); + } + ret = pen_rect( pdev, NULL, outline, rop ) && brush_rect( pdev, NULL, interior, rop ); + DeleteObject( outline ); + DeleteObject( interior ); + } + else + { + rect.left += (pdev->pen_width + 1) / 2; + rect.top += (pdev->pen_width + 1) / 2; + rect.right -= pdev->pen_width / 2; + rect.bottom -= pdev->pen_width / 2; + ret = brush_rect( pdev, &rect, pdev->clip, rop ); + } + return ret; } /***********************************************************************

1 0

Alexandre Julliard : gdi32: Use a region to render geometric and wide pens in PolyPolyline.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 64ed56366c6ac64c8d5a1e818b0480ff533ef5b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64ed56366c6ac64c8d5a1e818… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 28 13:52:58 2011 +0100 gdi32: Use a region to render geometric and wide pens in PolyPolyline. --- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/graphics.c | 45 ++++++++++++++++++++++++----------------- dlls/gdi32/dibdrv/objects.c | 2 + 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index fa8d445..ba8c0a4 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -84,7 +84,7 @@ typedef struct dibdrv_physdev /* pen */ COLORREF pen_colorref; DWORD pen_style, pen_endcap, pen_join; - BOOL pen_is_ext; + BOOL pen_uses_region, pen_is_ext; int pen_width; dash_pattern pen_pattern; dash_pos dash_pos; diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index e8b45a1..d43b30b 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -517,14 +517,27 @@ BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWO PHYSDEV next = GET_NEXT_PHYSDEV( dev, pPolyPolyline ); DWORD max_points = 0, i; POINT *points; + BOOL ret = TRUE; + INT rop = GetROP2( dev->hdc ); + HRGN outline = 0; if (defer_pen( pdev )) return next->funcs->pPolyPolyline( next, pt, counts, polylines ); - for (i = 0; i < polylines; i++) max_points = max( counts[i], max_points ); + for (i = 0; i < polylines; i++) + { + if (counts[i] < 2) return FALSE; + max_points = max( counts[i], max_points ); + } points = HeapAlloc( GetProcessHeap(), 0, max_points * sizeof(*pt) ); if (!points) return FALSE; + if (pdev->pen_uses_region && !(outline = CreateRectRgn( 0, 0, 0, 0 ))) + { + HeapFree( GetProcessHeap(), 0, points ); + return FALSE; + } + for (i = 0; i < polylines; i++) { memcpy( points, pt, counts[i] * sizeof(*pt) ); @@ -532,11 +545,18 @@ BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWO LPtoDP( dev->hdc, points, counts[i] ); reset_dash_origin( pdev ); - pdev->pen_lines( pdev, counts[i], points, FALSE, 0 ); + pdev->pen_lines( pdev, counts[i], points, FALSE, outline ); + } + + if (outline) + { + if (pdev->clip) CombineRgn( outline, outline, pdev->clip, RGN_AND ); + ret = pen_rect( pdev, NULL, outline, rop ); + DeleteObject( outline ); } HeapFree( GetProcessHeap(), 0, points ); - return TRUE; + return ret; } /*********************************************************************** @@ -544,23 +564,10 @@ BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWO */ BOOL dibdrv_Polyline( PHYSDEV dev, const POINT* pt, INT count ) { - dibdrv_physdev *pdev = get_dibdrv_pdev(dev); - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pPolyline ); - POINT *points; - - if (defer_pen( pdev )) return next->funcs->pPolyline( next, pt, count ); - - points = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*pt) ); - if (!points) return FALSE; + DWORD counts[1] = { count }; - memcpy( points, pt, count * sizeof(*pt) ); - LPtoDP( dev->hdc, points, count ); - - reset_dash_origin( pdev ); - pdev->pen_lines( pdev, count, points, FALSE, 0 ); - - HeapFree( GetProcessHeap(), 0, points ); - return TRUE; + if (count < 0) return FALSE; + return dibdrv_PolyPolyline( dev, pt, counts, 1 ); } /*********************************************************************** diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index dd7ddb7..197b220 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1615,6 +1615,7 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) break; case PS_NULL: + pdev->pen_width = 0; pdev->pen_lines = null_pen_lines; pdev->defer &= ~DEFER_PEN; break; @@ -1637,6 +1638,7 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) break; } + pdev->pen_uses_region = (logpen.lopnStyle & PS_GEOMETRIC || pdev->pen_width > 1); pdev->pen_is_ext = (elp != NULL); HeapFree( GetProcessHeap(), 0, elp );

1 0

Alexandre Julliard : gdi32: Implement returning a region for 1-pixel wide dashed pen lines.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 9ee690c984b22b9af936bd481a445a20444d3d07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ee690c984b22b9af936bd481… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 28 14:28:06 2011 +0100 gdi32: Implement returning a region for 1-pixel wide dashed pen lines. --- dlls/gdi32/dibdrv/objects.c | 153 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 145 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index bb68029..dd7ddb7 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1047,21 +1047,158 @@ static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) return TRUE; } +static BOOL dashed_pen_line_region(dibdrv_physdev *pdev, POINT *start, POINT *end, HRGN region) +{ + int i, dash_len; + RECT rect; + + rect.left = start->x; + rect.top = start->y; + rect.right = start->x + 1; + rect.bottom = start->y + 1; + + if (start->y == end->y) /* hline */ + { + if (start->x <= end->x) + { + for (i = start->x; i < end->x; i += dash_len) + { + dash_len = min( pdev->dash_pos.left_in_dash, end->x - i ); + if (pdev->dash_pos.mark) + { + rect.left = i; + rect.right = i + dash_len; + add_rect_to_region( region, &rect ); + } + skip_dash(pdev, dash_len); + } + } + else + { + for (i = start->x; i > end->x; i -= dash_len) + { + dash_len = min( pdev->dash_pos.left_in_dash, i - end->x ); + if (pdev->dash_pos.mark) + { + rect.left = i - dash_len + 1; + rect.right = i + 1; + add_rect_to_region( region, &rect ); + } + skip_dash(pdev, dash_len); + } + } + } + else if (start->x == end->x) /* vline */ + { + if (start->y <= end->y) + { + for (i = start->y; i < end->y; i += dash_len) + { + dash_len = min( pdev->dash_pos.left_in_dash, end->y - i ); + if (pdev->dash_pos.mark) + { + rect.top = i; + rect.bottom = i + dash_len; + add_rect_to_region( region, &rect ); + } + skip_dash(pdev, dash_len); + } + } + else + { + for (i = start->y; i > end->y; i -= dash_len) + { + dash_len = min( pdev->dash_pos.left_in_dash, i - end->y ); + if (pdev->dash_pos.mark) + { + rect.top = i - dash_len + 1; + rect.bottom = i + 1; + add_rect_to_region( region, &rect ); + } + skip_dash(pdev, dash_len); + } + } + } + else + { + INT dx = end->x - start->x, dy = end->y - start->y; + INT abs_dx = abs(dx), abs_dy = abs(dy); + DWORD octant = get_octant_mask(dx, dy); + INT bias = get_bias( octant ); + int x_inc = is_x_increasing( octant ) ? 1 : -1; + int y_inc = is_y_increasing( octant ) ? 1 : -1; + + if (is_xmajor( octant )) + { + int err_add_1 = 2 * abs_dy - 2 * abs_dx; + int err_add_2 = 2 * abs_dy; + int err = 2 * abs_dy - abs_dx; + + while (abs_dx--) + { + if (pdev->dash_pos.mark) add_rect_to_region( region, &rect ); + skip_dash(pdev, 1); + rect.left += x_inc; + rect.right += x_inc; + if (err + bias > 0) + { + rect.top += y_inc; + rect.bottom += y_inc; + err += err_add_1; + } + else err += err_add_2; + } + + } + else + { + int err_add_1 = 2 * abs_dx - 2 * abs_dy; + int err_add_2 = 2 * abs_dx; + int err = 2 * abs_dx - abs_dy; + + while (abs_dy--) + { + if (pdev->dash_pos.mark) add_rect_to_region( region, &rect ); + skip_dash(pdev, 1); + rect.top += y_inc; + rect.bottom += y_inc; + if (err + bias > 0) + { + rect.left += x_inc; + rect.right += x_inc; + err += err_add_1; + } + else err += err_add_2; + } + } + } + return TRUE; +} + static BOOL dashed_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN region) { int i; - get_color_masks( pdev, GetROP2(pdev->dev.hdc), pdev->pen_colorref, - pdev->pen_is_ext ? TRANSPARENT : GetBkMode(pdev->dev.hdc), - &pdev->dash_masks[1], &pdev->dash_masks[0] ); - assert( num >= 2 ); - for (i = 0; i < num - 1; i++) - if (!dashed_pen_line( pdev, pts + i, pts + i + 1 )) - return FALSE; - if (close) return dashed_pen_line( pdev, pts + num - 1, pts ); + if (region) + { + for (i = 0; i < num - 1; i++) + if (!dashed_pen_line_region( pdev, pts + i, pts + i + 1, region )) + return FALSE; + if (close) return dashed_pen_line_region( pdev, pts + num - 1, pts, region ); + } + else + { + get_color_masks( pdev, GetROP2(pdev->dev.hdc), pdev->pen_colorref, + pdev->pen_is_ext ? TRANSPARENT : GetBkMode(pdev->dev.hdc), + &pdev->dash_masks[1], &pdev->dash_masks[0] ); + for (i = 0; i < num - 1; i++) + if (!dashed_pen_line( pdev, pts + i, pts + i + 1 )) + return FALSE; + if (close) return dashed_pen_line( pdev, pts + num - 1, pts ); + } return TRUE; }

1 0

Alexandre Julliard : gdi32: Implement returning a region for 1-pixel wide solid pen lines.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 3188c3022971abe4bb441be8ae97496ab13aab7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3188c3022971abe4bb441be8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 28 12:21:07 2011 +0100 gdi32: Implement returning a region for 1-pixel wide solid pen lines. --- dlls/gdi32/dibdrv/objects.c | 136 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 128 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index bf821f2..bb68029 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -631,21 +631,141 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end, DWORD return TRUE; } +static BOOL solid_pen_line_region( dibdrv_physdev *pdev, POINT *start, POINT *end, HRGN region ) +{ + RECT rect; + + rect.left = start->x; + rect.top = start->y; + rect.right = start->x + 1; + rect.bottom = start->y + 1; + + if (start->y == end->y) + { + rect.right = end->x; + order_end_points(&rect.left, &rect.right); + add_rect_to_region( region, &rect ); + } + else if(start->x == end->x) + { + rect.bottom = end->y; + order_end_points(&rect.top, &rect.bottom); + add_rect_to_region( region, &rect ); + } + else + { + INT dx = end->x - start->x, dy = end->y - start->y; + INT abs_dx = abs(dx), abs_dy = abs(dy); + DWORD octant = get_octant_mask(dx, dy); + INT bias = get_bias( octant ); + + if (is_xmajor( octant )) + { + int y_inc = is_y_increasing( octant ) ? 1 : -1; + int err_add_1 = 2 * abs_dy - 2 * abs_dx; + int err_add_2 = 2 * abs_dy; + int err = 2 * abs_dy - abs_dx; + + if (is_x_increasing( octant )) + { + for (rect.right = start->x + 1; rect.right <= end->x; rect.right++) + { + if (err + bias > 0) + { + add_rect_to_region( region, &rect ); + rect.left = rect.right; + rect.top += y_inc; + rect.bottom += y_inc; + err += err_add_1; + } + else err += err_add_2; + } + } + else + { + for (rect.left = start->x; rect.left > end->x; rect.left--) + { + if (err + bias > 0) + { + add_rect_to_region( region, &rect ); + rect.right = rect.left; + rect.top += y_inc; + rect.bottom += y_inc; + err += err_add_1; + } + else err += err_add_2; + } + } + } + else + { + int x_inc = is_x_increasing( octant ) ? 1 : -1; + int err_add_1 = 2 * abs_dx - 2 * abs_dy; + int err_add_2 = 2 * abs_dx; + int err = 2 * abs_dx - abs_dy; + + if (is_y_increasing( octant )) + { + for (rect.bottom = start->y + 1; rect.bottom <= end->y; rect.bottom++) + { + if (err + bias > 0) + { + add_rect_to_region( region, &rect ); + rect.top = rect.bottom; + rect.left += x_inc; + rect.right += x_inc; + err += err_add_1; + } + else err += err_add_2; + } + } + else + { + for (rect.top = start->y; rect.top > end->y; rect.top--) + { + if (err + bias > 0) + { + add_rect_to_region( region, &rect ); + rect.bottom = rect.top; + rect.left += x_inc; + rect.right += x_inc; + err += err_add_1; + } + else err += err_add_2; + } + } + } + /* add final rect */ + add_rect_to_region( region, &rect ); + } + return TRUE; +} + static BOOL solid_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN region) { int i; - DWORD color, and, xor; - - color = get_pixel_color( pdev, pdev->pen_colorref, TRUE ); - calc_and_xor_masks( GetROP2(pdev->dev.hdc), color, &and, &xor ); assert( num >= 2 ); - for (i = 0; i < num - 1; i++) - if (!solid_pen_line( pdev, pts + i, pts + i + 1, and, xor )) - return FALSE; - if (close) return solid_pen_line( pdev, pts + num - 1, pts, and, xor ); + if (region) + { + for (i = 0; i < num - 1; i++) + if (!solid_pen_line_region( pdev, pts + i, pts + i + 1, region )) + return FALSE; + if (close) return solid_pen_line_region( pdev, pts + num - 1, pts, region ); + } + else + { + DWORD color, and, xor; + + color = get_pixel_color( pdev, pdev->pen_colorref, TRUE ); + calc_and_xor_masks( GetROP2(pdev->dev.hdc), color, &and, &xor ); + for (i = 0; i < num - 1; i++) + if (!solid_pen_line( pdev, pts + i, pts + i + 1, and, xor )) + return FALSE; + if (close) return solid_pen_line( pdev, pts + num - 1, pts, and, xor ); + } return TRUE; }

1 0

Alexandre Julliard : gdi32: Add support for updating a region from the pen backend functions instead of painting directly .
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 0429d9181f211e40f1fc922185a8924048f199c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0429d9181f211e40f1fc92218… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 28 11:56:24 2011 +0100 gdi32: Add support for updating a region from the pen backend functions instead of painting directly. --- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/graphics.c | 8 ++++---- dlls/gdi32/dibdrv/objects.c | 21 ++++++++++----------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 5d9ecb6..fa8d445 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -89,7 +89,7 @@ typedef struct dibdrv_physdev dash_pattern pen_pattern; dash_pos dash_pos; rop_mask dash_masks[2]; - BOOL (* pen_lines)(struct dibdrv_physdev *pdev, int num, POINT *pts, BOOL close); + BOOL (* pen_lines)(struct dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN region); /* brush */ UINT brush_style; diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index e5aad2a..e8b45a1 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -453,7 +453,7 @@ BOOL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) reset_dash_origin(pdev); - if(defer_pen(pdev) || !pdev->pen_lines(pdev, 2, pts, FALSE)) + if(defer_pen(pdev) || !pdev->pen_lines(pdev, 2, pts, FALSE, 0)) return next->funcs->pLineTo( next, x, y ); return TRUE; @@ -532,7 +532,7 @@ BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWO LPtoDP( dev->hdc, points, counts[i] ); reset_dash_origin( pdev ); - pdev->pen_lines( pdev, counts[i], points, FALSE ); + pdev->pen_lines( pdev, counts[i], points, FALSE, 0 ); } HeapFree( GetProcessHeap(), 0, points ); @@ -557,7 +557,7 @@ BOOL dibdrv_Polyline( PHYSDEV dev, const POINT* pt, INT count ) LPtoDP( dev->hdc, points, count ); reset_dash_origin( pdev ); - pdev->pen_lines( pdev, count, points, FALSE ); + pdev->pen_lines( pdev, count, points, FALSE, 0 ); HeapFree( GetProcessHeap(), 0, points ); return TRUE; @@ -596,7 +596,7 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) pts[1].x = pts[2].x = rect.left; pts[2].y = pts[3].y = rect.bottom - 1; - pdev->pen_lines(pdev, 4, pts, TRUE); + pdev->pen_lines(pdev, 4, pts, TRUE, 0); rect.left += (pdev->pen_width + 1) / 2; rect.top += (pdev->pen_width + 1) / 2; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 46f3092..bf821f2 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -631,7 +631,7 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end, DWORD return TRUE; } -static BOOL solid_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close) +static BOOL solid_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN region) { int i; DWORD color, and, xor; @@ -927,7 +927,7 @@ static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) return TRUE; } -static BOOL dashed_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close) +static BOOL dashed_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN region) { int i; @@ -945,7 +945,7 @@ static BOOL dashed_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL clo return TRUE; } -static BOOL null_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close) +static BOOL null_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN region) { return TRUE; } @@ -1072,15 +1072,13 @@ static void add_join( dibdrv_physdev *pdev, HRGN region, const POINT *pt, return; } -static HRGN get_wide_lines_region( dibdrv_physdev *pdev, int num, POINT *pts, BOOL close ) +static BOOL get_wide_lines_region( dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN total ) { int i; - HRGN total, segment; + HRGN segment; assert( num >= 2 ); - total = CreateRectRgn( 0, 0, 0, 0 ); - if (!close) num--; for (i = 0; i < num; i++) { @@ -1223,14 +1221,15 @@ static HRGN get_wide_lines_region( dibdrv_physdev *pdev, int num, POINT *pts, BO prev_face = face_2; } - return total; + return TRUE; } -static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close) +static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN region) { - HRGN region; + if (region) return get_wide_lines_region( pdev, num, pts, close, region ); - region = get_wide_lines_region( pdev, num, pts, close ); + if (!(region = CreateRectRgn( 0, 0, 0, 0 ))) return FALSE; + get_wide_lines_region( pdev, num, pts, close, region ); if (pdev->clip) CombineRgn( region, region, pdev->clip, RGN_AND ); pen_rect( pdev, NULL, region, GetROP2( pdev->dev.hdc ) ); DeleteObject( region );

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: 277361d7be206e1ff7634998f0d750f7c6d66498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=277361d7be206e1ff7634998f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 28 19:23:46 2011 +0100 po: Update German translation. --- po/de.po | 195 ++++++++++++++++++++++++++++++------------------------------- 1 files changed, 96 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=277361d7be206e1ff7634…

1 0

Ričardas Barkauskas : ws2_32: Don' t post completion packet if sending fails with error immediately.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: 1bbe92e79b77d7eeb13afe506512ae018db37095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bbe92e79b77d7eeb13afe506… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Wed Dec 28 01:25:20 2011 +0200 ws2_32: Don't post completion packet if sending fails with error immediately. --- dlls/ws2_32/socket.c | 2 -- dlls/ws2_32/tests/sock.c | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0e9524e..d3a4590 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3885,9 +3885,7 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, } if (n == -1 && errno != EAGAIN) { - int loc_errno = errno; err = wsaErrno(); - if (cvalue) WS_AddCompletion( s, cvalue, sock_get_ntstatus(loc_errno), 0 ); goto error; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7016dfb..5677a2c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5321,10 +5321,10 @@ static void test_completion_port(void) bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 200 ); ok(bret == FALSE, "GetQueuedCompletionStatus returned %u\n", bret ); - todo_wine ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); - todo_wine ok(key == 0xdeadbeef, "Key is %lu\n", key); - todo_wine ok(num_bytes == 0xdeadbeef, "Number of bytes transfered is %u\n", num_bytes); - todo_wine ok(!olp, "Overlaped structure is at %p\n", olp); + ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); + ok(key == 0xdeadbeef, "Key is %lu\n", key); + ok(num_bytes == 0xdeadbeef, "Number of bytes transfered is %u\n", num_bytes); + ok(!olp, "Overlaped structure is at %p\n", olp); if (dest != INVALID_SOCKET) closesocket(dest);

1 0

Ričardas Barkauskas : ws2_32/tests: Test some completion port behavior.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: fa4a90e6d21eb6c179625c25fc308eaef51d7b46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa4a90e6d21eb6c179625c25f… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Wed Dec 28 01:25:06 2011 +0200 ws2_32/tests: Test some completion port behavior. --- dlls/ws2_32/tests/sock.c | 222 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 222 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2cb56a6..7016dfb 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5203,6 +5203,226 @@ static void test_WSAAsyncGetServByPort(void) DestroyWindow(hwnd); } +static void test_completion_port(void) +{ + HANDLE previous_port, io_port; + WSAOVERLAPPED ov, *olp; + SOCKET src, dest; + char buf[1024]; + WSABUF bufs; + DWORD num_bytes, flags; + struct linger ling; + int iret; + BOOL bret; + ULONG_PTR key; + struct sockaddr_in bindAddress; + GUID acceptExGuid = WSAID_ACCEPTEX; + LPFN_ACCEPTEX pAcceptEx = NULL; + + previous_port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); + ok( previous_port != NULL, "Failed to create completion port %u\n", GetLastError()); + + memset(&ov, 0, sizeof(ov)); + + tcp_socketpair(&src, &dest); + if (src == INVALID_SOCKET || dest == INVALID_SOCKET) + { + skip("failed to create sockets\n"); + goto end; + } + + bufs.len = sizeof(buf); + bufs.buf = buf; + flags = 0; + + ling.l_onoff = 1; + ling.l_linger = 0; + iret = setsockopt (src, SOL_SOCKET, SO_LINGER, (char *) &ling, sizeof(ling)); + ok(!iret, "Failed to set linger %d\n", GetLastError()); + + io_port = CreateIoCompletionPort( (HANDLE)dest, previous_port, 125, 0 ); + ok(io_port != NULL, "Failed to create completion port %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + + iret = WSARecv(dest, &bufs, 1, &num_bytes, &flags, &ov, NULL); + ok(iret == SOCKET_ERROR, "WSARecv returned %d\n", iret); + ok(GetLastError() == ERROR_IO_PENDING, "Last error was %d\n", GetLastError()); + + closesocket(src); + src = INVALID_SOCKET; + + SetLastError(0xdeadbeef); + key = 0xdeadbeef; + num_bytes = 0xdeadbeef; + olp = (WSAOVERLAPPED *)0xdeadbeef; + + bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); + todo_wine ok(bret == FALSE, "GetQueuedCompletionStatus returned %d\n", bret); + todo_wine ok(GetLastError() == ERROR_NETNAME_DELETED, "Last error was %d\n", GetLastError()); + ok(key == 125, "Key is %lu\n", key); + ok(num_bytes == 0, "Number of bytes received is %u\n", num_bytes); + ok(olp == &ov, "Overlaped structure is at %p\n", olp); + + SetLastError(0xdeadbeef); + key = 0xdeadbeef; + num_bytes = 0xdeadbeef; + olp = (WSAOVERLAPPED *)0xdeadbeef; + + bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); + ok(bret == FALSE, "GetQueuedCompletionStatus returned %d\n", bret ); + ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); + ok(key == 0xdeadbeef, "Key is %lu\n", key); + ok(num_bytes == 0xdeadbeef, "Number of bytes transfered is %u\n", num_bytes); + ok(!olp, "Overlaped structure is at %p\n", olp); + + if (dest != INVALID_SOCKET) + closesocket(dest); + if (src != INVALID_SOCKET) + closesocket(src); + + memset(&ov, 0, sizeof(ov)); + + tcp_socketpair(&src, &dest); + if (src == INVALID_SOCKET || dest == INVALID_SOCKET) + { + skip("failed to create sockets\n"); + goto end; + } + + bufs.len = sizeof(buf); + bufs.buf = buf; + flags = 0; + + ling.l_onoff = 1; + ling.l_linger = 0; + iret = setsockopt (src, SOL_SOCKET, SO_LINGER, (char *) &ling, sizeof(ling)); + ok(!iret, "Failed to set linger %d\n", GetLastError()); + + io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 125, 0); + ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); + + set_blocking(dest, FALSE); + + closesocket(src); + src = INVALID_SOCKET; + num_bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + + iret = WSASend(dest, &bufs, 1, &num_bytes, 0, &ov, NULL); + ok(iret == SOCKET_ERROR, "WSASend failed - %d\n", iret); + ok(GetLastError() == WSAECONNRESET, "Last error was %d\n", GetLastError()); + ok(num_bytes == 0xdeadbeef, "Managed to send %d\n", num_bytes); + + SetLastError(0xdeadbeef); + key = 0xdeadbeef; + num_bytes = 0xdeadbeef; + olp = (WSAOVERLAPPED *)0xdeadbeef; + + bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 200 ); + ok(bret == FALSE, "GetQueuedCompletionStatus returned %u\n", bret ); + todo_wine ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); + todo_wine ok(key == 0xdeadbeef, "Key is %lu\n", key); + todo_wine ok(num_bytes == 0xdeadbeef, "Number of bytes transfered is %u\n", num_bytes); + todo_wine ok(!olp, "Overlaped structure is at %p\n", olp); + + if (dest != INVALID_SOCKET) + closesocket(dest); + if (src != INVALID_SOCKET) + closesocket(src); + + + src = socket(AF_INET, SOCK_STREAM, 0); + if (src == INVALID_SOCKET) + { + skip("could not create listener socket, error %d\n", WSAGetLastError()); + goto end; + } + + dest = socket(AF_INET, SOCK_STREAM, 0); + if (dest == INVALID_SOCKET) + { + skip("could not create acceptor socket, error %d\n", WSAGetLastError()); + goto end; + } + + iret = WSAIoctl(src, SIO_GET_EXTENSION_FUNCTION_POINTER, &acceptExGuid, sizeof(acceptExGuid), + &pAcceptEx, sizeof(pAcceptEx), &num_bytes, NULL, NULL); + if (iret) + { + skip("WSAIoctl failed to get AcceptEx with ret %d + errno %d\n", iret, WSAGetLastError()); + goto end; + } + + memset(&bindAddress, 0, sizeof(bindAddress)); + bindAddress.sin_family = AF_INET; + bindAddress.sin_addr.s_addr = inet_addr("127.0.0.1"); + iret = bind(src, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + if (iret != 0) + { + skip("failed to bind, error %d\n", WSAGetLastError()); + goto end; + } + + if (set_blocking(src, FALSE)) + { + skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); + goto end; + } + + iret = listen(src, 5); + if (iret != 0) + { + skip("listening failed, errno = %d\n", WSAGetLastError()); + goto end; + } + + SetLastError(0xdeadbeef); + + bret = pAcceptEx(src, dest, buf, sizeof(buf) - 2*(sizeof(struct sockaddr_in) + 16), + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &num_bytes, &ov); + ok(bret == FALSE, "AcceptEx returned %d\n", bret); + ok(GetLastError() == ERROR_IO_PENDING, "Last error was %d\n", GetLastError()); + + io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); + + closesocket(src); + src = INVALID_SOCKET; + + SetLastError(0xdeadbeef); + key = 0xdeadbeef; + num_bytes = 0xdeadbeef; + olp = (WSAOVERLAPPED *)0xdeadbeef; + + bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); + ok(bret == FALSE, "failed to get completion status %u\n", bret); + todo_wine ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); + todo_wine ok(key == 125, "Key is %lu\n", key); + todo_wine ok(num_bytes == 0, "Number of bytes transfered is %u\n", num_bytes); + todo_wine ok(olp == &ov, "Overlaped structure is at %p\n", olp); + todo_wine ok(olp && (olp->Internal == (ULONG)STATUS_CANCELLED), "Internal status is %lx\n", olp ? olp->Internal : 0); + + SetLastError(0xdeadbeef); + key = 0xdeadbeef; + num_bytes = 0xdeadbeef; + olp = (WSAOVERLAPPED *)0xdeadbeef; + bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 200 ); + ok(bret == FALSE, "failed to get completion status %u\n", bret); + ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); + ok(key == 0xdeadbeef, "Key is %lu\n", key); + ok(num_bytes == 0xdeadbeef, "Number of bytes transfered is %u\n", num_bytes); + ok(!olp, "Overlaped structure is at %p\n", olp); + + end: + if (dest != INVALID_SOCKET) + closesocket(dest); + if (src != INVALID_SOCKET) + closesocket(src); + CloseHandle(previous_port); +} + /**************** Main program ***************/ START_TEST( sock ) @@ -5266,6 +5486,8 @@ START_TEST( sock ) test_WSAAsyncGetServByPort(); + test_completion_port(); + /* this is a io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send(); test_synchronous_WSAIoctl();

1 0

André Hentschel : d3drm: Add IDirect3DRM2 interface.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: 7fd38368b41737b1c38c939002388a09a006312a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fd38368b41737b1c38c93900… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 27 23:16:10 2011 +0100 d3drm: Add IDirect3DRM2 interface. --- dlls/d3drm/d3drm.c | 464 +++++++++++++++++++++++++++++++++++++++++++- dlls/d3drm/d3drm_main.c | 2 +- dlls/d3drm/d3drm_private.h | 2 +- include/d3drm.h | 2 +- 4 files changed, 457 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7fd38368b41737b1c38c9…

1 0

André Hentschel : d3drm: Add IDirect3DRMMeshBuilder2 interface.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: f8766bdc724add134ee328d7f14b6d8d8b86a910 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8766bdc724add134ee328d7f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 27 23:14:48 2011 +0100 d3drm: Add IDirect3DRMMeshBuilder2 interface. --- dlls/d3drm/d3drm.c | 2 +- dlls/d3drm/d3drm_private.h | 2 +- dlls/d3drm/meshbuilder.c | 408 ++++++++++++++++++++++++++------------------ 3 files changed, 248 insertions(+), 164 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f8766bdc724add134ee32…

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2011