June 2011 - Wine-Commits - list.winehq.org

Aric Stewart : usp10: Apply 'half' only to the pre-base consonants in Indic syllables.
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: c1d4db0d787b1443eb949d1f64ece88ce254a2a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1d4db0d787b1443eb949d1f6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 15 09:54:20 2011 -0500 usp10: Apply 'half' only to the pre-base consonants in Indic syllables. --- dlls/usp10/shape.c | 78 +++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 56 insertions(+), 22 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index dd02c14..731e551 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -422,7 +422,6 @@ static OPENTYPE_FEATURE_RECORD devanagari_features[] = /* Base forms */ { MS_MAKE_TAG('r','p','h','f'), 1}, { MS_MAKE_TAG('b','l','w','f'), 1}, - { MS_MAKE_TAG('h','a','l','f'), 1}, { MS_MAKE_TAG('v','a','t','u'), 1}, { MS_MAKE_TAG('c','j','c','t'), 1}, /* Presentation forms */ @@ -457,7 +456,6 @@ static OPENTYPE_FEATURE_RECORD bengali_features[] = { MS_MAKE_TAG('r','p','h','f'), 1}, { MS_MAKE_TAG('b','l','w','f'), 1}, { MS_MAKE_TAG('p','s','t','f'), 1}, - { MS_MAKE_TAG('h','a','l','f'), 1}, { MS_MAKE_TAG('v','a','t','u'), 1}, { MS_MAKE_TAG('c','j','c','t'), 1}, /* Presentation forms */ @@ -494,7 +492,6 @@ static OPENTYPE_FEATURE_RECORD gurmukhi_features[] = { MS_MAKE_TAG('r','p','h','f'), 1}, { MS_MAKE_TAG('b','l','w','f'), 1}, { MS_MAKE_TAG('p','s','t','f'), 1}, - { MS_MAKE_TAG('h','a','l','f'), 1}, { MS_MAKE_TAG('v','a','t','u'), 1}, { MS_MAKE_TAG('c','j','c','t'), 1}, /* Presentation forms */ @@ -560,7 +557,6 @@ static OPENTYPE_FEATURE_RECORD tamil_features[] = /* Base forms */ { MS_MAKE_TAG('r','p','h','f'), 1}, { MS_MAKE_TAG('p','r','e','f'), 1}, - { MS_MAKE_TAG('h','a','l','f'), 1}, /* Presentation forms */ { MS_MAKE_TAG('p','r','e','s'), 1}, { MS_MAKE_TAG('a','b','v','s'), 1}, @@ -595,7 +591,6 @@ static OPENTYPE_FEATURE_RECORD telugu_features[] = { MS_MAKE_TAG('p','r','e','f'), 1}, { MS_MAKE_TAG('b','l','w','f'), 1}, { MS_MAKE_TAG('p','s','t','f'), 1}, - { MS_MAKE_TAG('h','a','l','f'), 1}, { MS_MAKE_TAG('c','j','c','t'), 1}, /* Presentation forms */ { MS_MAKE_TAG('p','r','e','s'), 1}, @@ -642,25 +637,25 @@ static const ScriptShapeData ShapingData[] = {{ thai_features, 1}, NULL, "thai", "", NULL, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, required_lao_features, "lao", "", NULL, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, required_lao_features, "lao", "", NULL, ShapeCharGlyphProp_Thai}, - {{ devanagari_features, 11}, required_devanagari_features, "deva", "dev2", ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, - {{ devanagari_features, 11}, required_devanagari_features, "deva", "dev2", ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, - {{ bengali_features, 12}, required_bengali_features, "beng", "bng2", ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, - {{ bengali_features, 12}, required_bengali_features, "beng", "bng2", ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, - {{ gurmukhi_features, 12}, required_gurmukhi_features, "guru", "gur2", ContextualShape_Gurmukhi, ShapeCharGlyphProp_Gurmukhi}, - {{ gurmukhi_features, 12}, required_gurmukhi_features, "guru", "gur2", ContextualShape_Gurmukhi, ShapeCharGlyphProp_Gurmukhi}, - {{ devanagari_features, 11}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, - {{ devanagari_features, 11}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, - {{ devanagari_features, 11}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, + {{ devanagari_features, 10}, required_devanagari_features, "deva", "dev2", ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, + {{ devanagari_features, 10}, required_devanagari_features, "deva", "dev2", ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, + {{ bengali_features, 11}, required_bengali_features, "beng", "bng2", ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, + {{ bengali_features, 11}, required_bengali_features, "beng", "bng2", ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, + {{ gurmukhi_features, 11}, required_gurmukhi_features, "guru", "gur2", ContextualShape_Gurmukhi, ShapeCharGlyphProp_Gurmukhi}, + {{ gurmukhi_features, 11}, required_gurmukhi_features, "guru", "gur2", ContextualShape_Gurmukhi, ShapeCharGlyphProp_Gurmukhi}, + {{ devanagari_features, 10}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, + {{ devanagari_features, 10}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, + {{ devanagari_features, 10}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, {{ oriya_features, 10}, required_oriya_features, "orya", "ory2", ContextualShape_Oriya, ShapeCharGlyphProp_Oriya}, {{ oriya_features, 10}, required_oriya_features, "orya", "ory2", ContextualShape_Oriya, ShapeCharGlyphProp_Oriya}, - {{ tamil_features, 9}, required_tamil_features, "taml", "tam2", ContextualShape_Tamil, ShapeCharGlyphProp_Tamil}, - {{ tamil_features, 9}, required_tamil_features, "taml", "tam2", ContextualShape_Tamil, ShapeCharGlyphProp_Tamil}, - {{ telugu_features, 12}, required_telugu_features, "telu", "tel2", ContextualShape_Telugu, ShapeCharGlyphProp_Telugu}, - {{ telugu_features, 12}, required_telugu_features, "telu", "tel2", ContextualShape_Telugu, ShapeCharGlyphProp_Telugu}, - {{ telugu_features, 12}, required_telugu_features, "knda", "knd2", ContextualShape_Kannada, ShapeCharGlyphProp_Kannada}, - {{ telugu_features, 12}, required_telugu_features, "knda", "knd2", ContextualShape_Kannada, ShapeCharGlyphProp_Kannada}, - {{ telugu_features, 12}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, - {{ telugu_features, 12}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, + {{ tamil_features, 8}, required_tamil_features, "taml", "tam2", ContextualShape_Tamil, ShapeCharGlyphProp_Tamil}, + {{ tamil_features, 8}, required_tamil_features, "taml", "tam2", ContextualShape_Tamil, ShapeCharGlyphProp_Tamil}, + {{ telugu_features, 11}, required_telugu_features, "telu", "tel2", ContextualShape_Telugu, ShapeCharGlyphProp_Telugu}, + {{ telugu_features, 11}, required_telugu_features, "telu", "tel2", ContextualShape_Telugu, ShapeCharGlyphProp_Telugu}, + {{ telugu_features, 11}, required_telugu_features, "knda", "knd2", ContextualShape_Kannada, ShapeCharGlyphProp_Kannada}, + {{ telugu_features, 11}, required_telugu_features, "knda", "knd2", ContextualShape_Kannada, ShapeCharGlyphProp_Kannada}, + {{ telugu_features, 11}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, + {{ telugu_features, 11}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) @@ -2030,6 +2025,42 @@ static void Apply_Indic_BasicForm(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps } } +static inline INT find_consonant_halant(WCHAR* pwChars, INT index, INT end, lexical_function lexical) +{ + int i = 0; + while (i + index < end - 1 && !(lexical(pwChars[index+i]) == lex_Consonant && (lexical(pwChars[index+i+1]) == lex_Halant || (index + i < end - 2 && lexical(pwChars[index+i+1]) == lex_Nukta && lexical(pwChars[index+i+2] == lex_Halant))))) + i++; + if (index + i <= end-1) + return index + i; + else + return -1; +} + +static void Apply_Indic_Half(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwChars, INT cChars, IndicSyllable *syllable, WORD *pwOutGlyphs, INT* pcGlyphs, WORD *pwLogClust, lexical_function lexical, IndicSyllable *glyph_index) +{ + INT index, nextIndex; + INT count,g_offset; + INT prevCount = *pcGlyphs; + + count = syllable->base - syllable->start; + + g_offset = 0; + index = find_consonant_halant(&pwChars[syllable->start], 0, count, lexical); + while (index >= 0 && index < (glyph_index->base - glyph_index->start)) + { + nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, index+glyph_index->start+g_offset, 1, pcGlyphs, "half"); + if (nextIndex > GSUB_E_NOGLYPH) + { + UpdateClusters(nextIndex, *pcGlyphs - prevCount, 1, cChars, pwLogClust); + g_offset += (*pcGlyphs - prevCount); + shift_syllable_glyph_indexs(glyph_index, index + glyph_index->start, g_offset); + } + + index+=2; + index = find_consonant_halant(&pwChars[syllable->start], index, count, lexical); + } +} + static void ShapeIndicSyllables(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwChars, INT cChars, IndicSyllable *syllables, INT syllable_count, WORD *pwOutGlyphs, INT* pcGlyphs, WORD *pwLogClust, lexical_function lexical) { int c; @@ -2038,6 +2069,7 @@ static void ShapeIndicSyllables(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const GSUB_Feature *nukt = load_GSUB_feature(hdc, psa, psc, "nukt"); const GSUB_Feature *akhn = load_GSUB_feature(hdc, psa, psc, "akhn"); const GSUB_Feature *rkrf = load_GSUB_feature(hdc, psa, psc, "rkrf"); + BOOL half = (load_GSUB_feature(hdc, psa, psc, "half") != NULL); IndicSyllable glyph_indexs; for (c = 0; c < syllable_count; c++) @@ -2067,6 +2099,8 @@ static void ShapeIndicSyllables(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, TRACE("applying feature rkrf\n"); Apply_Indic_BasicForm(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs, rkrf); } + if (half) + Apply_Indic_Half(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs); overall_shift += glyph_indexs.end - old_end; }

1 0

Aric Stewart : usp10: Apply 'rphf' only to the reph forms in Indic syllables.
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: f670d3b18404b42c970a51c58108d54ef22ec58c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f670d3b18404b42c970a51c58… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 15 09:54:24 2011 -0500 usp10: Apply 'rphf' only to the reph forms in Indic syllables. --- dlls/usp10/indic.c | 8 +++- dlls/usp10/shape.c | 79 ++++++++++++++++++++++++++---------------- dlls/usp10/usp10_internal.h | 1 + 3 files changed, 56 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f670d3b18404b42c970a5…

1 0

Aric Stewart : usp10: Shape Indic syllables basic forms per syllable.
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: 7058b3a38b6a5e7ad2e1943e11f7f6f7c1985384 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7058b3a38b6a5e7ad2e1943e1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 15 09:54:12 2011 -0500 usp10: Shape Indic syllables basic forms per syllable. --- dlls/usp10/shape.c | 167 +++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 121 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7058b3a38b6a5e7ad2e19…

1 0

Aric Stewart : usp10: Apply 'rkrf' to the Indic syllable.
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: e626019be82fa4456f2ee542b0d05b2dad28c677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e626019be82fa4456f2ee542b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 15 09:54:16 2011 -0500 usp10: Apply 'rkrf' to the Indic syllable. --- dlls/usp10/shape.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 154d45b..dd02c14 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -421,7 +421,6 @@ static OPENTYPE_FEATURE_RECORD devanagari_features[] = { /* Base forms */ { MS_MAKE_TAG('r','p','h','f'), 1}, - { MS_MAKE_TAG('r','k','r','f'), 1}, { MS_MAKE_TAG('b','l','w','f'), 1}, { MS_MAKE_TAG('h','a','l','f'), 1}, { MS_MAKE_TAG('v','a','t','u'), 1}, @@ -643,15 +642,15 @@ static const ScriptShapeData ShapingData[] = {{ thai_features, 1}, NULL, "thai", "", NULL, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, required_lao_features, "lao", "", NULL, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, required_lao_features, "lao", "", NULL, ShapeCharGlyphProp_Thai}, - {{ devanagari_features, 12}, required_devanagari_features, "deva", "dev2", ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, - {{ devanagari_features, 12}, required_devanagari_features, "deva", "dev2", ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, + {{ devanagari_features, 11}, required_devanagari_features, "deva", "dev2", ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, + {{ devanagari_features, 11}, required_devanagari_features, "deva", "dev2", ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, {{ bengali_features, 12}, required_bengali_features, "beng", "bng2", ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, {{ bengali_features, 12}, required_bengali_features, "beng", "bng2", ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, {{ gurmukhi_features, 12}, required_gurmukhi_features, "guru", "gur2", ContextualShape_Gurmukhi, ShapeCharGlyphProp_Gurmukhi}, {{ gurmukhi_features, 12}, required_gurmukhi_features, "guru", "gur2", ContextualShape_Gurmukhi, ShapeCharGlyphProp_Gurmukhi}, - {{ devanagari_features, 12}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, - {{ devanagari_features, 12}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, - {{ devanagari_features, 12}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, + {{ devanagari_features, 11}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, + {{ devanagari_features, 11}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, + {{ devanagari_features, 11}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, {{ oriya_features, 10}, required_oriya_features, "orya", "ory2", ContextualShape_Oriya, ShapeCharGlyphProp_Oriya}, {{ oriya_features, 10}, required_oriya_features, "orya", "ory2", ContextualShape_Oriya, ShapeCharGlyphProp_Oriya}, {{ tamil_features, 9}, required_tamil_features, "taml", "tam2", ContextualShape_Tamil, ShapeCharGlyphProp_Tamil}, @@ -2038,6 +2037,7 @@ static void ShapeIndicSyllables(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const GSUB_Feature *locl = load_GSUB_feature(hdc, psa, psc, "locl"); const GSUB_Feature *nukt = load_GSUB_feature(hdc, psa, psc, "nukt"); const GSUB_Feature *akhn = load_GSUB_feature(hdc, psa, psc, "akhn"); + const GSUB_Feature *rkrf = load_GSUB_feature(hdc, psa, psc, "rkrf"); IndicSyllable glyph_indexs; for (c = 0; c < syllable_count; c++) @@ -2062,6 +2062,11 @@ static void ShapeIndicSyllables(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, TRACE("applying feature akhn\n"); Apply_Indic_BasicForm(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs, akhn); } + if (rkrf) + { + TRACE("applying feature rkrf\n"); + Apply_Indic_BasicForm(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs, rkrf); + } overall_shift += glyph_indexs.end - old_end; }

1 0

Aric Stewart : usp10: Return the set of Indic syllables after reorder.
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: 35948c6fdd887fc304deab2fd10ec42fe61c5399 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35948c6fdd887fc304deab2fd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 15 09:54:00 2011 -0500 usp10: Return the set of Indic syllables after reorder. --- dlls/usp10/indic.c | 26 ++++-- dlls/usp10/shape.c | 206 +++++++++++++++++++++++++----------------- dlls/usp10/usp10_internal.h | 12 ++- 3 files changed, 150 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35948c6fdd887fc304dea…

1 0

Huw Davies : gdi32: Add support for 1 bpp brushes.
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: 0aacdc0d8558d9311c48e47f4c1f790181c32c91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aacdc0d8558d9311c48e47f4… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 15 13:43:51 2011 +0100 gdi32: Add support for 1 bpp brushes. --- dlls/gdi32/dibdrv/primitives.c | 197 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 197 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index f3d2130..c6751db 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -847,6 +847,27 @@ static BOOL convert_to_8888(dib_info *dst, const dib_info *src, const RECT *src_ break; } + case 1: + { + BYTE *src_start = get_pixel_ptr_1(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 & pixel_masks_1[x % 8]) ? 1 : 0; + if((x % 8) == 7) src_pixel++; + 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; @@ -993,6 +1014,29 @@ static BOOL convert_to_32(dib_info *dst, const dib_info *src, const RECT *src_re break; } + case 1: + { + BYTE *src_start = get_pixel_ptr_1(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 & pixel_masks_1[x % 8]) ? 1 : 0; + if((x % 8) == 7) src_pixel++; + 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; @@ -1132,6 +1176,29 @@ static BOOL convert_to_24(dib_info *dst, const dib_info *src, const RECT *src_re break; } + case 1: + { + BYTE *src_start = get_pixel_ptr_1(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 & pixel_masks_1[x % 8]) ? 1 : 0; + if((x % 8) == 7) src_pixel++; + rgb = src->color_table[src_val]; + *dst_pixel++ = rgb.rgbBlue; + *dst_pixel++ = rgb.rgbGreen; + *dst_pixel++ = rgb.rgbRed; + } + dst_start += dst->stride; + src_start += src->stride; + } + break; + } + default: FIXME("Unsupported conversion: %d -> 24\n", src->bit_count); return FALSE; @@ -1276,6 +1343,29 @@ static BOOL convert_to_555(dib_info *dst, const dib_info *src, const RECT *src_r break; } + case 1: + { + BYTE *src_start = get_pixel_ptr_1(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 & pixel_masks_1[x % 8]) ? 1 : 0; + if((x % 8) == 7) src_pixel++; + 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; @@ -1423,6 +1513,29 @@ static BOOL convert_to_16(dib_info *dst, const dib_info *src, const RECT *src_re break; } + case 1: + { + BYTE *src_start = get_pixel_ptr_1(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 & pixel_masks_1[x % 8]) ? 1 : 0; + if((x % 8) == 7) src_pixel++; + 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; @@ -1592,6 +1705,27 @@ static BOOL convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rec break; } + case 1: + { + BYTE *src_start = get_pixel_ptr_1(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 & pixel_masks_1[x % 8]) ? 1 : 0; + if((x % 8) == 7) src_pixel++; + 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; @@ -1790,6 +1924,34 @@ static BOOL convert_to_4(dib_info *dst, const dib_info *src, const RECT *src_rec break; } + case 1: + { + BYTE *src_start = get_pixel_ptr_1(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 & pixel_masks_1[x % 8]) ? 1 : 0; + if((x % 8) == 7) src_pixel++; + rgb = src->color_table[src_val]; + dst_val = colorref_to_pixel_colortable(dst, RGB(rgb.rgbRed, rgb.rgbGreen, rgb.rgbBlue)); + if((x - src_rect->left) & 1) + { + *dst_pixel = (dst_val & 0x0f) | (*dst_pixel & 0xf0); + dst_pixel++; + } + else + *dst_pixel = (dst_val << 4) & 0xf0; + } + dst_start += dst->stride; + src_start += src->stride; + } + break; + } + default: FIXME("Unsupported conversion: %d -> 4\n", src->bit_count); return FALSE; @@ -1984,6 +2146,41 @@ static BOOL convert_to_1(dib_info *dst, const dib_info *src, const RECT *src_rec break; } + /* Note that while MSDN states that a 1 bpp dib brush -> mono dc + uses text/bkgnd colours instead of the dib's colour table, this + doesn't appear to be the case for a dc backed by a + dibsection. */ + + case 1: + { + BYTE *src_start = get_pixel_ptr_1(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, bit_pos = 0; x < src_rect->right; x++) + { + RGBQUAD rgb; + src_val = (*src_pixel & pixel_masks_1[x % 8]) ? 1 : 0; + if((x % 8) == 7) src_pixel++; + rgb = src->color_table[src_val]; + dst_val = colorref_to_pixel_colortable(dst, RGB(rgb.rgbRed, rgb.rgbGreen, rgb.rgbBlue)) ? 0xff : 0; + + if(bit_pos == 0) *dst_pixel = 0; + *dst_pixel = (*dst_pixel & ~pixel_masks_1[bit_pos]) | (dst_val & pixel_masks_1[bit_pos]); + + if(++bit_pos == 8) + { + dst_pixel++; + bit_pos = 0; + } + } + dst_start += dst->stride; + src_start += src->stride; + } + break; + } + default: FIXME("Unsupported conversion: %d -> 1\n", src->bit_count); return FALSE;

1 0

Huw Davies : gdi32/tests: Add tests for 1 bpp dibs.
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: f2e9545b86c4128e08db168f40f23fb57e54f354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2e9545b86c4128e08db168f4… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 15 13:43:50 2011 +0100 gdi32/tests: Add tests for 1 bpp dibs. --- dlls/gdi32/tests/dib.c | 105 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 93 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 60791ca..b5c42df 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -277,6 +277,41 @@ static const char *sha1_graphics_4[] = NULL }; +static const char *sha1_graphics_1[] = +{ + "23366004515f3bc46796ea505d748f8d0f97fbe1", + "ad674a4104c6a1eacaee8f20effdfe31775b4409", + "a7cc69f957d7b533a0a330859a143d701daac73c", + "a955bf088c5edb129289ce65caace48ec95632e4", + "5316d3c558c254479883133cf58cd07ab521d3f0", + "fcbfdb5d60716ea05f2d1896fae7a6e7a8249d35", + "2c140b39cc8d21358fded8959cd655f03d7f0f89", + "121423a38b4ac4743bd516e0a7e88a3863796313", + "7c17635c6c7f62dbf8fd4773d0c503358553d2c7", + "21d5d9e47bb07de2cf7bc99b7725390d03a6cde6", + "f69ee65ea25676429a28eea79b5b9cb9206b8d01", + "39ff81f77ef4ee772367ed1a63785987c060126e", + "4c686508a994ca4c7a0a73b8c0fe52423c180d9c", + "b0cc1f5e244ae0c0835a9866a46abdfcd56d1cb1", + "7ddf19df5bbdf4475b6ec1bc042425e382502864", + "144c9a846e5e37ac6efd5ed3a97ec231479e8fca", + "c5ffc59048bf786b5646ad6226cd8633965de9ef", + "400a21caa01e015096ee1afcf1b54e7f8ec515bd", + "0ff4b49797e30e3555aab45219adf449a9a560ff", + "144c9a846e5e37ac6efd5ed3a97ec231479e8fca", + "b85463875f755b85f1464b1b6275912bcbad6c9f", + "a4964d8bbf80fe785f906bc0f7c5b113242a58fc", + "a5d204cc7342d40b765ca042f8668e22601c4ff9", + "adb2818f6d3845dd140bc0f9abdbaa89d2a8c3de", + "0a76e0121facb103857130bc6e12185ad77fc3fa", + "13cc63972aee4f6ae27091a8af18de01f1d3a5da", + "3bb745ccb08402ce6fac6ee26fb8d7aad2dba27e", + "d1e6091caa4482d3142df3b958606c41ebf4698e", + "07c1116d8286fb665a1005de220eadc3d5999aaf", + "4afb0649488f6e6f7d3a2b8bf438d82f2c88f4d1", + NULL +}; + static inline DWORD get_stride(BITMAPINFO *bmi) { return ((bmi->bmiHeader.biBitCount * bmi->bmiHeader.biWidth + 31) >> 3) & ~3; @@ -321,9 +356,11 @@ static char *hash_dib(BITMAPINFO *bmi, void *bits) return buf; } -static void compare_hash(BITMAPINFO *bmi, BYTE *bits, const char ***sha1, const char *info) +static void compare_hash_broken_todo(BITMAPINFO *bmi, BYTE *bits, const char ***sha1, const char *info, int num_broken, BOOL todo) { char *hash = hash_dib(bmi, bits); + BOOL ok_cond; + int i; if(!hash) { @@ -331,17 +368,37 @@ static void compare_hash(BITMAPINFO *bmi, BYTE *bits, const char ***sha1, const return; } - if(**sha1) + for(i = 0; i <= num_broken; i++) { - ok(!strcmp(hash, **sha1), "%d: %s: expected hash %s got %s\n", - bmi->bmiHeader.biBitCount, info, **sha1, hash); - (*sha1)++; + if((*sha1)[i] == NULL) + { + ok((*sha1)[i] != NULL, "missing hash, got \"%s\",\n", hash); + return; + } } - else ok(**sha1 != NULL, "missing hash, got \"%s\",\n", hash); + + ok_cond = !strcmp(hash, **sha1); + + for(i = 1; i <= num_broken; i++) + ok_cond = ok_cond || broken( !strcmp(hash, (*sha1)[i]) ); + + if(todo) + todo_wine ok( ok_cond, "%d: %s: expected hash %s got %s\n", + bmi->bmiHeader.biBitCount, info, **sha1, hash ); + else + ok( ok_cond, "%d: %s: expected hash %s got %s\n", + bmi->bmiHeader.biBitCount, info, **sha1, hash ); + + *sha1 += num_broken + 1; HeapFree(GetProcessHeap(), 0, hash); } +static void compare_hash(BITMAPINFO *bmi, BYTE *bits, const char ***sha1, const char *info) +{ + compare_hash_broken_todo(bmi, bits, sha1, info, 0, FALSE); +} + static const RECT bias_check[] = { {100, 100, 200, 150}, @@ -458,6 +515,7 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh BYTE dib_brush_buf[sizeof(BITMAPINFO) + 256 * sizeof(RGBQUAD) + 16 * 16 * sizeof(DWORD)]; /* Enough for 16 x 16 at 32 bpp */ BITMAPINFO *brush_bi = (BITMAPINFO*)dib_brush_buf; BYTE *brush_bits; + BOOL dib_is_1bpp = (bmi->bmiHeader.biBitCount == 1); memset(bits, 0xcc, dib_size); compare_hash(bmi, bits, sha1, "empty"); @@ -654,7 +712,7 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh y += 25; } } - compare_hash(bmi, bits, sha1, "top-down 8888 dib brush patblt"); + compare_hash_broken_todo(bmi, bits, sha1, "top-down 8888 dib brush patblt", dib_is_1bpp ? 1 : 0, dib_is_1bpp); memset(bits, 0xcc, dib_size); SelectObject(hdc, orig_brush); @@ -684,7 +742,7 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh y += 25; } } - compare_hash(bmi, bits, sha1, "bottom-up 8888 dib brush patblt"); + compare_hash_broken_todo(bmi, bits, sha1, "bottom-up 8888 dib brush patblt", dib_is_1bpp ? 1 : 0, dib_is_1bpp); memset(bits, 0xcc, dib_size); /* 24 bpp dib pattern brush */ @@ -711,7 +769,7 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh y += 25; } } - compare_hash(bmi, bits, sha1, "top-down 24 bpp brush patblt"); + compare_hash_broken_todo(bmi, bits, sha1, "top-down 24 bpp brush patblt", dib_is_1bpp ? 1 : 0, dib_is_1bpp); memset(bits, 0xcc, dib_size); SelectObject(hdc, orig_brush); @@ -741,7 +799,7 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh y += 25; } } - compare_hash(bmi, bits, sha1, "top-down 555 dib brush patblt"); + compare_hash_broken_todo(bmi, bits, sha1, "top-down 555 dib brush patblt", dib_is_1bpp ? 1 : 0, dib_is_1bpp); memset(bits, 0xcc, dib_size); SelectObject(hdc, orig_brush); @@ -781,7 +839,7 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh y += 25; } } - compare_hash(bmi, bits, sha1, "top-down 8 bpp dib brush patblt"); + compare_hash_broken_todo(bmi, bits, sha1, "top-down 8 bpp dib brush patblt", dib_is_1bpp ? 1 : 0, dib_is_1bpp); memset(bits, 0xcc, dib_size); SelectObject(hdc, orig_brush); @@ -806,7 +864,7 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh y += 25; } } - compare_hash(bmi, bits, sha1, "top-down 4 bpp dib brush patblt"); + compare_hash_broken_todo(bmi, bits, sha1, "top-down 4 bpp dib brush patblt", dib_is_1bpp ? 1 : 0, dib_is_1bpp); memset(bits, 0xcc, dib_size); SelectObject(hdc, orig_brush); @@ -1062,6 +1120,29 @@ todo_wine SelectObject(mem_dc, orig_bm); DeleteObject(dib); + /* 1 */ + trace("1\n"); + bmi->bmiHeader.biBitCount = 1; + bmi->bmiHeader.biClrUsed = 2; + + bmi->bmiColors[0].rgbRed = 0x00; + bmi->bmiColors[0].rgbGreen = 0x01; + bmi->bmiColors[0].rgbBlue = 0xff; + bmi->bmiColors[1].rgbRed = 0xff; + bmi->bmiColors[1].rgbGreen = 0x00; + bmi->bmiColors[1].rgbBlue = 0x00; + + 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_1; + 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 1 bpp dibs.
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: b0f59c3b11d928243dc54fb076b2a1ba27c1562e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0f59c3b11d928243dc54fb07… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 15 13:43:49 2011 +0100 gdi32: Add support for 1 bpp dibs. --- dlls/gdi32/dibdrv/dc.c | 6 + dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/objects.c | 49 ++++++- dlls/gdi32/dibdrv/primitives.c | 328 +++++++++++++++++++++++++++++++++++++++- dlls/gdi32/tests/bitmap.c | 3 +- 5 files changed, 379 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b0f59c3b11d928243dc54…

1 0

Huw Davies : gdi32: Add helpers to retrieve foreground and background colours.
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: 3582d3dfb41fdc51854b2fc6d3cc9b7a392064b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3582d3dfb41fdc51854b2fc6d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 15 13:43:48 2011 +0100 gdi32: Add helpers to retrieve foreground and background colours. --- dlls/gdi32/dibdrv/dc.c | 25 +++++++++++++++---------- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/objects.c | 41 +++++++++++++++++++++++++++++++++++------ 3 files changed, 51 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 6a38480..53e63bd 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -262,6 +262,20 @@ BOOL convert_dib(dib_info *dst, const dib_info *src) return ret; } +static void update_fg_colors( dibdrv_physdev *pdev ) +{ + pdev->pen_color = get_fg_color( pdev, pdev->pen_colorref ); + pdev->brush_color = get_fg_color( pdev, pdev->brush_colorref ); +} + +static void update_masks( dibdrv_physdev *pdev, INT rop ) +{ + calc_and_xor_masks( rop, pdev->pen_color, &pdev->pen_and, &pdev->pen_xor ); + update_brush_rop( pdev, rop ); + if( GetBkMode( pdev->dev.hdc ) == OPAQUE ) + calc_and_xor_masks( rop, pdev->bkgnd_color, &pdev->bkgnd_and, &pdev->bkgnd_xor ); +} + /*********************************************************************** * dibdrv_DeleteDC */ @@ -357,14 +371,6 @@ static void CDECL dibdrv_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip return next->funcs->pSetDeviceClipping( next, vis_rgn, clip_rgn); } -static void update_masks( dibdrv_physdev *pdev, INT rop ) -{ - calc_and_xor_masks( rop, pdev->pen_color, &pdev->pen_and, &pdev->pen_xor ); - update_brush_rop( pdev, rop ); - if( GetBkMode( pdev->dev.hdc ) == OPAQUE ) - calc_and_xor_masks( rop, pdev->bkgnd_color, &pdev->bkgnd_and, &pdev->bkgnd_xor ); -} - /*********************************************************************** * dibdrv_SetDIBColorTable */ @@ -379,9 +385,8 @@ static UINT CDECL dibdrv_SetDIBColorTable( PHYSDEV dev, UINT pos, UINT count, co if( pos + count > pdev->dib.color_table_size ) count = pdev->dib.color_table_size - pos; memcpy( pdev->dib.color_table + pos, colors, count * sizeof(RGBQUAD) ); - pdev->pen_color = pdev->dib.funcs->colorref_to_pixel( &pdev->dib, pdev->pen_colorref ); - pdev->brush_color = pdev->dib.funcs->colorref_to_pixel( &pdev->dib, pdev->brush_colorref ); pdev->bkgnd_color = pdev->dib.funcs->colorref_to_pixel( &pdev->dib, GetBkColor( dev->hdc ) ); + update_fg_colors( pdev ); update_masks( pdev, GetROP2( dev->hdc ) ); } diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index c23574b..3ebe4fe 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -62,6 +62,7 @@ extern void free_dib_info(dib_info *dib, BOOL free_bits) DECLSPEC_HIDDEN; extern void free_pattern_brush(dibdrv_physdev *pdev) DECLSPEC_HIDDEN; extern void copy_dib_color_info(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN; extern BOOL convert_dib(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN; +extern DWORD get_fg_color(dibdrv_physdev *pdev, COLORREF color) DECLSPEC_HIDDEN; static inline BOOL defer_pen(dibdrv_physdev *pdev) { diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 381cc39..2b59d0a 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -92,6 +92,36 @@ void calc_and_xor_masks(INT rop, DWORD color, DWORD *and, DWORD *xor) *xor = (color & rop2_xor_array[rop-1][0]) | ((~color) & rop2_xor_array[rop-1][1]); } +/****************************************************************** + * get_fg_color + */ +DWORD get_fg_color( dibdrv_physdev *pdev, COLORREF fg ) +{ + if(pdev->dib.bit_count != 1) + return pdev->dib.funcs->colorref_to_pixel( &pdev->dib, fg ); + + FIXME("bit count == 1\n"); + return 0; +} + +/*************************************************************************** + * get_pen_bkgnd_masks + */ +static inline void get_pen_bkgnd_masks(const dibdrv_physdev *pdev, DWORD *and, DWORD *xor) +{ + if(pdev->dib.bit_count != 1 || GetBkMode(pdev->dev.hdc) == TRANSPARENT) + { + *and = pdev->bkgnd_and; + *xor = pdev->bkgnd_xor; + } + else + { + FIXME("bit count == 1\n"); + *and = ~0u; + *xor = 0u; + } +} + static inline void order_end_points(int *s, int *e) { if(*s > *e) @@ -579,8 +609,7 @@ static inline void get_dash_colors(const dibdrv_physdev *pdev, DWORD *and, DWORD } else /* space */ { - *and = pdev->bkgnd_and; - *xor = pdev->bkgnd_xor; + get_pen_bkgnd_masks( pdev, and, xor ); } } @@ -869,7 +898,7 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) logpen.lopnColor = GetDCPenColor( dev->hdc ); pdev->pen_colorref = logpen.lopnColor; - pdev->pen_color = pdev->dib.funcs->colorref_to_pixel(&pdev->dib, logpen.lopnColor); + pdev->pen_color = get_fg_color( pdev, pdev->pen_colorref ); calc_and_xor_masks(GetROP2(dev->hdc), pdev->pen_color, &pdev->pen_and, &pdev->pen_xor); pdev->pen_pattern = dash_patterns[PS_SOLID]; @@ -921,7 +950,7 @@ COLORREF CDECL dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) if (GetCurrentObject(dev->hdc, OBJ_PEN) == GetStockObject( DC_PEN )) { pdev->pen_colorref = color; - pdev->pen_color = pdev->dib.funcs->colorref_to_pixel(&pdev->dib, color); + pdev->pen_color = get_fg_color( pdev, pdev->pen_colorref ); calc_and_xor_masks(GetROP2(dev->hdc), pdev->pen_color, &pdev->pen_and, &pdev->pen_xor); } @@ -1105,7 +1134,7 @@ HBRUSH CDECL dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) { case BS_SOLID: pdev->brush_colorref = logbrush.lbColor; - pdev->brush_color = pdev->dib.funcs->colorref_to_pixel(&pdev->dib, logbrush.lbColor); + pdev->brush_color = get_fg_color( pdev, pdev->brush_colorref ); calc_and_xor_masks(GetROP2(dev->hdc), pdev->brush_color, &pdev->brush_and, &pdev->brush_xor); pdev->brush_rects = solid_brush; pdev->defer &= ~DEFER_BRUSH; @@ -1156,7 +1185,7 @@ COLORREF CDECL dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) if (GetCurrentObject(dev->hdc, OBJ_BRUSH) == GetStockObject( DC_BRUSH )) { pdev->brush_colorref = color; - pdev->brush_color = pdev->dib.funcs->colorref_to_pixel(&pdev->dib, color); + pdev->brush_color = get_fg_color( pdev, pdev->brush_colorref ); calc_and_xor_masks(GetROP2(dev->hdc), pdev->brush_color, &pdev->brush_and, &pdev->brush_xor); }

1 0

Huw Davies : gdi32/tests: Add tests for 1bpp brushes.
by Alexandre Julliard June 15, 2011

June 15, 2011

Module: wine Branch: master Commit: b1ec7c9d71cb42fb1790a519020807ccefbae01d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1ec7c9d71cb42fb1790a5190… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 15 13:43:52 2011 +0100 gdi32/tests: Add tests for 1bpp brushes. --- dlls/gdi32/tests/dib.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index b5c42df..86e4fee 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -97,6 +97,7 @@ static const char *sha1_graphics_a8r8g8b8[] = "d7398de15b2837a58a62a701ca1b3384625afec4", "a78b28472bb7ff480ddedd06b9cf2daa775fa7ae", "5246ef357e7317b9d141a3294d300c195da76cb7", + "87f6b6a19f021ca5912d285e14ce2ff9474d79f3", "e2a8eef4aeda3a0f6c950075acba38f1f9e0814d", "8b66f14d51ecdeea12bc993302bb9b7d3ec085a1", "7da9dd3d40d44d92deb9883fb7110443c2d5769a", @@ -126,6 +127,7 @@ static const char *sha1_graphics_a8b8g8r8[] = "3369889a67d6c79a24ee15f7d14374f9995215e4", "473a1fd07df800c87a5d3286b642ace10c61c6af", "10cd25a0ed5cd8f978d7d68236f81d949b938e84", + "b8951d2b20518fd129e5113a5f429626893913bf", "4851c5b7d5bc18590e787c0c218a592ef504e738", "9aa506e3df33e0d5298755aa4144e10eb4b5adcf", "abdf003699364fe45fab7dc61e67c606d0063b40", @@ -155,6 +157,7 @@ static const char *sha1_graphics_24[] = "0bb222e540b82720d4971e4a2fc626899af03e03", "adc20832d8c43f1cf372d8392535492013cd2306", "45649794dcbcabda487f66f7a80fc1bec79047a1", + "367c2dc1e91ff9ea0e984d6fb3000cfb4e0ae7e9", "b4df692ac70a5f9f303270df4641ab014c6cbf46", "8bc3128ba47891366fd7b02fde7ca19100e64b9f", "e649e00efe7fea1eb8b17f7867fe089e5270c44b", @@ -184,6 +187,7 @@ static const char *sha1_graphics_r5g5b5[] = "9d21bcfdeaf1ca5d47eb823bdefc24d7a95f4f56", "6daaf945a955928c5c124c880522ca4634fb2343", "12a288390d16e1efa99d4185301de48a4d433b14", + "ea92af2538b76f41a3a03eaa11ac395c9b6197c4", "3a50ce21b3563a604b4fc9f247a30f5a981f1ba6", "d7d97e28ed316f6596c737eb83baa5948d86b673", "ecc2991277d7314f55b00e0f284ae3703aeef81e", @@ -213,6 +217,7 @@ static const char *sha1_graphics_r4g4b4[] = "32b6e0aa79b7e96cd0ab2da167f6463c011023a8", "1d283aa4d2b2114f7809fe59357d590c7c779aa7", "29640e2ddd2d3016da14507c3ce9b2ce32f39bb4", + "57ebf8becac1524543da120e88e9cc57ecfdec49", "d591232bbc2592462c819a9486750f64180518fd", "0e183a4c30b3da345129cffe33fe0fc593d8666b", "f14d9a4bd8a365b7c8f068a0dad481b6eb2b178b", @@ -242,6 +247,7 @@ static const char *sha1_graphics_8[] = "cfc67c325c7cdf96d90af9b3cceb8d0504cbb3b0", "7262364067e03c7fa498af1d59d228d6c63b460e", "5241241a355a667ef0834049adf4218e8b3f16b8", + "db22d666690948eb966f75b796c72c7150a5c4b9", "1f13ea0034db4b0ffa4ddcff9664fd892058f9cd", "3caf512cfddfd463d0750cfe3cadb58548eb2ae8", "4e5e7d5fd64818b2b3d3e793c88f603b699d2f0f", @@ -271,6 +277,7 @@ static const char *sha1_graphics_4[] = "0f44e12ecd1ea7e39433890443626d4fc35204a4", "eb38683e812fd13dca971ba8f4cfd2b6820d3524", "73bbc83f88f1aaa6df0158b63e70bb3165163163", + "0dc2690a5c58a2907a8ab06693ebfab6698172eb", "39c16648cf6c261be71a33cec41867f28e119b94", "26ad5116562e7b58c76a26eaf521e2e40899e944", "1bcc54eaf8e3c2b7c59ecccb23c240181d7ba8b8", @@ -306,6 +313,8 @@ static const char *sha1_graphics_1[] = "0a76e0121facb103857130bc6e12185ad77fc3fa", "13cc63972aee4f6ae27091a8af18de01f1d3a5da", "3bb745ccb08402ce6fac6ee26fb8d7aad2dba27e", + "4d95c3d1e170f004c80aa8c52feafb8e0e90760e", + "c14832e69ec3585c15987b3d69d5007236fa9814", "d1e6091caa4482d3142df3b958606c41ebf4698e", "07c1116d8286fb665a1005de220eadc3d5999aaf", "4afb0649488f6e6f7d3a2b8bf438d82f2c88f4d1", @@ -504,6 +513,7 @@ static const BITMAPINFOHEADER dib_brush_header_24 = {sizeof(BITMAPINFOHEADER), 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 const BITMAPINFOHEADER dib_brush_header_4 = {sizeof(BITMAPINFOHEADER), 16, -16, 1, 4, BI_RGB, 0, 0, 0, 0, 0}; +static const BITMAPINFOHEADER dib_brush_header_1 = {sizeof(BITMAPINFOHEADER), 16, -16, 1, 1, BI_RGB, 0, 0, 0, 0, 0}; static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sha1) { @@ -745,6 +755,9 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh compare_hash_broken_todo(bmi, bits, sha1, "bottom-up 8888 dib brush patblt", dib_is_1bpp ? 1 : 0, dib_is_1bpp); memset(bits, 0xcc, dib_size); + SelectObject(hdc, orig_brush); + DeleteObject(dib_brush); + /* 24 bpp dib pattern brush */ brush_bi->bmiHeader = dib_brush_header_24; @@ -868,6 +881,35 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh memset(bits, 0xcc, dib_size); SelectObject(hdc, orig_brush); + DeleteObject(dib_brush); + + /* 1 bpp dib pattern brush */ + + brush_bi->bmiHeader = dib_brush_header_1; + brush_bi->bmiHeader.biClrUsed = 2; + memset(brush_bits, 0, 16 * 4); + brush_bits[0] = 0xf0; + brush_bits[4] = 0xf0; + brush_bits[8] = 0xf0; + + dib_brush = CreateDIBPatternBrushPt(brush_bi, DIB_RGB_COLORS); + SelectObject(hdc, dib_brush); + 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_broken_todo(bmi, bits, sha1, "top-down 1 bpp dib brush patblt", dib_is_1bpp ? 1 : 0, dib_is_1bpp); + memset(bits, 0xcc, dib_size); + + SelectObject(hdc, orig_brush); SetBrushOrgEx(hdc, 0, 0, NULL); /* Rectangle */

1 0