December 2011 - Wine-Commits

Alexandre Julliard : gdi32: Add checks for invalid color usage values.
by Alexandre Julliard Dec. 29, 2011

Dec. 29, 2011

Module: wine Branch: master Commit: 63a9217539b54ee4af5535d8f2e7ca5408d00c7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=63a9217539b54ee4af5535d8f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 29 14:05:20 2011 +0100 gdi32: Add checks for invalid color usage values. --- dlls/gdi32/dib.c | 8 +++++- dlls/gdi32/tests/bitmap.c | 50 +++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/tests/brush.c | 11 +++++++++ 3 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index d97b30f..b9ffbbe 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -169,7 +169,7 @@ static BOOL bitmapinfoheader_from_user_bitmapinfo( BITMAPINFOHEADER *dst, const /******************************************************************************************* * Fill out a true BITMAPINFO from a variable sized BITMAPINFO / BITMAPCOREINFO. * - * The resulting stanitized BITMAPINFO is guaranteed to have: + * The resulting sanitized BITMAPINFO is guaranteed to have: * - biSize set to sizeof(BITMAPINFOHEADER) * - biSizeImage set to the actual image size even for non-compressed DIB * - biClrUsed set to the size of the color table, and 0 only when there is no color table @@ -180,6 +180,7 @@ static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO * { void *src_colors; + if (coloruse > DIB_PAL_COLORS + 1) return FALSE; /* FIXME: handle DIB_PAL_COLORS+1 format */ if (!bitmapinfoheader_from_user_bitmapinfo( &dst->bmiHeader, &info->bmiHeader )) return FALSE; if (!is_valid_dib_format( &dst->bmiHeader, allow_compression )) return FALSE; @@ -645,7 +646,7 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, HRGN clip = 0; const struct gdi_dc_funcs *funcs; - if (!bitmapinfo_from_user_bitmapinfo( src_info, info, coloruse, TRUE )) + if (!bitmapinfo_from_user_bitmapinfo( src_info, info, coloruse, TRUE ) || coloruse > DIB_PAL_COLORS) { SetLastError( ERROR_INVALID_PARAMETER ); return 0; @@ -1209,6 +1210,7 @@ INT WINAPI GetDIBits( /* Since info may be a BITMAPCOREINFO or any of the larger BITMAPINFO structures, we'll use our own copy and transfer the colour info back at the end */ if (!bitmapinfoheader_from_user_bitmapinfo( &dst_info->bmiHeader, &info->bmiHeader )) return 0; + if (coloruse > DIB_PAL_COLORS) return 0; if (bits && (dst_info->bmiHeader.biCompression == BI_JPEG || dst_info->bmiHeader.biCompression == BI_PNG)) return 0; @@ -1426,6 +1428,7 @@ HBITMAP WINAPI CreateDIBitmap( HDC hdc, const BITMAPINFOHEADER *header, if (!bitmapinfoheader_from_user_bitmapinfo( &info, header )) return 0; if (info.biCompression == BI_JPEG || info.biCompression == BI_PNG) return 0; + if (coloruse > DIB_PAL_COLORS + 1) return 0; if (info.biWidth < 0) return 0; /* Top-down DIBs have a negative height */ @@ -1474,6 +1477,7 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, if (bits) *bits = NULL; if (!bitmapinfo_from_user_bitmapinfo( info, bmi, usage, FALSE )) return 0; + if (usage > DIB_PAL_COLORS) return 0; if (info->bmiHeader.biPlanes != 1) { if (info->bmiHeader.biPlanes * info->bmiHeader.biBitCount > 16) return 0; diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 9a34f63..7f609f2 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1155,6 +1155,56 @@ static void test_dib_formats(void) ret = GetDIBits(hdc, hbmp, 0, 2, NULL, bi, DIB_RGB_COLORS); ok( !ret || broken(ret), /* nt4 */ "GetDIBits succeeded with zero height\n" ); + /* some functions accept DIB_PAL_COLORS+1, but not beyond */ + + bi->bmiHeader.biWidth = 2; + bi->bmiHeader.biHeight = 2; + bi->bmiHeader.biBitCount = 1; + bi->bmiHeader.biCompression = BI_RGB; + hdib = CreateDIBSection(hdc, bi, DIB_PAL_COLORS+1, &bits, NULL, 0); + ok( hdib == NULL, "CreateDIBSection succeeded with DIB_PAL_COLORS+1\n" ); + hdib = CreateDIBitmap( hdc, &bi->bmiHeader, 0, bits, bi, DIB_PAL_COLORS+1 ); + ok( hdib != NULL, "CreateDIBitmap failed with DIB_PAL_COLORS+1\n" ); + DeleteObject( hdib ); + ret = SetDIBits(hdc, hbmp, 0, 1, data, bi, DIB_PAL_COLORS+1); + ok( !ret, "SetDIBits succeeded with DIB_PAL_COLORS+1\n" ); + ret = SetDIBitsToDevice( memdc, 0, 0, 1, 1, 0, 0, 0, 1, data, bi, DIB_PAL_COLORS+1 ); + ok( ret, "SetDIBitsToDevice failed with DIB_PAL_COLORS+1\n" ); + ret = StretchDIBits( memdc, 0, 0, 1, 1, 0, 0, 1, 1, data, bi, DIB_PAL_COLORS+1, SRCCOPY ); + ok( ret, "StretchDIBits failed with DIB_PAL_COLORS+1\n" ); + ret = GetDIBits(hdc, hbmp, 0, 2, data, bi, DIB_PAL_COLORS+1); + ok( !ret, "GetDIBits succeeded with DIB_PAL_COLORS+1\n" ); + bi->bmiHeader.biWidth = 2; + bi->bmiHeader.biHeight = 2; + bi->bmiHeader.biBitCount = 1; + bi->bmiHeader.biCompression = BI_RGB; + ret = GetDIBits(hdc, hbmp, 0, 0, NULL, bi, DIB_PAL_COLORS+1); + ok( !ret, "GetDIBits succeeded with DIB_PAL_COLORS+1\n" ); + + bi->bmiHeader.biWidth = 2; + bi->bmiHeader.biHeight = 2; + bi->bmiHeader.biBitCount = 1; + bi->bmiHeader.biCompression = BI_RGB; + hdib = CreateDIBSection(hdc, bi, DIB_PAL_COLORS+2, &bits, NULL, 0); + ok( hdib == NULL, "CreateDIBSection succeeded with DIB_PAL_COLORS+2\n" ); + hdib = CreateDIBitmap( hdc, &bi->bmiHeader, 0, bits, bi, DIB_PAL_COLORS+2 ); + ok( hdib == NULL, "CreateDIBitmap succeeded with DIB_PAL_COLORS+2\n" ); + DeleteObject( hdib ); + ret = SetDIBits(hdc, hbmp, 0, 1, data, bi, DIB_PAL_COLORS+2); + ok( !ret, "SetDIBits succeeded with DIB_PAL_COLORS+2\n" ); + ret = SetDIBitsToDevice( memdc, 0, 0, 1, 1, 0, 0, 0, 1, data, bi, DIB_PAL_COLORS+2 ); + ok( !ret, "SetDIBitsToDevice succeeded with DIB_PAL_COLORS+2\n" ); + ret = StretchDIBits( memdc, 0, 0, 1, 1, 0, 0, 1, 1, data, bi, DIB_PAL_COLORS+2, SRCCOPY ); + ok( !ret, "StretchDIBits succeeded with DIB_PAL_COLORS+2\n" ); + ret = GetDIBits(hdc, hbmp, 0, 2, data, bi, DIB_PAL_COLORS+2); + ok( !ret, "GetDIBits succeeded with DIB_PAL_COLORS+2\n" ); + bi->bmiHeader.biWidth = 2; + bi->bmiHeader.biHeight = 2; + bi->bmiHeader.biBitCount = 1; + bi->bmiHeader.biCompression = BI_RGB; + ret = GetDIBits(hdc, hbmp, 0, 0, NULL, bi, DIB_PAL_COLORS+2); + ok( !ret, "GetDIBits succeeded with DIB_PAL_COLORS+2\n" ); + DeleteDC( memdc ); DeleteObject( hbmp ); ReleaseDC( 0, hdc ); diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index 4f44d03..b11d21c 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -192,6 +192,17 @@ static void test_pattern_brush(void) ret = GlobalFlags( mem ); ok( ret == 2, "wrong flags %x\n", ret ); + brush = CreateDIBPatternBrushPt( info, DIB_PAL_COLORS ); + ok( brush != 0, "CreateDIBPatternBrushPt failed\n" ); + DeleteObject( brush ); + brush = CreateDIBPatternBrushPt( info, DIB_PAL_COLORS + 1 ); + ok( brush != 0, "CreateDIBPatternBrushPt failed\n" ); + DeleteObject( brush ); + brush = CreateDIBPatternBrushPt( info, DIB_PAL_COLORS + 2 ); + ok( !brush, "CreateDIBPatternBrushPt succeeded\n" ); + brush = CreateDIBPatternBrushPt( info, DIB_PAL_COLORS + 3 ); + ok( !brush, "CreateDIBPatternBrushPt succeeded\n" ); + info->bmiHeader.biBitCount = 8; info->bmiHeader.biCompression = BI_RLE8; brush = CreateDIBPatternBrushPt( info, DIB_RGB_COLORS );

1 0

Alexandre Julliard : gdi32: Implement PolyPolygon in the DIB driver.
by Alexandre Julliard Dec. 29, 2011

Dec. 29, 2011

Module: wine Branch: master Commit: 579afe5cc6ffd661b1802c42ae2adf17dbfcedc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=579afe5cc6ffd661b1802c42a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 29 09:57:58 2011 +0100 gdi32: Implement PolyPolygon in the DIB driver. --- dlls/gdi32/dibdrv/dc.c | 4 +- dlls/gdi32/dibdrv/dibdrv.h | 2 + dlls/gdi32/dibdrv/graphics.c | 68 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 7001b46..6ce2212 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -474,9 +474,9 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pPolyBezier */ NULL, /* pPolyBezierTo */ NULL, /* pPolyDraw */ - NULL, /* pPolyPolygon */ + dibdrv_PolyPolygon, /* pPolyPolygon */ dibdrv_PolyPolyline, /* pPolyPolyline */ - NULL, /* pPolygon */ + dibdrv_Polygon, /* pPolygon */ dibdrv_Polyline, /* pPolyline */ NULL, /* pPolylineTo */ dibdrv_PutImage, /* pPutImage */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index ba8c0a4..1f158db 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -122,8 +122,10 @@ extern COLORREF dibdrv_GetPixel( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; extern BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD polygons ) DECLSPEC_HIDDEN; extern BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polylines ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_Polygon( PHYSDEV dev, const POINT *pt, INT count ) DECLSPEC_HIDDEN; extern BOOL dibdrv_Polyline( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; extern DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info, const struct gdi_image_bits *bits, struct bitblt_coords *src, diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 4fb1126..81d1d1b 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -520,6 +520,64 @@ BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) } /*********************************************************************** + * dibdrv_PolyPolygon + */ +BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD polygons ) +{ + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pPolyPolygon ); + DWORD total, i, pos; + BOOL ret = FALSE; + POINT *points; + INT rop = GetROP2( dev->hdc ); + HRGN outline = 0, interior; + + if (defer_pen( pdev )) return next->funcs->pPolyPolygon( next, pt, counts, polygons ); + + for (i = total = 0; i < polygons; i++) + { + if (counts[i] < 2) return FALSE; + total += counts[i]; + } + + points = HeapAlloc( GetProcessHeap(), 0, total * sizeof(*pt) ); + if (!points) return FALSE; + memcpy( points, pt, total * sizeof(*pt) ); + LPtoDP( dev->hdc, points, total ); + + if (!(interior = CreatePolyPolygonRgn( points, counts, polygons, GetPolyFillMode( dev->hdc )))) + { + HeapFree( GetProcessHeap(), 0, points ); + return FALSE; + } + + if (pdev->clip) CombineRgn( interior, interior, pdev->clip, RGN_AND ); + + /* if not using a region, paint the interior first so the outline can overlap it */ + if (!pdev->pen_uses_region || !(outline = CreateRectRgn( 0, 0, 0, 0 ))) + ret = brush_rect( pdev, NULL, interior, rop ); + + for (i = pos = 0; i < polygons; i++) + { + reset_dash_origin( pdev ); + pdev->pen_lines( pdev, counts[i], points + pos, TRUE, outline ); + pos += counts[i]; + } + + if (outline) + { + if (pdev->clip) CombineRgn( outline, outline, pdev->clip, RGN_AND ); + CombineRgn( interior, interior, outline, RGN_DIFF ); + ret = pen_rect( pdev, NULL, outline, rop ) && brush_rect( pdev, NULL, interior, rop ); + DeleteObject( outline ); + } + + DeleteObject( interior ); + HeapFree( GetProcessHeap(), 0, points ); + return ret; +} + +/*********************************************************************** * dibdrv_PolyPolyline */ BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polylines ) @@ -571,6 +629,16 @@ BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWO } /*********************************************************************** + * dibdrv_Polygon + */ +BOOL dibdrv_Polygon( PHYSDEV dev, const POINT *pt, INT count ) +{ + INT counts[1] = { count }; + + return dibdrv_PolyPolygon( dev, pt, counts, 1 ); +} + +/*********************************************************************** * dibdrv_Polyline */ BOOL dibdrv_Polyline( PHYSDEV dev, const POINT* pt, INT count )

1 0

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

Dec. 29, 2011

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: Add support for updating a region from the pen backend functions instead of painting directly .
by Alexandre Julliard Dec. 29, 2011

Dec. 29, 2011

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

Alexandre Julliard : gdi32: Add helpers to paint a region with the brush or pen.
by Alexandre Julliard Dec. 29, 2011

Dec. 29, 2011

Module: wine Branch: master Commit: c1c8c92875085bbabfe4cbbd266edc8296b2ef0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1c8c92875085bbabfe4cbbd2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 29 10:10:35 2011 +0100 gdi32: Add helpers to paint a region with the brush or pen. --- dlls/gdi32/dibdrv/dibdrv.h | 3 ++- dlls/gdi32/dibdrv/graphics.c | 23 ++++++----------------- dlls/gdi32/dibdrv/objects.c | 31 +++++++++++++++---------------- 3 files changed, 23 insertions(+), 34 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 1f158db..a5fd968 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -233,7 +233,8 @@ extern BOOL convert_dib(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN; extern COLORREF make_rgb_colorref( HDC hdc, dib_info *dib, COLORREF color, BOOL *got_pixel, DWORD *pixel ) DECLSPEC_HIDDEN; extern DWORD get_pixel_color(dibdrv_physdev *pdev, COLORREF color, BOOL mono_fixup) DECLSPEC_HIDDEN; extern BOOL brush_rect( dibdrv_physdev *pdev, const RECT *rect, HRGN clip, INT rop ) DECLSPEC_HIDDEN; -extern BOOL pen_rect(dibdrv_physdev *pdev, const RECT *rect, HRGN clip, INT rop) DECLSPEC_HIDDEN; +extern BOOL brush_region( dibdrv_physdev *pdev, HRGN region ) DECLSPEC_HIDDEN; +extern BOOL pen_region( dibdrv_physdev *pdev, HRGN region ) DECLSPEC_HIDDEN; extern int get_clipped_rects( const dib_info *dib, const RECT *rc, HRGN clip, struct clipped_rects *clip_rects ) DECLSPEC_HIDDEN; extern int clip_line(const POINT *start, const POINT *end, const RECT *clip, const bres_params *params, POINT *pt1, POINT *pt2) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 81d1d1b..ad52273 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -464,7 +464,7 @@ BOOL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) if (region) { if (pdev->clip) CombineRgn( region, region, pdev->clip, RGN_AND ); - ret = pen_rect( pdev, NULL, region, GetROP2(dev->hdc) ); + ret = pen_region( pdev, region ); DeleteObject( region ); } return ret; @@ -529,7 +529,6 @@ BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD DWORD total, i, pos; BOOL ret = FALSE; POINT *points; - INT rop = GetROP2( dev->hdc ); HRGN outline = 0, interior; if (defer_pen( pdev )) return next->funcs->pPolyPolygon( next, pt, counts, polygons ); @@ -551,11 +550,9 @@ BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD return FALSE; } - if (pdev->clip) CombineRgn( interior, interior, pdev->clip, RGN_AND ); - /* if not using a region, paint the interior first so the outline can overlap it */ if (!pdev->pen_uses_region || !(outline = CreateRectRgn( 0, 0, 0, 0 ))) - ret = brush_rect( pdev, NULL, interior, rop ); + ret = brush_region( pdev, interior ); for (i = pos = 0; i < polygons; i++) { @@ -566,9 +563,8 @@ BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD if (outline) { - if (pdev->clip) CombineRgn( outline, outline, pdev->clip, RGN_AND ); CombineRgn( interior, interior, outline, RGN_DIFF ); - ret = pen_rect( pdev, NULL, outline, rop ) && brush_rect( pdev, NULL, interior, rop ); + ret = pen_region( pdev, outline ) && brush_region( pdev, interior ); DeleteObject( outline ); } @@ -587,7 +583,6 @@ BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWO 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 ); @@ -620,7 +615,7 @@ BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWO if (outline) { if (pdev->clip) CombineRgn( outline, outline, pdev->clip, RGN_AND ); - ret = pen_rect( pdev, NULL, outline, rop ); + ret = pen_region( pdev, outline ); DeleteObject( outline ); } @@ -659,7 +654,6 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) 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); @@ -696,12 +690,7 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) HRGN interior = CreateRectRgnIndirect( &rect ); 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 ); + ret = pen_region( pdev, outline ) && brush_region( pdev, interior ); DeleteObject( outline ); DeleteObject( interior ); } @@ -711,7 +700,7 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) 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 ); + ret = brush_rect( pdev, &rect, pdev->clip, GetROP2(dev->hdc) ); } return ret; } diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 197b220..c7f2ae9 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1329,11 +1329,12 @@ static void add_join( dibdrv_physdev *pdev, HRGN region, const POINT *pt, return; } -static BOOL get_wide_lines_region( dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN total ) +static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN total) { int i; HRGN segment; + assert( total != 0 ); /* wide pens should always be drawn through a region */ assert( num >= 2 ); if (!close) num--; @@ -1481,18 +1482,6 @@ static BOOL get_wide_lines_region( dibdrv_physdev *pdev, int num, POINT *pts, BO return TRUE; } -static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN region) -{ - if (region) return get_wide_lines_region( pdev, num, pts, close, region ); - - 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 ); - return TRUE; -} - static const dash_pattern dash_patterns_cosmetic[4] = { {2, {18, 6}, 24}, /* PS_DASH */ @@ -2022,15 +2011,25 @@ BOOL brush_rect(dibdrv_physdev *pdev, const RECT *rect, HRGN clip, INT rop) return ret; } -BOOL pen_rect(dibdrv_physdev *pdev, const RECT *rect, HRGN clip, INT rop) +/* paint a region with the brush (note: the region can be modified) */ +BOOL brush_region( dibdrv_physdev *pdev, HRGN region ) +{ + if (pdev->clip) CombineRgn( region, region, pdev->clip, RGN_AND ); + return brush_rect( pdev, NULL, region, GetROP2( pdev->dev.hdc )); +} + +/* paint a region with the pen (note: the region can be modified) */ +BOOL pen_region( dibdrv_physdev *pdev, HRGN region ) { struct clipped_rects clipped_rects; rop_mask color; DWORD pen_color = get_pixel_color( pdev, pdev->pen_colorref, TRUE ); - if (!get_clipped_rects( &pdev->dib, rect, clip, &clipped_rects )) return TRUE; + if (pdev->clip) CombineRgn( region, region, pdev->clip, RGN_AND ); + + if (!get_clipped_rects( &pdev->dib, NULL, region, &clipped_rects )) return TRUE; - calc_rop_masks( rop, pen_color, &color ); + calc_rop_masks( GetROP2( pdev->dev.hdc ), pen_color, &color ); pdev->dib.funcs->solid_rects( &pdev->dib, clipped_rects.count, clipped_rects.rects, color.and, color.xor ); free_clipped_rects( &clipped_rects );

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard Dec. 28, 2011

Dec. 28, 2011

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

André Hentschel : d3drm: Add IDirect3DRM2 interface.
by Alexandre Julliard Dec. 28, 2011

Dec. 28, 2011

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 Dec. 28, 2011

Dec. 28, 2011

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

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

Dec. 28, 2011

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

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

Dec. 28, 2011

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