wine-commits December 2011

wine-commits@winehq.org

2 participants
810 discussions

Alexandre Julliard : gdi32: Add support for 1-pixel wide PS_USERSTYLE pens.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: f155db574f3c086a03f6876e016075b97064dcf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f155db574f3c086a03f6876e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 28 17:41:15 2011 +0100 gdi32: Add support for 1-pixel wide PS_USERSTYLE pens. --- dlls/gdi32/dibdrv/objects.c | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index ab0dd87..46f3092 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1253,6 +1253,24 @@ static const dash_pattern dash_patterns_geometric[4] = {6, {3, 1, 1, 1, 1, 1}, 8} /* PS_DASHDOTDOT */ }; +static inline void set_dash_pattern( dash_pattern *pattern, DWORD count, DWORD *dashes ) +{ + DWORD i; + + pattern->count = count; + pattern->total_len = 0; + memcpy( pattern->dashes, dashes, count * sizeof(DWORD) ); + for (i = 0; i < count; i++) pattern->total_len += dashes[i]; + if (pattern->count % 2) pattern->total_len *= 2; +} + +static inline void scale_dash_pattern( dash_pattern *pattern, DWORD scale ) +{ + DWORD i; + for (i = 0; i < pattern->count; i++) pattern->dashes[i] *= scale; + pattern->total_len *= scale; +} + static inline int get_pen_device_width( dibdrv_physdev *pdev, int width ) { POINT pts[2]; @@ -1303,7 +1321,7 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) logpen.lopnColor = GetDCPenColor( dev->hdc ); pdev->pen_colorref = logpen.lopnColor; - memset( &pdev->pen_pattern, 0, sizeof(pdev->pen_pattern) ); + set_dash_pattern( &pdev->pen_pattern, 0, NULL ); pdev->defer |= DEFER_PEN; @@ -1351,6 +1369,14 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) pdev->defer &= ~DEFER_PEN; break; + case PS_USERSTYLE: + if (pdev->pen_width > 1) break; /* not supported yet */ + pdev->pen_lines = dashed_pen_lines; + set_dash_pattern( &pdev->pen_pattern, elp->elpNumEntries, elp->elpStyleEntry ); + if (!(logpen.lopnStyle & PS_GEOMETRIC)) scale_dash_pattern( &pdev->pen_pattern, 3 ); + pdev->defer &= ~DEFER_PEN; + break; + default: break; }

1 0

Alexandre Julliard : gdi32: Add support for PS_ALTERNATE pens.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: 305be80e2fc108a773f7e7a70d84777c305729ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=305be80e2fc108a773f7e7a70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 28 17:15:24 2011 +0100 gdi32: Add support for PS_ALTERNATE pens. --- dlls/gdi32/dibdrv/objects.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index dfd5f1c..ab0dd87 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1345,6 +1345,12 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) pdev->defer &= ~DEFER_PEN; break; + case PS_ALTERNATE: + pdev->pen_lines = dashed_pen_lines; + pdev->pen_pattern = dash_patterns_geometric[PS_DOT - 1]; + pdev->defer &= ~DEFER_PEN; + break; + default: break; }

1 0

Alexandre Julliard : gdi32: Add support for 1-pixel wide geometric dashed pens.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: e364809a90deed3fa65b9b28aa432eb992fa1869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e364809a90deed3fa65b9b28a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 28 16:49:14 2011 +0100 gdi32: Add support for 1-pixel wide geometric dashed pens. --- dlls/gdi32/dibdrv/objects.c | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 30af359..dfd5f1c 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1237,15 +1237,22 @@ static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close return TRUE; } -static const dash_pattern dash_patterns[5] = +static const dash_pattern dash_patterns_cosmetic[4] = { - {0, {0}, 0}, /* PS_SOLID - a pseudo-pattern used to initialise unpatterned pens. */ {2, {18, 6}, 24}, /* PS_DASH */ {2, {3, 3}, 6}, /* PS_DOT */ {4, {9, 6, 3, 6}, 24}, /* PS_DASHDOT */ {6, {9, 3, 3, 3, 3, 3}, 24} /* PS_DASHDOTDOT */ }; +static const dash_pattern dash_patterns_geometric[4] = +{ + {2, {3, 1}, 4}, /* PS_DASH */ + {2, {1, 1}, 2}, /* PS_DOT */ + {4, {3, 1, 1, 1}, 6}, /* PS_DASHDOT */ + {6, {3, 1, 1, 1, 1, 1}, 8} /* PS_DASHDOTDOT */ +}; + static inline int get_pen_device_width( dibdrv_physdev *pdev, int width ) { POINT pts[2]; @@ -1296,7 +1303,7 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) logpen.lopnColor = GetDCPenColor( dev->hdc ); pdev->pen_colorref = logpen.lopnColor; - pdev->pen_pattern = dash_patterns[PS_SOLID]; + memset( &pdev->pen_pattern, 0, sizeof(pdev->pen_pattern) ); pdev->defer |= DEFER_PEN; @@ -1308,11 +1315,18 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) case PS_DOT: case PS_DASHDOT: case PS_DASHDOTDOT: - if(logpen.lopnStyle & PS_GEOMETRIC) break; + if (logpen.lopnStyle & PS_GEOMETRIC) + { + if (pdev->pen_width > 1) break; /* not supported yet */ + pdev->pen_lines = dashed_pen_lines; + pdev->pen_pattern = dash_patterns_geometric[pdev->pen_style - 1]; + pdev->defer &= ~DEFER_PEN; + break; + } if (pdev->pen_width == 1) /* wide cosmetic pens are not dashed */ { pdev->pen_lines = dashed_pen_lines; - pdev->pen_pattern = dash_patterns[pdev->pen_style]; + pdev->pen_pattern = dash_patterns_cosmetic[pdev->pen_style - 1]; pdev->defer &= ~DEFER_PEN; break; }

1 0

Alexandre Julliard : gdi32: Fix handling of invalid pen styles.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: bbd7f4e0e399f6b207e2e25e5e8c076724926a25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbd7f4e0e399f6b207e2e25e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 28 13:52:51 2011 +0100 gdi32: Fix handling of invalid pen styles. --- dlls/gdi32/pen.c | 87 +++++++++++++++++++++++++++++++----------------- dlls/gdi32/tests/pen.c | 20 ++++++++++- 2 files changed, 75 insertions(+), 32 deletions(-) diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index 1f92b87..2f69375 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -89,25 +89,32 @@ HPEN WINAPI CreatePenIndirect( const LOGPEN * pen ) if (!(penPtr = HeapAlloc( GetProcessHeap(), 0, sizeof(*penPtr) ))) return 0; - if (pen->lopnStyle == PS_USERSTYLE || pen->lopnStyle == PS_ALTERNATE) - penPtr->logpen.elpPenStyle = PS_SOLID; - else - penPtr->logpen.elpPenStyle = pen->lopnStyle; - if (pen->lopnStyle == PS_NULL) - { - penPtr->logpen.elpWidth = 1; - penPtr->logpen.elpColor = RGB(0, 0, 0); - } - else - { - penPtr->logpen.elpWidth = abs(pen->lopnWidth.x); - penPtr->logpen.elpColor = pen->lopnColor; - } + penPtr->logpen.elpPenStyle = pen->lopnStyle; + penPtr->logpen.elpWidth = abs(pen->lopnWidth.x); + penPtr->logpen.elpColor = pen->lopnColor; penPtr->logpen.elpBrushStyle = BS_SOLID; penPtr->logpen.elpHatch = 0; penPtr->logpen.elpNumEntries = 0; penPtr->logpen.elpStyleEntry[0] = 0; + switch (pen->lopnStyle) + { + case PS_SOLID: + case PS_DASH: + case PS_DOT: + case PS_DASHDOT: + case PS_DASHDOTDOT: + case PS_INSIDEFRAME: + break; + case PS_NULL: + penPtr->logpen.elpWidth = 1; + penPtr->logpen.elpColor = 0; + break; + default: + penPtr->logpen.elpPenStyle = PS_SOLID; + break; + } + if (!(hpen = alloc_gdi_handle( &penPtr->header, OBJ_PEN, &pen_funcs ))) HeapFree( GetProcessHeap(), 0, penPtr ); return hpen; @@ -124,10 +131,26 @@ HPEN WINAPI ExtCreatePen( DWORD style, DWORD width, PENOBJ * penPtr; HPEN hpen; - if ((style & PS_STYLE_MASK) == PS_USERSTYLE) + if ((style_count || style_bits) && (style & PS_STYLE_MASK) != PS_USERSTYLE) { - if(((INT)style_count) <= 0) - return 0; + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + switch (style & PS_STYLE_MASK) + { + case PS_NULL: + return CreatePen( PS_NULL, 0, brush->lbColor ); + + case PS_SOLID: + case PS_DASH: + case PS_DOT: + case PS_DASHDOT: + case PS_DASHDOTDOT: + break; + + case PS_USERSTYLE: + if (((INT)style_count) <= 0) return 0; if ((style_count > 16) || !style_bits) { @@ -152,28 +175,31 @@ HPEN WINAPI ExtCreatePen( DWORD style, DWORD width, return 0; } } - } - else - { - if (style_count || style_bits) + break; + + case PS_INSIDEFRAME: /* applicable only for geometric pens */ + if ((style & PS_TYPE_MASK) != PS_GEOMETRIC) { SetLastError(ERROR_INVALID_PARAMETER); return 0; } - } - - if ((style & PS_STYLE_MASK) == PS_NULL) - return CreatePen( PS_NULL, 0, brush->lbColor ); + break; - if ((style & PS_TYPE_MASK) == PS_GEOMETRIC) - { - /* PS_ALTERNATE is applicable only for cosmetic pens */ - if ((style & PS_STYLE_MASK) == PS_ALTERNATE) + case PS_ALTERNATE: /* applicable only for cosmetic pens */ + if ((style & PS_TYPE_MASK) == PS_GEOMETRIC) { SetLastError(ERROR_INVALID_PARAMETER); return 0; } + break; + default: + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if ((style & PS_TYPE_MASK) == PS_GEOMETRIC) + { if (brush->lbHatch && ((brush->lbStyle != BS_SOLID) && (brush->lbStyle != BS_HOLLOW))) { static int fixme_hatches_shown; @@ -182,8 +208,7 @@ HPEN WINAPI ExtCreatePen( DWORD style, DWORD width, } else { - /* PS_INSIDEFRAME is applicable only for geometric pens */ - if ((style & PS_STYLE_MASK) == PS_INSIDEFRAME || width != 1) + if (width != 1) { SetLastError(ERROR_INVALID_PARAMETER); return 0; diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index fa2fa88..3a198a1 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -53,7 +53,13 @@ static void test_logpen(void) { PS_NULL, 123, RGB(0x12,0x34,0x56), PS_NULL, 1, 0 }, { PS_INSIDEFRAME, 123, RGB(0x12,0x34,0x56), PS_INSIDEFRAME, 123, RGB(0x12,0x34,0x56) }, { PS_USERSTYLE, 123, RGB(0x12,0x34,0x56), PS_SOLID, 123, RGB(0x12,0x34,0x56) }, - { PS_ALTERNATE, 123, RGB(0x12,0x34,0x56), PS_SOLID, 123, RGB(0x12,0x34,0x56) } + { PS_ALTERNATE, 123, RGB(0x12,0x34,0x56), PS_SOLID, 123, RGB(0x12,0x34,0x56) }, + { 9, 123, RGB(0x12,0x34,0x56), PS_SOLID, 123, RGB(0x12,0x34,0x56) }, + { 10, 123, RGB(0x12,0x34,0x56), PS_SOLID, 123, RGB(0x12,0x34,0x56) }, + { 11, 123, RGB(0x12,0x34,0x56), PS_SOLID, 123, RGB(0x12,0x34,0x56) }, + { 13, 123, RGB(0x12,0x34,0x56), PS_SOLID, 123, RGB(0x12,0x34,0x56) }, + { 14, 123, RGB(0x12,0x34,0x56), PS_SOLID, 123, RGB(0x12,0x34,0x56) }, + { 15, 123, RGB(0x12,0x34,0x56), PS_SOLID, 123, RGB(0x12,0x34,0x56) }, }; INT i, size; HPEN hpen; @@ -216,6 +222,12 @@ static void test_logpen(void) ok(hpen == 0, "ExtCreatePen should fail\n"); goto test_geometric_pens; } + if (pen[i].style > PS_ALTERNATE) + { + ok(hpen == 0, "ExtCreatePen should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong last error value %d\n", GetLastError()); + goto test_geometric_pens; + } ok(hpen != 0, "ExtCreatePen error %d\n", GetLastError()); obj_type = GetObjectType(hpen); @@ -335,6 +347,12 @@ test_geometric_pens: ok(hpen == 0, "ExtCreatePen should fail\n"); continue; } + if (pen[i].style > PS_ALTERNATE) + { + ok(hpen == 0, "ExtCreatePen should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong last error value %d\n", GetLastError()); + continue; + } ok(hpen != 0, "ExtCreatePen error %d\n", GetLastError()); obj_type = GetObjectType(hpen);

1 0

Alexandre Julliard : gdi32: Extended pens are always transparent.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: 881f635ce9ba21757e0a4458740bfe16e6b06326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=881f635ce9ba21757e0a44587… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 28 16:33:31 2011 +0100 gdi32: Extended pens are always transparent. --- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/objects.c | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 8649752..5d9ecb6 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -84,6 +84,7 @@ typedef struct dibdrv_physdev /* pen */ COLORREF pen_colorref; DWORD pen_style, pen_endcap, pen_join; + BOOL pen_is_ext; int pen_width; dash_pattern pen_pattern; dash_pos dash_pos; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index b30c062..30af359 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -198,13 +198,13 @@ DWORD get_pixel_color( dibdrv_physdev *pdev, COLORREF color, BOOL mono_fixup ) * of the relevant fg color (which is always set up correctly). */ static inline void get_color_masks( dibdrv_physdev *pdev, UINT rop, COLORREF colorref, - rop_mask *fg_mask, rop_mask *bg_mask ) + INT bkgnd_mode, rop_mask *fg_mask, rop_mask *bg_mask ) { DWORD color = get_pixel_color( pdev, colorref, TRUE ); calc_rop_masks( rop, color, fg_mask ); - if (GetBkMode(pdev->dev.hdc) == TRANSPARENT) + if (bkgnd_mode == TRANSPARENT) { bg_mask->and = ~0u; bg_mask->xor = 0; @@ -932,6 +932,7 @@ static BOOL dashed_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL clo int i; get_color_masks( pdev, GetROP2(pdev->dev.hdc), pdev->pen_colorref, + pdev->pen_is_ext ? TRANSPARENT : GetBkMode(pdev->dev.hdc), &pdev->dash_masks[1], &pdev->dash_masks[0] ); assert( num >= 2 ); @@ -1265,13 +1266,13 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectPen ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); LOGPEN logpen; + EXTLOGPEN *elp = NULL; TRACE("(%p, %p)\n", dev, hpen); if (!GetObjectW( hpen, sizeof(logpen), &logpen )) { /* must be an extended pen */ - EXTLOGPEN *elp; INT size = GetObjectW( hpen, 0, NULL ); if (!size) return 0; @@ -1285,8 +1286,6 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) logpen.lopnColor = elp->elpColor; /* cosmetic ext pens are always 1-pixel wide */ if (!(logpen.lopnStyle & PS_GEOMETRIC)) logpen.lopnWidth.x = 0; - - HeapFree( GetProcessHeap(), 0, elp ); } pdev->pen_join = logpen.lopnStyle & PS_JOIN_MASK; @@ -1336,6 +1335,9 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) break; } + pdev->pen_is_ext = (elp != NULL); + HeapFree( GetProcessHeap(), 0, elp ); + return next->funcs->pSelectPen( next, hpen ); } @@ -1461,7 +1463,8 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev, BOOL *needs_reselect) hatch.bits.free = hatch.bits.param = NULL; hatch.bits.is_copy = FALSE; - get_color_masks( pdev, pdev->brush_rop, pdev->brush_colorref, &fg_mask, &bg_mask ); + get_color_masks( pdev, pdev->brush_rop, pdev->brush_colorref, GetBkMode(pdev->dev.hdc), + &fg_mask, &bg_mask ); if (pdev->brush_colorref & (1 << 24)) /* PALETTEINDEX */ *needs_reselect = TRUE;

1 0

Alexandre Julliard : gdi32: Wide cosmetic pens don't support dashes.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: 5f03c6c81b0783bfb2efadcd2121a0eb87c7a3ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f03c6c81b0783bfb2efadcd2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 28 13:52:11 2011 +0100 gdi32: Wide cosmetic pens don't support dashes. --- dlls/gdi32/dibdrv/objects.c | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index c9b7814..b30c062 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1305,23 +1305,25 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) switch (pdev->pen_style) { - case PS_SOLID: - case PS_INSIDEFRAME: - if(pdev->pen_width <= 1) - pdev->pen_lines = solid_pen_lines; - else - pdev->pen_lines = wide_pen_lines; - pdev->defer &= ~DEFER_PEN; - break; - case PS_DASH: case PS_DOT: case PS_DASHDOT: case PS_DASHDOTDOT: if(logpen.lopnStyle & PS_GEOMETRIC) break; - if(logpen.lopnWidth.x > 1) break; - pdev->pen_lines = dashed_pen_lines; - pdev->pen_pattern = dash_patterns[pdev->pen_style]; + if (pdev->pen_width == 1) /* wide cosmetic pens are not dashed */ + { + pdev->pen_lines = dashed_pen_lines; + pdev->pen_pattern = dash_patterns[pdev->pen_style]; + pdev->defer &= ~DEFER_PEN; + break; + } + /* fall through */ + case PS_SOLID: + case PS_INSIDEFRAME: + if(pdev->pen_width == 1) + pdev->pen_lines = solid_pen_lines; + else + pdev->pen_lines = wide_pen_lines; pdev->defer &= ~DEFER_PEN; break;

1 0

Alexandre Julliard : gdi32: Fix the scaling of the width of cosmetic pens.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: ab63eb5c40d25bcbf2742f2dcb73df08a4301c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab63eb5c40d25bcbf2742f2dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 28 13:50:41 2011 +0100 gdi32: Fix the scaling of the width of cosmetic pens. --- dlls/gdi32/dibdrv/objects.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index e203af7..c9b7814 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1245,18 +1245,15 @@ static const dash_pattern dash_patterns[5] = {6, {9, 3, 3, 3, 3, 3}, 24} /* PS_DASHDOTDOT */ }; -static inline int get_pen_device_width( dibdrv_physdev *pdev, LOGPEN *pen ) +static inline int get_pen_device_width( dibdrv_physdev *pdev, int width ) { - int width = pen->lopnWidth.x; + POINT pts[2]; - if (pen->lopnStyle & PS_GEOMETRIC && width > 1) - { - POINT pts[2]; - pts[0].x = pts[0].y = pts[1].y = 0; - pts[1].x = width; - LPtoDP( pdev->dev.hdc, pts, 2 ); - width = abs( pts[1].x - pts[0].x ); - } + if (!width) return 1; + pts[0].x = pts[0].y = pts[1].y = 0; + pts[1].x = width; + LPtoDP( pdev->dev.hdc, pts, 2 ); + width = abs( pts[1].x - pts[0].x ); return max( width, 1 ); } @@ -1285,15 +1282,16 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) /* FIXME: add support for user style pens */ logpen.lopnStyle = elp->elpPenStyle; logpen.lopnWidth.x = elp->elpWidth; - logpen.lopnWidth.y = 0; logpen.lopnColor = elp->elpColor; + /* cosmetic ext pens are always 1-pixel wide */ + if (!(logpen.lopnStyle & PS_GEOMETRIC)) logpen.lopnWidth.x = 0; HeapFree( GetProcessHeap(), 0, elp ); } pdev->pen_join = logpen.lopnStyle & PS_JOIN_MASK; pdev->pen_endcap = logpen.lopnStyle & PS_ENDCAP_MASK; - pdev->pen_width = get_pen_device_width( pdev, &logpen ); + pdev->pen_width = get_pen_device_width( pdev, logpen.lopnWidth.x ); if (hpen == GetStockObject( DC_PEN )) logpen.lopnColor = GetDCPenColor( dev->hdc );

1 0

Alexandre Julliard : gdi32: Pass the clip region to the brush_rect helper and add a similar helper for pens .
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: 9b8d920cb736eab30d65690f960b1833cbb00600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b8d920cb736eab30d65690f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 28 11:28:21 2011 +0100 gdi32: Pass the clip region to the brush_rect helper and add a similar helper for pens. --- dlls/gdi32/dibdrv/dibdrv.h | 3 ++- dlls/gdi32/dibdrv/graphics.c | 8 +++----- dlls/gdi32/dibdrv/objects.c | 32 ++++++++++++++++++-------------- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 85aa2cf..8649752 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -229,7 +229,8 @@ extern void copy_dib_color_info(dib_info *dst, const dib_info *src) DECLSPEC_HID 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, INT rop ) 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 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 c84cce2..e5aad2a 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -479,7 +479,7 @@ BOOL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) TRACE("(%p, %d, %d, %d, %d, %06x)\n", dev, dst->x, dst->y, dst->width, dst->height, rop); - return brush_rect( pdev, &dst->visrect, get_rop2_from_rop(rop) ); + return brush_rect( pdev, &dst->visrect, pdev->clip, get_rop2_from_rop(rop) ); } /*********************************************************************** @@ -501,7 +501,7 @@ BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) { rect = get_device_rect( dev->hdc, region->rects[i].left, region->rects[i].top, region->rects[i].right, region->rects[i].bottom, FALSE ); - brush_rect( pdev, &rect, GetROP2( dev->hdc ) ); + brush_rect( pdev, &rect, pdev->clip, GetROP2( dev->hdc ) ); } release_wine_region( rgn ); @@ -603,9 +603,7 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) rect.right -= (pdev->pen_width + 2) / 2; rect.bottom -= (pdev->pen_width + 2) / 2; - brush_rect( pdev, &rect, GetROP2(dev->hdc) ); - - return TRUE; + return brush_rect( pdev, &rect, pdev->clip, GetROP2(dev->hdc) ); } /*********************************************************************** diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 79ae047..e203af7 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1227,22 +1227,11 @@ static HRGN get_wide_lines_region( dibdrv_physdev *pdev, int num, POINT *pts, BO static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close) { - struct clipped_rects clipped_rects; - rop_mask color; HRGN region; - DWORD pen_color = get_pixel_color( pdev, pdev->pen_colorref, TRUE ); - - calc_rop_masks( GetROP2(pdev->dev.hdc), pen_color, &color ); region = get_wide_lines_region( pdev, num, pts, close ); if (pdev->clip) CombineRgn( region, region, pdev->clip, RGN_AND ); - - if (get_clipped_rects( &pdev->dib, NULL, region, &clipped_rects )) - { - pdev->dib.funcs->solid_rects( &pdev->dib, clipped_rects.count, clipped_rects.rects, - color.and, color.xor ); - free_clipped_rects( &clipped_rects ); - } + pen_rect( pdev, NULL, region, GetROP2( pdev->dev.hdc ) ); DeleteObject( region ); return TRUE; } @@ -1715,13 +1704,28 @@ COLORREF dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) return next->funcs->pSetDCBrushColor( next, color ); } -BOOL brush_rect(dibdrv_physdev *pdev, const RECT *rect, INT rop) +BOOL brush_rect(dibdrv_physdev *pdev, const RECT *rect, HRGN clip, INT rop) { struct clipped_rects clipped_rects; BOOL ret; - if (!get_clipped_rects( &pdev->dib, rect, pdev->clip, &clipped_rects )) return TRUE; + if (!get_clipped_rects( &pdev->dib, rect, clip, &clipped_rects )) return TRUE; ret = pdev->brush_rects( pdev, &pdev->dib, clipped_rects.count, clipped_rects.rects, rop ); free_clipped_rects( &clipped_rects ); return ret; } + +BOOL pen_rect(dibdrv_physdev *pdev, const RECT *rect, HRGN clip, INT rop) +{ + 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; + + calc_rop_masks( rop, 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 ); + return TRUE; +}

1 0

Alexandre Julliard : gdi32: Add support for PS_INSIDEFRAME pens when drawing rectangles.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: 18c20964e1e22f9aa974cc774bf77da6fc013716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18c20964e1e22f9aa974cc774… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 28 11:06:30 2011 +0100 gdi32: Add support for PS_INSIDEFRAME pens when drawing rectangles. --- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/graphics.c | 8 ++++++++ dlls/gdi32/dibdrv/objects.c | 8 ++++---- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 31c8783..85aa2cf 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -83,7 +83,7 @@ typedef struct dibdrv_physdev /* pen */ COLORREF pen_colorref; - DWORD pen_endcap, pen_join; + DWORD pen_style, pen_endcap, pen_join; int pen_width; dash_pattern pen_pattern; dash_pos dash_pos; diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index f319849..c84cce2 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -580,6 +580,14 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) if(defer_pen(pdev)) return next->funcs->pRectangle( next, left, top, right, bottom ); + 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; + } + reset_dash_origin(pdev); /* 4 pts going anti-clockwise starting from top-right */ diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index fe83dec..79ae047 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1279,7 +1279,6 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectPen ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); LOGPEN logpen; - DWORD style; TRACE("(%p, %p)\n", dev, hpen); @@ -1315,11 +1314,12 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) pdev->defer |= DEFER_PEN; - style = logpen.lopnStyle & PS_STYLE_MASK; + pdev->pen_style = logpen.lopnStyle & PS_STYLE_MASK; - switch(style) + switch (pdev->pen_style) { case PS_SOLID: + case PS_INSIDEFRAME: if(pdev->pen_width <= 1) pdev->pen_lines = solid_pen_lines; else @@ -1334,7 +1334,7 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) if(logpen.lopnStyle & PS_GEOMETRIC) break; if(logpen.lopnWidth.x > 1) break; pdev->pen_lines = dashed_pen_lines; - pdev->pen_pattern = dash_patterns[style]; + pdev->pen_pattern = dash_patterns[pdev->pen_style]; pdev->defer &= ~DEFER_PEN; break;

1 0

Alexandre Julliard : gdi32: Add a helper function to add a rectangle to a region.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: c861284a029dac7fa9a1238a098916226c0cc2ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=c861284a029dac7fa9a1238a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 28 11:04:30 2011 +0100 gdi32: Add a helper function to add a rectangle to a region. --- dlls/gdi32/dibdrv/bitblt.c | 27 ++++++++++++++++----------- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/region.c | 10 ++++++++++ 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 6e0d425..b491762 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -1288,8 +1288,8 @@ DWORD gradient_bitmapinfo( const BITMAPINFO *info, void *bits, TRIVERTEX *vert_a unsigned int i; int y; TRIVERTEX vert[3]; + RECT rc; DWORD ret = ERROR_SUCCESS; - HRGN tmp_rgn = 0; init_dib_info_from_bitmapinfo( &dib, info, bits, default_color_table ); @@ -1300,9 +1300,11 @@ DWORD gradient_bitmapinfo( const BITMAPINFO *info, void *bits, TRIVERTEX *vert_a { get_gradient_hrect_vertices( rect, vert_array, dev_pts, vert ); gradient_rect( &dib, vert, mode, 0 ); - if (!tmp_rgn) tmp_rgn = CreateRectRgn( vert[0].x, vert[0].y, vert[1].x, vert[1].y ); - else SetRectRgn( tmp_rgn, vert[0].x, vert[0].y, vert[1].x, vert[1].y ); - CombineRgn( rgn, rgn, tmp_rgn, RGN_OR ); + rc.left = vert[0].x; + rc.top = vert[0].y; + rc.right = vert[1].x; + rc.bottom = vert[1].y; + add_rect_to_region( rgn, &rc ); } break; @@ -1311,9 +1313,11 @@ DWORD gradient_bitmapinfo( const BITMAPINFO *info, void *bits, TRIVERTEX *vert_a { get_gradient_vrect_vertices( rect, vert_array, dev_pts, vert ); gradient_rect( &dib, vert, mode, 0 ); - if (!tmp_rgn) tmp_rgn = CreateRectRgn( vert[0].x, vert[0].y, vert[1].x, vert[1].y ); - else SetRectRgn( tmp_rgn, vert[0].x, vert[0].y, vert[1].x, vert[1].y ); - CombineRgn( rgn, rgn, tmp_rgn, RGN_OR ); + rc.left = vert[0].x; + rc.top = vert[0].y; + rc.right = vert[1].x; + rc.bottom = vert[1].y; + add_rect_to_region( rgn, &rc ); } break; @@ -1323,22 +1327,23 @@ DWORD gradient_bitmapinfo( const BITMAPINFO *info, void *bits, TRIVERTEX *vert_a get_gradient_triangle_vertices( tri, vert_array, dev_pts, vert ); if (gradient_rect( &dib, vert, mode, 0 )) { - if (!tmp_rgn) tmp_rgn = CreateRectRgn( 0, 0, 0, 0 ); for (y = vert[0].y; y < vert[2].y; y++) { int x1, x2 = edge_coord( y, vert[0].x, vert[0].y, vert[2].x, vert[2].y ); if (y < vert[1].y) x1 = edge_coord( y, vert[0].x, vert[0].y, vert[1].x, vert[1].y ); else x1 = edge_coord( y, vert[1].x, vert[1].y, vert[2].x, vert[2].y ); - SetRectRgn( tmp_rgn, min(x1,x2), y, max(x1,x2), y + 1 ); - CombineRgn( rgn, rgn, tmp_rgn, RGN_OR ); + rc.left = min( x1, x2 ); + rc.top = y; + rc.right = max( x1, x2 ); + rc.bottom = y + 1; + add_rect_to_region( rgn, &rc ); } } else ret = ERROR_INVALID_PARAMETER; } break; } - DeleteObject( tmp_rgn ); return ret; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index eab87d0..c9822fe 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -318,6 +318,7 @@ extern UINT WINAPI GDIRealizePalette( HDC hdc ) DECLSPEC_HIDDEN; extern HPALETTE PALETTE_Init(void) DECLSPEC_HIDDEN; /* region.c */ +extern BOOL add_rect_to_region( HRGN rgn, const RECT *rect ) DECLSPEC_HIDDEN; extern INT mirror_region( HRGN dst, HRGN src, INT width ) DECLSPEC_HIDDEN; extern BOOL REGION_FrameRgn( HRGN dest, HRGN src, INT x, INT y ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 40a5cea..4daf88c 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -1268,6 +1268,16 @@ static BOOL REGION_UnionRectWithRegion(const RECT *rect, WINEREGION *rgn) } +BOOL add_rect_to_region( HRGN rgn, const RECT *rect ) +{ + RGNOBJ *obj = GDI_GetObjPtr( rgn, OBJ_REGION ); + + if (!obj) return FALSE; + REGION_UnionRectWithRegion( rect, &obj->rgn ); + GDI_ReleaseObj( rgn ); + return TRUE; +} + /*********************************************************************** * REGION_CreateFrameRgn *

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
81
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 December 2011