December 2011 - Wine-commits

Alexandre Julliard : gdi32: Implement PolyPolygon in the DIB driver.
by Alexandre Julliard 29 Dec '11

29 Dec '11

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: Add helpers to paint a region with the brush or pen.
by Alexandre Julliard 29 Dec '11

29 Dec '11

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

Alexandre Julliard : gdi32: Add checks for invalid color usage values.
by Alexandre Julliard 29 Dec '11

29 Dec '11

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

Jacek Caban : jscript: Always use bytecode for with statement.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 1c0fe6002de00ac96f42f706bf9fb041028b9217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c0fe6002de00ac96f42f706b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 29 11:06:13 2011 +0100 jscript: Always use bytecode for with statement. --- dlls/jscript/compile.c | 8 -------- dlls/jscript/engine.c | 38 -------------------------------------- dlls/jscript/engine.h | 1 - 3 files changed, 0 insertions(+), 47 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 9d1081e..0f1e3af 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1313,11 +1313,8 @@ static HRESULT compile_break_statement(compiler_ctx_t *ctx, branch_statement_t * static HRESULT compile_with_statement(compiler_ctx_t *ctx, with_statement_t *stat) { statement_ctx_t stat_ctx = {0, TRUE, FALSE, -1, -1}; - unsigned off_backup; HRESULT hres; - off_backup = ctx->code_off; - hres = compile_expression(ctx, stat->expr); if(FAILED(hres)) return hres; @@ -1326,11 +1323,6 @@ static HRESULT compile_with_statement(compiler_ctx_t *ctx, with_statement_t *sta return E_OUTOFMEMORY; hres = compile_statement(ctx, &stat_ctx, stat->statement); - if(hres == E_NOTIMPL) { - ctx->code_off = off_backup; - stat->stat.eval = with_statement_eval; - return compile_interp_fallback(ctx, &stat->stat); - } if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 0d97765..30222b8 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1068,44 +1068,6 @@ HRESULT return_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type } /* ECMA-262 3rd Edition 12.10 */ -HRESULT with_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) -{ - with_statement_t *stat = (with_statement_t*)_stat; - IDispatch *disp; - jsdisp_t *obj; - VARIANT val; - HRESULT hres; - - TRACE("\n"); - - hres = expr_eval(ctx, stat->expr, &rt->ei, &val); - if(FAILED(hres)) - return hres; - - hres = to_object(ctx, &val, &disp); - VariantClear(&val); - if(FAILED(hres)) - return hres; - - obj = iface_to_jsdisp((IUnknown*)disp); - IDispatch_Release(disp); - if(!obj) { - FIXME("disp id not jsdisp\n"); - return E_NOTIMPL; - } - - hres = scope_push(ctx->exec_ctx->scope_chain, obj, &ctx->exec_ctx->scope_chain); - jsdisp_release(obj); - if(FAILED(hres)) - return hres; - - hres = stat_eval(ctx, stat->statement, rt, ret); - - scope_pop(&ctx->exec_ctx->scope_chain); - return hres; -} - -/* ECMA-262 3rd Edition 12.10 */ HRESULT interp_push_scope(exec_ctx_t *ctx) { IDispatch *disp; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 1b827b2..4f088b5 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -419,7 +419,6 @@ HRESULT forin_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) HRESULT continue_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT break_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT return_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; -HRESULT with_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT switch_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT try_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : jscript: Always use bytecode for for..in statement.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 2c0920f8c349ebe66fa52927ddac27d35f8a2e81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c0920f8c349ebe66fa52927d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 29 11:06:41 2011 +0100 jscript: Always use bytecode for for..in statement. --- dlls/jscript/compile.c | 6 -- dlls/jscript/engine.c | 222 ------------------------------------------------ dlls/jscript/engine.h | 1 - 3 files changed, 0 insertions(+), 229 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 0f1e3af..da9b107 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1164,7 +1164,6 @@ static HRESULT compile_for_statement(compiler_ctx_t *ctx, for_statement_t *stat) static HRESULT compile_forin_statement(compiler_ctx_t *ctx, forin_statement_t *stat) { statement_ctx_t stat_ctx = {4, FALSE, FALSE}; - unsigned off_backup = ctx->code_off; HRESULT hres; if(stat->variable) { @@ -1216,11 +1215,6 @@ static HRESULT compile_forin_statement(compiler_ctx_t *ctx, forin_statement_t *s return E_OUTOFMEMORY; hres = compile_statement(ctx, &stat_ctx, stat->statement); - if(hres == E_NOTIMPL) { - ctx->code_off = off_backup; - stat->stat.eval = forin_statement_eval; - return compile_interp_fallback(ctx, &stat->stat); - } if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 30222b8..896fc9a 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -388,15 +388,6 @@ static HRESULT disp_get_id(script_ctx_t *ctx, IDispatch *disp, BSTR name, DWORD return hres; } -/* ECMA-262 3rd Edition 8.7.2 */ -static HRESULT put_value(script_ctx_t *ctx, exprval_t *ref, VARIANT *v, jsexcept_t *ei) -{ - if(ref->type != EXPRVAL_IDREF) - return throw_reference_error(ctx, ei, JS_E_ILLEGAL_ASSIGN, NULL); - - return disp_propput(ctx, ref->u.idref.disp, ref->u.idref.id, v, ei, NULL/*FIXME*/); -} - static inline BOOL is_null(const VARIANT *v) { return V_VT(v) == VT_NULL || (V_VT(v) == VT_DISPATCH && !V_DISPATCH(v)); @@ -827,124 +818,6 @@ HRESULT for_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t return S_OK; } -static HRESULT array_expression_eval(script_ctx_t*,expression_t*,jsexcept_t*,exprval_t*); -static HRESULT member_expression_eval(script_ctx_t*,expression_t*,jsexcept_t*,exprval_t*); -static HRESULT identifier_expression_eval(script_ctx_t*,expression_t*,jsexcept_t*,exprval_t*); - -/* ECMA-262 3rd Edition 12.6.4 */ -HRESULT forin_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) -{ - forin_statement_t *stat = (forin_statement_t*)_stat; - VARIANT val, name, retv, tmp; - DISPID id = DISPID_STARTENUM; - BSTR str, identifier = NULL; - IDispatchEx *in_obj; - exprval_t exprval; - HRESULT hres; - - TRACE("\n"); - - if(stat->variable) { - hres = variable_list_eval(ctx, stat->variable, &rt->ei); - if(FAILED(hres)) - return hres; - } - - hres = expr_eval(ctx, stat->in_expr, &rt->ei, &val); - if(FAILED(hres)) - return hres; - - if(V_VT(&val) != VT_DISPATCH) { - TRACE("in vt %d\n", V_VT(&val)); - VariantClear(&val); - V_VT(ret) = VT_EMPTY; - return S_OK; - } - - hres = IDispatch_QueryInterface(V_DISPATCH(&val), &IID_IDispatchEx, (void**)&in_obj); - IDispatch_Release(V_DISPATCH(&val)); - if(FAILED(hres)) { - TRACE("Object doesn't support IDispatchEx\n"); - V_VT(ret) = VT_EMPTY; - return S_OK; - } - - V_VT(&retv) = VT_EMPTY; - - if(stat->variable) - identifier = SysAllocString(stat->variable->identifier); - - while(1) { - hres = IDispatchEx_GetNextDispID(in_obj, fdexEnumDefault, id, &id); - if(FAILED(hres) || hres == S_FALSE) - break; - - hres = IDispatchEx_GetMemberName(in_obj, id, &str); - if(FAILED(hres)) - break; - - TRACE("iter %s\n", debugstr_w(str)); - - if(stat->variable) { - hres = identifier_eval(ctx, identifier, 0, NULL, &exprval); - }else { - switch(stat->expr->type) { - case EXPR_ARRAY: - hres = array_expression_eval(ctx, stat->expr, &rt->ei, &exprval); - break; - case EXPR_IDENT: - hres = identifier_expression_eval(ctx, stat->expr, &rt->ei, &exprval); - break; - case EXPR_MEMBER: - hres = member_expression_eval(ctx, stat->expr, &rt->ei, &exprval); - break; - default: - hres = expr_eval(ctx, stat->expr, &rt->ei, &tmp); - if(FAILED(hres)) - break; - - VariantClear(&tmp); - hres = throw_reference_error(ctx, &rt->ei, JS_E_ILLEGAL_ASSIGN, NULL); - break; - } - } - if(SUCCEEDED(hres)) { - V_VT(&name) = VT_BSTR; - V_BSTR(&name) = str; - hres = put_value(ctx, &exprval, &name, &rt->ei); - exprval_release(&exprval); - } - SysFreeString(str); - if(FAILED(hres)) - break; - - hres = stat_eval(ctx, stat->statement, rt, &tmp); - if(FAILED(hres)) - break; - - VariantClear(&retv); - retv = tmp; - - if(rt->type == RT_CONTINUE) - rt->type = RT_NORMAL; - else if(rt->type != RT_NORMAL) - break; - } - - SysFreeString(identifier); - IDispatchEx_Release(in_obj); - if(FAILED(hres)) { - VariantClear(&retv); - return hres; - } - - if(rt->type == RT_BREAK) - rt->type = RT_NORMAL; - - *ret = retv; - return S_OK; -} - /* ECMA-262 3rd Edition 12.6.4 */ static HRESULT interp_forin(exec_ctx_t *ctx) { @@ -1389,46 +1262,6 @@ static HRESULT interp_func(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.2.1 */ -static HRESULT array_expression_eval(script_ctx_t *ctx, expression_t *_expr, jsexcept_t *ei, exprval_t *ret) -{ - binary_expression_t *expr = (binary_expression_t*)_expr; - VARIANT member, val; - DISPID id; - BSTR str; - IDispatch *obj = NULL; - HRESULT hres; - - TRACE("\n"); - - hres = expr_eval(ctx, expr->expression1, ei, &member); - if(FAILED(hres)) - return hres; - - hres = expr_eval(ctx, expr->expression2, ei, &val); - if(SUCCEEDED(hres)) { - hres = to_object(ctx, &member, &obj); - if(FAILED(hres)) - VariantClear(&val); - } - VariantClear(&member); - if(SUCCEEDED(hres)) { - hres = to_string(ctx, &val, ei, &str); - VariantClear(&val); - if(SUCCEEDED(hres)) { - hres = disp_get_id(ctx, obj, str, fdexNameEnsure, &id); - SysFreeString(str); - } - - if(SUCCEEDED(hres)) - exprval_set_idref(ret, obj, id); - - IDispatch_Release(obj); - } - - return hres; -} - -/* ECMA-262 3rd Edition 11.2.1 */ static HRESULT interp_array(exec_ctx_t *ctx) { VARIANT v, *namev; @@ -1470,42 +1303,6 @@ static HRESULT interp_array(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.2.1 */ -static HRESULT member_expression_eval(script_ctx_t *ctx, expression_t *_expr, jsexcept_t *ei, exprval_t *ret) -{ - member_expression_t *expr = (member_expression_t*)_expr; - IDispatch *obj = NULL; - VARIANT member; - DISPID id; - BSTR str; - HRESULT hres; - - TRACE("\n"); - - hres = expr_eval(ctx, expr->expression, ei, &member); - if(FAILED(hres)) - return hres; - - hres = to_object(ctx, &member, &obj); - VariantClear(&member); - if(FAILED(hres)) - return hres; - - str = SysAllocString(expr->identifier); - if(!str) { - IDispatch_Release(obj); - return E_OUTOFMEMORY; - } - - hres = disp_get_id(ctx, obj, str, fdexNameEnsure, &id); - SysFreeString(str); - if(SUCCEEDED(hres)) - exprval_set_idref(ret, obj, id); - - IDispatch_Release(obj); - return hres; -} - -/* ECMA-262 3rd Edition 11.2.1 */ static HRESULT interp_member(exec_ctx_t *ctx) { const BSTR arg = ctx->parser->code->instrs[ctx->ip].arg1.bstr; @@ -1715,25 +1512,6 @@ static HRESULT interp_this(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 10.1.4 */ -static HRESULT identifier_expression_eval(script_ctx_t *ctx, expression_t *_expr, jsexcept_t *ei, exprval_t *ret) -{ - identifier_expression_t *expr = (identifier_expression_t*)_expr; - BSTR identifier; - HRESULT hres; - - TRACE("\n"); - - identifier = SysAllocString(expr->identifier); - if(!identifier) - return E_OUTOFMEMORY; - - hres = identifier_eval(ctx, identifier, fdexNameEnsure, ei, ret); - - SysFreeString(identifier); - return hres; -} - -/* ECMA-262 3rd Edition 10.1.4 */ static HRESULT interp_ident(exec_ctx_t *ctx) { const BSTR arg = ctx->parser->code->instrs[ctx->ip].arg1.bstr; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 4f088b5..f137d8b 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -415,7 +415,6 @@ typedef struct { HRESULT compiled_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT while_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT for_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; -HRESULT forin_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT continue_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT break_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT return_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN;

1 0

Matteo Bruni : wined3d: Improve projection TEXTURETRANSFORMFLAGS handling in the ARB fragment ffp implementation .
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: fb38bad0c41359b97923b3a33e1fb65c36db5b4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb38bad0c41359b97923b3a33… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Dec 27 17:28:58 2011 +0100 wined3d: Improve projection TEXTURETRANSFORMFLAGS handling in the ARB fragment ffp implementation. --- dlls/wined3d/utils.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7786788..a521f4b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3035,14 +3035,14 @@ void gen_ffp_frag_op(const struct wined3d_device *device, const struct wined3d_s { ttff = state->texture_states[i][WINED3DTSS_TEXTURETRANSFORMFLAGS]; if (ttff == (WINED3DTTFF_PROJECTED | WINED3DTTFF_COUNT3)) - { settings->op[i].projected = proj_count3; - } else if(ttff == (WINED3DTTFF_PROJECTED | WINED3DTTFF_COUNT4)) { + else if (ttff & WINED3DTTFF_PROJECTED) settings->op[i].projected = proj_count4; - } else { + else settings->op[i].projected = proj_none; - } - } else { + } + else + { settings->op[i].projected = proj_none; }

1 0

Matteo Bruni : d3d9/tests: More D3DTSS_TEXTURETRANSFORMFLAGS projection tests.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: 8dee7989f242b8ea624abc3b1fe929494d1fd329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dee7989f242b8ea624abc3b1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Dec 27 17:28:59 2011 +0100 d3d9/tests: More D3DTSS_TEXTURETRANSFORMFLAGS projection tests. --- dlls/d3d9/tests/visual.c | 388 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 269 insertions(+), 119 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8dee7989f242b8ea624ab…

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

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

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