December 2011 - Wine-commits

Huw Davies : gdi32: Add support for wide cosmetic pens.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: e155a8054bff9e139116ceaeec272b5cbf0a3d3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e155a8054bff9e139116ceaee… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 9 13:47:27 2011 +0000 gdi32: Add support for wide cosmetic pens. --- dlls/gdi32/dibdrv/dibdrv.h | 3 +- dlls/gdi32/dibdrv/objects.c | 185 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 185 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 1bf0696..6f01a5e 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -85,7 +85,8 @@ typedef struct dibdrv_physdev /* pen */ COLORREF pen_colorref; - DWORD pen_color, pen_and, pen_xor; + DWORD pen_color, pen_and, pen_xor, pen_endcap, pen_join; + int pen_width; dash_pattern pen_pattern; dash_pos dash_pos; BOOL (* pen_lines)(struct dibdrv_physdev *pdev, int num, POINT *pts, BOOL close); diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 9c85094..14f1260 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1017,6 +1017,166 @@ static BOOL null_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close return TRUE; } +static void add_cap( dibdrv_physdev *pdev, HRGN region, const POINT *pt ) +{ + HRGN cap; + + switch (pdev->pen_endcap) + { + case PS_ENDCAP_ROUND: + cap = CreateEllipticRgn( pt->x - pdev->pen_width / 2, pt->y - pdev->pen_width / 2, + pt->x + (pdev->pen_width + 1) / 2, pt->y + (pdev->pen_width + 1) / 2 ); + break; + + default: /* only supporting cosmetic pens so far, so always PS_ENDCAP_ROUND */ + return; + } + + CombineRgn( region, region, cap, RGN_OR ); + DeleteObject( cap ); + return; +} + +static void add_join( dibdrv_physdev *pdev, HRGN region, const POINT *pt ) +{ + HRGN join; + + switch (pdev->pen_join) + { + case PS_JOIN_ROUND: + join = CreateEllipticRgn( pt->x - pdev->pen_width / 2, pt->y - pdev->pen_width / 2, + pt->x + (pdev->pen_width + 1) / 2, pt->y + (pdev->pen_width + 1) / 2 ); + break; + + default: /* only supporting cosmetic pens so far, so always PS_JOIN_ROUND */ + return; + } + + CombineRgn( region, region, join, RGN_OR ); + DeleteObject( join ); + return; +} + +#define round( f ) (((f) > 0) ? (f) + 0.5 : (f) - 0.5) + +static HRGN get_wide_lines_region( dibdrv_physdev *pdev, int num, POINT *pts, BOOL close ) +{ + int i; + HRGN total, segment; + + assert( num >= 2 ); + + total = CreateRectRgn( 0, 0, 0, 0 ); + + if (!close) num--; + for (i = 0; i < num; i++) + { + const POINT *pt_1 = pts + i; + const POINT *pt_2 = pts + ((close && i == num - 1) ? 0 : i + 1); + int dx = pt_2->x - pt_1->x; + int dy = pt_2->y - pt_1->y; + RECT rect; + + if (dx == 0 && dy == 0) continue; + + if (dy == 0) + { + rect.left = min( pt_1->x, pt_2->x ); + rect.right = rect.left + abs( dx ); + rect.top = pt_1->y - pdev->pen_width / 2; + rect.bottom = rect.top + pdev->pen_width; + segment = CreateRectRgnIndirect( &rect ); + } + else if (dx == 0) + { + rect.top = min( pt_1->y, pt_2->y ); + rect.bottom = rect.top + abs( dy ); + rect.left = pt_1->x - pdev->pen_width / 2; + rect.right = rect.left + pdev->pen_width; + segment = CreateRectRgnIndirect( &rect ); + } + else + { + double len = hypot( dx, dy ); + double width_x, width_y; + POINT seg_pts[4]; + POINT wide_half, narrow_half; + + width_x = pdev->pen_width * abs( dy ) / len; + width_y = pdev->pen_width * abs( dx ) / len; + + narrow_half.x = round( width_x / 2 ); + narrow_half.y = round( width_y / 2 ); + wide_half.x = round( (width_x + 1) / 2 ); + wide_half.y = round( (width_y + 1) / 2 ); + + if (dx < 0) + { + wide_half.y = -wide_half.y; + narrow_half.y = -narrow_half.y; + } + + if (dy < 0) + { + POINT tmp = narrow_half; narrow_half = wide_half; wide_half = tmp; + wide_half.x = -wide_half.x; + narrow_half.x = -narrow_half.x; + } + + seg_pts[0].x = pt_1->x - narrow_half.x; + seg_pts[0].y = pt_1->y + narrow_half.y; + seg_pts[1].x = pt_1->x + wide_half.x; + seg_pts[1].y = pt_1->y - wide_half.y; + seg_pts[2].x = pt_2->x + wide_half.x; + seg_pts[2].y = pt_2->y - wide_half.y; + seg_pts[3].x = pt_2->x - narrow_half.x; + seg_pts[3].y = pt_2->y + narrow_half.y; + + segment = CreatePolygonRgn( seg_pts, 4, ALTERNATE ); + } + + CombineRgn( total, total, segment, RGN_OR ); + DeleteObject( segment ); + + if (i == 0) + { + if (!close) add_cap( pdev, total, pt_1 ); + } + else + add_join( pdev, total, pt_1 ); + + if (i == num - 1) + { + if (close) add_join( pdev, total, pt_2 ); + else add_cap( pdev, total, pt_2 ); + } + + } + return total; +} + +static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close) +{ + const WINEREGION *data; + rop_mask color; + HRGN region; + + color.and = pdev->pen_and; + color.xor = pdev->pen_xor; + + region = get_wide_lines_region( pdev, num, pts, close ); + + if (CombineRgn( region, region, pdev->clip, RGN_AND ) != ERROR) + { + data = get_wine_region( region ); + solid_rects( &pdev->dib, data->numRects, data->rects, &color, NULL ); + release_wine_region( region ); + } + + DeleteObject( region ); + return TRUE; +} + static const dash_pattern dash_patterns[5] = { {0, {0}, 0}, /* PS_SOLID - a pseudo-pattern used to initialise unpatterned pens. */ @@ -1026,6 +1186,21 @@ 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 ) +{ + int width = pen->lopnWidth.x; + + 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 = max( abs( pts[1].x - pts[0].x ), 1 ); + } + return width; +} + /*********************************************************************** * dibdrv_SelectPen */ @@ -1058,6 +1233,10 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) 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 ); + if (hpen == GetStockObject( DC_PEN )) logpen.lopnColor = GetDCPenColor( dev->hdc ); @@ -1075,8 +1254,10 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) { case PS_SOLID: if(logpen.lopnStyle & PS_GEOMETRIC) break; - if(logpen.lopnWidth.x > 1) break; - pdev->pen_lines = solid_pen_lines; + 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

Huw Davies : gdi32/tests: Add some tests for wide pens.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: ac7e9f6dcc7c5b05be0d993cfb7f6ea804955f2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac7e9f6dcc7c5b05be0d993cf… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 9 13:47:28 2011 +0000 gdi32/tests: Add some tests for wide pens. --- dlls/gdi32/tests/dib.c | 51 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 79a62db..909457d 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -135,6 +135,7 @@ static const char *sha1_graphics_a8r8g8b8[] = "0cdf6fee6721d60d5d5ed26b1989eacddc16b14e", "e462052a03dbe4ec3814db7700e166d00d4d686f", "a27917d4db49ce77989fae246015aeb2a28520ee", + "657514a4ca1f2b6ca7a125ad58dfed82099a37d1", NULL }; @@ -196,6 +197,7 @@ static const char *sha1_graphics_a8r8g8b8_bitfields[] = "0cdf6fee6721d60d5d5ed26b1989eacddc16b14e", "0cda6b3297003b3ccd6d5baa17e1ca9bb7c56f08", "b2c8e1ebb9435031fe068442f479d1304096e79f", + "657514a4ca1f2b6ca7a125ad58dfed82099a37d1", NULL }; @@ -257,6 +259,7 @@ static const char *sha1_graphics_a8b8g8r8[] = "9c8f3063504a81bbbfa8558e111c63d8bc36dbbf", "87f57a31253a38dbf3dc3070473328fa04b68a48", "db64cc4d830fc35ed170b53943e722b2342954d4", + "9988ceca44dafbee247aece1f027c06c27c01652", NULL }; @@ -318,6 +321,7 @@ static const char *sha1_graphics_r10g10b10[] = "3a81fe558c69ca0aea7e7191771ed86cf4321a5a", "8ea5d7e4bebc40a1d91b04b12e1c11a42c188095", "317521e576801acaea62c76fe16813cdfe20f4ad", + "ce0fc29bb0281d6c955d64e239254ef9e6dbc06d", NULL }; @@ -379,6 +383,7 @@ static const char *sha1_graphics_r6g6b6[] = "796fd861474aa7861bd0384127df755458757ec3", "aecb242c31f31a90f071b6455ea7d808d4ea22e3", "77ea86e51a94b11a8081b29696cb4115687843e3", + "d67b897cad72d31e75359094007b1346fd8806ea", NULL }; @@ -440,6 +445,7 @@ static const char *sha1_graphics_24[] = "826de85271b67a11e7bd1a6596b58a045a96b69e", "354b92008a8409c62d0fa1dff1532c5943aa37a2", "8dc9cb7deae5c24d1eae004d53893fa6caf4723c", + "cf311a96d41bd98fdbdfb5dfaac4ba1ba9b7d6da", NULL }; @@ -505,6 +511,7 @@ static const char *sha1_graphics_r5g5b5[] = "517e32a8c0312b5676d498583ea092b0f198f2bc", "295ec16530126046790fb734e99f86f5b3b74ed8", "d98b0561010606b55a1b9b85fbc93640f681d256", + "1c1499051860b7caa25173b328ca9c862f01dd1a", NULL }; @@ -565,6 +572,7 @@ static const char *sha1_graphics_r4g4b4[] = "d8ba2e556fd64c9c2f1746496e6e7dd7a487cd6d", "7587a9c87cab1eca827807f351bb67ca184d1ac5", "b53ef0b5c674822e784903a9dbdd3b386d9f2350", + "5505d2ed20dc61ffe48832ecf5329162a5ceb734", NULL }; @@ -631,6 +639,7 @@ static const char *sha1_graphics_8_color[] = "1f9a21eba2f2ce87768a5618d9cfefa7e48fb386", "e58d9c0acf0219d0839e1dbd162e08a765ed7f0f", "34ca0f9660e1889f9f2c0deb80535d3c4f349fa4", + "2c07272462c68cf5944b03e2aa049475b99143c5", NULL }; @@ -702,6 +711,7 @@ static const char *sha1_graphics_8_grayscale[] = "d908c86b7301666a8d7999b831841115a4938181", "0ca8775d9a61ccc251d1e6f2e3cfd26a24ae24a2", "17ae603c199a5d6695d198a7f36e6d7263990951", + "1918a33f59d3500204ffc573318a39e9ff754221", NULL }; @@ -766,6 +776,7 @@ static const char *sha1_graphics_8[] = "ba49de83c4668fb08956221f465b93e7dd6a3383", "bd28d77cd85b20a2384d6b25082cfd884bba683e", "7e591ec8ae9bb61c3a443c93f071cab2b8978394", + "f81c70b6ee2d4690f9f7c797c66582b176f8dcef", NULL }; @@ -826,6 +837,7 @@ static const char *sha1_graphics_4[] = "38a3b6edcba2a1fba6064f0b4d771aedae7f4673", "28a6b9f7927e99e53cf46f0333d29168cb10e920", "029552113292cc110fd6b7888e766628950aaeef", + "297f6ad15200bffbf15198324ee8f27a61a6f2d4", NULL }; @@ -886,6 +898,7 @@ static const char *sha1_graphics_4_grayscale[] = "2e4dc1e859350289575ffc2a47cd0033efca6c32", "ada3b7c34946e584dcdf4203e07cfa3dad02bc63", "c2f61571b067a44b30f56b4658c9606f0edfc0f3", + "58f400c9bb78e49a879276fb049edfc9c981740a", NULL }; @@ -961,6 +974,7 @@ static const char *sha1_graphics_1[] = "6c4640b17e072efc682044c499e5a4f3481b7c87", "781d8c5cbc28591fd48fce06f984c502fdc6b363", "df510792a7790cc699532b1420d43c6d4da2ae2f", + "55c26d22f11d80b73383fa57d0fac552d705b092", NULL }; @@ -1114,6 +1128,18 @@ static const RECT line_clips[] = {199, 142, 210, 143} /* start pt just inside r edge */ }; +static const RECT wide_lines[] = +{ + {100, 10, 200, 10}, + {100, 21, 200, 21}, + {200, 40, 100, 40}, + {200, 61, 100, 61}, + { 10, 100, 10, 200}, + { 21, 100, 21, 200}, + { 40, 200, 40, 100}, + { 61, 200, 61, 100}, +}; + static const RECT patblt_clips[] = { {120, 120, 140, 126}, /* unclipped */ @@ -1181,7 +1207,7 @@ static inline void solid_patblt( HDC hdc, int x, int y, int width, int height, C static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sha1) { DWORD dib_size = get_dib_size(bmi); - HPEN solid_pen, dashed_pen, orig_pen; + HPEN solid_pen, dashed_pen, wide_pen, orig_pen; HBRUSH solid_brush, dib_brush, hatch_brush, orig_brush; HBITMAP bmp; INT i, x, y, hatch_style; @@ -2168,14 +2194,33 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh compare_hash(bmi, bits, sha1, "GdiGradientFill" ); memset(bits, 0xcc, dib_size); } - else win_skip( "GdiGradientFill not supported\n" ); + else + { + win_skip( "GdiGradientFill not supported\n" ); + *sha1 += 2; + } + + /* wide pen */ + + wide_pen = CreatePen( PS_SOLID, 7, RGB( 0xff, 0, 0 ) ); + SelectObject( hdc, wide_pen ); + + for (i = 0; i < sizeof( wide_lines ) / sizeof( wide_lines[0] ); i++) + { + MoveToEx( hdc, wide_lines[i].left, wide_lines[i].top, NULL ); + LineTo( hdc, wide_lines[i].right, wide_lines[i].bottom ); + } + + compare_hash(bmi, bits, sha1, "wide pen" ); + memset(bits, 0xcc, dib_size); SelectObject(hdc, orig_brush); SelectObject(hdc, orig_pen); DeleteObject(hrgn); DeleteObject(dib_brush); - DeleteObject(dashed_pen); DeleteObject(solid_brush); + DeleteObject(wide_pen); + DeleteObject(dashed_pen); DeleteObject(solid_pen); }

1 0

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: 7626ad68503a86ed53caea69fc79919871d6425e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7626ad68503a86ed53caea69f… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Thu Dec 8 18:20:22 2011 +0100 po: Update Polish translation. --- po/pl.po | 254 ++++++++++++++++++++++++++++---------------------------------- 1 files changed, 115 insertions(+), 139 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7626ad68503a86ed53cae…

1 0

Hans Leidekker : po: Update Dutch translation.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: b37151b980743cfadf904b4a7eaadca1a900f106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b37151b980743cfadf904b4a7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 9 08:59:18 2011 +0100 po: Update Dutch translation. --- po/nl.po | 1092 +++++++++++++++++++++++++++----------------------------------- 1 files changed, 476 insertions(+), 616 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b37151b980743cfadf904…

1 0

Francois Gouget : include: Add a couple of missing include directives in dshow.h.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: f6c037cee38c66813aba01440483292fd95ebc08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6c037cee38c66813aba01440… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 9 11:57:32 2011 +0100 include: Add a couple of missing include directives in dshow.h. --- include/dshow.h | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/dshow.h b/include/dshow.h index 6513140..3451609 100644 --- a/include/dshow.h +++ b/include/dshow.h @@ -32,7 +32,10 @@ #include <olectl.h> #include <ddraw.h> #include <mmsystem.h> -/* FIXME: #include <strsafe.h>*/ +#ifndef NO_DSHOW_STRSAFE +#define NO_SHLWAPI_STRFCNS +#include <strsafe.h> +#endif #ifndef NUMELMS #define NUMELMS(array) (sizeof(array)/sizeof((array)[0])) @@ -41,7 +44,7 @@ #include <strmif.h> #include <amvideo.h> #ifdef DSHOW_USE_AMAUDIO -/* FIXME: #include <amaudio.h>*/ +#include <amaudio.h> #endif #include <control.h> #include <evcode.h>

1 0

Alexandre Julliard : gdi32: Add a helper to build a color table from the DIB_PAL_COLORS bitmap info.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: 91d19b4b1733cad4642ea91ecf20e460a2041c4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=91d19b4b1733cad4642ea91ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 21:31:59 2011 +0100 gdi32: Add a helper to build a color table from the DIB_PAL_COLORS bitmap info. --- dlls/gdi32/dib.c | 42 ++++++++++++++++++++++++++---------------- dlls/gdi32/dibdrv/dc.c | 14 ++------------ dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/objects.c | 3 +-- dlls/gdi32/gdi_private.h | 1 + 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index ed5eea7..d870582 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -233,6 +233,28 @@ static int fill_color_table_from_palette( BITMAPINFO *info, HDC hdc ) return colors; } +int fill_color_table_from_pal_colors( HDC hdc, const BITMAPINFO *info, RGBQUAD *color_table ) +{ + PALETTEENTRY entries[256]; + HPALETTE palette; + const WORD *index = (const WORD *)info->bmiColors; + int i, count, colors = get_dib_num_of_colors( info ); + + if (!colors) return 0; + if (!(palette = GetCurrentObject( hdc, OBJ_PAL ))) return 0; + if (!(count = GetPaletteEntries( palette, 0, colors, entries ))) return 0; + + for (i = 0; i < colors; i++, index++) + { + PALETTEENTRY *entry = &entries[*index % count]; + color_table[i].rgbRed = entry->peRed; + color_table[i].rgbGreen = entry->peGreen; + color_table[i].rgbBlue = entry->peBlue; + color_table[i].rgbReserved = 0; + } + return colors; +} + static void *get_pixel_ptr( const BITMAPINFO *info, void *bits, int x, int y ) { const int width = info->bmiHeader.biWidth, height = info->bmiHeader.biHeight; @@ -1383,11 +1405,10 @@ HBITMAP WINAPI CreateDIBitmap( HDC hdc, const BITMAPINFOHEADER *header, } /* Copy/synthesize RGB palette from BITMAPINFO */ -static void DIB_CopyColorTable( DC *dc, BITMAPOBJ *bmp, WORD coloruse, const BITMAPINFO *info ) +static void DIB_CopyColorTable( HDC hdc, BITMAPOBJ *bmp, WORD coloruse, const BITMAPINFO *info ) { - unsigned int colors, i; + unsigned int colors = get_dib_num_of_colors( info ); - colors = get_dib_num_of_colors( info ); if (!(bmp->color_table = HeapAlloc(GetProcessHeap(), 0, colors * sizeof(RGBQUAD) ))) return; bmp->nb_colors = colors; @@ -1397,18 +1418,7 @@ static void DIB_CopyColorTable( DC *dc, BITMAPOBJ *bmp, WORD coloruse, const BIT } else { - PALETTEENTRY entries[256]; - const WORD *index = (const WORD *)info->bmiColors; - UINT count = GetPaletteEntries( dc->hPalette, 0, colors, entries ); - - for (i = 0; i < colors; i++, index++) - { - PALETTEENTRY *entry = &entries[*index % count]; - bmp->color_table[i].rgbRed = entry->peRed; - bmp->color_table[i].rgbGreen = entry->peGreen; - bmp->color_table[i].rgbBlue = entry->peBlue; - bmp->color_table[i].rgbReserved = 0; - } + fill_color_table_from_pal_colors( hdc, info, bmp->color_table ); } } @@ -1521,7 +1531,7 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, bmp->dib = dib; bmp->funcs = physdev->funcs; /* create local copy of DIB palette */ - if (info->bmiHeader.biBitCount <= 8) DIB_CopyColorTable( dc, bmp, usage, info ); + if (info->bmiHeader.biBitCount <= 8) DIB_CopyColorTable( hdc, bmp, usage, info ); GDI_ReleaseObj( ret ); if (!physdev->funcs->pCreateDIBSection( physdev, ret, info, usage )) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index b9308bf..12d1168 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -162,7 +162,7 @@ static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD return TRUE; } -BOOL init_dib_info_from_brush(dib_info *dib, const BITMAPINFO *bi, void *bits, UINT usage, HPALETTE palette) +BOOL init_dib_info_from_brush(dib_info *dib, const BITMAPINFO *bi, void *bits, UINT usage, HDC hdc) { DWORD *masks = (bi->bmiHeader.biCompression == BI_BITFIELDS) ? (DWORD *)bi->bmiColors : NULL; RGBQUAD *color_table = NULL, pal_table[256]; @@ -172,17 +172,7 @@ BOOL init_dib_info_from_brush(dib_info *dib, const BITMAPINFO *bi, void *bits, U { if(usage == DIB_PAL_COLORS) { - PALETTEENTRY entries[256]; - const WORD *index = (const WORD *)bi->bmiColors; - UINT i, count = GetPaletteEntries( palette, 0, num_colors, entries ); - for (i = 0; i < num_colors; i++, index++) - { - PALETTEENTRY *entry = &entries[*index % count]; - pal_table[i].rgbRed = entry->peRed; - pal_table[i].rgbGreen = entry->peGreen; - pal_table[i].rgbBlue = entry->peBlue; - pal_table[i].rgbReserved = 0; - } + fill_color_table_from_pal_colors( hdc, bi, pal_table ); color_table = pal_table; } else color_table = (RGBQUAD *)bi->bmiColors; diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 28633e0..1bf0696 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -224,7 +224,7 @@ extern void get_rop_codes(INT rop, struct rop_codes *codes) DECLSPEC_HIDDEN; extern void calc_and_xor_masks(INT rop, DWORD color, DWORD *and, DWORD *xor) DECLSPEC_HIDDEN; extern void update_brush_rop( dibdrv_physdev *pdev, INT rop ) DECLSPEC_HIDDEN; extern void reset_dash_origin(dibdrv_physdev *pdev) DECLSPEC_HIDDEN; -extern BOOL init_dib_info_from_brush(dib_info *dib, const BITMAPINFO *bi, void *bits, UINT usage, HPALETTE pal) DECLSPEC_HIDDEN; +extern BOOL init_dib_info_from_brush(dib_info *dib, const BITMAPINFO *bi, void *bits, UINT usage, HDC hdc) DECLSPEC_HIDDEN; extern BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void *bits, enum dib_info_flags flags) DECLSPEC_HIDDEN; extern BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_flags flags) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 0baafdb..9c85094 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1338,9 +1338,8 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_info *dib, int num, const RE if (pdev->brush_pattern_usage == DIB_PAL_COLORS) { dib_info pattern; - HPALETTE pal = GetCurrentObject( pdev->dev.hdc, OBJ_PAL ); if (!init_dib_info_from_brush( &pattern, pdev->brush_pattern_info, - pdev->brush_pattern_bits, DIB_PAL_COLORS, pal )) + pdev->brush_pattern_bits, DIB_PAL_COLORS, pdev->dev.hdc )) return FALSE; select_pattern_brush( pdev, &pattern ); free_dib_info( &pattern ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 56fc96d..2bed05b 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -235,6 +235,7 @@ extern void DC_UpdateXforms( DC * dc ) DECLSPEC_HIDDEN; /* dib.c */ extern int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) DECLSPEC_HIDDEN; +extern int fill_color_table_from_pal_colors( HDC hdc, const BITMAPINFO *info, RGBQUAD *color_table ) DECLSPEC_HIDDEN; extern void fill_default_color_table( BITMAPINFO *info ) DECLSPEC_HIDDEN; extern void get_ddb_bitmapinfo( BITMAPOBJ *bmp, BITMAPINFO *info ) DECLSPEC_HIDDEN; extern BITMAPINFO *copy_packed_dib( const BITMAPINFO *src_info, UINT usage ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Always allocate a full-size color table when creating a DIB section.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: 647a4d58441c0d0702a6c74b2894f929fdb319f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=647a4d58441c0d0702a6c74b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 16:20:04 2011 +0100 gdi32: Always allocate a full-size color table when creating a DIB section. --- dlls/gdi32/dib.c | 84 +++++++++++++++++++++++++++++++---------------------- 1 files changed, 49 insertions(+), 35 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index d870582..2cc89fd 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -172,13 +172,11 @@ static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO * UINT coloruse, BOOL allow_compression ) { void *src_colors; - unsigned int colors; if (!bitmapinfoheader_from_user_bitmapinfo( &dst->bmiHeader, &info->bmiHeader )) return FALSE; if (!is_valid_dib_format( &dst->bmiHeader, allow_compression )) return FALSE; src_colors = (char *)info + info->bmiHeader.biSize; - colors = get_dib_num_of_colors( dst ); if (dst->bmiHeader.biCompression == BI_BITFIELDS) { @@ -186,12 +184,23 @@ static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO * memcpy( dst->bmiColors, info->bmiColors, 3 * sizeof(DWORD) ); dst->bmiHeader.biClrUsed = 0; } - else if (colors) + else if (dst->bmiHeader.biBitCount <= 8) { + unsigned int colors = dst->bmiHeader.biClrUsed; + unsigned int max_colors = 1 << dst->bmiHeader.biBitCount; + + if (!colors) colors = max_colors; + else colors = min( colors, max_colors ); + if (coloruse == DIB_PAL_COLORS) + { memcpy( dst->bmiColors, src_colors, colors * sizeof(WORD) ); + max_colors = colors; + } else if (info->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) + { memcpy( dst->bmiColors, src_colors, colors * sizeof(RGBQUAD) ); + } else { unsigned int i; @@ -204,8 +213,11 @@ static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO * dst->bmiColors[i].rgbReserved = 0; } } - dst->bmiHeader.biClrUsed = colors; + memset( dst->bmiColors + colors, 0, (max_colors - colors) * sizeof(RGBQUAD) ); + dst->bmiHeader.biClrUsed = max_colors; } + else dst->bmiHeader.biClrUsed = 0; + return TRUE; } @@ -236,9 +248,10 @@ static int fill_color_table_from_palette( BITMAPINFO *info, HDC hdc ) int fill_color_table_from_pal_colors( HDC hdc, const BITMAPINFO *info, RGBQUAD *color_table ) { PALETTEENTRY entries[256]; + RGBQUAD table[256]; HPALETTE palette; const WORD *index = (const WORD *)info->bmiColors; - int i, count, colors = get_dib_num_of_colors( info ); + int i, count, colors = info->bmiHeader.biClrUsed; if (!colors) return 0; if (!(palette = GetCurrentObject( hdc, OBJ_PAL ))) return 0; @@ -246,12 +259,13 @@ int fill_color_table_from_pal_colors( HDC hdc, const BITMAPINFO *info, RGBQUAD * for (i = 0; i < colors; i++, index++) { - PALETTEENTRY *entry = &entries[*index % count]; - color_table[i].rgbRed = entry->peRed; - color_table[i].rgbGreen = entry->peGreen; - color_table[i].rgbBlue = entry->peBlue; - color_table[i].rgbReserved = 0; + table[i].rgbRed = entries[*index % count].peRed; + table[i].rgbGreen = entries[*index % count].peGreen; + table[i].rgbBlue = entries[*index % count].peBlue; + table[i].rgbReserved = 0; } + memcpy( color_table, table, colors * sizeof(RGBQUAD) ); + memset( color_table + colors, 0, ((1 << info->bmiHeader.biBitCount) - colors) * sizeof(RGBQUAD) ); return colors; } @@ -1350,6 +1364,7 @@ INT WINAPI GetDIBits( *index = i; } + dst_info->bmiHeader.biClrUsed = 0; copy_color_info( info, dst_info, coloruse ); done: @@ -1404,23 +1419,6 @@ HBITMAP WINAPI CreateDIBitmap( HDC hdc, const BITMAPINFOHEADER *header, return handle; } -/* Copy/synthesize RGB palette from BITMAPINFO */ -static void DIB_CopyColorTable( HDC hdc, BITMAPOBJ *bmp, WORD coloruse, const BITMAPINFO *info ) -{ - unsigned int colors = get_dib_num_of_colors( info ); - - if (!(bmp->color_table = HeapAlloc(GetProcessHeap(), 0, colors * sizeof(RGBQUAD) ))) return; - bmp->nb_colors = colors; - - if (coloruse == DIB_RGB_COLORS) - { - memcpy( bmp->color_table, info->bmiColors, colors * sizeof(RGBQUAD)); - } - else - { - fill_color_table_from_pal_colors( hdc, info, bmp->color_table ); - } -} /*********************************************************************** * CreateDIBSection (GDI32.@) @@ -1435,6 +1433,7 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, BOOL bDesktopDC = FALSE; DIBSECTION *dib; BITMAPOBJ *bmp; + RGBQUAD *color_table = NULL; void *mapBits = NULL; if (bits) *bits = NULL; @@ -1462,9 +1461,22 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, dib->dsBm.bmBits = NULL; dib->dsBmih = info->bmiHeader; - /* set number of entries in bmi.bmiColors table */ - if( info->bmiHeader.biBitCount <= 8 ) - dib->dsBmih.biClrUsed = 1 << info->bmiHeader.biBitCount; + if (info->bmiHeader.biBitCount <= 8) /* build the color table */ + { + unsigned int colors = 1 << info->bmiHeader.biBitCount; + + if (!(color_table = HeapAlloc( GetProcessHeap(), 0, colors * sizeof(RGBQUAD) ))) + { + HeapFree( GetProcessHeap(), 0, dib ); + return 0; + } + if (usage == DIB_RGB_COLORS) + memcpy( color_table, info->bmiColors, colors * sizeof(RGBQUAD) ); + else + fill_color_table_from_pal_colors( hdc, info, color_table ); + + dib->dsBmih.biClrUsed = colors; + } /* set dsBitfields values */ if (info->bmiHeader.biBitCount == 16 && info->bmiHeader.biCompression == BI_RGB) @@ -1476,9 +1488,9 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, } else if (info->bmiHeader.biCompression == BI_BITFIELDS) { - dib->dsBitfields[0] = *(const DWORD *)bmi->bmiColors; - dib->dsBitfields[1] = *((const DWORD *)bmi->bmiColors + 1); - dib->dsBitfields[2] = *((const DWORD *)bmi->bmiColors + 2); + dib->dsBitfields[0] = *(const DWORD *)info->bmiColors; + dib->dsBitfields[1] = *((const DWORD *)info->bmiColors + 1); + dib->dsBitfields[2] = *((const DWORD *)info->bmiColors + 2); if (!dib->dsBitfields[0] || !dib->dsBitfields[1] || !dib->dsBitfields[2]) goto error; } else dib->dsBitfields[0] = dib->dsBitfields[1] = dib->dsBitfields[2] = 0; @@ -1508,6 +1520,7 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, if (!dib->dsBm.bmBits) { + HeapFree( GetProcessHeap(), 0, color_table ); HeapFree( GetProcessHeap(), 0, dib ); return 0; } @@ -1530,8 +1543,8 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, PHYSDEV physdev = GET_DC_PHYSDEV( dc, pCreateDIBSection ); bmp->dib = dib; bmp->funcs = physdev->funcs; - /* create local copy of DIB palette */ - if (info->bmiHeader.biBitCount <= 8) DIB_CopyColorTable( hdc, bmp, usage, info ); + bmp->color_table = color_table; + bmp->nb_colors = dib->dsBmih.biClrUsed; GDI_ReleaseObj( ret ); if (!physdev->funcs->pCreateDIBSection( physdev, ret, info, usage )) @@ -1550,6 +1563,7 @@ error: if (bDesktopDC) DeleteDC( hdc ); if (section) UnmapViewOfFile( mapBits ); else if (!offset) VirtualFree( dib->dsBm.bmBits, 0, MEM_RELEASE ); + HeapFree( GetProcessHeap(), 0, color_table ); HeapFree( GetProcessHeap(), 0, dib ); return 0; }

1 0

Alexandre Julliard : gdi32: Fix handling of DIB_PAL_COLORS in the various DIB functions.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: c441ebc21d122db1c9c14e0e34a5593df706cb11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c441ebc21d122db1c9c14e0e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 16:48:28 2011 +0100 gdi32: Fix handling of DIB_PAL_COLORS in the various DIB functions. --- dlls/gdi32/dib.c | 48 ++++++++++++++++++--------------------------- dlls/gdi32/dibdrv/dc.c | 18 +++++++--------- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 28 insertions(+), 40 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 2cc89fd..4c75fc2 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -245,7 +245,7 @@ static int fill_color_table_from_palette( BITMAPINFO *info, HDC hdc ) return colors; } -int fill_color_table_from_pal_colors( HDC hdc, const BITMAPINFO *info, RGBQUAD *color_table ) +BOOL fill_color_table_from_pal_colors( BITMAPINFO *info, HDC hdc ) { PALETTEENTRY entries[256]; RGBQUAD table[256]; @@ -253,9 +253,9 @@ int fill_color_table_from_pal_colors( HDC hdc, const BITMAPINFO *info, RGBQUAD * const WORD *index = (const WORD *)info->bmiColors; int i, count, colors = info->bmiHeader.biClrUsed; - if (!colors) return 0; - if (!(palette = GetCurrentObject( hdc, OBJ_PAL ))) return 0; - if (!(count = GetPaletteEntries( palette, 0, colors, entries ))) return 0; + if (!colors) return TRUE; + if (!(palette = GetCurrentObject( hdc, OBJ_PAL ))) return FALSE; + if (!(count = GetPaletteEntries( palette, 0, colors, entries ))) return FALSE; for (i = 0; i < colors; i++, index++) { @@ -264,9 +264,10 @@ int fill_color_table_from_pal_colors( HDC hdc, const BITMAPINFO *info, RGBQUAD * table[i].rgbBlue = entries[*index % count].peBlue; table[i].rgbReserved = 0; } - memcpy( color_table, table, colors * sizeof(RGBQUAD) ); - memset( color_table + colors, 0, ((1 << info->bmiHeader.biBitCount) - colors) * sizeof(RGBQUAD) ); - return colors; + info->bmiHeader.biClrUsed = 1 << info->bmiHeader.biBitCount; + memcpy( info->bmiColors, table, colors * sizeof(RGBQUAD) ); + memset( info->bmiColors + colors, 0, (info->bmiHeader.biClrUsed - colors) * sizeof(RGBQUAD) ); + return TRUE; } static void *get_pixel_ptr( const BITMAPINFO *info, void *bits, int x, int y ) @@ -448,7 +449,7 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he src_bits.is_copy = FALSE; src_bits.free = NULL; - if (coloruse == DIB_PAL_COLORS && !fill_color_table_from_palette( src_info, dev->hdc )) return 0; + if (coloruse == DIB_PAL_COLORS && !fill_color_table_from_pal_colors( src_info, dev->hdc )) return 0; rect.left = xDst; rect.top = yDst; @@ -656,7 +657,7 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, src_bits.free = NULL; src_bits.param = NULL; - if (coloruse == DIB_PAL_COLORS && !fill_color_table_from_palette( src_info, hdc )) return 0; + if (coloruse == DIB_PAL_COLORS && !fill_color_table_from_pal_colors( src_info, hdc )) return 0; if (!(bitmap = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ))) return 0; @@ -753,7 +754,7 @@ INT nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD cx, DWOR src_bits.free = NULL; if (!lines) return 0; - if (coloruse == DIB_PAL_COLORS && !fill_color_table_from_palette( src_info, dev->hdc )) return 0; + if (coloruse == DIB_PAL_COLORS && !fill_color_table_from_pal_colors( src_info, dev->hdc )) return 0; if (src_info->bmiHeader.biCompression == BI_RLE4 || src_info->bmiHeader.biCompression == BI_RLE8) { @@ -1463,19 +1464,12 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, if (info->bmiHeader.biBitCount <= 8) /* build the color table */ { - unsigned int colors = 1 << info->bmiHeader.biBitCount; - - if (!(color_table = HeapAlloc( GetProcessHeap(), 0, colors * sizeof(RGBQUAD) ))) - { - HeapFree( GetProcessHeap(), 0, dib ); - return 0; - } - if (usage == DIB_RGB_COLORS) - memcpy( color_table, info->bmiColors, colors * sizeof(RGBQUAD) ); - else - fill_color_table_from_pal_colors( hdc, info, color_table ); - - dib->dsBmih.biClrUsed = colors; + if (usage == DIB_PAL_COLORS && !fill_color_table_from_pal_colors( info, hdc )) + goto error; + dib->dsBmih.biClrUsed = info->bmiHeader.biClrUsed; + if (!(color_table = HeapAlloc( GetProcessHeap(), 0, dib->dsBmih.biClrUsed * sizeof(RGBQUAD) ))) + goto error; + memcpy( color_table, info->bmiColors, dib->dsBmih.biClrUsed * sizeof(RGBQUAD) ); } /* set dsBitfields values */ @@ -1488,6 +1482,7 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, } else if (info->bmiHeader.biCompression == BI_BITFIELDS) { + if (usage == DIB_PAL_COLORS) goto error; dib->dsBitfields[0] = *(const DWORD *)info->bmiColors; dib->dsBitfields[1] = *((const DWORD *)info->bmiColors + 1); dib->dsBitfields[2] = *((const DWORD *)info->bmiColors + 2); @@ -1518,12 +1513,7 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, dib->dshSection = section; dib->dsOffset = offset; - if (!dib->dsBm.bmBits) - { - HeapFree( GetProcessHeap(), 0, color_table ); - HeapFree( GetProcessHeap(), 0, dib ); - return 0; - } + if (!dib->dsBm.bmBits) goto error; /* If the reference hdc is null, take the desktop dc */ if (hdc == 0) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 12d1168..384cb5e 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -164,20 +164,18 @@ static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD BOOL init_dib_info_from_brush(dib_info *dib, const BITMAPINFO *bi, void *bits, UINT usage, HDC hdc) { - DWORD *masks = (bi->bmiHeader.biCompression == BI_BITFIELDS) ? (DWORD *)bi->bmiColors : NULL; - RGBQUAD *color_table = NULL, pal_table[256]; int num_colors = get_dib_num_of_colors( bi ); - if(num_colors) + if (num_colors && usage == DIB_PAL_COLORS) { - if(usage == DIB_PAL_COLORS) - { - fill_color_table_from_pal_colors( hdc, bi, pal_table ); - color_table = pal_table; - } - else color_table = (RGBQUAD *)bi->bmiColors; + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *info = (BITMAPINFO *)buffer; + + copy_bitmapinfo( info, bi ); + fill_color_table_from_pal_colors( info, hdc ); + return init_dib_info_from_bitmapinfo( dib, info, bits, private_color_table ); } - return init_dib_info(dib, &bi->bmiHeader, masks, color_table, num_colors, bits, private_color_table); + return init_dib_info_from_bitmapinfo(dib, bi, bits, private_color_table ); } BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void *bits, enum dib_info_flags flags) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2bed05b..23c8f38 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -235,7 +235,7 @@ extern void DC_UpdateXforms( DC * dc ) DECLSPEC_HIDDEN; /* dib.c */ extern int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) DECLSPEC_HIDDEN; -extern int fill_color_table_from_pal_colors( HDC hdc, const BITMAPINFO *info, RGBQUAD *color_table ) DECLSPEC_HIDDEN; +extern BOOL fill_color_table_from_pal_colors( BITMAPINFO *info, HDC hdc ) DECLSPEC_HIDDEN; extern void fill_default_color_table( BITMAPINFO *info ) DECLSPEC_HIDDEN; extern void get_ddb_bitmapinfo( BITMAPOBJ *bmp, BITMAPINFO *info ) DECLSPEC_HIDDEN; extern BITMAPINFO *copy_packed_dib( const BITMAPINFO *src_info, UINT usage ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Remove the nb_colors fields in the bitmap object, we always allocate a full size color table.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: 494bfa866a0858cdbdcd99d9820162275b03a29d URL: http://source.winehq.org/git/wine.git/?a=commit;h=494bfa866a0858cdbdcd99d98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 20:00:36 2011 +0100 gdi32: Remove the nb_colors fields in the bitmap object, we always allocate a full size color table. --- dlls/gdi32/bitmap.c | 1 - dlls/gdi32/brush.c | 6 +++--- dlls/gdi32/dib.c | 15 ++++++--------- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/gdi_private.h | 3 +-- 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 510d5f5..af9012b 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -300,7 +300,6 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) bmpobj->funcs = &null_driver; bmpobj->dib = NULL; bmpobj->color_table = NULL; - bmpobj->nb_colors = 0; if (!(hbitmap = alloc_gdi_handle( &bmpobj->header, OBJ_BITMAP, &bitmap_funcs ))) { diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index a360a1d..34d3a57 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -122,10 +122,10 @@ static BOOL copy_bitmap( BRUSHOBJ *brush, HBITMAP bitmap ) bitmap_info_size( (BITMAPINFO *)&bmp->dib->dsBmih, DIB_RGB_COLORS )); if (!info) goto done; info->bmiHeader = bmp->dib->dsBmih; - if (bmp->dib->dsBmih.biCompression == BI_BITFIELDS) + if (info->bmiHeader.biCompression == BI_BITFIELDS) memcpy( &info->bmiHeader + 1, bmp->dib->dsBitfields, sizeof(bmp->dib->dsBitfields) ); - else if (bmp->nb_colors) - memcpy( &info->bmiHeader + 1, bmp->color_table, bmp->nb_colors * sizeof(RGBQUAD) ); + else if (info->bmiHeader.biClrUsed) + memcpy( &info->bmiHeader + 1, bmp->color_table, info->bmiHeader.biClrUsed * sizeof(RGBQUAD) ); if (!(brush->bits.ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( info )))) { HeapFree( GetProcessHeap(), 0, info ); diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 4c75fc2..b2d18cc 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -894,11 +894,10 @@ UINT WINAPI SetDIBColorTable( HDC hdc, UINT startpos, UINT entries, CONST RGBQUA /* Check if currently selected bitmap is a DIB */ if (bitmap->color_table) { - if (startpos < bitmap->nb_colors) + if (startpos < bitmap->dib->dsBmih.biClrUsed) { - if (startpos + entries > bitmap->nb_colors) entries = bitmap->nb_colors - startpos; - memcpy(bitmap->color_table + startpos, colors, entries * sizeof(RGBQUAD)); - result = entries; + result = min( entries, bitmap->dib->dsBmih.biClrUsed - startpos ); + memcpy(bitmap->color_table + startpos, colors, result * sizeof(RGBQUAD)); } } GDI_ReleaseObj( dc->hBitmap ); @@ -925,11 +924,10 @@ UINT WINAPI GetDIBColorTable( HDC hdc, UINT startpos, UINT entries, RGBQUAD *col /* Check if currently selected bitmap is a DIB */ if (bitmap->color_table) { - if (startpos < bitmap->nb_colors) + if (startpos < bitmap->dib->dsBmih.biClrUsed) { - if (startpos + entries > bitmap->nb_colors) entries = bitmap->nb_colors - startpos; - memcpy(colors, bitmap->color_table + startpos, entries * sizeof(RGBQUAD)); - result = entries; + result = min( entries, bitmap->dib->dsBmih.biClrUsed - startpos ); + memcpy(colors, bitmap->color_table + startpos, result * sizeof(RGBQUAD)); } } GDI_ReleaseObj( dc->hBitmap ); @@ -1534,7 +1532,6 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, bmp->dib = dib; bmp->funcs = physdev->funcs; bmp->color_table = color_table; - bmp->nb_colors = dib->dsBmih.biClrUsed; GDI_ReleaseObj( ret ); if (!physdev->funcs->pCreateDIBSection( physdev, ret, info, usage )) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 384cb5e..44a4075 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -206,7 +206,7 @@ BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_f flags | private_color_table ); } return init_dib_info( dib, &bmp->dib->dsBmih, bmp->dib->dsBitfields, - bmp->color_table, bmp->nb_colors, bmp->dib->dsBm.bmBits, flags ); + bmp->color_table, bmp->dib->dsBmih.biClrUsed, bmp->dib->dsBm.bmBits, flags ); } static void clear_dib_info(dib_info *dib) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 23c8f38..6d47143 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -179,8 +179,7 @@ typedef struct tagBITMAPOBJ const struct gdi_dc_funcs *funcs; /* DC function table */ /* For device-independent bitmaps: */ DIBSECTION *dib; - RGBQUAD *color_table; /* DIB color table if <= 8bpp */ - UINT nb_colors; /* number of colors in table */ + RGBQUAD *color_table; /* DIB color table if <= 8bpp (always 1 << bpp in size) */ } BITMAPOBJ; /* bidi.c */

1 0

Alexandre Julliard : gdi32/tests: Add tests for DIB_PAL_COLORS and DIB palettes with missing entries.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: 98670510f40822ae1824d4908668ca88ca3d3ba9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98670510f40822ae1824d4908… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 21:32:22 2011 +0100 gdi32/tests: Add tests for DIB_PAL_COLORS and DIB palettes with missing entries. --- dlls/gdi32/tests/bitmap.c | 446 +++++++++++++++++++++++++++++++++------------ 1 files changed, 325 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=98670510f40822ae1824d…

1 0