May 2011 - Wine-commits - list.winehq.org

Huw Davies : gdi32: Add support for 8 bpp dibs.
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: master Commit: 30f26b3bcadf1fcc35a15f024570e10ceab08d5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=30f26b3bcadf1fcc35a15f024… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 27 14:26:02 2011 +0100 gdi32: Add support for 8 bpp dibs. --- dlls/gdi32/dibdrv/dc.c | 4 + dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/primitives.c | 182 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 187 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index d6023b0..850fbc3 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -114,6 +114,10 @@ static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD dib->funcs = &funcs_16; break; + case 8: + dib->funcs = &funcs_8; + break; + default: TRACE("bpp %d not supported, will forward to graphics driver.\n", dib->bit_count); return FALSE; diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index a330d0a..56d08b3 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -49,6 +49,7 @@ extern const primitive_funcs funcs_8888 DECLSPEC_HIDDEN; extern const primitive_funcs funcs_32 DECLSPEC_HIDDEN; extern const primitive_funcs funcs_555 DECLSPEC_HIDDEN; extern const primitive_funcs funcs_16 DECLSPEC_HIDDEN; +extern const primitive_funcs funcs_8 DECLSPEC_HIDDEN; extern const primitive_funcs funcs_null DECLSPEC_HIDDEN; extern void calc_and_xor_masks(INT rop, DWORD color, DWORD *and, DWORD *xor) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 8ff95fa..9622098 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -35,6 +35,11 @@ static inline WORD *get_pixel_ptr_16(const dib_info *dib, int x, int y) return (WORD *)((BYTE*)dib->bits + y * dib->stride + x * 2); } +static inline BYTE *get_pixel_ptr_8(const dib_info *dib, int x, int y) +{ + return (BYTE*)dib->bits + y * dib->stride + x; +} + static inline void do_rop_32(DWORD *ptr, DWORD and, DWORD xor) { *ptr = (*ptr & and) ^ xor; @@ -45,6 +50,11 @@ static inline void do_rop_16(WORD *ptr, WORD and, WORD xor) *ptr = (*ptr & and) ^ xor; } +static inline void do_rop_8(BYTE *ptr, BYTE and, BYTE xor) +{ + *ptr = (*ptr & and) ^ xor; +} + static void solid_rects_32(const dib_info *dib, int num, const RECT *rc, DWORD and, DWORD xor) { DWORD *ptr, *start; @@ -73,6 +83,20 @@ static void solid_rects_16(const dib_info *dib, int num, const RECT *rc, DWORD a } } +static void solid_rects_8(const dib_info *dib, int num, const RECT *rc, DWORD and, DWORD xor) +{ + BYTE *ptr, *start; + int x, y, i; + + for(i = 0; i < num; i++, rc++) + { + start = get_pixel_ptr_8(dib, rc->left, rc->top); + for(y = rc->top; y < rc->bottom; y++, start += dib->stride) + for(x = rc->left, ptr = start; x < rc->right; x++) + do_rop_8(ptr++, and, xor); + } +} + static void solid_rects_null(const dib_info *dib, int num, const RECT *rc, DWORD and, DWORD xor) { return; @@ -194,6 +218,52 @@ static void pattern_rects_16(const dib_info *dib, int num, const RECT *rc, const } } +static void pattern_rects_8(const dib_info *dib, int num, const RECT *rc, const POINT *origin, + const dib_info *brush, void *and_bits, void *xor_bits) +{ + BYTE *ptr, *start, *start_and, *and_ptr, *start_xor, *xor_ptr; + int x, y, i; + POINT offset; + + for(i = 0; i < num; i++, rc++) + { + offset = calc_brush_offset(rc, brush, origin); + + start = get_pixel_ptr_8(dib, rc->left, rc->top); + start_and = (BYTE*)and_bits + offset.y * brush->stride; + start_xor = (BYTE*)xor_bits + offset.y * brush->stride; + + for(y = rc->top; y < rc->bottom; y++, start += dib->stride) + { + and_ptr = start_and + offset.x; + xor_ptr = start_xor + offset.x; + + for(x = rc->left, ptr = start; x < rc->right; x++) + { + do_rop_8(ptr++, *and_ptr++, *xor_ptr++); + if(and_ptr == start_and + brush->width) + { + and_ptr = start_and; + xor_ptr = start_xor; + } + } + + offset.y++; + if(offset.y == brush->height) + { + start_and = and_bits; + start_xor = xor_bits; + offset.y = 0; + } + else + { + start_and += brush->stride; + start_xor += brush->stride; + } + } + } +} + static void pattern_rects_null(const dib_info *dib, int num, const RECT *rc, const POINT *origin, const dib_info *brush, void *and_bits, void *xor_bits) { @@ -235,6 +305,37 @@ static DWORD colorref_to_pixel_555(const dib_info *dib, COLORREF color) return ( ((color >> 19) & 0x1f) | ((color >> 6) & 0x03e0) | ((color << 7) & 0x7c00) ); } +static DWORD colorref_to_pixel_colortable(const dib_info *dib, COLORREF color) +{ + int i, best_index = 0; + RGBQUAD rgb; + DWORD diff, best_diff = 0xffffffff; + + rgb.rgbRed = GetRValue(color); + rgb.rgbGreen = GetGValue(color); + rgb.rgbBlue = GetBValue(color); + + for(i = 0; i < dib->color_table_size; i++) + { + RGBQUAD *cur = dib->color_table + i; + diff = (rgb.rgbRed - cur->rgbRed) * (rgb.rgbRed - cur->rgbRed) + + (rgb.rgbGreen - cur->rgbGreen) * (rgb.rgbGreen - cur->rgbGreen) + + (rgb.rgbBlue - cur->rgbBlue) * (rgb.rgbBlue - cur->rgbBlue); + + if(diff == 0) + { + best_index = i; + break; + } + + if(diff < best_diff) + { + best_diff = diff; + best_index = i; + } + } + return best_index; +} static DWORD colorref_to_pixel_null(const dib_info *dib, COLORREF color) { @@ -524,6 +625,79 @@ static BOOL convert_to_16(dib_info *dst, const dib_info *src, const RECT *src_re return TRUE; } +static BOOL convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rect) +{ + BYTE *dst_start = dst->bits, *dst_pixel; + INT x, y; + DWORD src_val; + + switch(src->bit_count) + { + case 32: + { + DWORD *src_start = get_pixel_ptr_32(src, src_rect->left, src_rect->top), *src_pixel; + + if(src->funcs == &funcs_8888) + { + for(y = src_rect->top; y < src_rect->bottom; y++) + { + dst_pixel = dst_start; + src_pixel = src_start; + for(x = src_rect->left; x < src_rect->right; x++) + { + src_val = *src_pixel++; + *dst_pixel++ = colorref_to_pixel_colortable(dst, ((src_val >> 16) & 0x0000ff) | + ( src_val & 0x00ff00) | + ((src_val << 16) & 0xff0000) ); + } + dst_start += dst->stride; + src_start += src->stride / 4; + } + } + else + { + FIXME("Unsupported conversion: 32 -> 8\n"); + return FALSE; + } + break; + } + + case 16: + { + WORD *src_start = get_pixel_ptr_16(src, src_rect->left, src_rect->top), *src_pixel; + if(src->funcs == &funcs_555) + { + for(y = src_rect->top; y < src_rect->bottom; y++) + { + dst_pixel = dst_start; + src_pixel = src_start; + for(x = src_rect->left; x < src_rect->right; x++) + { + src_val = *src_pixel++; + *dst_pixel++ = colorref_to_pixel_colortable(dst, ((src_val >> 7) & 0x0000f8) | ((src_val >> 12) & 0x000007) | + ((src_val << 6) & 0x00f800) | ((src_val << 1) & 0x000700) | + ((src_val << 19) & 0xf80000) | ((src_val << 14) & 0x070000) ); + } + dst_start += dst->stride; + src_start += src->stride / 2; + } + } + else + { + FIXME("Unsupported conversion: 16 -> 8\n"); + return FALSE; + } + break; + } + + default: + FIXME("Unsupported conversion: %d -> 8\n", src->bit_count); + return FALSE; + + } + return TRUE; +} + static BOOL convert_to_null(dib_info *dst, const dib_info *src, const RECT *src_rect) { return TRUE; @@ -561,6 +735,14 @@ const primitive_funcs funcs_16 = convert_to_16 }; +const primitive_funcs funcs_8 = +{ + solid_rects_8, + pattern_rects_8, + colorref_to_pixel_colortable, + convert_to_8 +}; + const primitive_funcs funcs_null = { solid_rects_null,

1 0

Huw Davies : gdi32/tests: Add tests for 8 bpp dibs.
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: master Commit: 64a34a33b1fca508956760e8097e31586f114e38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64a34a33b1fca508956760e80… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 27 14:29:49 2011 +0100 gdi32/tests: Add tests for 8 bpp dibs. --- dlls/gdi32/tests/dib.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 75519b6..bb30215 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -178,6 +178,32 @@ static const char *sha1_graphics_r4g4b4[] = NULL }; +static const char *sha1_graphics_8[] = +{ + "41728d7ff2bb425b5fc06521adeabf6cc73136f3", + "512246d4886ab889a090b167ba194577cb95272e", + "921e852d4564cb9e5ac15ff68b5207bebea871d1", + "9636b0ebefc443ea11949ccd28f6ca454277dd41", + "aa9050da55e6b6957c60b7d603fce539cb5c0048", + "e2b93aca15fb1233ac09a713dced1f4cd950b1e4", + "3e3a603fc26cc305aa27f88da7d2a3b0073877d8", + "390b2bf70daba36310683f46af9cd50b9a061396", + "82d21737e9a7247397a6c983a9b6d9a0452dd74d", + "2a8460af91675e01cbe9384eb6cd3eb2cb420960", + "1af53b1218ee9844fcda891b836d42f6b2f66bd5", + "da1cc34a9d9b779fc7849e03e214096026506464", + "5ba8f99ca034666effa556748c49a0f5a015125f", + "b67ba2f55659c75ac72c1112494461bb3086e1a4", + "73e2859ce849f756f954718ce3c90f02e31712b6", + "196d832d283bf642d2e481e5452ca175f7902761", + "9552f48b88982633a44001227abb847dae4d06b0", + "cfc67c325c7cdf96d90af9b3cceb8d0504cbb3b0", + "1f13ea0034db4b0ffa4ddcff9664fd892058f9cd", + "3caf512cfddfd463d0750cfe3cadb58548eb2ae8", + "4e5e7d5fd64818b2b3d3e793c88f603b699d2f0f", + NULL +}; + static inline DWORD get_stride(BITMAPINFO *bmi) { return ((bmi->bmiHeader.biBitCount * bmi->bmiHeader.biWidth + 31) >> 3) & ~3; @@ -800,6 +826,38 @@ todo_wine SelectObject(mem_dc, orig_bm); DeleteObject(dib); + /* 8 */ + trace("8\n"); + bmi->bmiHeader.biBitCount = 8; + bmi->bmiHeader.biCompression = BI_RGB; + bmi->bmiHeader.biClrUsed = 5; + bmi->bmiColors[0].rgbRed = 0xff; + bmi->bmiColors[0].rgbGreen = 0xff; + bmi->bmiColors[0].rgbBlue = 0xff; + bmi->bmiColors[1].rgbRed = 0; + bmi->bmiColors[1].rgbGreen = 0; + bmi->bmiColors[1].rgbBlue = 0; + bmi->bmiColors[2].rgbRed = 0xff; + bmi->bmiColors[2].rgbGreen = 0; + bmi->bmiColors[2].rgbBlue = 0; + bmi->bmiColors[3].rgbRed = 0; + bmi->bmiColors[3].rgbGreen = 0xff; + bmi->bmiColors[3].rgbBlue = 0; + bmi->bmiColors[4].rgbRed = 0; + bmi->bmiColors[4].rgbGreen = 0; + bmi->bmiColors[4].rgbBlue = 0xff; + + dib = CreateDIBSection(0, bmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(dib != NULL, "ret NULL\n"); + + orig_bm = SelectObject(mem_dc, dib); + + sha1 = sha1_graphics_8; + draw_graphics(mem_dc, bmi, bits, &sha1); + + SelectObject(mem_dc, orig_bm); + DeleteObject(dib); + DeleteDC(mem_dc); }

1 0

Huw Davies : gdi32: Add support for 8 bpp brushes.
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: master Commit: c4576b4a9445b87e775fc3a80dc6f8a22bf91c65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4576b4a9445b87e775fc3a80… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 27 14:36:55 2011 +0100 gdi32: Add support for 8 bpp brushes. --- dlls/gdi32/dibdrv/primitives.c | 139 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 139 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 9622098..f2738ba 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> + #include "gdi_private.h" #include "dibdrv.h" @@ -402,6 +404,27 @@ static BOOL convert_to_8888(dib_info *dst, const dib_info *src, const RECT *src_ break; } + case 8: + { + BYTE *src_start = get_pixel_ptr_8(src, src_rect->left, src_rect->top), *src_pixel; + for(y = src_rect->top; y < src_rect->bottom; y++) + { + dst_pixel = dst_start; + src_pixel = src_start; + for(x = src_rect->left; x < src_rect->right; x++) + { + RGBQUAD rgb; + src_val = *src_pixel++; + if(src_val >= src->color_table_size) src_val = src->color_table_size - 1; + rgb = src->color_table[src_val]; + *dst_pixel++ = rgb.rgbRed << 16 | rgb.rgbGreen << 8 | rgb.rgbBlue; + } + dst_start += dst->stride / 4; + src_start += src->stride; + } + break; + } + default: FIXME("Unsupported conversion: %d -> 8888\n", src->bit_count); return FALSE; @@ -474,6 +497,29 @@ static BOOL convert_to_32(dib_info *dst, const dib_info *src, const RECT *src_re break; } + case 8: + { + BYTE *src_start = get_pixel_ptr_8(src, src_rect->left, src_rect->top), *src_pixel; + for(y = src_rect->top; y < src_rect->bottom; y++) + { + dst_pixel = dst_start; + src_pixel = src_start; + for(x = src_rect->left; x < src_rect->right; x++) + { + RGBQUAD rgb; + src_val = *src_pixel++; + if(src_val >= src->color_table_size) src_val = src->color_table_size - 1; + rgb = src->color_table[src_val]; + *dst_pixel++ = put_field(rgb.rgbRed, dst->red_shift, dst->red_len) | + put_field(rgb.rgbGreen, dst->green_shift, dst->green_len) | + put_field(rgb.rgbBlue, dst->blue_shift, dst->blue_len); + } + dst_start += dst->stride / 4; + src_start += src->stride; + } + break; + } + default: FIXME("Unsupported conversion: %d -> 32\n", src->bit_count); return FALSE; @@ -544,6 +590,29 @@ static BOOL convert_to_555(dib_info *dst, const dib_info *src, const RECT *src_r break; } + case 8: + { + BYTE *src_start = get_pixel_ptr_8(src, src_rect->left, src_rect->top), *src_pixel; + for(y = src_rect->top; y < src_rect->bottom; y++) + { + dst_pixel = dst_start; + src_pixel = src_start; + for(x = src_rect->left; x < src_rect->right; x++) + { + RGBQUAD rgb; + src_val = *src_pixel++; + if(src_val >= src->color_table_size) src_val = src->color_table_size - 1; + rgb = src->color_table[src_val]; + *dst_pixel++ = ((rgb.rgbRed << 7) & 0x7c00) | + ((rgb.rgbGreen << 2) & 0x03e0) | + ((rgb.rgbBlue >> 3) & 0x001f); + } + dst_start += dst->stride / 2; + src_start += src->stride; + } + break; + } + default: FIXME("Unsupported conversion: %d -> 555\n", src->bit_count); return FALSE; @@ -617,6 +686,29 @@ static BOOL convert_to_16(dib_info *dst, const dib_info *src, const RECT *src_re break; } + case 8: + { + BYTE *src_start = get_pixel_ptr_8(src, src_rect->left, src_rect->top), *src_pixel; + for(y = src_rect->top; y < src_rect->bottom; y++) + { + dst_pixel = dst_start; + src_pixel = src_start; + for(x = src_rect->left; x < src_rect->right; x++) + { + RGBQUAD rgb; + src_val = *src_pixel++; + if(src_val >= src->color_table_size) src_val = src->color_table_size - 1; + rgb = src->color_table[src_val]; + *dst_pixel++ = put_field(rgb.rgbRed, dst->red_shift, dst->red_len) | + put_field(rgb.rgbGreen, dst->green_shift, dst->green_len) | + put_field(rgb.rgbBlue, dst->blue_shift, dst->blue_len); + } + dst_start += dst->stride / 2; + src_start += src->stride; + } + break; + } + default: FIXME("Unsupported conversion: %d -> 16\n", src->bit_count); return FALSE; @@ -625,6 +717,14 @@ static BOOL convert_to_16(dib_info *dst, const dib_info *src, const RECT *src_re return TRUE; } +static inline BOOL color_tables_match(const dib_info *d1, const dib_info *d2) +{ + assert(d1->color_table_size && d2->color_table_size); + + if(d1->color_table_size != d2->color_table_size) return FALSE; + return !memcmp(d1->color_table, d2->color_table, d1->color_table_size * sizeof(d1->color_table[0])); +} + static BOOL convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rect) { BYTE *dst_start = dst->bits, *dst_pixel; @@ -690,6 +790,45 @@ static BOOL convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rec break; } + case 8: + { + BYTE *src_start = get_pixel_ptr_8(src, src_rect->left, src_rect->top), *src_pixel; + + if(color_tables_match(dst, src)) + { + if(src->stride > 0 && dst->stride > 0 && src_rect->left == 0 && src_rect->right == src->width) + memcpy(dst->bits, src_start, (src_rect->bottom - src_rect->top) * src->stride); + else + { + for(y = src_rect->top; y < src_rect->bottom; y++) + { + memcpy(dst_start, src_start, src_rect->right - src_rect->left); + dst_start += dst->stride; + src_start += src->stride; + } + } + } + else + { + for(y = src_rect->top; y < src_rect->bottom; y++) + { + dst_pixel = dst_start; + src_pixel = src_start; + for(x = src_rect->left; x < src_rect->right; x++) + { + RGBQUAD rgb; + src_val = *src_pixel++; + if(src_val >= src->color_table_size) src_val = src->color_table_size - 1; + rgb = src->color_table[src_val]; + *dst_pixel++ = colorref_to_pixel_colortable(dst, RGB(rgb.rgbRed, rgb.rgbGreen, rgb.rgbBlue)); + } + dst_start += dst->stride; + src_start += src->stride; + } + } + break; + } + default: FIXME("Unsupported conversion: %d -> 8\n", src->bit_count); return FALSE;

1 0

Huw Davies : gdi32/tests: Add tests for 8bpp brushes.
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: master Commit: 73a4178ad12d751cb7e9ad09a3f3931328afbe57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73a4178ad12d751cb7e9ad09a… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 27 14:43:11 2011 +0100 gdi32/tests: Add tests for 8bpp brushes. --- dlls/gdi32/tests/dib.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index bb30215..675c07b 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -94,6 +94,7 @@ static const char *sha1_graphics_a8r8g8b8[] = "ef654fedcb494dae79559f4db8b691ae2d522a3f", "a694872f38e66a7ff471440c3e6a9310ef78328a", "d7398de15b2837a58a62a701ca1b3384625afec4", + "a78b28472bb7ff480ddedd06b9cf2daa775fa7ae", "e2a8eef4aeda3a0f6c950075acba38f1f9e0814d", "8b66f14d51ecdeea12bc993302bb9b7d3ec085a1", "7da9dd3d40d44d92deb9883fb7110443c2d5769a", @@ -120,6 +121,7 @@ static const char *sha1_graphics_a8b8g8r8[] = "66da15b6780a4ca3b3d2eb1d1dba4e30f7b74964", "42fefefe4435570fa8038ec759140c66c76570e9", "3369889a67d6c79a24ee15f7d14374f9995215e4", + "473a1fd07df800c87a5d3286b642ace10c61c6af", "4851c5b7d5bc18590e787c0c218a592ef504e738", "9aa506e3df33e0d5298755aa4144e10eb4b5adcf", "abdf003699364fe45fab7dc61e67c606d0063b40", @@ -146,6 +148,7 @@ static const char *sha1_graphics_r5g5b5[] = "5c636ffadec10fbe440b552fe6436f3dbc607dcf", "4aac89fc18c128eddb69eea658272af53138a1cb", "9d21bcfdeaf1ca5d47eb823bdefc24d7a95f4f56", + "6daaf945a955928c5c124c880522ca4634fb2343", "3a50ce21b3563a604b4fc9f247a30f5a981f1ba6", "d7d97e28ed316f6596c737eb83baa5948d86b673", "ecc2991277d7314f55b00e0f284ae3703aeef81e", @@ -172,6 +175,7 @@ static const char *sha1_graphics_r4g4b4[] = "dbc8d66b419880108793db91c05766c0c6efd86d", "6092ccbab6b6e073c6ac8244d122f2cfc453aa38", "32b6e0aa79b7e96cd0ab2da167f6463c011023a8", + "1d283aa4d2b2114f7809fe59357d590c7c779aa7", "d591232bbc2592462c819a9486750f64180518fd", "0e183a4c30b3da345129cffe33fe0fc593d8666b", "f14d9a4bd8a365b7c8f068a0dad481b6eb2b178b", @@ -198,6 +202,7 @@ static const char *sha1_graphics_8[] = "196d832d283bf642d2e481e5452ca175f7902761", "9552f48b88982633a44001227abb847dae4d06b0", "cfc67c325c7cdf96d90af9b3cceb8d0504cbb3b0", + "7262364067e03c7fa498af1d59d228d6c63b460e", "1f13ea0034db4b0ffa4ddcff9664fd892058f9cd", "3caf512cfddfd463d0750cfe3cadb58548eb2ae8", "4e5e7d5fd64818b2b3d3e793c88f603b699d2f0f", @@ -371,6 +376,7 @@ static const RECT rectangles[] = static const BITMAPINFOHEADER dib_brush_header_32 = {sizeof(BITMAPINFOHEADER), 16, -16, 1, 32, BI_RGB, 0, 0, 0, 0, 0}; static const BITMAPINFOHEADER dib_brush_header_555 = {sizeof(BITMAPINFOHEADER), 16, -16, 1, 16, BI_RGB, 0, 0, 0, 0, 0}; +static const BITMAPINFOHEADER dib_brush_header_8 = {sizeof(BITMAPINFOHEADER), 16, -16, 1, 8, BI_RGB, 0, 0, 0, 0, 0}; static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sha1) { @@ -638,6 +644,44 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh SetBrushOrgEx(hdc, 0, 0, NULL); + /* 8 bpp dib pattern brush */ + + brush_bi->bmiHeader = dib_brush_header_8; + brush_bi->bmiHeader.biClrUsed = 3; + memset(brush_bi->bmiColors, 0, brush_bi->bmiHeader.biClrUsed * sizeof(RGBQUAD)); + brush_bi->bmiColors[0].rgbRed = 0xff; + brush_bi->bmiColors[1].rgbRed = 0xff; + brush_bi->bmiColors[1].rgbGreen = 0xff; + brush_bi->bmiColors[1].rgbBlue = 0xff; + + brush_bits = (BYTE*)brush_bi + sizeof(BITMAPINFOHEADER) + brush_bi->bmiHeader.biClrUsed * sizeof(RGBQUAD); + memset(brush_bits, 0, 16 * 16 * sizeof(BYTE)); + brush_bits[0] = brush_bits[1] = 1; + brush_bits[16] = brush_bits[17] = 2; + brush_bits[32] = brush_bits[33] = 6; + + dib_brush = CreateDIBPatternBrushPt(brush_bi, DIB_RGB_COLORS); + + SelectObject(hdc, dib_brush); + SetBrushOrgEx(hdc, 1, 1, NULL); + + for(i = 0, y = 10; i < 256; i++) + { + BOOL ret; + + if(!rop_uses_src(rop3[i])) + { + ret = PatBlt(hdc, 10 + i, y, 100, 20, rop3[i]); + ok(ret, "got FALSE for %x\n", rop3[i]); + y += 25; + } + } + compare_hash(bmi, bits, sha1, "top-down 8 bpp dib brush patblt"); + memset(bits, 0xcc, dib_size); + + SelectObject(hdc, orig_brush); + DeleteObject(dib_brush); + /* Rectangle */ SelectObject(hdc, solid_pen);

1 0

Frédéric Delanoy : wrc: Fix spelling/ grammar in manpage.
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: master Commit: a53468b489aeff90f43656eb79ee19fdebeab62a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a53468b489aeff90f43656eb7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri May 27 16:19:31 2011 +0200 wrc: Fix spelling/grammar in manpage. --- tools/wrc/wrc.man.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/wrc/wrc.man.in b/tools/wrc/wrc.man.in index 99bc13d..16ed347 100644 --- a/tools/wrc/wrc.man.in +++ b/tools/wrc/wrc.man.in @@ -39,7 +39,7 @@ messages, 16=preprocessor scanner and 32=preprocessor parser trace. .TP .I \fB\-\-endianess\fR=\fIe\fR Win32 only; set output byte\-ordering, where \fIe\fR is one of n[ative], -l[ittle] or b[ig]. Only resources in source-form can be reorderd. Native +l[ittle] or b[ig]. Only resources in source-form can be reordered. Native ordering depends on the system on which \fBwrc\fR was built. You can see the native ordering by typing \fIwrc \-h\fR. .TP @@ -188,12 +188,12 @@ CHARACTERISTICS 876 .B wrc was written by Bertho A. Stultiens and is a nearly complete rewrite of the first wine resource compiler (1994) by Martin von Loewis. -Additional resource\-types were contributed Ulrich Czekalla and Albert +Additional resource\-types were contributed by Ulrich Czekalla and Albert den Haan. Many cleanups by Dimitrie O. Paun in 2002-2003. Bugfixes have been contributed by many Wine developers. .SH BUGS \- The preprocessor recognizes variable argument macros, but does not -expanded them correctly. +expand them correctly. .br \- Error reporting should be more precise, as currently the column and line number reported are those of the next token.

1 0

Piotr Caban : msvcp90: Added ios_base class stub.
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: master Commit: 031ae07edc15ffa9ae6011f771aa279457bd614d URL: http://source.winehq.org/git/wine.git/?a=commit;h=031ae07edc15ffa9ae6011f77… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 27 14:34:27 2011 +0200 msvcp90: Added ios_base class stub. --- dlls/msvcp100/msvcp100.spec | 164 +++++++------- dlls/msvcp70/msvcp70.spec | 164 +++++++------- dlls/msvcp71/msvcp71.spec | 164 +++++++------- dlls/msvcp80/msvcp80.spec | 182 +++++++------- dlls/msvcp90/Makefile.in | 1 + dlls/msvcp90/exception.c | 18 -- dlls/msvcp90/ios.c | 560 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 33 +++- dlls/msvcp90/msvcp90.spec | 182 +++++++------- dlls/msvcp90/string.c | 46 ++-- 10 files changed, 1044 insertions(+), 470 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=031ae07edc15ffa9ae601…

1 0

Piotr Caban : msvcp90/tests: Don' t check if msvcp90 functions exists in misc tests.
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: master Commit: 8a96e66f7b8ba393125871b586483ece9f45fe46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a96e66f7b8ba393125871b58… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 27 14:35:18 2011 +0200 msvcp90/tests: Don't check if msvcp90 functions exists in misc tests. --- dlls/msvcp90/tests/misc.c | 87 +++++++++++++++++--------------------------- 1 files changed, 34 insertions(+), 53 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index d052225..7e2fe1a 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -162,6 +162,8 @@ static void* do_call_func3(void *func, void *_this, #endif /* __i386__ */ +#define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) +#define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static BOOL init(void) { HMODULE msvcr = LoadLibraryA("msvcr90.dll"); @@ -180,39 +182,39 @@ static BOOL init(void) p_set_invalid_parameter_handler(test_invalid_parameter_handler); if(sizeof(void*) == 8) { /* 64-bit initialization */ - p_char_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits(a)D@std@@SAXAEADAEBD(a)Z"); - p_wchar_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits(a)_W@std@@SAXAEA_WAEB_W(a)Z"); - p_short_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits(a)G@std@@SAXAEAGAEBG(a)Z"); - - p_char_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits(a)D@std@@SA_NAEBD0(a)Z"); - p_wchar_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits(a)_W@std@@SA_NAEB_W0(a)Z"); - p_short_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits(a)G@std@@SA_NAEBG0(a)Z"); - - p_Copy_s = (void*)GetProcAddress(msvcp, "?_Copy_s@?$char_traits(a)D@std@@SAPEADPEAD_KPEBD1(a)Z"); - - p_char_address = (void*)GetProcAddress(msvcp, "?address@?$allocator(a)D@std@@QEBAPEADAEAD(a)Z"); - p_char_ctor = (void*)GetProcAddress(msvcp, "??0?$allocator(a)D@std@@QEAA(a)XZ"); - p_char_deallocate = (void*)GetProcAddress(msvcp, "?deallocate@?$allocator(a)D@std@@QEAAXPEAD_K(a)Z"); - p_char_allocate = (void*)GetProcAddress(msvcp, "?allocate@?$allocator(a)D@std@@QEAAPEAD_K(a)Z"); - p_char_construct = (void*)GetProcAddress(msvcp, "?construct@?$allocator(a)D@std@@QEAAXPEADAEBD(a)Z"); - p_char_max_size = (void*)GetProcAddress(msvcp, "?max_size@?$allocator(a)D@std@@QEBA_KXZ"); + SET(p_char_assign, "?assign@?$char_traits(a)D@std@@SAXAEADAEBD(a)Z"); + SET(p_wchar_assign, "?assign@?$char_traits(a)_W@std@@SAXAEA_WAEB_W(a)Z"); + SET(p_short_assign, "?assign@?$char_traits(a)G@std@@SAXAEAGAEBG(a)Z"); + + SET(p_char_eq, "?eq@?$char_traits(a)D@std@@SA_NAEBD0(a)Z"); + SET(p_wchar_eq, "?eq@?$char_traits(a)_W@std@@SA_NAEB_W0(a)Z"); + SET(p_short_eq, "?eq@?$char_traits(a)G@std@@SA_NAEBG0(a)Z"); + + SET(p_Copy_s, "?_Copy_s@?$char_traits(a)D@std@@SAPEADPEAD_KPEBD1(a)Z"); + + SET(p_char_address, "?address@?$allocator(a)D@std@@QEBAPEADAEAD(a)Z"); + SET(p_char_ctor, "??0?$allocator(a)D@std@@QEAA(a)XZ"); + SET(p_char_deallocate, "?deallocate@?$allocator(a)D@std@@QEAAXPEAD_K(a)Z"); + SET(p_char_allocate, "?allocate@?$allocator(a)D@std@@QEAAPEAD_K(a)Z"); + SET(p_char_construct, "?construct@?$allocator(a)D@std@@QEAAXPEADAEBD(a)Z"); + SET(p_char_max_size, "?max_size@?$allocator(a)D@std@@QEBA_KXZ"); } else { - p_char_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits(a)D@std@@SAXAADABD(a)Z"); - p_wchar_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits(a)_W@std@@SAXAA_WAB_W(a)Z"); - p_short_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits(a)G@std@@SAXAAGABG(a)Z"); - - p_char_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits(a)D@std@@SA_NABD0(a)Z"); - p_wchar_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits(a)_W@std@@SA_NAB_W0(a)Z"); - p_short_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits(a)G@std@@SA_NABG0(a)Z"); - - p_Copy_s = (void*)GetProcAddress(msvcp, "?_Copy_s@?$char_traits(a)D@std@@SAPADPADIPBDI(a)Z"); - - p_char_address = (void*)GetProcAddress(msvcp, "?address@?$allocator(a)D@std@@QBEPADAAD(a)Z"); - p_char_ctor = (void*)GetProcAddress(msvcp, "??0?$allocator(a)D@std@@QAE(a)XZ"); - p_char_deallocate = (void*)GetProcAddress(msvcp, "?deallocate@?$allocator(a)D@std@@QAEXPADI(a)Z"); - p_char_allocate = (void*)GetProcAddress(msvcp, "?allocate@?$allocator(a)D@std@@QAEPADI(a)Z"); - p_char_construct = (void*)GetProcAddress(msvcp, "?construct@?$allocator(a)D@std@@QAEXPADABD(a)Z"); - p_char_max_size = (void*)GetProcAddress(msvcp, "?max_size@?$allocator(a)D@std@@QBEIXZ"); + SET(p_char_assign, "?assign@?$char_traits(a)D@std@@SAXAADABD(a)Z"); + SET(p_wchar_assign, "?assign@?$char_traits(a)_W@std@@SAXAA_WAB_W(a)Z"); + SET(p_short_assign, "?assign@?$char_traits(a)G@std@@SAXAAGABG(a)Z"); + + SET(p_char_eq, "?eq@?$char_traits(a)D@std@@SA_NABD0(a)Z"); + SET(p_wchar_eq, "?eq@?$char_traits(a)_W@std@@SA_NAB_W0(a)Z"); + SET(p_short_eq, "?eq@?$char_traits(a)G@std@@SA_NABG0(a)Z"); + + SET(p_Copy_s, "?_Copy_s@?$char_traits(a)D@std@@SAPADPADIPBDI(a)Z"); + + SET(p_char_address, "?address@?$allocator(a)D@std@@QBEPADAAD(a)Z"); + SET(p_char_ctor, "??0?$allocator(a)D@std@@QAE(a)XZ"); + SET(p_char_deallocate, "?deallocate@?$allocator(a)D@std@@QAEXPADI(a)Z"); + SET(p_char_allocate, "?allocate@?$allocator(a)D@std@@QAEPADI(a)Z"); + SET(p_char_construct, "?construct@?$allocator(a)D@std@@QAEXPADABD(a)Z"); + SET(p_char_max_size, "?max_size@?$allocator(a)D@std@@QBEIXZ"); } return TRUE; @@ -223,11 +225,6 @@ static void test_assign(void) const char in[] = "abc"; char out[4]; - if(!p_char_assign || !p_wchar_assign || !p_short_assign) { - win_skip("assign tests skipped\n"); - return; - } - out[1] = '#'; p_char_assign(out, in); ok(out[0] == in[0], "out[0] = %c\n", out[0]); @@ -254,11 +251,6 @@ static void test_equal(void) static const char in4[] = "b"; BYTE ret; - if(!p_char_eq || !p_wchar_eq || !p_short_eq) { - win_skip("equal tests skipped\n"); - return; - } - ret = p_char_eq(in1, in2); ok(ret == TRUE, "ret = %d\n", (int)ret); ret = p_char_eq(in1, in3); @@ -286,11 +278,6 @@ static void test_Copy_s(void) static const char src[] = "abcd"; char dest[32], *ret; - if(!p_Copy_s) { - win_skip("Copy_s tests skipped\n"); - return; - } - dest[4] = '#'; dest[5] = '\0'; ret = p_Copy_s(dest, 4, src, 4); @@ -335,12 +322,6 @@ static void test_allocator_char(void) char val; unsigned int size; - if(!p_char_address || !p_char_ctor || !p_char_deallocate || !p_char_allocate - || !p_char_construct || !p_char_max_size) { - win_skip("allocator<char> class not available\n"); - return; - } - allocator = call_func1(p_char_ctor, allocator); ok(allocator == (void*)0xdeadbeef, "allocator = %p\n", allocator);

1 0

Piotr Caban : msvcp90/tests: Don' t check if msvcp90 functions exists in string tests.
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: master Commit: 28d5eb082754321f3242ca5925f378b679e02d36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28d5eb082754321f3242ca592… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 27 14:35:28 2011 +0200 msvcp90/tests: Don't check if msvcp90 functions exists in string tests. --- dlls/msvcp90/tests/string.c | 175 +++++++++++++++---------------------------- 1 files changed, 60 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=28d5eb082754321f3242c…

1 0

Piotr Caban : msvcp90: Added basic_ios<char> class stub.
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: master Commit: 0dbb0f1ee8ec6a7fcaad1b121e19631927dac735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dbb0f1ee8ec6a7fcaad1b121… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 27 14:35:40 2011 +0200 msvcp90: Added basic_ios<char> class stub. --- dlls/msvcp100/msvcp100.spec | 74 +++++++------- dlls/msvcp70/msvcp70.spec | 74 +++++++------- dlls/msvcp71/msvcp71.spec | 74 +++++++------- dlls/msvcp80/msvcp80.spec | 74 +++++++------- dlls/msvcp90/ios.c | 224 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 2 +- dlls/msvcp90/msvcp90.spec | 74 +++++++------- 7 files changed, 410 insertions(+), 186 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0dbb0f1ee8ec6a7fcaad1…

1 0

Piotr Caban : msvcp90: Added _Mutex class implementation.
by Alexandre Julliard 27 May '11

27 May '11

Module: wine Branch: master Commit: d74b339e1729bfdd9e4bed5a5632e95dc011386b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d74b339e1729bfdd9e4bed5a5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 27 14:35:53 2011 +0200 msvcp90: Added _Mutex class implementation. --- dlls/msvcp100/msvcp100.spec | 32 +++++++------- dlls/msvcp71/msvcp71.spec | 16 ++++---- dlls/msvcp80/msvcp80.spec | 32 +++++++------- dlls/msvcp90/Makefile.in | 1 + dlls/msvcp90/misc.c | 92 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 32 +++++++------- 6 files changed, 149 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d74b339e1729bfdd9e4be…

1 0