April 2012 - Wine-commits - list.winehq.org

Henri Verbeet : d3d9: COM cleanup for the IDirect3DVertexDeclaration9 interface.
by Alexandre Julliard 13 Apr '12

13 Apr '12

Module: wine Branch: master Commit: 949f7b45244d77bfd839307ee002fa1bc6ca52d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=949f7b45244d77bfd839307ee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 12 22:49:03 2012 +0200 d3d9: COM cleanup for the IDirect3DVertexDeclaration9 interface. --- dlls/d3d9/buffer.c | 1 - dlls/d3d9/d3d9_private.h | 5 +++- dlls/d3d9/device.c | 11 ++++--- dlls/d3d9/shader.c | 1 - dlls/d3d9/surface.c | 1 - dlls/d3d9/vertexdeclaration.c | 61 +++++++++++++++++++++++++--------------- 6 files changed, 48 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=949f7b45244d77bfd8393…

1 0

Henri Verbeet : wined3d: Unify the wined3d_mapped_rect and wined3d_mapped_box structures.
by Alexandre Julliard 13 Apr '12

13 Apr '12

Module: wine Branch: master Commit: 8cef8b358760b17de780f0093f653c0c7e6afebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cef8b358760b17de780f0093… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 12 22:49:04 2012 +0200 wined3d: Unify the wined3d_mapped_rect and wined3d_mapped_box structures. --- dlls/d3d10core/texture.c | 2 +- dlls/d3d8/surface.c | 27 +++++++++++++++++---------- dlls/d3d8/volume.c | 12 ++++++++---- dlls/d3d9/surface.c | 11 ++++++++--- dlls/d3d9/volume.c | 12 ++++++++---- dlls/ddraw/surface.c | 16 ++++++++-------- dlls/wined3d/device.c | 20 +++++++++----------- dlls/wined3d/surface.c | 29 +++++++++++++++-------------- dlls/wined3d/volume.c | 20 ++++++++++---------- include/wine/wined3d.h | 12 +++--------- 10 files changed, 87 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8cef8b358760b17de780f…

1 0

Henri Verbeet : include: Fix a couple of ID3DXSaveUserData prototypes.
by Alexandre Julliard 13 Apr '12

13 Apr '12

Module: wine Branch: master Commit: bdcc868ec473739076204e1fb6f3dec68af7a7bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdcc868ec473739076204e1fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 12 22:49:05 2012 +0200 include: Fix a couple of ID3DXSaveUserData prototypes. --- include/d3dx9anim.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index 142acba..1e31299 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -192,10 +192,10 @@ DECLARE_INTERFACE(ID3DXLoadUserData) #define INTERFACE ID3DXSaveUserData DECLARE_INTERFACE(ID3DXSaveUserData) { - STDMETHOD(AddFrameChildData)(CONST LPD3DXFRAME *frame, LPD3DXFILESAVEOBJECT save_obj, - LPD3DXFILESAVEDATA frame_data) PURE; - STDMETHOD(AddMeshChildData)(CONST LPD3DXMESHCONTAINER *mesh_container, - LPD3DXFILESAVEOBJECT save_obj, LPD3DXFILESAVEDATA mesh_data) PURE; + STDMETHOD(AddFrameChildData)(const D3DXFRAME *frame, + ID3DXFileSaveObject *save_obj, ID3DXFileSaveData *frame_data) PURE; + STDMETHOD(AddMeshChildData)(const D3DXMESHCONTAINER *mesh_container, + ID3DXFileSaveObject *save_obj, ID3DXFileSaveData *mesh_data) PURE; STDMETHOD(AddTopLevelDataObjectsPre)(LPD3DXFILESAVEOBJECT save_obj) PURE; STDMETHOD(AddTopLevelDataObjectsPost)(LPD3DXFILESAVEOBJECT save_obj) PURE; STDMETHOD(RegisterTemplates)(LPD3DXFILE xfile) PURE;

1 0

Henri Verbeet : d3dx9: Don' t return a pointer to the implementation in ID3DXBaseEffectImpl_QueryInterface ().
by Alexandre Julliard 13 Apr '12

13 Apr '12

Module: wine Branch: master Commit: 2b1da8c77f4cb2509876281e2bf7a361d6c865f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b1da8c77f4cb2509876281e2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 12 22:49:06 2012 +0200 d3dx9: Don't return a pointer to the implementation in ID3DXBaseEffectImpl_QueryInterface(). --- dlls/d3dx9_36/effect.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c76bdef..b8509b1 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1116,15 +1116,13 @@ static inline struct ID3DXBaseEffectImpl *impl_from_ID3DXBaseEffect(ID3DXBaseEff /*** IUnknown methods ***/ static HRESULT WINAPI ID3DXBaseEffectImpl_QueryInterface(ID3DXBaseEffect *iface, REFIID riid, void **object) { - struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); - - TRACE("iface %p, riid %s, object %p\n", This, debugstr_guid(riid), object); + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXBaseEffect)) { - This->ID3DXBaseEffect_iface.lpVtbl->AddRef(iface); - *object = This; + iface->lpVtbl->AddRef(iface); + *object = iface; return S_OK; }

1 0

Alexandre Julliard : gdi32: Move the pen/brush_region helpers to graphics. c and avoid redundant clipping.
by Alexandre Julliard 13 Apr '12

13 Apr '12

Module: wine Branch: master Commit: 568afc210ef3639e4170dc65497e2f4eee85413f URL: http://source.winehq.org/git/wine.git/?a=commit;h=568afc210ef3639e4170dc654… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 13:36:23 2012 +0200 gdi32: Move the pen/brush_region helpers to graphics.c and avoid redundant clipping. --- dlls/gdi32/dibdrv/dibdrv.h | 2 -- dlls/gdi32/dibdrv/graphics.c | 16 ++++++++++++++-- dlls/gdi32/dibdrv/objects.c | 14 -------------- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index fb7eb21..b374840 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -245,8 +245,6 @@ 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, dib_brush *brush, 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 2f67efe..5cffeac 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -26,6 +26,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(dib); +/* paint a region with the brush (note: the region can be modified) */ +static BOOL brush_region( dibdrv_physdev *pdev, HRGN region ) +{ + if (pdev->clip) CombineRgn( region, region, pdev->clip, RGN_AND ); + return brush_rect( pdev, &pdev->brush, NULL, region, GetROP2( pdev->dev.hdc )); +} + +/* paint a region with the pen (note: the region can be modified) */ +static BOOL pen_region( dibdrv_physdev *pdev, HRGN region ) +{ + if (pdev->clip) CombineRgn( region, region, pdev->clip, RGN_AND ); + return brush_rect( pdev, &pdev->pen_brush, NULL, region, GetROP2( pdev->dev.hdc )); +} + static RECT get_device_rect( HDC hdc, int left, int top, int right, int bottom, BOOL rtl_correction ) { RECT rect; @@ -813,7 +827,6 @@ BOOL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) if (region) { - if (pdev->clip) CombineRgn( region, region, pdev->clip, RGN_AND ); ret = pen_region( pdev, region ); DeleteObject( region ); } @@ -968,7 +981,6 @@ 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_region( pdev, outline ); DeleteObject( outline ); } diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index a9d6ca5..acb7091 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -2162,17 +2162,3 @@ BOOL brush_rect(dibdrv_physdev *pdev, dib_brush *brush, const RECT *rect, HRGN c free_clipped_rects( &clipped_rects ); return ret; } - -/* 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, &pdev->brush, 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 ) -{ - if (pdev->clip) CombineRgn( region, region, pdev->clip, RGN_AND ); - return brush_rect( pdev, &pdev->pen_brush, NULL, region, GetROP2( pdev->dev.hdc )); -}

1 0

Alexandre Julliard : gdi32: Map all the points at once in PolyPolyline, similarly to what PolyPolygon does.
by Alexandre Julliard 13 Apr '12

13 Apr '12

Module: wine Branch: master Commit: ea5fa7ddbef2ac8bbbfc12fee12a1761573d99a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea5fa7ddbef2ac8bbbfc12fee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 13:39:06 2012 +0200 gdi32: Map all the points at once in PolyPolyline, similarly to what PolyPolygon does. --- dlls/gdi32/dibdrv/graphics.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 5cffeac..d29c405 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -949,19 +949,21 @@ BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polylines ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); - DWORD max_points = 0, i; + DWORD total, pos, i; POINT *points; BOOL ret = TRUE; HRGN outline = 0; - for (i = 0; i < polylines; i++) + for (i = total = 0; i < polylines; i++) { if (counts[i] < 2) return FALSE; - max_points = max( counts[i], max_points ); + total += counts[i]; } - points = HeapAlloc( GetProcessHeap(), 0, max_points * sizeof(*pt) ); + points = HeapAlloc( GetProcessHeap(), 0, total * sizeof(*pt) ); if (!points) return FALSE; + memcpy( points, pt, total * sizeof(*pt) ); + LPtoDP( dev->hdc, points, total ); if (pdev->pen_uses_region && !(outline = CreateRectRgn( 0, 0, 0, 0 ))) { @@ -969,14 +971,11 @@ BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWO return FALSE; } - for (i = 0; i < polylines; i++) + for (i = pos = 0; i < polylines; i++) { - memcpy( points, pt, counts[i] * sizeof(*pt) ); - pt += counts[i]; - LPtoDP( dev->hdc, points, counts[i] ); - reset_dash_origin( pdev ); - pdev->pen_lines( pdev, counts[i], points, FALSE, outline ); + pdev->pen_lines( pdev, counts[i], points + pos, FALSE, outline ); + pos += counts[i]; } if (outline)

1 0

Alexandre Julliard : gdi32: Avoid redundant computation of the gradient bounding rectangle.
by Alexandre Julliard 13 Apr '12

13 Apr '12

Module: wine Branch: master Commit: 6c028b19c5467a4614fe475e058b71b452727ed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c028b19c5467a4614fe475e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 13:41:16 2012 +0200 gdi32: Avoid redundant computation of the gradient bounding rectangle. --- dlls/gdi32/dibdrv/bitblt.c | 79 ++++++++++++++++--------------------------- 1 files changed, 30 insertions(+), 49 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index c3acb8c..dd9525f 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -573,7 +573,7 @@ static DWORD blend_rect( dib_info *dst, const RECT *dst_rect, const dib_info *sr /* compute y-ordered, device coords vertices for a horizontal rectangle gradient */ static void get_gradient_hrect_vertices( const GRADIENT_RECT *rect, const TRIVERTEX *vert, - const POINT *dev_pts, TRIVERTEX v[2] ) + const POINT *dev_pts, TRIVERTEX v[2], RECT *bounds ) { int v0 = rect->UpperLeft; int v1 = rect->LowerRight; @@ -585,15 +585,15 @@ static void get_gradient_hrect_vertices( const GRADIENT_RECT *rect, const TRIVER } v[0] = vert[v0]; v[1] = vert[v1]; - v[0].x = dev_pts[v0].x; - v[1].x = dev_pts[v1].x; - v[0].y = min( dev_pts[v0].y, dev_pts[v1].y ); - v[1].y = max( dev_pts[v0].y, dev_pts[v1].y ); + bounds->left = v[0].x = dev_pts[v0].x; + bounds->right = v[1].x = dev_pts[v1].x; + bounds->top = v[0].y = min( dev_pts[v0].y, dev_pts[v1].y ); + bounds->bottom = v[1].y = max( dev_pts[v0].y, dev_pts[v1].y ); } /* compute y-ordered, device coords vertices for a vertical rectangle gradient */ static void get_gradient_vrect_vertices( const GRADIENT_RECT *rect, const TRIVERTEX *vert, - const POINT *dev_pts, TRIVERTEX v[2] ) + const POINT *dev_pts, TRIVERTEX v[2], RECT *bounds ) { int v0 = rect->UpperLeft; int v1 = rect->LowerRight; @@ -605,15 +605,15 @@ static void get_gradient_vrect_vertices( const GRADIENT_RECT *rect, const TRIVER } v[0] = vert[v0]; v[1] = vert[v1]; - v[0].x = min( dev_pts[v0].x, dev_pts[v1].x ); - v[1].x = max( dev_pts[v0].x, dev_pts[v1].x ); - v[0].y = dev_pts[v0].y; - v[1].y = dev_pts[v1].y; + bounds->left = v[0].x = min( dev_pts[v0].x, dev_pts[v1].x ); + bounds->right = v[1].x = max( dev_pts[v0].x, dev_pts[v1].x ); + bounds->top = v[0].y = dev_pts[v0].y; + bounds->bottom = v[1].y = dev_pts[v1].y; } /* compute y-ordered, device coords vertices for a triangle gradient */ static void get_gradient_triangle_vertices( const GRADIENT_TRIANGLE *tri, const TRIVERTEX *vert, - const POINT *dev_pts, TRIVERTEX v[3] ) + const POINT *dev_pts, TRIVERTEX v[3], RECT *bounds ) { int v0, v1, v2; @@ -644,31 +644,19 @@ static void get_gradient_triangle_vertices( const GRADIENT_TRIANGLE *tri, const v[1].x = dev_pts[v1].x; v[2].x = dev_pts[v2].x; v[2].y = dev_pts[v2].y; + bounds->left = min( v[0].x, min( v[1].x, v[2].x )); + bounds->top = v[0].y; + bounds->right = max( v[0].x, max( v[1].x, v[2].x )); + bounds->bottom = v[2].y; } -static BOOL gradient_rect( dib_info *dib, TRIVERTEX *v, int mode, HRGN clip ) +static BOOL gradient_rect( dib_info *dib, TRIVERTEX *v, int mode, HRGN clip, const RECT *bounds ) { int i; struct clipped_rects clipped_rects; - RECT rect; BOOL ret = TRUE; - if (mode == GRADIENT_FILL_TRIANGLE) - { - rect.left = min( v[0].x, min( v[1].x, v[2].x )); - rect.top = v[0].y; - rect.right = max( v[0].x, max( v[1].x, v[2].x )); - rect.bottom = v[2].y; - } - else - { - rect.left = v[0].x; - rect.top = v[0].y; - rect.right = v[1].x; - rect.bottom = v[1].y; - } - - if (!get_clipped_rects( dib, &rect, clip, &clipped_rects )) return TRUE; + if (!get_clipped_rects( dib, bounds, clip, &clipped_rects )) return TRUE; for (i = 0; i < clipped_rects.count; i++) { if (!(ret = dib->funcs->gradient_rect( dib, &clipped_rects.rects[i], v, mode ))) break; @@ -1298,12 +1286,8 @@ DWORD gradient_bitmapinfo( const BITMAPINFO *info, void *bits, TRIVERTEX *vert_a case GRADIENT_FILL_RECT_H: for (i = 0; i < ngrad; i++, rect++) { - get_gradient_hrect_vertices( rect, vert_array, dev_pts, vert ); - gradient_rect( &dib, vert, mode, 0 ); - rc.left = vert[0].x; - rc.top = vert[0].y; - rc.right = vert[1].x; - rc.bottom = vert[1].y; + get_gradient_hrect_vertices( rect, vert_array, dev_pts, vert, &rc ); + gradient_rect( &dib, vert, mode, 0, &rc ); add_rect_to_region( rgn, &rc ); } break; @@ -1311,12 +1295,8 @@ DWORD gradient_bitmapinfo( const BITMAPINFO *info, void *bits, TRIVERTEX *vert_a case GRADIENT_FILL_RECT_V: for (i = 0; i < ngrad; i++, rect++) { - get_gradient_vrect_vertices( rect, vert_array, dev_pts, vert ); - gradient_rect( &dib, vert, mode, 0 ); - rc.left = vert[0].x; - rc.top = vert[0].y; - rc.right = vert[1].x; - rc.bottom = vert[1].y; + get_gradient_vrect_vertices( rect, vert_array, dev_pts, vert, &rc ); + gradient_rect( &dib, vert, mode, 0, &rc ); add_rect_to_region( rgn, &rc ); } break; @@ -1324,8 +1304,8 @@ DWORD gradient_bitmapinfo( const BITMAPINFO *info, void *bits, TRIVERTEX *vert_a case GRADIENT_FILL_TRIANGLE: for (i = 0; i < ngrad; i++, tri++) { - get_gradient_triangle_vertices( tri, vert_array, dev_pts, vert ); - if (gradient_rect( &dib, vert, mode, 0 )) + get_gradient_triangle_vertices( tri, vert_array, dev_pts, vert, &rc ); + if (gradient_rect( &dib, vert, mode, 0, &rc )) { for (y = vert[0].y; y < vert[2].y; y++) { @@ -1405,6 +1385,7 @@ BOOL dibdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, unsigned int i; POINT *pts; TRIVERTEX vert[3]; + RECT bounds; BOOL ret = TRUE; if (!(pts = HeapAlloc( GetProcessHeap(), 0, nvert * sizeof(*pts) ))) return FALSE; @@ -1420,33 +1401,33 @@ BOOL dibdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, case GRADIENT_FILL_RECT_H: for (i = 0; i < ngrad; i++, rect++) { - get_gradient_hrect_vertices( rect, vert_array, pts, vert ); + get_gradient_hrect_vertices( rect, vert_array, pts, vert, &bounds ); /* Windows bug: no alpha on a8r8g8b8 created with bitfields */ if (pdev->dib.funcs == &funcs_8888 && pdev->dib.compression == BI_BITFIELDS) vert[0].Alpha = vert[1].Alpha = 0; - gradient_rect( &pdev->dib, vert, mode, pdev->clip ); + gradient_rect( &pdev->dib, vert, mode, pdev->clip, &bounds ); } break; case GRADIENT_FILL_RECT_V: for (i = 0; i < ngrad; i++, rect++) { - get_gradient_vrect_vertices( rect, vert_array, pts, vert ); + get_gradient_vrect_vertices( rect, vert_array, pts, vert, &bounds ); /* Windows bug: no alpha on a8r8g8b8 created with bitfields */ if (pdev->dib.funcs == &funcs_8888 && pdev->dib.compression == BI_BITFIELDS) vert[0].Alpha = vert[1].Alpha = 0; - gradient_rect( &pdev->dib, vert, mode, pdev->clip ); + gradient_rect( &pdev->dib, vert, mode, pdev->clip, &bounds ); } break; case GRADIENT_FILL_TRIANGLE: for (i = 0; i < ngrad; i++, tri++) { - get_gradient_triangle_vertices( tri, vert_array, pts, vert ); + get_gradient_triangle_vertices( tri, vert_array, pts, vert, &bounds ); /* Windows bug: no alpha on a8r8g8b8 created with bitfields */ if (pdev->dib.funcs == &funcs_8888 && pdev->dib.compression == BI_BITFIELDS) vert[0].Alpha = vert[1].Alpha = vert[2].Alpha = 0; - if (!gradient_rect( &pdev->dib, vert, mode, pdev->clip )) ret = FALSE; + if (!gradient_rect( &pdev->dib, vert, mode, pdev->clip, &bounds )) ret = FALSE; } break; }

1 0

Alexandre Julliard : gdi32/tests: Add test cases for wide pen bounding rectangles.
by Alexandre Julliard 13 Apr '12

13 Apr '12

Module: wine Branch: master Commit: 81fcb10977780207bb0e932b039a3f60fe9b0775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81fcb10977780207bb0e932b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 13:42:58 2012 +0200 gdi32/tests: Add test cases for wide pen bounding rectangles. --- dlls/gdi32/tests/dc.c | 61 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 54 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 324e65b..4b8567d 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -744,7 +744,7 @@ static void test_boundsrect(void) HBITMAP bitmap, dib, old; RECT rect, expect, set_rect; UINT ret; - int level; + int i, level; hdc = CreateCompatibleDC(0); ok(hdc != NULL, "CreateCompatibleDC failed\n"); @@ -952,8 +952,8 @@ static void test_boundsrect(void) memset( buffer, 0, sizeof(buffer) ); info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - info->bmiHeader.biWidth = 64; - info->bmiHeader.biHeight = 64; + info->bmiHeader.biWidth = 256; + info->bmiHeader.biHeight = 256; info->bmiHeader.biPlanes = 1; info->bmiHeader.biBitCount = 8; info->bmiHeader.biCompression = BI_RGB; @@ -971,19 +971,66 @@ static void test_boundsrect(void) SetRect( &expect, 6, 6, 56, 51 ); todo_wine ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); - LineTo( hdc, 100, 30 ); + LineTo( hdc, 300, 30 ); ret = GetBoundsRect( hdc, &rect, 0 ); ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); - SetRect( &expect, 6, 6, 64, 51 ); + SetRect( &expect, 6, 6, 256, 51 ); todo_wine ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); - LineTo( hdc, -100, -100 ); + LineTo( hdc, -300, -300 ); ret = GetBoundsRect( hdc, &rect, 0 ); ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); - SetRect( &expect, 0, 0, 64, 51 ); + SetRect( &expect, 0, 0, 256, 51 ); todo_wine ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); + /* test the wide pen heuristics */ + SetBoundsRect( hdc, NULL, DCB_ENABLE | DCB_RESET ); + for (i = 0; i < 1000; i++) + { + static const UINT endcaps[3] = { PS_ENDCAP_ROUND, PS_ENDCAP_SQUARE, PS_ENDCAP_FLAT }; + static const UINT joins[3] = { PS_JOIN_ROUND, PS_JOIN_BEVEL, PS_JOIN_MITER }; + LOGBRUSH brush = { BS_SOLID, RGB(0,0,0), 0 }; + UINT join = joins[i % 3]; + UINT endcap = endcaps[(i / 3) % 3]; + INT inflate, width = 1 + i / 9; + HPEN pen = ExtCreatePen( PS_GEOMETRIC | join | endcap | PS_SOLID, width, &brush, 0, NULL ); + HPEN old = SelectObject( hdc, pen ); + MoveToEx( hdc, 100, 100, NULL ); + LineTo( hdc, 160, 100 ); + LineTo( hdc, 100, 160 ); + LineTo( hdc, 160, 160 ); + GetBoundsRect( hdc, &rect, DCB_RESET ); + SetRect( &expect, 100, 100, 161, 161 ); + + inflate = width + 2; + if (join == PS_JOIN_MITER) + { + inflate *= 5; + if (endcap == PS_ENDCAP_SQUARE) + InflateRect( &expect, (inflate * 3 + 1) / 2, (inflate * 3 + 1) / 2 ); + else + InflateRect( &expect, inflate, inflate ); + } + else + { + if (endcap == PS_ENDCAP_SQUARE) + InflateRect( &expect, inflate - inflate / 4, inflate - inflate / 4 ); + else + InflateRect( &expect, (inflate + 1) / 2, (inflate + 1) / 2 ); + } + expect.left = max( expect.left, 0 ); + expect.top = max( expect.top, 0 ); + expect.right = min( expect.right, 256 ); + expect.bottom = min( expect.bottom, 256 ); + todo_wine + ok( EqualRect(&rect, &expect), + "Got %d,%d,%d,%d expected %d,%d,%d,%d %u/%x/%x\n", + rect.left, rect.top, rect.right, rect.bottom, + expect.left, expect.top, expect.right, expect.bottom, width, endcap, join ); + DeleteObject( SelectObject( hdc, old )); + } + DeleteDC( hdc ); DeleteObject( bitmap ); DeleteObject( dib );

1 0

Jacek Caban : mshtml: Improved helper for returning color as VARIANT in HTMLBodyElement implementation .
by Alexandre Julliard 13 Apr '12

13 Apr '12

Module: wine Branch: master Commit: 4c66a4626bef026cf496585ac64d85d4c1ec10f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c66a4626bef026cf496585ac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 13 12:00:55 2012 +0200 mshtml: Improved helper for returning color as VARIANT in HTMLBodyElement implementation. --- dlls/mshtml/htmlbody.c | 40 ++++++++++++++++++---------------------- 1 files changed, 18 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 26f5574..d96142a 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -178,10 +178,16 @@ static BOOL variant_to_nscolor(const VARIANT *v, nsAString *nsstr) } -static void nscolor_to_variant(const nsAString *nsstr, VARIANT *p) +static HRESULT return_nscolor(nsresult nsres, nsAString *nsstr, VARIANT *p) { const PRUnichar *color; + if(NS_FAILED(nsres)) { + ERR("failed: %08x\n", nsres); + nsAString_Finish(nsstr); + return E_FAIL; + } + nsAString_GetData(nsstr, &color); if(*color == '#') { @@ -190,7 +196,15 @@ static void nscolor_to_variant(const nsAString *nsstr, VARIANT *p) }else { V_VT(p) = VT_BSTR; V_BSTR(p) = SysAllocString(color); + if(!V_BSTR(p)) { + nsAString_Finish(nsstr); + return E_OUTOFMEMORY; + } } + + nsAString_Finish(nsstr); + TRACE("ret %s\n", debugstr_variant(p)); + return S_OK; } static inline HTMLBodyElement *impl_from_IHTMLBodyElement(IHTMLBodyElement *iface) @@ -502,13 +516,7 @@ static HRESULT WINAPI HTMLBodyElement_get_link(IHTMLBodyElement *iface, VARIANT nsAString_Init(&link_str, NULL); nsres = nsIDOMHTMLBodyElement_GetLink(This->nsbody, &link_str); - if(NS_FAILED(nsres)) - ERR("GetLink failed: %08x\n", nsres); - - nscolor_to_variant(&link_str, p); - nsAString_Finish(&link_str); - - return S_OK; + return return_nscolor(nsres, &link_str, p); } static HRESULT WINAPI HTMLBodyElement_put_vLink(IHTMLBodyElement *iface, VARIANT v) @@ -540,13 +548,7 @@ static HRESULT WINAPI HTMLBodyElement_get_vLink(IHTMLBodyElement *iface, VARIANT nsAString_Init(&vlink_str, NULL); nsres = nsIDOMHTMLBodyElement_GetVLink(This->nsbody, &vlink_str); - if(NS_FAILED(nsres)) - ERR("GetLink failed: %08x\n", nsres); - - nscolor_to_variant(&vlink_str, p); - nsAString_Finish(&vlink_str); - - return S_OK; + return return_nscolor(nsres, &vlink_str, p); } static HRESULT WINAPI HTMLBodyElement_put_aLink(IHTMLBodyElement *iface, VARIANT v) @@ -578,13 +580,7 @@ static HRESULT WINAPI HTMLBodyElement_get_aLink(IHTMLBodyElement *iface, VARIANT nsAString_Init(&alink_str, NULL); nsres = nsIDOMHTMLBodyElement_GetALink(This->nsbody, &alink_str); - if(NS_FAILED(nsres)) - ERR("GetALink failed: %08x\n", nsres); - - nscolor_to_variant(&alink_str, p); - nsAString_Finish(&alink_str); - - return S_OK; + return return_nscolor(nsres, &alink_str, p); } static HRESULT WINAPI HTMLBodyElement_put_onload(IHTMLBodyElement *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Use return_nsstr helper in IHTMLBodyElement:: get_background implementation.
by Alexandre Julliard 13 Apr '12

13 Apr '12

Module: wine Branch: master Commit: b43cd188df54e2546d8b03e2b49842ac6ee29d2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b43cd188df54e2546d8b03e2b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 13 12:02:11 2012 +0200 mshtml: Use return_nsstr helper in IHTMLBodyElement::get_background implementation. --- dlls/mshtml/htmlbody.c | 15 +-------------- 1 files changed, 1 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index d96142a..fb22128 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -293,21 +293,8 @@ static HRESULT WINAPI HTMLBodyElement_get_background(IHTMLBodyElement *iface, BS TRACE("(%p)->(%p)\n", This, p); nsAString_Init(&background_str, NULL); - nsres = nsIDOMHTMLBodyElement_GetBackground(This->nsbody, &background_str); - if(NS_SUCCEEDED(nsres)) { - const PRUnichar *background; - nsAString_GetData(&background_str, &background); - *p = *background ? SysAllocString(background) : NULL; - }else { - ERR("GetBackground failed: %08x\n", nsres); - *p = NULL; - } - - nsAString_Finish(&background_str); - - TRACE("*p = %s\n", debugstr_w(*p)); - return S_OK; + return return_nsstr(nsres, &background_str, p); } static HRESULT WINAPI HTMLBodyElement_put_bgProperties(IHTMLBodyElement *iface, BSTR v)

1 0