December 2011 - Wine-commits

Jacek Caban : jscript: Properly handle NULL IDispatch in stack_pop_object.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 2c8e8948df50313990bfa80ba08ac91b4fbe9aec URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c8e8948df50313990bfa80ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 12 14:44:09 2011 +0100 jscript: Properly handle NULL IDispatch in stack_pop_object. --- dlls/jscript/engine.c | 2 + dlls/jscript/jscript.h | 1 + dlls/jscript/jscript.rc | 1 + dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 3 ++ po/ar.po | 50 +++++++++++++++++++++++-------------------- po/bg.po | 50 +++++++++++++++++++++++-------------------- po/ca.po | 51 ++++++++++++++++++++++++-------------------- po/cs.po | 50 +++++++++++++++++++++++-------------------- po/da.po | 51 ++++++++++++++++++++++++-------------------- po/de.po | 51 ++++++++++++++++++++++++-------------------- po/el.po | 50 +++++++++++++++++++++++-------------------- po/en.po | 50 +++++++++++++++++++++++-------------------- po/en_US.po | 50 +++++++++++++++++++++++-------------------- po/eo.po | 50 +++++++++++++++++++++++-------------------- po/es.po | 51 ++++++++++++++++++++++++-------------------- po/fa.po | 50 +++++++++++++++++++++++-------------------- po/fi.po | 50 +++++++++++++++++++++++-------------------- po/fr.po | 51 ++++++++++++++++++++++++-------------------- po/he.po | 50 +++++++++++++++++++++++-------------------- po/hi.po | 50 +++++++++++++++++++++++-------------------- po/hu.po | 51 ++++++++++++++++++++++++-------------------- po/it.po | 51 ++++++++++++++++++++++++-------------------- po/ja.po | 51 ++++++++++++++++++++++++-------------------- po/ko.po | 51 ++++++++++++++++++++++++-------------------- po/lt.po | 51 ++++++++++++++++++++++++-------------------- po/ml.po | 50 +++++++++++++++++++++++-------------------- po/nb_NO.po | 51 ++++++++++++++++++++++++-------------------- po/nl.po | 51 ++++++++++++++++++++++++-------------------- po/or.po | 50 +++++++++++++++++++++++-------------------- po/pa.po | 50 +++++++++++++++++++++++-------------------- po/pl.po | 51 ++++++++++++++++++++++++-------------------- po/pt_BR.po | 51 ++++++++++++++++++++++++-------------------- po/pt_PT.po | 51 ++++++++++++++++++++++++-------------------- po/rm.po | 50 +++++++++++++++++++++++-------------------- po/ro.po | 51 ++++++++++++++++++++++++-------------------- po/ru.po | 51 ++++++++++++++++++++++++-------------------- po/sk.po | 50 +++++++++++++++++++++++-------------------- po/sl.po | 51 ++++++++++++++++++++++++-------------------- po/sr_RS(a)cyrillic.po | 51 ++++++++++++++++++++++++-------------------- po/sr_RS(a)latin.po | 51 ++++++++++++++++++++++++-------------------- po/sv.po | 51 ++++++++++++++++++++++++-------------------- po/te.po | 50 +++++++++++++++++++++++-------------------- po/th.po | 50 +++++++++++++++++++++++-------------------- po/tr.po | 50 +++++++++++++++++++++++-------------------- po/uk.po | 51 ++++++++++++++++++++++++-------------------- po/wa.po | 50 +++++++++++++++++++++++-------------------- po/wine.pot | 50 +++++++++++++++++++++++-------------------- po/zh_CN.po | 50 +++++++++++++++++++++++-------------------- po/zh_TW.po | 50 +++++++++++++++++++++++-------------------- 50 files changed, 1245 insertions(+), 1035 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c8e8948df50313990bfa…

1 0

Jacek Caban : jscript: Initialize VARIANT before passing it to disp_propget .
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 64ef20ce5332f5601a6afe7f12f9a538e45d6475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64ef20ce5332f5601a6afe7f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 12 14:44:20 2011 +0100 jscript: Initialize VARIANT before passing it to disp_propget. --- dlls/jscript/engine.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 0bc5a5b..da02052 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1579,6 +1579,7 @@ static HRESULT interp_member(exec_ctx_t *ctx) hres = disp_get_id(ctx->parser->script, obj, arg, 0, &id); if(SUCCEEDED(hres)) { + V_VT(&v) = VT_EMPTY; hres = disp_propget(ctx->parser->script, obj, id, &v, &ctx->ei, NULL/*FIXME*/); }else if(hres == DISP_E_UNKNOWNNAME) { V_VT(&v) = VT_EMPTY;

1 0

Dmitry Timoshkov : user32: Strip WS_CAPTION|WS_SYSMENU when a dialog has DS_CONTROL style set.
by Alexandre Julliard 12 Dec '11

12 Dec '11

1 0

Alexandre Julliard : gdi32: GetCharABCWidthsFloatW must succeed with non-TrueType fonts.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 27eb63b0829d5d38ed4b0ed99d240db872620d09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27eb63b0829d5d38ed4b0ed99… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 11:14:09 2011 +0100 gdi32: GetCharABCWidthsFloatW must succeed with non-TrueType fonts. --- dlls/gdi32/font.c | 9 +++++++++ dlls/gdi32/freetype.c | 3 --- dlls/gdi32/tests/font.c | 14 +++++++++++++- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 0d308b0..d2dfd44 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2656,6 +2656,7 @@ BOOL WINAPI GetCharABCWidthsW( HDC hdc, UINT firstChar, UINT lastChar, PHYSDEV dev; unsigned int i; BOOL ret; + TEXTMETRICW tm; if (!dc) return FALSE; @@ -2665,6 +2666,14 @@ BOOL WINAPI GetCharABCWidthsW( HDC hdc, UINT firstChar, UINT lastChar, return FALSE; } + /* unlike GetCharABCWidthsFloatW, this one is supposed to fail on non-TrueType fonts */ + dev = GET_DC_PHYSDEV( dc, pGetTextMetrics ); + if (!dev->funcs->pGetTextMetrics( dev, &tm ) || !(tm.tmPitchAndFamily & TMPF_TRUETYPE)) + { + release_dc_ptr( dc ); + return FALSE; + } + dev = GET_DC_PHYSDEV( dc, pGetCharABCWidths ); ret = dev->funcs->pGetCharABCWidths( dev, firstChar, lastChar, abc ); if (ret) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3a1ae99..959f4aa 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6416,9 +6416,6 @@ static BOOL freetype_GetCharABCWidths( PHYSDEV dev, UINT firstChar, UINT lastCha TRACE("%p, %d, %d, %p\n", physdev->font, firstChar, lastChar, buffer); - if(!FT_IS_SCALABLE(physdev->font->ft_face)) - return FALSE; - GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 30296a5..cc34fed 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -41,6 +41,7 @@ static DWORD (WINAPI *pGdiGetCodePage)(HDC hdc); static BOOL (WINAPI *pGetCharABCWidthsI)(HDC hdc, UINT first, UINT count, LPWORD glyphs, LPABC abc); static BOOL (WINAPI *pGetCharABCWidthsA)(HDC hdc, UINT first, UINT last, LPABC abc); static BOOL (WINAPI *pGetCharABCWidthsW)(HDC hdc, UINT first, UINT last, LPABC abc); +static BOOL (WINAPI *pGetCharABCWidthsFloatW)(HDC hdc, UINT first, UINT last, LPABCFLOAT abc); static DWORD (WINAPI *pGetFontUnicodeRanges)(HDC hdc, LPGLYPHSET lpgs); static DWORD (WINAPI *pGetGlyphIndicesA)(HDC hdc, LPCSTR lpstr, INT count, LPWORD pgi, DWORD flags); static DWORD (WINAPI *pGetGlyphIndicesW)(HDC hdc, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags); @@ -63,6 +64,7 @@ static void init(void) pGetCharABCWidthsI = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsI"); pGetCharABCWidthsA = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsA"); pGetCharABCWidthsW = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsW"); + pGetCharABCWidthsFloatW = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsFloatW"); pGetFontUnicodeRanges = (void *)GetProcAddress(hgdi32, "GetFontUnicodeRanges"); pGetGlyphIndicesA = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesA"); pGetGlyphIndicesW = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesW"); @@ -936,6 +938,7 @@ static void test_GetCharABCWidths(void) LOGFONTA lf; HFONT hfont; ABC abc[1]; + ABCFLOAT abcf[1]; WORD glyphs[1]; DWORD nb; static const struct @@ -973,7 +976,7 @@ static void test_GetCharABCWidths(void) }; UINT i; - if (!pGetCharABCWidthsA || !pGetCharABCWidthsW || !pGetCharABCWidthsI) + if (!pGetCharABCWidthsA || !pGetCharABCWidthsW || !pGetCharABCWidthsFloatW || !pGetCharABCWidthsI) { win_skip("GetCharABCWidthsA/W/I not available on this platform\n"); return; @@ -1008,6 +1011,15 @@ static void test_GetCharABCWidths(void) ret = pGetCharABCWidthsW(hdc, 'a', 'a', abc); ok(!ret, "GetCharABCWidthsW should have failed\n"); + ret = pGetCharABCWidthsFloatW(NULL, 'a', 'a', abcf); + ok(!ret, "GetCharABCWidthsFloatW should have failed\n"); + + ret = pGetCharABCWidthsFloatW(hdc, 'a', 'a', NULL); + ok(!ret, "GetCharABCWidthsFloatW should have failed\n"); + + ret = pGetCharABCWidthsFloatW(hdc, 'a', 'a', abcf); + ok(ret, "GetCharABCWidthsFloatW should have succeeded\n"); + hfont = SelectObject(hdc, hfont); DeleteObject(hfont);

1 0

Alexandre Julliard : gdi32: Store the default color tables as static data.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 3a9cabb8c4a72cf9e1247dfbf29d070b573d3eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a9cabb8c4a72cf9e1247dfbf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 17:03:28 2011 +0100 gdi32: Store the default color tables as static data. --- dlls/gdi32/dib.c | 150 ++++++++++++++++++++++++++++------------------ dlls/gdi32/gdi_private.h | 1 + 2 files changed, 93 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3a9cabb8c4a72cf9e1247…

1 0

Alexandre Julliard : gdi32: Use the default DIB color table to create system and halftone palettes.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: c5895ead6a778ecee4dd31f1549d6b730146a970 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5895ead6a778ecee4dd31f15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 11:16:59 2011 +0100 gdi32: Use the default DIB color table to create system and halftone palettes. --- dlls/gdi32/palette.c | 151 +++++++++----------------------------------- dlls/gdi32/tests/palette.c | 39 +++++++++++ 2 files changed, 70 insertions(+), 120 deletions(-) diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index f172897..338d860 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -72,40 +72,6 @@ static UINT SystemPaletteUse = SYSPAL_STATIC; /* currently not considered */ static HPALETTE hPrimaryPalette = 0; /* used for WM_PALETTECHANGED */ static HPALETTE hLastRealizedPalette = 0; /* UnrealizeObject() needs it */ -#define NB_RESERVED_COLORS 20 /* number of fixed colors in system palette */ - -static const PALETTEENTRY sys_pal_template[NB_RESERVED_COLORS] = -{ - /* first 10 entries in the system palette */ - /* red green blue flags */ - { 0x00, 0x00, 0x00, 0 }, - { 0x80, 0x00, 0x00, 0 }, - { 0x00, 0x80, 0x00, 0 }, - { 0x80, 0x80, 0x00, 0 }, - { 0x00, 0x00, 0x80, 0 }, - { 0x80, 0x00, 0x80, 0 }, - { 0x00, 0x80, 0x80, 0 }, - { 0xc0, 0xc0, 0xc0, 0 }, - { 0xc0, 0xdc, 0xc0, 0 }, - { 0xa6, 0xca, 0xf0, 0 }, - - /* ... c_min/2 dynamic colorcells */ - - /* ... gap (for sparse palettes) */ - - /* ... c_min/2 dynamic colorcells */ - - { 0xff, 0xfb, 0xf0, 0 }, - { 0xa0, 0xa0, 0xa4, 0 }, - { 0x80, 0x80, 0x80, 0 }, - { 0xff, 0x00, 0x00, 0 }, - { 0x00, 0xff, 0x00, 0 }, - { 0xff, 0xff, 0x00, 0 }, - { 0x00, 0x00, 0xff, 0 }, - { 0xff, 0x00, 0xff, 0 }, - { 0x00, 0xff, 0xff, 0 }, - { 0xff, 0xff, 0xff, 0 } /* last 10 */ -}; /*********************************************************************** * PALETTE_Init @@ -114,21 +80,30 @@ static const PALETTEENTRY sys_pal_template[NB_RESERVED_COLORS] = */ HPALETTE PALETTE_Init(void) { - HPALETTE hpalette; - LOGPALETTE * palPtr; + const RGBQUAD *entries = get_default_color_table( 8 ); + char buffer[FIELD_OFFSET( LOGPALETTE, palPalEntry[20] )]; + LOGPALETTE *palPtr = (LOGPALETTE *)buffer; + int i; /* create default palette (20 system colors) */ - palPtr = HeapAlloc( GetProcessHeap(), 0, - sizeof(LOGPALETTE) + (NB_RESERVED_COLORS-1)*sizeof(PALETTEENTRY)); - if (!palPtr) return FALSE; - palPtr->palVersion = 0x300; - palPtr->palNumEntries = NB_RESERVED_COLORS; - memcpy( palPtr->palPalEntry, sys_pal_template, sizeof(sys_pal_template) ); - hpalette = CreatePalette( palPtr ); - HeapFree( GetProcessHeap(), 0, palPtr ); - return hpalette; + palPtr->palNumEntries = 20; + for (i = 0; i < 10; i++) + { + palPtr->palPalEntry[i].peRed = entries[i].rgbRed; + palPtr->palPalEntry[i].peGreen = entries[i].rgbGreen; + palPtr->palPalEntry[i].peBlue = entries[i].rgbBlue; + palPtr->palPalEntry[i].peFlags = 0; + } + for (i = 10; i < 20; i++) + { + palPtr->palPalEntry[i].peRed = entries[236 + i].rgbRed; + palPtr->palPalEntry[i].peGreen = entries[236 + i].rgbGreen; + palPtr->palPalEntry[i].peBlue = entries[236 + i].rgbBlue; + palPtr->palPalEntry[i].peFlags = 0; + } + return CreatePalette( palPtr ); } @@ -151,8 +126,6 @@ HPALETTE WINAPI CreatePalette( if (!palette) return 0; TRACE("entries=%i\n", palette->palNumEntries); - size = sizeof(LOGPALETTE) + (palette->palNumEntries - 1) * sizeof(PALETTEENTRY); - if (!(palettePtr = HeapAlloc( GetProcessHeap(), 0, sizeof(*palettePtr) ))) return 0; palettePtr->unrealize = NULL; palettePtr->version = palette->palVersion; @@ -191,83 +164,21 @@ HPALETTE WINAPI CreatePalette( HPALETTE WINAPI CreateHalftonePalette( HDC hdc) /* [in] Handle to device context */ { + const RGBQUAD *entries = get_default_color_table( 8 ); + char buffer[FIELD_OFFSET( LOGPALETTE, palPalEntry[256] )]; + LOGPALETTE *pal = (LOGPALETTE *)buffer; int i; - struct { - WORD Version; - WORD NumberOfEntries; - PALETTEENTRY aEntries[256]; - } Palette; - - Palette.Version = 0x300; - Palette.NumberOfEntries = 256; - GetSystemPaletteEntries(hdc, 0, 256, Palette.aEntries); - - Palette.NumberOfEntries = 20; - for (i = 0; i < Palette.NumberOfEntries; i++) + pal->palVersion = 0x300; + pal->palNumEntries = 256; + for (i = 0; i < 256; i++) { - Palette.aEntries[i].peRed=0xff; - Palette.aEntries[i].peGreen=0xff; - Palette.aEntries[i].peBlue=0xff; - Palette.aEntries[i].peFlags=0x00; + pal->palPalEntry[i].peRed = entries[i].rgbRed; + pal->palPalEntry[i].peGreen = entries[i].rgbGreen; + pal->palPalEntry[i].peBlue = entries[i].rgbBlue; + pal->palPalEntry[i].peFlags = 0; } - - Palette.aEntries[0].peRed=0x00; - Palette.aEntries[0].peBlue=0x00; - Palette.aEntries[0].peGreen=0x00; - - /* the first 6 */ - for (i=1; i <= 6; i++) - { - Palette.aEntries[i].peRed=(i%2)?0x80:0; - Palette.aEntries[i].peGreen=(i==2)?0x80:(i==3)?0x80:(i==6)?0x80:0; - Palette.aEntries[i].peBlue=(i>3)?0x80:0; - } - - for (i=7; i <= 12; i++) - { - switch(i) - { - case 7: - Palette.aEntries[i].peRed=0xc0; - Palette.aEntries[i].peBlue=0xc0; - Palette.aEntries[i].peGreen=0xc0; - break; - case 8: - Palette.aEntries[i].peRed=0xc0; - Palette.aEntries[i].peGreen=0xdc; - Palette.aEntries[i].peBlue=0xc0; - break; - case 9: - Palette.aEntries[i].peRed=0xa6; - Palette.aEntries[i].peGreen=0xca; - Palette.aEntries[i].peBlue=0xf0; - break; - case 10: - Palette.aEntries[i].peRed=0xff; - Palette.aEntries[i].peGreen=0xfb; - Palette.aEntries[i].peBlue=0xf0; - break; - case 11: - Palette.aEntries[i].peRed=0xa0; - Palette.aEntries[i].peGreen=0xa0; - Palette.aEntries[i].peBlue=0xa4; - break; - case 12: - Palette.aEntries[i].peRed=0x80; - Palette.aEntries[i].peGreen=0x80; - Palette.aEntries[i].peBlue=0x80; - } - } - - for (i=13; i <= 18; i++) - { - Palette.aEntries[i].peRed=(i%2)?0xff:0; - Palette.aEntries[i].peGreen=(i==14)?0xff:(i==15)?0xff:(i==18)?0xff:0; - Palette.aEntries[i].peBlue=(i>15)?0xff:0x00; - } - - return CreatePalette((LOGPALETTE *)&Palette); + return CreatePalette( pal ); } diff --git a/dlls/gdi32/tests/palette.c b/dlls/gdi32/tests/palette.c index 039be59..4f14d7a 100644 --- a/dlls/gdi32/tests/palette.c +++ b/dlls/gdi32/tests/palette.c @@ -144,8 +144,47 @@ static void test_palette_entries(void) ok( palEntry.peFlags == getEntryResult.peFlags, "palEntry.peFlags (%#x) != getEntryResult.peFlags (%#x)\n", palEntry.peFlags, getEntryResult.peFlags ); } +static void test_halftone_palette(void) +{ + HDC hdc; + HPALETTE pal; + PALETTEENTRY entries[256]; + PALETTEENTRY defpal[20]; + int i, count; + + hdc = GetDC(0); + + count = GetPaletteEntries( GetStockObject(DEFAULT_PALETTE), 0, 20, defpal ); + ok( count == 20, "wrong size %u\n", count ); + + pal = CreateHalftonePalette( hdc ); + count = GetPaletteEntries( pal, 0, 256, entries ); + ok( count == 256 || broken(count == 20), /* nt 4 */ + "wrong size %u\n", count ); + + /* first and last 10 match the default palette */ + for (i = 0; i < 10; i++) + ok( entries[i].peRed == defpal[i].peRed && + entries[i].peGreen == defpal[i].peGreen && + entries[i].peBlue == defpal[i].peBlue && + !entries[i].peFlags, + "%u: wrong color %02x,%02x,%02x,%02x\n", i, + entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags ); + for (i = count - 10; i < count; i++) + ok( entries[i].peRed == defpal[i - count + 20].peRed && + entries[i].peGreen == defpal[i - count + 20].peGreen && + entries[i].peBlue == defpal[i - count + 20].peBlue && + !entries[i].peFlags, + "%u: wrong color %02x,%02x,%02x,%02x\n", i, + entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags ); + + DeleteObject( pal ); + ReleaseDC( 0, hdc ); +} + START_TEST(palette) { test_DIB_PAL_COLORS(); test_palette_entries(); + test_halftone_palette(); }

1 0

Alexandre Julliard : gdi32: Add a flag to request a default color table from init_dib_info.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: d353c95d474e9891dcfc6000620add57b08c23c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d353c95d474e9891dcfc60006… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 11:44:11 2011 +0100 gdi32: Add a flag to request a default color table from init_dib_info. --- dlls/gdi32/bitblt.c | 14 -------------- dlls/gdi32/dib.c | 1 - dlls/gdi32/dibdrv/bitblt.c | 5 ++--- dlls/gdi32/dibdrv/dc.c | 19 +++++++++++-------- dlls/gdi32/dibdrv/dibdrv.h | 3 ++- 5 files changed, 15 insertions(+), 27 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 7167c4a..1638f46 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -321,20 +321,6 @@ BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, err = dst_dev->funcs->pBlendImage( dst_dev, dst_info, &bits, src, dst, func ); if (err == ERROR_BAD_FORMAT) { - /* 1-bpp source without a color table uses black & white */ - if (src_info->bmiHeader.biBitCount == 1 && !src_info->bmiHeader.biClrUsed) - { - src_info->bmiColors[0].rgbRed = 0; - src_info->bmiColors[0].rgbGreen = 0; - src_info->bmiColors[0].rgbBlue = 0; - src_info->bmiColors[0].rgbReserved = 0; - src_info->bmiColors[1].rgbRed = 0xff; - src_info->bmiColors[1].rgbGreen = 0xff; - src_info->bmiColors[1].rgbBlue = 0xff; - src_info->bmiColors[1].rgbReserved = 0; - src_info->bmiHeader.biClrUsed = 2; - } - err = convert_bits( src_info, src, dst_info, &bits, TRUE ); if (!err) err = dst_dev->funcs->pBlendImage( dst_dev, dst_info, &bits, src, dst, func ); } diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 4d2ece9..d97b30f 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1155,7 +1155,6 @@ void get_ddb_bitmapinfo( BITMAPOBJ *bmp, BITMAPINFO *info ) info->bmiHeader.biYPelsPerMeter = 0; info->bmiHeader.biClrUsed = 0; info->bmiHeader.biClrImportant = 0; - if (info->bmiHeader.biBitCount <= 8) fill_default_color_table( info ); } BITMAPINFO *copy_packed_dib( const BITMAPINFO *src_info, UINT usage ) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 28e2fac..24ae1b2 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -927,7 +927,6 @@ static BOOL matching_color_info( const dib_info *dib, const BITMAPINFO *info ) case 8: { RGBQUAD *color_table = (RGBQUAD *)((char *)info + info->bmiHeader.biSize); - if (!info->bmiHeader.biClrUsed) return FALSE; if (dib->color_table_size != info->bmiHeader.biClrUsed) return FALSE; return !memcmp( color_table, dib->color_table, dib->color_table_size * sizeof(RGBQUAD) ); } @@ -1327,7 +1326,7 @@ DWORD blend_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitbl if (!init_dib_info_from_bitmapinfo( &src_dib, src_info, src_bits, 0 ) ) return ERROR_BAD_FORMAT; - if (!init_dib_info_from_bitmapinfo( &dst_dib, dst_info, dst_bits, 0 ) ) + if (!init_dib_info_from_bitmapinfo( &dst_dib, dst_info, dst_bits, default_color_table ) ) return ERROR_BAD_FORMAT; return blend_rect( &dst_dib, &dst->visrect, &src_dib, &src->visrect, NULL, blend ); @@ -1345,7 +1344,7 @@ DWORD gradient_bitmapinfo( const BITMAPINFO *info, void *bits, TRIVERTEX *vert_a DWORD ret = ERROR_SUCCESS; HRGN tmp_rgn = 0; - if (!init_dib_info_from_bitmapinfo( &dib, info, bits, 0 )) return ERROR_BAD_FORMAT; + if (!init_dib_info_from_bitmapinfo( &dib, info, bits, default_color_table )) return ERROR_BAD_FORMAT; switch (mode) { diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 2f06d62..6bcce26 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -153,6 +153,11 @@ static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD dib->color_table = color_table; dib->color_table_size = bi->biClrUsed; } + else if (flags & default_color_table) + { + dib->color_table = (RGBQUAD *)get_default_color_table( dib->bit_count ); + dib->color_table_size = dib->color_table ? (1 << dib->bit_count) : 0; + } else { dib->color_table = NULL; @@ -186,10 +191,9 @@ BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_f { if (!bmp->dib) { - char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - BITMAPINFO *info = (BITMAPINFO *)buffer; + BITMAPINFO info; - get_ddb_bitmapinfo( bmp, info ); + get_ddb_bitmapinfo( bmp, &info ); if (!bmp->bitmap.bmBits) { int width_bytes = get_dib_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); @@ -197,8 +201,7 @@ BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_f bmp->bitmap.bmHeight * width_bytes ); if (!bmp->bitmap.bmBits) return FALSE; } - return init_dib_info_from_bitmapinfo( dib, info, bmp->bitmap.bmBits, - flags | private_color_table ); + return init_dib_info_from_bitmapinfo( dib, &info, bmp->bitmap.bmBits, flags ); } return init_dib_info( dib, &bmp->dib->dsBmih, bmp->dib->dsBitfields, bmp->color_table, bmp->dib->dsBm.bmBits, flags ); @@ -261,9 +264,9 @@ DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bit dib_info src_dib, dst_dib; DWORD ret; - if ( !init_dib_info_from_bitmapinfo( &src_dib, src_info, src_bits, 0 ) ) + if ( !init_dib_info_from_bitmapinfo( &src_dib, src_info, src_bits, default_color_table ) ) return ERROR_BAD_FORMAT; - if ( !init_dib_info_from_bitmapinfo( &dst_dib, dst_info, dst_bits, 0 ) ) + if ( !init_dib_info_from_bitmapinfo( &dst_dib, dst_info, dst_bits, default_color_table ) ) return ERROR_BAD_FORMAT; __TRY @@ -405,7 +408,7 @@ static HBITMAP dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) free_dib_info(&pdev->dib); pdev->defer = 0; - if(!init_dib_info_from_bitmapobj(&pdev->dib, bmp, 0)) + if(!init_dib_info_from_bitmapobj(&pdev->dib, bmp, default_color_table)) pdev->defer |= DEFER_FORMAT; GDI_ReleaseObj( bitmap ); diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 6f01a5e..2aa672d 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -20,7 +20,8 @@ enum dib_info_flags { - private_color_table = 1 + private_color_table = 1, + default_color_table = 2 }; typedef struct

1 0

Alexandre Julliard : gdi32: Select the pattern brush only when first used.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: d5fe87e2e89ed485c9a2c481eb7c43b391047b1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5fe87e2e89ed485c9a2c481e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 12:12:54 2011 +0100 gdi32: Select the pattern brush only when first used. --- dlls/gdi32/dibdrv/dc.c | 14 ------ dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/objects.c | 98 ++++++++++++++++++++---------------------- 3 files changed, 48 insertions(+), 66 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 6bcce26..ed7b0f7 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -167,20 +167,6 @@ 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, HDC hdc) -{ - if (bi->bmiHeader.biClrUsed && usage == DIB_PAL_COLORS) - { - 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_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) { return init_dib_info( dib, &info->bmiHeader, (const DWORD *)info->bmiColors, diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 2aa672d..d388f91 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -103,6 +103,7 @@ typedef struct dibdrv_physdev const BITMAPINFO *brush_pattern_info; void *brush_pattern_bits; UINT brush_pattern_usage; + HBITMAP brush_pattern_bitmap; BOOL (* brush_rects)(struct dibdrv_physdev *pdev, dib_info *dib, int num, const RECT *rects, HRGN clip); /* background */ @@ -226,7 +227,6 @@ 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, 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 14f1260..9ab3bcd 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1468,35 +1468,62 @@ static BOOL matching_pattern_format( dib_info *dib, dib_info *pattern ) return TRUE; } -static void select_pattern_brush( dibdrv_physdev *pdev, dib_info *pattern ) +static BOOL select_pattern_brush( dibdrv_physdev *pdev ) { + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *info = (BITMAPINFO *)buffer; RECT rect; + dib_info pattern; + + if (!pdev->brush_pattern_info) + { + BITMAPOBJ *bmp = GDI_GetObjPtr( pdev->brush_pattern_bitmap, OBJ_BITMAP ); + BOOL ret; + + if (!bmp) return FALSE; + ret = init_dib_info_from_bitmapobj( &pattern, bmp, 0 ); + GDI_ReleaseObj( pdev->brush_pattern_bitmap ); + if (!ret) return FALSE; + } + else if (pdev->brush_pattern_info->bmiHeader.biClrUsed && pdev->brush_pattern_usage == DIB_PAL_COLORS) + { + copy_bitmapinfo( info, pdev->brush_pattern_info ); + fill_color_table_from_pal_colors( info, pdev->dev.hdc ); + init_dib_info_from_bitmapinfo( &pattern, info, pdev->brush_pattern_bits, 0 ); + } + else + { + init_dib_info_from_bitmapinfo( &pattern, pdev->brush_pattern_info, pdev->brush_pattern_bits, 0 ); + } - free_pattern_brush( pdev ); copy_dib_color_info(&pdev->brush_dib, &pdev->dib); - pdev->brush_dib.height = pattern->height; - pdev->brush_dib.width = pattern->width; + pdev->brush_dib.height = pattern.height; + pdev->brush_dib.width = pattern.width; pdev->brush_dib.stride = get_dib_stride( pdev->brush_dib.width, pdev->brush_dib.bit_count ); - if (matching_pattern_format( &pdev->brush_dib, pattern )) + if (matching_pattern_format( &pdev->brush_dib, &pattern )) { - pdev->brush_dib.bits.ptr = pattern->bits.ptr; + pdev->brush_dib.bits.ptr = pattern.bits.ptr; pdev->brush_dib.bits.is_copy = FALSE; pdev->brush_dib.bits.free = NULL; - return; } + else + { + pdev->brush_dib.bits.ptr = HeapAlloc( GetProcessHeap(), 0, + pdev->brush_dib.height * pdev->brush_dib.stride ); + pdev->brush_dib.bits.is_copy = TRUE; + pdev->brush_dib.bits.free = free_heap_bits; - pdev->brush_dib.bits.ptr = HeapAlloc( GetProcessHeap(), 0, - pdev->brush_dib.height * pdev->brush_dib.stride ); - pdev->brush_dib.bits.is_copy = TRUE; - pdev->brush_dib.bits.free = free_heap_bits; + rect.left = rect.top = 0; + rect.right = pattern.width; + rect.bottom = pattern.height; - rect.left = rect.top = 0; - rect.right = pattern->width; - rect.bottom = pattern->height; + pdev->brush_dib.funcs->convert_to(&pdev->brush_dib, &pattern, &rect); + } - pdev->brush_dib.funcs->convert_to(&pdev->brush_dib, pattern, &rect); + free_dib_info( &pattern ); + return TRUE; } /********************************************************************** @@ -1516,15 +1543,8 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_info *dib, int num, const RE switch(pdev->brush_style) { case BS_DIBPATTERN: - if (pdev->brush_pattern_usage == DIB_PAL_COLORS) - { - dib_info pattern; - if (!init_dib_info_from_brush( &pattern, pdev->brush_pattern_info, - pdev->brush_pattern_bits, DIB_PAL_COLORS, pdev->dev.hdc )) - return FALSE; - select_pattern_brush( pdev, &pattern ); - free_dib_info( &pattern ); - } + if (!pdev->brush_dib.bits.ptr && !select_pattern_brush( pdev )) + return FALSE; if(!create_pattern_brush_bits(pdev)) return FALSE; break; @@ -1582,7 +1602,7 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_info *dib, int num, const RE /* we need to recompute the bits each time for DIB_PAL_COLORS */ if (pdev->brush_style == BS_DIBPATTERN && pdev->brush_pattern_usage == DIB_PAL_COLORS) - free_pattern_brush_bits( pdev ); + free_pattern_brush( pdev ); return TRUE; } @@ -1614,38 +1634,14 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap, if (bitmap || info) /* pattern brush */ { - dib_info pattern; - BOOL ret; - - if (!info) - { - BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, OBJ_BITMAP ); - - if (!bmp) return 0; - ret = init_dib_info_from_bitmapobj( &pattern, bmp, 0 ); - GDI_ReleaseObj( bitmap ); - if (!ret) return 0; - select_pattern_brush( pdev, &pattern ); - free_dib_info( &pattern ); - } - else if (usage != DIB_PAL_COLORS) - { - if (!init_dib_info_from_brush( &pattern, info, bits, DIB_RGB_COLORS, 0 )) return 0; - select_pattern_brush( pdev, &pattern ); - free_dib_info( &pattern ); - } - else - { - /* brush is actually selected only when it's used */ - free_pattern_brush( pdev ); - } - pdev->brush_rects = pattern_brush; pdev->brush_style = BS_DIBPATTERN; pdev->brush_pattern_info = info; pdev->brush_pattern_bits = bits; pdev->brush_pattern_usage = usage; + pdev->brush_pattern_bitmap = bitmap; pdev->defer &= ~DEFER_BRUSH; + free_pattern_brush( pdev ); /* brush is actually selected only when it's used */ return next->funcs->pSelectBrush( next, hbrush, bitmap, info, bits, usage ); }

1 0

Alexandre Julliard : gdi32: Don' t create a default color table for pattern brushes, use the DC colors instead.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 65a2c885f1148966f841d1fd2f4e2cbd6c7f7768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65a2c885f1148966f841d1fd2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 12:23:12 2011 +0100 gdi32: Don't create a default color table for pattern brushes, use the DC colors instead. --- dlls/gdi32/brush.c | 4 ++-- dlls/gdi32/dibdrv/objects.c | 29 ++++++++++++++++++++++++----- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index dc8eb90..384ef12 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -79,8 +79,6 @@ static BOOL store_bitmap_bits( BRUSHOBJ *brush, BITMAPOBJ *bmp ) return FALSE; } - if (info->bmiHeader.biBitCount <= 8 && !info->bmiHeader.biClrUsed) fill_default_color_table( info ); - /* release the unneeded space */ HeapReAlloc( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, info, get_dib_info_size( info, DIB_RGB_COLORS )); @@ -162,6 +160,8 @@ BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT * if (brush->info) { memcpy( info, brush->info, get_dib_info_size( brush->info, brush->usage )); + if (info->bmiHeader.biBitCount <= 8 && !info->bmiHeader.biClrUsed) + fill_default_color_table( info ); *bits = brush->bits.ptr; *usage = brush->usage; ret = TRUE; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 9ab3bcd..9229915 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1468,10 +1468,11 @@ static BOOL matching_pattern_format( dib_info *dib, dib_info *pattern ) return TRUE; } -static BOOL select_pattern_brush( dibdrv_physdev *pdev ) +static BOOL select_pattern_brush( dibdrv_physdev *pdev, BOOL *needs_reselect ) { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer; + RGBQUAD color_table[2]; RECT rect; dib_info pattern; @@ -1490,12 +1491,31 @@ static BOOL select_pattern_brush( dibdrv_physdev *pdev ) copy_bitmapinfo( info, pdev->brush_pattern_info ); fill_color_table_from_pal_colors( info, pdev->dev.hdc ); init_dib_info_from_bitmapinfo( &pattern, info, pdev->brush_pattern_bits, 0 ); + *needs_reselect = TRUE; } else { init_dib_info_from_bitmapinfo( &pattern, pdev->brush_pattern_info, pdev->brush_pattern_bits, 0 ); } + if (pattern.bit_count == 1 && !pattern.color_table) + { + /* monochrome DDB pattern uses DC colors */ + COLORREF color = GetTextColor( pdev->dev.hdc ); + color_table[0].rgbRed = GetRValue( color ); + color_table[0].rgbGreen = GetGValue( color ); + color_table[0].rgbBlue = GetBValue( color ); + color_table[0].rgbReserved = 0; + color = GetBkColor( pdev->dev.hdc ); + color_table[1].rgbRed = GetRValue( color ); + color_table[1].rgbGreen = GetGValue( color ); + color_table[1].rgbBlue = GetBValue( color ); + color_table[1].rgbReserved = 0; + pattern.color_table = color_table; + pattern.color_table_size = 2; + *needs_reselect = TRUE; + } + copy_dib_color_info(&pdev->brush_dib, &pdev->dib); pdev->brush_dib.height = pattern.height; @@ -1537,13 +1557,14 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_info *dib, int num, const RE int i, j; const WINEREGION *clip; POINT origin; + BOOL needs_reselect = FALSE; if(pdev->brush_and_bits == NULL) { switch(pdev->brush_style) { case BS_DIBPATTERN: - if (!pdev->brush_dib.bits.ptr && !select_pattern_brush( pdev )) + if (!pdev->brush_dib.bits.ptr && !select_pattern_brush( pdev, &needs_reselect )) return FALSE; if(!create_pattern_brush_bits(pdev)) return FALSE; @@ -1600,9 +1621,7 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_info *dib, int num, const RE } release_wine_region( region ); - /* we need to recompute the bits each time for DIB_PAL_COLORS */ - if (pdev->brush_style == BS_DIBPATTERN && pdev->brush_pattern_usage == DIB_PAL_COLORS) - free_pattern_brush( pdev ); + if (needs_reselect) free_pattern_brush( pdev ); return TRUE; }

1 0

Alexandre Julliard : gdi32/tests: Add tests for 1-bpp DDB pattern brushes.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: f85a28faf6d7f2131c857b6ac9fe34d5437a6e56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f85a28faf6d7f2131c857b6ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 13:38:55 2011 +0100 gdi32/tests: Add tests for 1-bpp DDB pattern brushes. --- dlls/gdi32/tests/dib.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 909457d..5d1eb8b 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -101,6 +101,7 @@ static const char *sha1_graphics_a8r8g8b8[] = "a78b28472bb7ff480ddedd06b9cf2daa775fa7ae", "5246ef357e7317b9d141a3294d300c195da76cb7", "87f6b6a19f021ca5912d285e14ce2ff9474d79f3", + "3d8244b665ecdb104087bad171b0b0f83545133c", "e2a8eef4aeda3a0f6c950075acba38f1f9e0814d", "8b66f14d51ecdeea12bc993302bb9b7d3ec085a1", "7da9dd3d40d44d92deb9883fb7110443c2d5769a", @@ -163,6 +164,7 @@ static const char *sha1_graphics_a8r8g8b8_bitfields[] = "a78b28472bb7ff480ddedd06b9cf2daa775fa7ae", "5246ef357e7317b9d141a3294d300c195da76cb7", "87f6b6a19f021ca5912d285e14ce2ff9474d79f3", + "3d8244b665ecdb104087bad171b0b0f83545133c", "e2a8eef4aeda3a0f6c950075acba38f1f9e0814d", "8b66f14d51ecdeea12bc993302bb9b7d3ec085a1", "7da9dd3d40d44d92deb9883fb7110443c2d5769a", @@ -225,6 +227,7 @@ static const char *sha1_graphics_a8b8g8r8[] = "473a1fd07df800c87a5d3286b642ace10c61c6af", "10cd25a0ed5cd8f978d7d68236f81d949b938e84", "b8951d2b20518fd129e5113a5f429626893913bf", + "e81fc45962f861d53f420e29cb5d33faf5adbec8", "4851c5b7d5bc18590e787c0c218a592ef504e738", "9aa506e3df33e0d5298755aa4144e10eb4b5adcf", "abdf003699364fe45fab7dc61e67c606d0063b40", @@ -287,6 +290,7 @@ static const char *sha1_graphics_r10g10b10[] = "92cddcabf5365eef1e037f488af52b31669d987f", "2c9c4f27bade080a2cd6f9160422762e267c2f5f", "c7ce29d189dc06ba57e64f0cc32202f5a25ba48d", + "717778cc9ab30bcfc026a4344ea1bdef870bd247", "7ac4cb547c8f4ce5079c95afad9d0e2b0cd76a0e", "d578210815e27fe210eb678a71e6d22ba4b4c196", "c7a027c7079dfcc831ca8bc134a509958273073c", @@ -349,6 +353,7 @@ static const char *sha1_graphics_r6g6b6[] = "2128157e601ef0d6b3636b7387d3b28e876de728", "8bdcdcd463f0052279d070ac763757f4db975483", "9ea0ad22d7b61598fe36e9c942242e8e07e32edb", + "8b6452ebd1f6d189d10ee6647e7704821559cfcb", "c39a25a61c4eade48dea62a97c9fb8714c06a8af", "66b130f83381957cfc4763558c5f5cddf2e3b564", "d548135ce2320499277ce12b80bc35004f8a9787", @@ -411,6 +416,7 @@ static const char *sha1_graphics_24[] = "adc20832d8c43f1cf372d8392535492013cd2306", "45649794dcbcabda487f66f7a80fc1bec79047a1", "367c2dc1e91ff9ea0e984d6fb3000cfb4e0ae7e9", + "9c6afd47dd748a33c585e6655fd4ec1c28976a47", "b4df692ac70a5f9f303270df4641ab014c6cbf46", "8bc3128ba47891366fd7b02fde7ca19100e64b9f", "e649e00efe7fea1eb8b17f7867fe089e5270c44b", @@ -473,6 +479,7 @@ static const char *sha1_graphics_r5g5b5[] = "6daaf945a955928c5c124c880522ca4634fb2343", "12a288390d16e1efa99d4185301de48a4d433b14", "ea92af2538b76f41a3a03eaa11ac395c9b6197c4", + "1d3af561605fd61433035600d8962cb8d266fdd0", "3a50ce21b3563a604b4fc9f247a30f5a981f1ba6", "d7d97e28ed316f6596c737eb83baa5948d86b673", "ecc2991277d7314f55b00e0f284ae3703aeef81e", @@ -539,6 +546,7 @@ static const char *sha1_graphics_r4g4b4[] = "1d283aa4d2b2114f7809fe59357d590c7c779aa7", "29640e2ddd2d3016da14507c3ce9b2ce32f39bb4", "57ebf8becac1524543da120e88e9cc57ecfdec49", + "e68ef3ffd7401244cdea79781eab12d7a5e8ca18", "d591232bbc2592462c819a9486750f64180518fd", "0e183a4c30b3da345129cffe33fe0fc593d8666b", "f14d9a4bd8a365b7c8f068a0dad481b6eb2b178b", @@ -600,6 +608,7 @@ static const char *sha1_graphics_8_color[] = "940db409d4c3e5640275724f9e5f7c1a0d2e21b2", "242ce86967ea62fa69c1e6f597ccbcf2f0b1602c", "5092b22af85a08f10a2899888bb9d552f25f828e", + "f5dafef807237fe72c74c0bbd47c382ace45bfde", "e91973be2651eeef568700463652838d8cbba976", "1df851515ecf46df5c2d3279535c1763f72353dd", "b68922915ebc2797d58deecf983f7d0cf9a5efbd", @@ -671,6 +680,7 @@ static const char *sha1_graphics_8_grayscale[] = "15b991814d84d6aa252696dd0c6150ef88a8db3f", "1cb52f2a4d17b9b0d8375d016aa8cf0677fcd29a", "9a6cfd68523e40ea1d52847d7747da912cfe2ca9", + "b6785a410048bb85e7ea3f0492459972103c935e", "82e641ebe47d9f8cc229b82b8315e69e52f812b1", "15db343049e3a9b31addc5d2ffebc3fe91b39c51", "a895daf1f20371d4d1c3f93c070124cc13e341c3", @@ -739,6 +749,7 @@ static const char *sha1_graphics_8[] = "7262364067e03c7fa498af1d59d228d6c63b460e", "5241241a355a667ef0834049adf4218e8b3f16b8", "db22d666690948eb966f75b796c72c7150a5c4b9", + "af21fb2645b568b049549de375584c4aa3055143", "1f13ea0034db4b0ffa4ddcff9664fd892058f9cd", "3caf512cfddfd463d0750cfe3cadb58548eb2ae8", "4e5e7d5fd64818b2b3d3e793c88f603b699d2f0f", @@ -804,6 +815,7 @@ static const char *sha1_graphics_4[] = "eb38683e812fd13dca971ba8f4cfd2b6820d3524", "73bbc83f88f1aaa6df0158b63e70bb3165163163", "0dc2690a5c58a2907a8ab06693ebfab6698172eb", + "df5f0d6574bdf1781754b5b9f98232a77e439e33", "39c16648cf6c261be71a33cec41867f28e119b94", "26ad5116562e7b58c76a26eaf521e2e40899e944", "1bcc54eaf8e3c2b7c59ecccb23c240181d7ba8b8", @@ -865,6 +877,7 @@ static const char *sha1_graphics_4_grayscale[] = "b067f0421cb2c83b218b8ab6edbede2ff5723b57", "c8de76f9c0900e5f86c7584fe94d5749376b7b49", "43ee3e187dda14b86aef12371041ae70313b5a65", + "7fab79b7f1a5cb2ec31ed8eeaf213b3d8dcde4d8", "d4930552a7845111ffd9db57260be1ab97967c06", "afdf41fca7951c6dd6193320de1295f2c68fe52a", "f2f1f331fe6b1b31d7c9ddd37793b375fc01d3d4", @@ -939,6 +952,9 @@ static const char *sha1_graphics_1[] = "4d95c3d1e170f004c80aa8c52feafb8e0e90760e", "c14832e69ec3585c15987b3d69d5007236fa9814", "e44ea620b0c47125a34193537ab9d219a52ad028", + "ef2db9fb75a672f69bab88e5d08fe64f50ec2bc4", + "8819bf7a43295161fe045a42936000b3a51fe200", + "e08dbc26469c229f75ccbf1a38a133401f270b84", "d1e6091caa4482d3142df3b958606c41ebf4698e", "07c1116d8286fb665a1005de220eadc3d5999aaf", "4afb0649488f6e6f7d3a2b8bf438d82f2c88f4d1", @@ -1196,6 +1212,9 @@ static const DWORD four_by_four_data[16] = { 0x000000, 0xff0000, 0x00ff00, 0x000 0x000000, 0xff0000, 0x00ff00, 0x0000ff, 0xffffff, 0x00ffff, 0xff00ff, 0xffff00 }; +static const DWORD ddb_brush_bits[8] = { 0x11112222, 0x33334444, 0x55556666, 0x77778888, + 0xaaaaaaaa, 0x00000000, 0x98765432, 0xabcdef00 }; + static inline void solid_patblt( HDC hdc, int x, int y, int width, int height, COLORREF color ) { HBRUSH brush = CreateSolidBrush( color ); @@ -1222,6 +1241,7 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh BOOL ret, dib_is_1bpp = (bmi->bmiHeader.biBitCount == 1); BOOL dib_is_8bpp_gray = (bmi->bmiHeader.biBitCount == 8 && bmi->bmiColors[1].rgbRed == 1); BLENDFUNCTION blend; + COLORREF old_text, old_bkgnd; blend.BlendOp = AC_SRC_OVER; blend.BlendFlags = 0; @@ -1606,7 +1626,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 ddb pattern brush */ + + old_text = GetTextColor( hdc ); + old_bkgnd = GetBkColor( hdc ); + bmp = CreateBitmap( 16, 16, 1, 1, ddb_brush_bits ); + dib_brush = CreatePatternBrush( bmp ); + SelectObject(hdc, dib_brush); + for(i = 0, y = 10; i < 256; i++) + { + SetTextColor(hdc, RGB( i, 2*i, 255 - i ) ); + SetBkColor(hdc, RGB( 255 - i, i / 3, i ) ); + 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, "1 bpp ddb brush patblt", dib_is_1bpp ? 2 : 0, dib_is_1bpp); + memset(bits, 0xcc, dib_size); + + DeleteObject(bmp); + SelectObject(hdc, orig_brush); SetBrushOrgEx(hdc, 0, 0, NULL); + SetTextColor(hdc, old_text); + SetBkColor(hdc, old_bkgnd); /* Rectangle */

1 0