wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Francois Gouget : include: mshtml.idl should import dispex.idl.
by Alexandre Julliard 06 Jan '12

06 Jan '12

Module: wine Branch: master Commit: 80bee500b1560827544bfed2271ebc0c4d405f1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=80bee500b1560827544bfed22… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 6 09:23:23 2012 +0100 include: mshtml.idl should import dispex.idl. --- include/mshtml.idl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 2837b60..71d49e1 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -24,6 +24,7 @@ import "ocidl.idl"; import "dimm.idl"; import "shtypes.idl"; +import "dispex.idl"; cpp_quote("#include <olectl.h>")

1 0

Francois Gouget : include: ocmm.idl should import oleidl.idl.
by Alexandre Julliard 06 Jan '12

06 Jan '12

Module: wine Branch: master Commit: 94711b29fdcc8c701452fe3220b6dda5c129dd71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94711b29fdcc8c701452fe322… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 6 09:23:02 2012 +0100 include: ocmm.idl should import oleidl.idl. --- include/ocmm.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/ocmm.idl b/include/ocmm.idl index 57adf34..0d2c2c0 100644 --- a/include/ocmm.idl +++ b/include/ocmm.idl @@ -17,7 +17,7 @@ */ import "oaidl.idl"; -import "ocidl.idl"; +import "oleidl.idl"; cpp_quote("EXTERN_C const GUID NAMEDTIMER_DRAW;")

1 0

Francois Gouget : include: wincodec.idl should not import objidl.idl.
by Alexandre Julliard 06 Jan '12

06 Jan '12

Module: wine Branch: master Commit: 33ec4fbdc4febed037cb9f10516f65bd8fca1122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33ec4fbdc4febed037cb9f105… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 6 09:22:56 2012 +0100 include: wincodec.idl should not import objidl.idl. --- include/wincodec.idl | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 4c46cf4..a57c5b7 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -18,7 +18,6 @@ import "wtypes.idl"; import "propidl.idl"; -import "objidl.idl"; import "ocidl.idl"; cpp_quote("#define WINCODEC_SDK_VERSION 0x0236")

1 0

Alexandre Julliard : gdi32: Add an empty ExtEscape DIB driver entry point.
by Alexandre Julliard 06 Jan '12

06 Jan '12

Module: wine Branch: master Commit: 867be0e3e304ee7640b981bafc323f4560ed1d7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=867be0e3e304ee7640b981baf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 6 17:53:42 2012 +0100 gdi32: Add an empty ExtEscape DIB driver entry point. --- dlls/gdi32/dibdrv/dc.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index f223bc1..89d916b 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -418,6 +418,15 @@ static INT dibdrv_DescribePixelFormat( PHYSDEV dev, INT fmt, UINT size, PIXELFOR } /*********************************************************************** + * dibdrv_ExtEscape + */ +static INT dibdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_size, const void *in_data, + INT out_size, void *out_data ) +{ + return 0; +} + +/*********************************************************************** * dibdrv_GetDeviceGammaRamp */ static BOOL dibdrv_GetDeviceGammaRamp( PHYSDEV dev, void *ramp ) @@ -601,7 +610,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pEnumICMProfiles */ NULL, /* pExcludeClipRect */ NULL, /* pExtDeviceMode */ - NULL, /* pExtEscape */ + dibdrv_ExtEscape, /* pExtEscape */ dibdrv_ExtFloodFill, /* pExtFloodFill */ NULL, /* pExtSelectClipRgn */ dibdrv_ExtTextOut, /* pExtTextOut */

1 0

Alexandre Julliard : gdi32: Don't allow Get/ SetDeviceGammaRamp on DIBs or memory DCs.
by Alexandre Julliard 06 Jan '12

06 Jan '12

Module: wine Branch: master Commit: 56331e2a9a81cbe2af36ae24ead07d8b1b000efb URL: http://source.winehq.org/git/wine.git/?a=commit;h=56331e2a9a81cbe2af36ae24e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 6 17:45:16 2012 +0100 gdi32: Don't allow Get/SetDeviceGammaRamp on DIBs or memory DCs. --- dlls/gdi32/dibdrv/dc.c | 22 ++++++++++++++++++++-- dlls/gdi32/driver.c | 2 ++ dlls/gdi32/tests/dc.c | 27 +++++++++++++++++++++++++-- dlls/winex11.drv/xvidmode.c | 10 ++++++++++ 4 files changed, 57 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 2fbd6dd..f223bc1 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -418,6 +418,15 @@ static INT dibdrv_DescribePixelFormat( PHYSDEV dev, INT fmt, UINT size, PIXELFOR } /*********************************************************************** + * dibdrv_GetDeviceGammaRamp + */ +static BOOL dibdrv_GetDeviceGammaRamp( PHYSDEV dev, void *ramp ) +{ + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; +} + +/*********************************************************************** * dibdrv_GetPixelFormat */ static INT dibdrv_GetPixelFormat( PHYSDEV dev ) @@ -427,6 +436,15 @@ static INT dibdrv_GetPixelFormat( PHYSDEV dev ) } /*********************************************************************** + * dibdrv_SetDeviceGammaRamp + */ +static BOOL dibdrv_SetDeviceGammaRamp( PHYSDEV dev, void *ramp ) +{ + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; +} + +/*********************************************************************** * dibdrv_SetPixelFormat */ static BOOL dibdrv_SetPixelFormat( PHYSDEV dev, INT fmt, const PIXELFORMATDESCRIPTOR *pfd ) @@ -598,7 +616,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ NULL, /* pGetDeviceCaps */ - NULL, /* pGetDeviceGammaRamp */ + dibdrv_GetDeviceGammaRamp, /* pGetDeviceGammaRamp */ NULL, /* pGetFontData */ NULL, /* pGetFontUnicodeRanges */ NULL, /* pGetGlyphIndices */ @@ -660,7 +678,7 @@ const struct gdi_dc_funcs dib_driver = dibdrv_SetDIBColorTable, /* pSetDIBColorTable */ NULL, /* pSetDIBitsToDevice */ dibdrv_SetDeviceClipping, /* pSetDeviceClipping */ - NULL, /* pSetDeviceGammaRamp */ + dibdrv_SetDeviceGammaRamp, /* pSetDeviceGammaRamp */ NULL, /* pSetLayout */ NULL, /* pSetMapMode */ NULL, /* pSetMapperFlags */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index b21fb74..abb2d6a 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -355,6 +355,7 @@ static INT nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) static BOOL nulldrv_GetDeviceGammaRamp( PHYSDEV dev, void *ramp ) { + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } @@ -587,6 +588,7 @@ static DWORD nulldrv_SetLayout( PHYSDEV dev, DWORD layout ) static BOOL nulldrv_SetDeviceGammaRamp( PHYSDEV dev, void *ramp ) { + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 8c92b5e..922907a 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -305,22 +305,39 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) DESKTOPVERTRES, DESKTOPHORZRES, BLTALIGNMENT, - SHADEBLENDCAPS, - COLORMGMTCAPS + SHADEBLENDCAPS }; unsigned int i; + WORD ramp[3][256]; + BOOL ret; if (GetObjectType( hdc ) == OBJ_METADC) + { for (i = 0; i < sizeof(caps)/sizeof(caps[0]); i++) ok( GetDeviceCaps( hdc, caps[i] ) == (caps[i] == TECHNOLOGY ? DT_METAFILE : 0), "wrong caps on %s for %u: %u\n", descr, caps[i], GetDeviceCaps( hdc, caps[i] ) ); + + SetLastError( 0xdeadbeef ); + ret = GetDeviceGammaRamp( hdc, &ramp ); + ok( !ret, "GetDeviceGammaRamp succeeded on %s\n", descr ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */ + "wrong error %u on %s\n", GetLastError(), descr ); + } else + { for (i = 0; i < sizeof(caps)/sizeof(caps[0]); i++) ok( GetDeviceCaps( hdc, caps[i] ) == GetDeviceCaps( ref_dc, caps[i] ), "mismatched caps on %s for %u: %u/%u\n", descr, caps[i], GetDeviceCaps( hdc, caps[i] ), GetDeviceCaps( ref_dc, caps[i] ) ); + SetLastError( 0xdeadbeef ); + ret = GetDeviceGammaRamp( hdc, &ramp ); + ok( !ret, "GetDeviceGammaRamp succeeded on %s\n", descr ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */ + "wrong error %u on %s\n", GetLastError(), descr ); + } + if (GetObjectType( hdc ) == OBJ_MEMDC) { char buffer[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)]; @@ -342,6 +359,12 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) "mismatched caps on %s and DIB for %u: %u/%u\n", descr, caps[i], GetDeviceCaps( hdc, caps[i] ), GetDeviceCaps( ref_dc, caps[i] ) ); + SetLastError( 0xdeadbeef ); + ret = GetDeviceGammaRamp( hdc, &ramp ); + ok( !ret, "GetDeviceGammaRamp succeeded on %s\n", descr ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */ + "wrong error %u on %s\n", GetLastError(), descr ); + SelectObject( hdc, old ); DeleteObject( dib ); } diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index e279b70..e108dee 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -424,6 +424,11 @@ static BOOL X11DRV_XF86VM_SetGammaRamp(LPDDGAMMARAMP ramp) */ BOOL X11DRV_GetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) { + if (GetObjectType( dev->hdc ) == OBJ_MEMDC) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } #ifdef SONAME_LIBXXF86VM return X11DRV_XF86VM_GetGammaRamp(ramp); #else @@ -440,6 +445,11 @@ BOOL X11DRV_GetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) */ BOOL X11DRV_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) { + if (GetObjectType( dev->hdc ) == OBJ_MEMDC) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } #ifdef SONAME_LIBXXF86VM return X11DRV_XF86VM_SetGammaRamp(ramp); #else

1 0

Alexandre Julliard : gdi32: Add a stub for the ExtFloodFill entry point.
by Alexandre Julliard 06 Jan '12

06 Jan '12

Module: wine Branch: master Commit: bf718448f3415df1ab4a53265377555437529c87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf718448f3415df1ab4a53265… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 6 17:23:00 2012 +0100 gdi32: Add a stub for the ExtFloodFill entry point. --- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/graphics.c | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index ac506b2..2fbd6dd 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -584,7 +584,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pExcludeClipRect */ NULL, /* pExtDeviceMode */ NULL, /* pExtEscape */ - NULL, /* pExtFloodFill */ + dibdrv_ExtFloodFill, /* pExtFloodFill */ NULL, /* pExtSelectClipRgn */ dibdrv_ExtTextOut, /* pExtTextOut */ NULL, /* pFillPath */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 8327e34..2c980fe 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -119,6 +119,7 @@ extern DWORD dibdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct g extern BOOL dibdrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT start_x, INT start_y, INT end_x, INT end_y ) DECLSPEC_HIDDEN; extern BOOL dibdrv_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) DECLSPEC_HIDDEN; extern BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect, LPCWSTR str, UINT count, const INT *dx ) DECLSPEC_HIDDEN; extern DWORD dibdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 99be734..766514f 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -680,6 +680,15 @@ BOOL dibdrv_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) } /*********************************************************************** + * dibdrv_ExtFloodFill + */ +BOOL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) +{ + FIXME( "not implemented yet\n" ); + return TRUE; +} + +/*********************************************************************** * dibdrv_GetNearestColor */ COLORREF dibdrv_GetNearestColor( PHYSDEV dev, COLORREF color )

1 0

Alexandre Julliard : gdi32: Implement Arc, ArcTo, Chord, and Pie, using line segments for now.
by Alexandre Julliard 06 Jan '12

06 Jan '12

Module: wine Branch: master Commit: ff31a448b3b1c623ab21ea29229d0c94bbc0046f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff31a448b3b1c623ab21ea292… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 6 17:20:37 2012 +0100 gdi32: Implement Arc, ArcTo, Chord, and Pie, using line segments for now. --- dlls/gdi32/dibdrv/dc.c | 8 +- dlls/gdi32/dibdrv/dibdrv.h | 8 ++ dlls/gdi32/dibdrv/graphics.c | 229 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 241 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff31a448b3b1c623ab21e…

1 0

Alexandre Julliard : gdi32: Add a helper function for computing the device rect for PS_INSIDEFRAME.
by Alexandre Julliard 06 Jan '12

06 Jan '12

Module: wine Branch: master Commit: 92d5b41599a910539c7603f1f594e8b40afdf9c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92d5b41599a910539c7603f1f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 6 19:21:42 2012 +0100 gdi32: Add a helper function for computing the device rect for PS_INSIDEFRAME. --- dlls/gdi32/dibdrv/graphics.c | 39 +++++++++++++++++++-------------------- 1 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 108dd39..0cde4de 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -57,6 +57,21 @@ static RECT get_device_rect( HDC hdc, int left, int top, int right, int bottom, return rect; } +static BOOL get_pen_device_rect( dibdrv_physdev *dev, RECT *rect, int left, int top, int right, int bottom ) +{ + *rect = get_device_rect( dev->dev.hdc, left, top, right, bottom, TRUE ); + if (rect->left == rect->right || rect->top == rect->bottom) return FALSE; + + if (dev->pen_style == PS_INSIDEFRAME) + { + rect->left += dev->pen_width / 2; + rect->top += dev->pen_width / 2; + rect->right -= (dev->pen_width - 1) / 2; + rect->bottom -= (dev->pen_width - 1) / 2; + } + return TRUE; +} + /* compute the points for the first quadrant of an ellipse, counterclockwise from the x axis */ /* 'data' must contain enough space, (width+height)/2 is a reasonable upper bound */ static int ellipse_first_quadrant( int width, int height, POINT *data ) @@ -696,22 +711,14 @@ BOOL dibdrv_Polyline( PHYSDEV dev, const POINT* pt, INT count ) 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 ); + RECT rect; POINT pts[4]; BOOL ret; HRGN outline = 0; TRACE("(%p, %d, %d, %d, %d)\n", dev, left, top, right, bottom); - if(rect.left == rect.right || rect.top == rect.bottom) return TRUE; - - if (pdev->pen_style == PS_INSIDEFRAME) - { - rect.left += pdev->pen_width / 2; - rect.top += pdev->pen_width / 2; - rect.right -= (pdev->pen_width - 1) / 2; - rect.bottom -= (pdev->pen_width - 1) / 2; - } + if (!get_pen_device_rect( pdev, &rect, left, top, right, bottom )) return TRUE; if (pdev->pen_uses_region && !(outline = CreateRectRgn( 0, 0, 0, 0 ))) return FALSE; @@ -769,21 +776,13 @@ BOOL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT ellipse_width, INT ellipse_height ) { dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); - RECT rect = get_device_rect( dev->hdc, left, top, right, bottom, TRUE ); + RECT rect; POINT pt[2], *points; int i, end, count; BOOL ret = TRUE; HRGN outline = 0, interior = 0; - if (rect.left == rect.right || rect.top == rect.bottom) return TRUE; - - if (pdev->pen_style == PS_INSIDEFRAME) - { - rect.left += pdev->pen_width / 2; - rect.top += pdev->pen_width / 2; - rect.right -= (pdev->pen_width - 1) / 2; - rect.bottom -= (pdev->pen_width - 1) / 2; - } + if (!get_pen_device_rect( pdev, &rect, left, top, right, bottom )) return TRUE; pt[0].x = pt[0].y = 0; pt[1].x = ellipse_width;

1 0

Alexandre Julliard : gdi32: Implement Ellipse and RoundRect, using line segments for now.
by Alexandre Julliard 06 Jan '12

06 Jan '12

Module: wine Branch: master Commit: 5ff285629e58645a16c8a40d24df79256ed4b431 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ff285629e58645a16c8a40d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 6 12:55:15 2012 +0100 gdi32: Implement Ellipse and RoundRect, using line segments for now. --- dlls/gdi32/dibdrv/dc.c | 4 +- dlls/gdi32/dibdrv/dibdrv.h | 7 ++- dlls/gdi32/dibdrv/graphics.c | 165 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 172 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ff285629e58645a16c8a…

1 0

Alexandre Julliard : gdi32: Use a better algorithm for CreateRoundRectRgn.
by Alexandre Julliard 06 Jan '12

06 Jan '12

Module: wine Branch: master Commit: 3e51dd751568730d500b7ed7402fbf308a99f028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e51dd751568730d500b7ed74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 6 12:53:20 2012 +0100 gdi32: Use a better algorithm for CreateRoundRectRgn. --- dlls/gdi32/dibdrv/objects.c | 4 +- dlls/gdi32/region.c | 123 ++++++++++++++++++------------------------- 2 files changed, 53 insertions(+), 74 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index e18d715..de2339a 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1512,7 +1512,7 @@ static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close if (pdev->pen_join == PS_JOIN_ROUND || pdev->pen_endcap == PS_ENDCAP_ROUND) round_cap = CreateEllipticRgn( -(pdev->pen_width / 2), -(pdev->pen_width / 2), - (pdev->pen_width + 1) / 2, (pdev->pen_width + 1) / 2 ); + (pdev->pen_width + 1) / 2 + 1, (pdev->pen_width + 1) / 2 + 1 ); if (close) wide_line_segments( pdev, num, pts, TRUE, 0, num, &pts[0], &pts[0], round_cap, total ); @@ -1538,7 +1538,7 @@ static BOOL dashed_wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOO if (pdev->pen_join == PS_JOIN_ROUND || pdev->pen_endcap == PS_ENDCAP_ROUND) round_cap = CreateEllipticRgn( -(pdev->pen_width / 2), -(pdev->pen_width / 2), - (pdev->pen_width + 1) / 2, (pdev->pen_width + 1) / 2 ); + (pdev->pen_width + 1) / 2 + 1, (pdev->pen_width + 1) / 2 + 1); start = 0; cur_len = 0; diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 66ca1c3..336e56e 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -754,101 +754,80 @@ HRGN WINAPI CreateRoundRectRgn( INT left, INT top, { RGNOBJ * obj; HRGN hrgn = 0; - int asq, bsq, d, xd, yd; - RECT rect; + int a, b, i, x, y, asq, bsq, dx, dy, err; + RECT *rects; /* Make the dimensions sensible */ if (left > right) { INT tmp = left; left = right; right = tmp; } if (top > bottom) { INT tmp = top; top = bottom; bottom = tmp; } + /* the region is for the rectangle interior, but only at right and bottom for some reason */ + right--; + bottom--; - ellipse_width = abs(ellipse_width); - ellipse_height = abs(ellipse_height); - - /* Check parameters */ - - if (ellipse_width > right-left) ellipse_width = right-left; - if (ellipse_height > bottom-top) ellipse_height = bottom-top; + ellipse_width = min( right - left, abs( ellipse_width )); + ellipse_height = min( bottom - top, abs( ellipse_height )); /* Check if we can do a normal rectangle instead */ if ((ellipse_width < 2) || (ellipse_height < 2)) return CreateRectRgn( left, top, right, bottom ); - /* Create region */ - - d = (ellipse_height < 128) ? ((3 * ellipse_height) >> 2) : 64; if (!(obj = HeapAlloc( GetProcessHeap(), 0, sizeof(*obj) ))) return 0; - if (!init_region( &obj->rgn, d )) - { - HeapFree( GetProcessHeap(), 0, obj ); - return 0; - } + obj->rgn.size = ellipse_height; + obj->rgn.numRects = ellipse_height; + obj->rgn.extents.left = left; + obj->rgn.extents.top = top; + obj->rgn.extents.right = right; + obj->rgn.extents.bottom = bottom; - /* Ellipse algorithm, based on an article by K. Porter */ - /* in DDJ Graphics Programming Column, 8/89 */ + obj->rgn.rects = rects = HeapAlloc( GetProcessHeap(), 0, obj->rgn.size * sizeof(RECT) ); + if (!rects) goto done; - asq = ellipse_width * ellipse_width / 4; /* a^2 */ - bsq = ellipse_height * ellipse_height / 4; /* b^2 */ - d = bsq - asq * ellipse_height / 2 + asq / 4; /* b^2 - a^2b + a^2/4 */ - xd = 0; - yd = asq * ellipse_height; /* 2a^2b */ + /* based on an algorithm by Alois Zingl */ - rect.left = left + ellipse_width / 2; - rect.right = right - ellipse_width / 2; + a = ellipse_width - 1; + b = ellipse_height - 1; + asq = 8 * a * a; + bsq = 8 * b * b; + dx = 4 * b * b * (1 - a); + dy = 4 * a * a * (1 + (b % 2)); + err = dx + dy + a * a * (b % 2); - /* Loop to draw first half of quadrant */ + x = 0; + y = ellipse_height / 2; - while (xd < yd) + rects[y].left = left; + rects[y].right = right; + + while (x <= ellipse_width / 2) { - if (d > 0) /* if nearest pixel is toward the center */ - { - /* move toward center */ - rect.top = top++; - rect.bottom = rect.top + 1; - if (!REGION_UnionRectWithRegion( &rect, &obj->rgn )) goto done; - rect.top = --bottom; - rect.bottom = rect.top + 1; - if (!REGION_UnionRectWithRegion( &rect, &obj->rgn )) goto done; - yd -= 2*asq; - d -= yd; - } - rect.left--; /* next horiz point */ - rect.right++; - xd += 2*bsq; - d += bsq + xd; + int e2 = 2 * err; + if (e2 >= dx) + { + x++; + err += dx += bsq; + } + if (e2 <= dy) + { + y++; + err += dy += asq; + rects[y].left = left + x; + rects[y].right = right - x; + } } - - /* Loop to draw second half of quadrant */ - - d += (3 * (asq-bsq) / 2 - (xd+yd)) / 2; - while (yd >= 0) + for (i = 0; i < ellipse_height / 2; i++) { - /* next vertical point */ - rect.top = top++; - rect.bottom = rect.top + 1; - if (!REGION_UnionRectWithRegion( &rect, &obj->rgn )) goto done; - rect.top = --bottom; - rect.bottom = rect.top + 1; - if (!REGION_UnionRectWithRegion( &rect, &obj->rgn )) goto done; - if (d < 0) /* if nearest pixel is outside ellipse */ - { - rect.left--; /* move away from center */ - rect.right++; - xd += 2*bsq; - d += xd; - } - yd -= 2*asq; - d += asq - yd; + rects[i].left = rects[b - i].left; + rects[i].right = rects[b - i].right; + rects[i].top = top + i; + rects[i].bottom = rects[i].top + 1; } - - /* Add the inside rectangle */ - - if (top <= bottom) + rects[i - 1].bottom = bottom - ellipse_height + i; /* extend to bottom of rectangle */ + for (; i < ellipse_height; i++) { - rect.top = top; - rect.bottom = bottom; - if (!REGION_UnionRectWithRegion( &rect, &obj->rgn )) goto done; + rects[i].top = bottom - ellipse_height + i; + rects[i].bottom = rects[i].top + 1; } hrgn = alloc_gdi_handle( &obj->header, OBJ_REGION, &region_funcs );

1 0

← Newer
1
...
81
82
83
84
85
86
87
...
98
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 January 2012