December 2011 - Wine-commits

Alexandre Julliard : gdi32: Add a helper function to compute the list of rectangles to paint after clipping .
by Alexandre Julliard 27 Dec '11

27 Dec '11

Module: wine Branch: master Commit: b761d0e1c672c7dc27287ea0864d7a93f7a5e1e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b761d0e1c672c7dc27287ea08… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 27 14:31:11 2011 +0100 gdi32: Add a helper function to compute the list of rectangles to paint after clipping. --- dlls/gdi32/dibdrv/bitblt.c | 49 +++++++++++------------------------------ dlls/gdi32/dibdrv/dc.c | 43 ++++++++++++++++++++++++++++++++++++- dlls/gdi32/dibdrv/dibdrv.h | 19 ++++++++++++++++ dlls/gdi32/dibdrv/graphics.c | 27 +++++++--------------- dlls/gdi32/gdi_private.h | 6 ----- 5 files changed, 83 insertions(+), 61 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index ad329be..b862ebb 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -576,28 +576,17 @@ static DWORD blend_rect( dib_info *dst, const RECT *dst_rect, const dib_info *sr HRGN clip, BLENDFUNCTION blend ) { POINT origin; - RECT clipped_rect; - const WINEREGION *clip_data; + struct clipped_rects clipped_rects; int i; - origin.x = src_rect->left; - origin.y = src_rect->top; - - if (clip == NULL) dst->funcs->blend_rect( dst, dst_rect, src, &origin, blend ); - else + if (!get_clipped_rects( dst, dst_rect, clip, &clipped_rects )) return ERROR_SUCCESS; + for (i = 0; i < clipped_rects.count; i++) { - clip_data = get_wine_region( clip ); - for (i = 0; i < clip_data->numRects; i++) - { - if (intersect_rect( &clipped_rect, dst_rect, clip_data->rects + i )) - { - origin.x = src_rect->left + clipped_rect.left - dst_rect->left; - origin.y = src_rect->top + clipped_rect.top - dst_rect->top; - dst->funcs->blend_rect( dst, &clipped_rect, src, &origin, blend ); - } - } - release_wine_region( clip ); + origin.x = src_rect->left + clipped_rects.rects[i].left - dst_rect->left; + origin.y = src_rect->top + clipped_rects.rects[i].top - dst_rect->top; + dst->funcs->blend_rect( dst, &clipped_rects.rects[i], src, &origin, blend ); } + free_clipped_rects( &clipped_rects ); return ERROR_SUCCESS; } @@ -679,7 +668,8 @@ static void get_gradient_triangle_vertices( const GRADIENT_TRIANGLE *tri, const static BOOL gradient_rect( dib_info *dib, TRIVERTEX *v, int mode, HRGN clip ) { int i; - RECT rect, clipped_rect; + struct clipped_rects clipped_rects; + RECT rect; BOOL ret = TRUE; if (mode == GRADIENT_FILL_TRIANGLE) @@ -696,26 +686,13 @@ static BOOL gradient_rect( dib_info *dib, TRIVERTEX *v, int mode, HRGN clip ) rect.right = v[1].x; rect.bottom = v[1].y; } - rect.left = max( rect.left, 0 ); - rect.top = max( rect.top, 0 ); - rect.right = min( rect.right, dib->width ); - rect.bottom = min( rect.bottom, dib->height ); - if (clip) + if (!get_clipped_rects( dib, &rect, clip, &clipped_rects )) return TRUE; + for (i = 0; i < clipped_rects.count; i++) { - const WINEREGION *clip_data = get_wine_region( clip ); - - for (i = 0; i < clip_data->numRects; i++) - { - if (intersect_rect( &clipped_rect, &rect, clip_data->rects + i )) - { - if (!(ret = dib->funcs->gradient_rect( dib, &clipped_rect, v, mode ))) break; - } - } - release_wine_region( clip ); + if (!(ret = dib->funcs->gradient_rect( dib, &clipped_rects.rects[i], v, mode ))) break; } - else if (!is_rect_empty( &rect )) ret = dib->funcs->gradient_rect( dib, &rect, v, mode ); - + free_clipped_rects( &clipped_rects ); return ret; } diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index cdcbd19..404ead2 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -257,7 +257,48 @@ DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bit return ERROR_SUCCESS; } - /*********************************************************************** +int get_clipped_rects( const dib_info *dib, const RECT *rc, HRGN clip, struct clipped_rects *clip_rects ) +{ + const WINEREGION *region; + RECT rect, *out = clip_rects->buffer; + int i; + + init_clipped_rects( clip_rects ); + + rect.left = 0; + rect.top = 0; + rect.right = dib->width; + rect.bottom = dib->height; + if (rc && !intersect_rect( &rect, &rect, rc )) return 0; + + if (!clip) + { + *out = rect; + clip_rects->count = 1; + return 1; + } + + if (!(region = get_wine_region( clip ))) return 0; + + for (i = 0; i < region->numRects; i++) + { + if (region->rects[i].top >= rect.bottom) break; + if (!intersect_rect( out, &rect, &region->rects[i] )) continue; + out++; + if (out == &clip_rects->buffer[sizeof(clip_rects->buffer) / sizeof(RECT)]) + { + clip_rects->rects = HeapAlloc( GetProcessHeap(), 0, region->numRects * sizeof(RECT) ); + if (!clip_rects->rects) return 0; + memcpy( clip_rects->rects, clip_rects->buffer, (out - clip_rects->buffer) * sizeof(RECT) ); + out = clip_rects->rects + (out - clip_rects->buffer); + } + } + release_wine_region( clip ); + clip_rects->count = out - clip_rects->rects; + return clip_rects->count; +} + +/*********************************************************************** * add_extra_clipping_region * * Temporarily add a region to the current clipping region. diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index e8acfa0..c0cbc5b 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -212,6 +212,13 @@ typedef struct DWORD octant; } bres_params; +struct clipped_rects +{ + RECT *rects; + int count; + RECT buffer[32]; +}; + extern void get_rop_codes(INT rop, struct rop_codes *codes) DECLSPEC_HIDDEN; extern void update_brush_rop( dibdrv_physdev *pdev, INT rop ) DECLSPEC_HIDDEN; extern void reset_dash_origin(dibdrv_physdev *pdev) DECLSPEC_HIDDEN; @@ -225,11 +232,23 @@ extern COLORREF make_rgb_colorref( HDC hdc, dib_info *dib, COLORREF color, BOOL extern DWORD get_pixel_color(dibdrv_physdev *pdev, COLORREF color, BOOL mono_fixup) DECLSPEC_HIDDEN; extern BOOL brush_rects( dibdrv_physdev *pdev, int num, const RECT *rects ) DECLSPEC_HIDDEN; extern void solid_rects( dib_info *dib, int num, const RECT *rects, const rop_mask *color, 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 HRGN add_extra_clipping_region( dibdrv_physdev *pdev, HRGN rgn ) DECLSPEC_HIDDEN; extern void restore_clipping_region( dibdrv_physdev *pdev, HRGN rgn ) 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; +static inline void init_clipped_rects( struct clipped_rects *clip_rects ) +{ + clip_rects->count = 0; + clip_rects->rects = clip_rects->buffer; +} + +static inline void free_clipped_rects( struct clipped_rects *clip_rects ) +{ + if (clip_rects->rects != clip_rects->buffer) HeapFree( GetProcessHeap(), 0, clip_rects->rects ); +} + /* compute the x coordinate corresponding to y on the specified edge */ static inline int edge_coord( int y, int x1, int y1, int x2, int y2 ) { diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index ad6c4ad..d9b305d 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -606,36 +606,27 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) COLORREF dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) { dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); - int i; + struct clipped_rects clipped_rects; + RECT rect; POINT pt; DWORD pixel; - const WINEREGION *clip = get_wine_region( pdev->clip ); TRACE( "(%p, %d, %d, %08x)\n", dev, x, y, color ); pt.x = x; pt.y = y; LPtoDP( dev->hdc, &pt, 1 ); + rect.left = pt.x; + rect.top = pt.y; + rect.right = rect.left + 1; + rect.bottom = rect.top + 1; /* SetPixel doesn't do the 1bpp massaging like other fg colors */ pixel = get_pixel_color( pdev, color, FALSE ); color = pdev->dib.funcs->pixel_to_colorref( &pdev->dib, pixel ); - for (i = 0; i < clip->numRects; i++) - { - if (pt_in_rect( clip->rects + i, pt )) - { - RECT rect; - rect.left = pt.x; - rect.top = pt.y; - rect.right = rect.left + 1; - rect.bottom = rect.top + 1; - - pdev->dib.funcs->solid_rects( &pdev->dib, 1, &rect, 0, pixel ); - break; - } - } - - release_wine_region( pdev->clip ); + if (!get_clipped_rects( &pdev->dib, &rect, pdev->clip, &clipped_rects )) return color; + pdev->dib.funcs->solid_rects( &pdev->dib, clipped_rects.count, clipped_rects.rects, 0, pixel ); + free_clipped_rects( &clipped_rects ); return color; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index d87dfdc..eab87d0 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -430,12 +430,6 @@ static inline void offset_rect( RECT *rect, int offset_x, int offset_y ) rect->bottom += offset_y; } -static inline BOOL pt_in_rect( const RECT *rect, POINT pt ) -{ - return ((pt.x >= rect->left) && (pt.x < rect->right) && - (pt.y >= rect->top) && (pt.y < rect->bottom)); -} - static inline void get_bounding_rect( RECT *rect, int x, int y, int width, int height ) { rect->left = x;

1 0

Alexandre Julliard : gdi32: Use the get_clipped_rects helper in the text functions.
by Alexandre Julliard 27 Dec '11

27 Dec '11

Module: wine Branch: master Commit: 63ebfc591e6cc681b2f4385ea78fceaf305115ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=63ebfc591e6cc681b2f4385ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 27 14:32:12 2011 +0100 gdi32: Use the get_clipped_rects helper in the text functions. --- dlls/gdi32/dibdrv/graphics.c | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index d9b305d..2e95d66 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -126,9 +126,8 @@ static inline void get_text_bkgnd_masks( dibdrv_physdev *pdev, rop_mask *mask ) static void draw_glyph( dibdrv_physdev *pdev, const POINT *origin, const GLYPHMETRICS *metrics, const struct gdi_image_bits *image, DWORD text_color, - const struct intensity_range *ranges ) + const struct intensity_range *ranges, const struct clipped_rects *clipped_rects ) { - const WINEREGION *clip = get_wine_region( pdev->clip ); int i; RECT rect, clipped_rect; POINT src_origin; @@ -145,9 +144,9 @@ static void draw_glyph( dibdrv_physdev *pdev, const POINT *origin, const GLYPHME rect.right = rect.left + metrics->gmBlackBoxX; rect.bottom = rect.top + metrics->gmBlackBoxY; - for (i = 0; i < clip->numRects; i++) + for (i = 0; i < clipped_rects->count; i++) { - if (intersect_rect( &clipped_rect, &rect, clip->rects + i )) + if (intersect_rect( &clipped_rect, &rect, clipped_rects->rects + i )) { src_origin.x = clipped_rect.left - rect.left; src_origin.y = clipped_rect.top - rect.top; @@ -156,8 +155,6 @@ static void draw_glyph( dibdrv_physdev *pdev, const POINT *origin, const GLYPHME text_color, ranges ); } } - - release_wine_region( pdev->clip ); } static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; @@ -267,7 +264,7 @@ BOOL render_aa_text_bitmapinfo( HDC hdc, BITMAPINFO *info, struct gdi_image_bits bkgnd_color.and = 0; bkgnd_color.xor = bg_pixel; - solid_rects( &dib, 1, &src->visrect, &bkgnd_color, 0 ); + dib.funcs->solid_rects( &dib, 1, &src->visrect, bkgnd_color.and, bkgnd_color.xor ); } for (i = 0; i < count; i++) @@ -332,27 +329,36 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect, LPCWSTR str, UINT count, const INT *dx ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + struct clipped_rects clipped_rects; UINT aa_flags, i; POINT origin; DWORD text_color, err; - HRGN saved_clip = NULL; struct intensity_range ranges[17]; + init_clipped_rects( &clipped_rects ); + if (flags & ETO_OPAQUE) { rop_mask bkgnd_color; get_text_bkgnd_masks( pdev, &bkgnd_color ); - solid_rects( &pdev->dib, 1, rect, &bkgnd_color, pdev->clip ); + get_clipped_rects( &pdev->dib, rect, pdev->clip, &clipped_rects ); + pdev->dib.funcs->solid_rects( &pdev->dib, clipped_rects.count, clipped_rects.rects, + bkgnd_color.and, bkgnd_color.xor ); } - if (count == 0) return TRUE; + if (count == 0) goto done; if (flags & ETO_CLIPPED) { - HRGN clip = CreateRectRgnIndirect( rect ); - saved_clip = add_extra_clipping_region( pdev, clip ); - DeleteObject( clip ); + if (!(flags & ETO_OPAQUE)) /* otherwise we have done it already */ + get_clipped_rects( &pdev->dib, rect, pdev->clip, &clipped_rects ); } + else + { + free_clipped_rects( &clipped_rects ); + get_clipped_rects( &pdev->dib, NULL, pdev->clip, &clipped_rects ); + } + if (!clipped_rects.count) return TRUE; text_color = get_pixel_color( pdev, GetTextColor( pdev->dev.hdc ), TRUE ); get_aa_ranges( pdev->dib.funcs->pixel_to_colorref( &pdev->dib, text_color ), ranges ); @@ -368,7 +374,7 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, err = get_glyph_bitmap( dev->hdc, (UINT)str[i], aa_flags, &metrics, &image ); if (err) continue; - if (image.ptr) draw_glyph( pdev, &origin, &metrics, &image, text_color, ranges ); + if (image.ptr) draw_glyph( pdev, &origin, &metrics, &image, text_color, ranges, &clipped_rects ); if (image.free) image.free( &image ); if (dx) @@ -388,7 +394,8 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, } } - restore_clipping_region( pdev, saved_clip ); +done: + free_clipped_rects( &clipped_rects ); return TRUE; }

1 0

Alexandre Julliard : gdi32: Use the get_clipped_rects helper in the pen functions.
by Alexandre Julliard 27 Dec '11

27 Dec '11

Module: wine Branch: master Commit: d0f110e2a90068d952671fb1f38966d2524fc214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0f110e2a90068d952671fb1f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 27 14:32:41 2011 +0100 gdi32: Use the get_clipped_rects helper in the pen functions. --- dlls/gdi32/dibdrv/objects.c | 117 ++++++++++++++++--------------------------- 1 files changed, 44 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d0f110e2a90068d952671…

1 0

Alexandre Julliard : gdi32: Use the get_clipped_rects helper in the blitting functions.
by Alexandre Julliard 27 Dec '11

27 Dec '11

Module: wine Branch: master Commit: 56373bc491c5700e80ec76ea50c4a0d24bfb2148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56373bc491c5700e80ec76ea5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 27 14:38:39 2011 +0100 gdi32: Use the get_clipped_rects helper in the blitting functions. --- dlls/gdi32/dibdrv/bitblt.c | 145 ++++++++++++++++++++---------------------- dlls/gdi32/dibdrv/dibdrv.h | 5 +- dlls/gdi32/dibdrv/graphics.c | 6 +- dlls/gdi32/dibdrv/objects.c | 85 ++++--------------------- 4 files changed, 86 insertions(+), 155 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=56373bc491c5700e80ec7…

1 0

Alexandre Julliard : gdi32: Avoid making a copy of the device clipping region in the DIB driver.
by Alexandre Julliard 27 Dec '11

27 Dec '11

Module: wine Branch: master Commit: 8b3271c3b0284a56ce886972830a014faf0fe96c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b3271c3b0284a56ce8869728… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 27 15:48:05 2011 +0100 gdi32: Avoid making a copy of the device clipping region in the DIB driver. --- dlls/gdi32/dibdrv/bitblt.c | 13 +++++++++---- dlls/gdi32/dibdrv/dc.c | 36 +----------------------------------- dlls/gdi32/dibdrv/dibdrv.h | 2 -- 3 files changed, 10 insertions(+), 41 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index cbfd8b0..64ded69 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -929,7 +929,7 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info struct clipped_rects clipped_rects; DWORD ret; dib_info src_dib; - HRGN saved_clip = NULL; + HRGN tmp_rgn = 0; dibdrv_physdev *pdev = NULL; TRACE( "%p %p %p\n", dev, hbitmap, info ); @@ -972,8 +972,13 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info if (!hbitmap) { - if (clip) saved_clip = add_extra_clipping_region( pdev, clip ); - clip = pdev->clip; + if (clip && pdev->clip) + { + tmp_rgn = CreateRectRgn( 0, 0, 0, 0 ); + CombineRgn( tmp_rgn, clip, pdev->clip, RGN_AND ); + clip = tmp_rgn; + } + else if (!clip) clip = pdev->clip; } if (!get_clipped_rects( dib, &dst->visrect, clip, &clipped_rects )) @@ -1000,7 +1005,7 @@ update_format: ret = ERROR_BAD_FORMAT; done: - if (saved_clip) restore_clipping_region( pdev, saved_clip ); + if (tmp_rgn) DeleteObject( tmp_rgn ); if (hbitmap) GDI_ReleaseObj( hbitmap ); return ret; } diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 404ead2..d9bb6f9 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -298,33 +298,6 @@ int get_clipped_rects( const dib_info *dib, const RECT *rc, HRGN clip, struct cl return clip_rects->count; } -/*********************************************************************** - * add_extra_clipping_region - * - * Temporarily add a region to the current clipping region. - * The returned region must be restored with restore_clipping_region. - */ -HRGN add_extra_clipping_region( dibdrv_physdev *pdev, HRGN rgn ) -{ - HRGN ret, clip; - - if (!(clip = CreateRectRgn( 0, 0, 0, 0 ))) return 0; - CombineRgn( clip, pdev->clip, rgn, RGN_AND ); - ret = pdev->clip; - pdev->clip = clip; - return ret; -} - -/*********************************************************************** - * restore_clipping_region - */ -void restore_clipping_region( dibdrv_physdev *pdev, HRGN rgn ) -{ - if (!rgn) return; - DeleteObject( pdev->clip ); - pdev->clip = rgn; -} - /********************************************************************** * dibdrv_CreateDC */ @@ -334,11 +307,6 @@ static BOOL dibdrv_CreateDC( PHYSDEV *dev, LPCWSTR driver, LPCWSTR device, dibdrv_physdev *pdev = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pdev) ); if (!pdev) return FALSE; - if (!(pdev->clip = CreateRectRgn(0, 0, 0, 0))) - { - HeapFree( GetProcessHeap(), 0, pdev ); - return FALSE; - } clear_dib_info(&pdev->dib); clear_dib_info(&pdev->brush_dib); push_dc_driver( dev, &pdev->dev, &dib_driver ); @@ -352,7 +320,6 @@ static BOOL dibdrv_DeleteDC( PHYSDEV dev ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); TRACE("(%p)\n", dev); - DeleteObject(pdev->clip); free_pattern_brush(pdev); HeapFree( GetProcessHeap(), 0, pdev ); return TRUE; @@ -409,8 +376,7 @@ static void dibdrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) dibdrv_physdev *pdev = get_dibdrv_pdev(dev); TRACE("(%p, %p)\n", dev, rgn); - SetRectRgn( pdev->clip, 0, 0, pdev->dib.width, pdev->dib.height ); - if (rgn) CombineRgn( pdev->clip, pdev->clip, rgn, RGN_AND ); + pdev->clip = rgn; return next->funcs->pSetDeviceClipping( next, rgn ); } diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 2b42b46..a100e80 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -232,8 +232,6 @@ extern COLORREF make_rgb_colorref( HDC hdc, dib_info *dib, COLORREF color, BOOL 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 ) DECLSPEC_HIDDEN; extern int get_clipped_rects( const dib_info *dib, const RECT *rc, HRGN clip, struct clipped_rects *clip_rects ) DECLSPEC_HIDDEN; -extern HRGN add_extra_clipping_region( dibdrv_physdev *pdev, HRGN rgn ) DECLSPEC_HIDDEN; -extern void restore_clipping_region( dibdrv_physdev *pdev, HRGN rgn ) 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;

1 0

Alexandre Julliard : gdi32: Re-create the brush bits only when the ROP has really changed.
by Alexandre Julliard 27 Dec '11

27 Dec '11

Module: wine Branch: master Commit: a80eafe8d761af0f91138777f11998c74f21532e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a80eafe8d761af0f91138777f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 27 16:40:48 2011 +0100 gdi32: Re-create the brush bits only when the ROP has really changed. --- dlls/gdi32/dibdrv/bitblt.c | 9 +++------ dlls/gdi32/dibdrv/dc.c | 17 ++--------------- dlls/gdi32/dibdrv/dibdrv.h | 7 +++---- dlls/gdi32/dibdrv/graphics.c | 11 +++-------- dlls/gdi32/dibdrv/objects.c | 35 +++++++++++++++++++---------------- 5 files changed, 30 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a80eafe8d761af0f91138…

1 0

Rico Schüller : d3dx9: Fix variable sequence.
by Alexandre Julliard 27 Dec '11

27 Dec '11

Module: wine Branch: master Commit: a8f32acfedead8c25645789c7e74e1933b27d9cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8f32acfedead8c25645789c7… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Dec 23 18:17:03 2011 +0100 d3dx9: Fix variable sequence. --- dlls/d3dx9_36/shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index b538edd..fd7e6b7 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1145,8 +1145,8 @@ static HRESULT parse_ctab_constant_type(const D3DXSHADER_TYPEINFO *type, ctab_co constant->desc.Bytes = calc_bytes(&constant->desc); TRACE("class = %d, type = %d, rows = %d, columns = %d, elements = %d, struct_members = %d\n", - constant->desc.Class, constant->desc.Type, constant->desc.Elements, - constant->desc.Rows, constant->desc.Columns, constant->desc.StructMembers); + constant->desc.Class, constant->desc.Type, constant->desc.Rows, + constant->desc.Columns, constant->desc.Elements, constant->desc.StructMembers); if ((constant->desc.Class == D3DXPC_STRUCT) && constant->desc.StructMembers) {

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value GetMatrix() test.
by Alexandre Julliard 27 Dec '11

27 Dec '11

Module: wine Branch: master Commit: f856afe336b0224e59e8916254590920df7788fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=f856afe336b0224e59e891625… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Dec 26 11:51:30 2011 +0100 d3dx9/tests: Add effect parameter value GetMatrix() test. --- dlls/d3dx9_36/tests/effect.c | 49 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 8cf01de..fcc336f 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -920,6 +920,54 @@ static void test_effect_parameter_value_GetVectorArray(const struct test_effect_ } } +static void test_effect_parameter_value_GetMatrix(const struct test_effect_parameter_value_result *res, + ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) +{ + const D3DXPARAMETER_DESC *res_desc = &res->desc; + LPCSTR res_full_name = res->full_name; + HRESULT hr; + DWORD cmp = 0xabababab; + FLOAT fvalue[16]; + UINT l, k; + + memset(fvalue, 0xab, sizeof(fvalue)); + hr = effect->lpVtbl->GetMatrix(effect, parameter, (D3DXMATRIX *)&fvalue); + if (!res_desc->Elements && res_desc->Class == D3DXPC_MATRIX_ROWS) + { + ok(hr == D3D_OK, "%u - %s: GetMatrix failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + for (k = 0; k < 4; ++k) + { + for (l = 0; l < 4; ++l) + { + if (k < res_desc->Columns && l < res_desc->Rows) + { + ok(compare_float(fvalue[l * 4 + k], get_float(res_desc->Type, &res_value[l * res_desc->Columns + k]), 512), + "%u - %s: GetMatrix fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l * 4 + k, fvalue[l * 4 + k], + get_float(res_desc->Type, &res_value[l * res_desc->Columns + k])); + } + else + { + ok(fvalue[l * 4 + k] == 0.0f, "%u - %s: GetMatrix fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l * 4 + k, fvalue[l * 4 + k], 0.0f); + } + } + } + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrix failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + for (l = 0; l < sizeof(fvalue) / sizeof(*fvalue); ++l) + { + ok(fvalue[l] == *(FLOAT *)&cmp, "%u - %s: GetMatrix fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], *(FLOAT *)&cmp); + } + } +} + static void test_effect_parameter_value(IDirect3DDevice9 *device) { UINT i; @@ -998,6 +1046,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_GetFloatArray(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetVector(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetVectorArray(&res[k], effect, &blob[res_value_offset], parameter, i); + test_effect_parameter_value_GetMatrix(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value GetMatrixArray() test.
by Alexandre Julliard 27 Dec '11

27 Dec '11

Module: wine Branch: master Commit: 9be82e317552907eda0ac2dc59d8c1c5aa975270 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9be82e317552907eda0ac2dc5… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Dec 26 11:51:34 2011 +0100 d3dx9/tests: Add effect parameter value GetMatrixArray() test. --- dlls/d3dx9_36/tests/effect.c | 70 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index fcc336f..0aa4d05 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -968,6 +968,75 @@ static void test_effect_parameter_value_GetMatrix(const struct test_effect_param } } +static void test_effect_parameter_value_GetMatrixArray(const struct test_effect_parameter_value_result *res, + ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) +{ + const D3DXPARAMETER_DESC *res_desc = &res->desc; + LPCSTR res_full_name = res->full_name; + HRESULT hr; + DWORD cmp = 0xabababab; + FLOAT fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; + UINT l, k, m; + + memset(fvalue, 0xab, sizeof(fvalue)); + hr = effect->lpVtbl->GetMatrixArray(effect, parameter, (D3DXMATRIX *)&fvalue, res_desc->Elements); + if (!res_desc->Elements) + { + ok(hr == D3D_OK, "%u - %s: GetMatrixArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(fvalue[l] == *(FLOAT *)&cmp, "%u - %s: GetMatrixArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], *(FLOAT *)&cmp); + } + } + else if (res_desc->Elements && res_desc->Class == D3DXPC_MATRIX_ROWS) + { + ok(hr == D3D_OK, "%u - %s: GetMatrixArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + for (m = 0; m < res_desc->Elements; ++m) + { + for (k = 0; k < 4; ++k) + { + for (l = 0; l < 4; ++l) + { + if (k < res_desc->Columns && l < res_desc->Rows) + { + ok(compare_float(fvalue[m * 16 + l * 4 + k], get_float(res_desc->Type, + &res_value[m * res_desc->Columns * res_desc->Rows + l * res_desc->Columns + k]), 512), + "%u - %s: GetMatrixArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, m * 16 + l * 4 + k, fvalue[m * 16 + l * 4 + k], + get_float(res_desc->Type, &res_value[m * res_desc->Columns * res_desc->Rows + + l * res_desc->Columns + k])); + } + else + { + ok(fvalue[m * 16 + l * 4 + k] == 0.0f, "%u - %s: GetMatrixArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, m * 16 + l * 4 + k, fvalue[m * 16 + l * 4 + k], 0.0f); + } + } + } + } + + for (l = res_desc->Elements * 16; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(fvalue[l] == *(FLOAT *)&cmp, "%u - %s: GetMatrixArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], *(FLOAT *)&cmp); + } + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrixArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(fvalue[l] == *(FLOAT *)&cmp, "%u - %s: GetMatrixArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], *(FLOAT *)&cmp); + } + } +} + static void test_effect_parameter_value(IDirect3DDevice9 *device) { UINT i; @@ -1047,6 +1116,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_GetVector(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetVectorArray(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetMatrix(&res[k], effect, &blob[res_value_offset], parameter, i); + test_effect_parameter_value_GetMatrixArray(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value GetMatrixTranspose() test.
by Alexandre Julliard 27 Dec '11

27 Dec '11

Module: wine Branch: master Commit: c7d2159a78f36e55c3eacbdb162fc28df8caa73f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7d2159a78f36e55c3eacbdb1… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Dec 26 11:51:42 2011 +0100 d3dx9/tests: Add effect parameter value GetMatrixTranspose() test. --- dlls/d3dx9_36/tests/effect.c | 72 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 0aa4d05..d413042 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1037,6 +1037,77 @@ static void test_effect_parameter_value_GetMatrixArray(const struct test_effect_ } } +static void test_effect_parameter_value_GetMatrixTranspose(const struct test_effect_parameter_value_result *res, + ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) +{ + const D3DXPARAMETER_DESC *res_desc = &res->desc; + LPCSTR res_full_name = res->full_name; + HRESULT hr; + DWORD cmp = 0xabababab; + FLOAT fvalue[16]; + UINT l, k; + + memset(fvalue, 0xab, sizeof(fvalue)); + hr = effect->lpVtbl->GetMatrixTranspose(effect, parameter, (D3DXMATRIX *)&fvalue); + if (!res_desc->Elements && res_desc->Class == D3DXPC_MATRIX_ROWS) + { + ok(hr == D3D_OK, "%u - %s: GetMatrixTranspose failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + for (k = 0; k < 4; ++k) + { + for (l = 0; l < 4; ++l) + { + if (k < res_desc->Columns && l < res_desc->Rows) + { + ok(compare_float(fvalue[l + k * 4], get_float(res_desc->Type, &res_value[l * res_desc->Columns + k]), 512), + "%u - %s: GetMatrixTranspose fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l + k * 4, fvalue[l + k * 4], + get_float(res_desc->Type, &res_value[l * res_desc->Columns + k])); + } + else + { + ok(fvalue[l + k * 4] == 0.0f, "%u - %s: GetMatrixTranspose fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l + k * 4, fvalue[l + k * 4], 0.0f); + } + } + } + } + else if (!res_desc->Elements && (res_desc->Class == D3DXPC_VECTOR || res_desc->Class == D3DXPC_SCALAR)) + { + ok(hr == D3D_OK, "%u - %s: GetMatrixTranspose failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + for (k = 0; k < 4; ++k) + { + for (l = 0; l < 4; ++l) + { + if (k < res_desc->Columns && l < res_desc->Rows) + { + FLOAT res = get_float(res_desc->Type, &res_value[l * res_desc->Columns + k]); + + ok(fvalue[l * 4 + k] == res, "%u - %s: GetMatrixTranspose fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l * 4 + k, fvalue[l * 4 + k], res); + } + else + { + ok(fvalue[l * 4 + k] == 0.0f, "%u - %s: GetMatrixTranspose fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l * 4 + k, fvalue[l * 4 + k], 0.0f); + } + } + } + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrixTranspose failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + for (l = 0; l < sizeof(fvalue) / sizeof(*fvalue); ++l) + { + ok(fvalue[l] == *(FLOAT *)&cmp, "%u - %s: GetMatrixTranspose fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], *(FLOAT *)&cmp); + } + } +} + static void test_effect_parameter_value(IDirect3DDevice9 *device) { UINT i; @@ -1117,6 +1188,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_GetVectorArray(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetMatrix(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetMatrixArray(&res[k], effect, &blob[res_value_offset], parameter, i); + test_effect_parameter_value_GetMatrixTranspose(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0