wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

Roderick Colenbrander : wined3d: Separate AMD GPUs in D3D9 and D3D10 models , this allows for a more correct fall back when the GPU table isn' t up to date.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 3b993117c3d60edd033ee2494082a12c5d3c131c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b993117c3d60edd033ee2494… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Fri Apr 16 08:49:41 2010 +0200 wined3d: Separate AMD GPUs in D3D9 and D3D10 models, this allows for a more correct fall back when the GPU table isn't up to date. D3D10_CAPABLE should work on any AMD OpenGL 3.0 driver (those came out in september 2008) and on OSX 10.5 and up. --- dlls/wined3d/directx.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7e22dbc..8fb0f21 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1506,7 +1506,7 @@ static enum wined3d_pci_device select_card_ati_binary(const struct wined3d_gl_in * * Beware: renderer string do not match exact card model, * eg HD 4800 is returned for multiple cards, even for RV790 based ones. */ - if (WINE_D3D9_CAPABLE(gl_info)) + if (WINE_D3D10_CAPABLE(gl_info)) { /* Radeon EG CYPRESS XT / PRO HD5800 - highend */ if (strstr(gl_renderer, "HD 5800") /* Radeon EG CYPRESS HD58xx generic renderer string */ @@ -1603,6 +1603,13 @@ static enum wined3d_pci_device select_card_ati_binary(const struct wined3d_gl_in return CARD_ATI_RADEON_HD3200; } + /* Default for when no GPU has been found */ + *vidmem = 128; /* 128MB */ + return CARD_ATI_RADEON_HD3200; + } + + if (WINE_D3D8_CAPABLE(gl_info)) + { /* Radeon R5xx */ if (strstr(gl_renderer, "X1600") || strstr(gl_renderer, "X1650")

1 0

Roderick Colenbrander : wined3d: Separate AMD Radeon HD2300 from other HD2xxx/ HD3xxx GPUs since it is D3D9 instead of D3D10.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 057c64c5b08d726340f41d5270abe8ab3d493609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=057c64c5b08d726340f41d527… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Fri Apr 16 08:49:40 2010 +0200 wined3d: Separate AMD Radeon HD2300 from other HD2xxx/HD3xxx GPUs since it is D3D9 instead of D3D10. --- dlls/wined3d/directx.c | 30 ++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6498859..7e22dbc 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1021,7 +1021,7 @@ static const struct driver_version_information driver_version_table[] = {HW_VENDOR_ATI, CARD_ATI_RADEON_9500, "ATI Radeon 9500", 14, 10, 6764 }, {HW_VENDOR_ATI, CARD_ATI_RADEON_X700, "ATI Radeon X700 SE", 14, 10, 6764 }, {HW_VENDOR_ATI, CARD_ATI_RADEON_X1600, "ATI Radeon X1600 Series", 14, 10, 6764 }, - {HW_VENDOR_ATI, CARD_ATI_RADEON_HD2300, "ATI Mobility Radeon HD 2300", 14, 10, 6764 }, + {HW_VENDOR_ATI, CARD_ATI_RADEON_HD2350, "ATI Mobility Radeon HD 2350", 14, 10, 6764 }, {HW_VENDOR_ATI, CARD_ATI_RADEON_HD2600, "ATI Mobility Radeon HD 2600", 14, 10, 6764 }, {HW_VENDOR_ATI, CARD_ATI_RADEON_HD2900, "ATI Radeon HD 2900 XT", 14, 10, 6764 }, {HW_VENDOR_ATI, CARD_ATI_RADEON_HD4350, "ATI Radeon HD 4350", 14, 10, 6764 }, @@ -1581,16 +1581,17 @@ static enum wined3d_pci_device select_card_ati_binary(const struct wined3d_gl_in return CARD_ATI_RADEON_HD2600; } - /* Radeon R6xx HD2300/HD2400/HD3400 - lowend */ - if (strstr(gl_renderer, "HD 2300") + /* Radeon R6xx HD2350/HD2400/HD3400 - lowend + * Note HD2300=DX9, HD2350=DX10 */ + if (strstr(gl_renderer, "HD 2350") || strstr(gl_renderer, "HD 2400") || strstr(gl_renderer, "HD 3470") || strstr(gl_renderer, "HD 3450") || strstr(gl_renderer, "HD 3430") || strstr(gl_renderer, "HD 3400")) { - *vidmem = 128; /* HD2300 uses at least 128MB, HD2400 uses 256MB */ - return CARD_ATI_RADEON_HD2300; + *vidmem = 256; /* HD2350/2400 use 256MB, HD34xx use 256-512MB */ + return CARD_ATI_RADEON_HD2350; } /* Radeon R6xx/R7xx integrated */ @@ -1613,14 +1614,19 @@ static enum wined3d_pci_device select_card_ati_binary(const struct wined3d_gl_in return CARD_ATI_RADEON_X1600; } - /* Radeon R4xx + X1300/X1400/X1450/X1550/X2300 (lowend R5xx) */ + /* Radeon R4xx + X1300/X1400/X1450/X1550/X2300/X2500/HD2300 (lowend R5xx) + * Note X2300/X2500/HD2300 are R5xx GPUs with a 2xxx naming but they are still DX9-only */ if (strstr(gl_renderer, "X700") || strstr(gl_renderer, "X800") || strstr(gl_renderer, "X850") || strstr(gl_renderer, "X1300") || strstr(gl_renderer, "X1400") || strstr(gl_renderer, "X1450") - || strstr(gl_renderer, "X1550")) + || strstr(gl_renderer, "X1550") + || strstr(gl_renderer, "X2300") + || strstr(gl_renderer, "X2500") + || strstr(gl_renderer, "HD 2300") + ) { *vidmem = 128; /* x700/x8*0 use 128-256MB, >=x1300 128-512MB */ return CARD_ATI_RADEON_X700; @@ -1737,12 +1743,12 @@ static enum wined3d_pci_device select_card_ati_mesa(const struct wined3d_gl_info return CARD_ATI_RADEON_HD2600; } - /* Radeon R6xx HD2300/HD2400/HD3400 - lowend */ + /* Radeon R6xx HD2350/HD2400/HD3400 - lowend */ if (strstr(gl_renderer, "RV610") || strstr(gl_renderer, "RV620")) { - *vidmem = 128; /* HD2300 uses at least 128MB, HD2400 uses 256MB */ - return CARD_ATI_RADEON_HD2300; + *vidmem = 256; /* HD2350/2400 use 256MB, HD34xx use 256-512MB */ + return CARD_ATI_RADEON_HD2350; } /* Radeon R6xx/R7xx integrated */ @@ -1860,8 +1866,8 @@ static enum wined3d_pci_device select_card_ati_mesa(const struct wined3d_gl_info if (strstr(gl_renderer, "(RV610") || strstr(gl_renderer, "(RV620")) { - *vidmem = 128; /* HD2300 uses at least 128MB, HD2400 uses 256MB */ - return CARD_ATI_RADEON_HD2300; + *vidmem = 256; /* HD2350/2400 use 256MB, HD34xx use 256-512MB */ + return CARD_ATI_RADEON_HD2350; } /* Radeon R6xx/R7xx integrated */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 31ed565..460c2b3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1301,7 +1301,7 @@ enum wined3d_pci_device CARD_ATI_RADEON_XPRESS_200M = 0x5955, CARD_ATI_RADEON_X700 = 0x5e4c, CARD_ATI_RADEON_X1600 = 0x71c2, - CARD_ATI_RADEON_HD2300 = 0x7210, + CARD_ATI_RADEON_HD2350 = 0x94c7, CARD_ATI_RADEON_HD2600 = 0x9581, CARD_ATI_RADEON_HD2900 = 0x9400, CARD_ATI_RADEON_HD3200 = 0x9620,

1 0

Piotr Caban : msvcrt: Fix locale initialization.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 2548742bb49812aaa6c24dea2d51d092bd3d62e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2548742bb49812aaa6c24dea2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 15 23:13:59 2010 +0200 msvcrt: Fix locale initialization. --- dlls/msvcrt/main.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index e2184b3..272ba71 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -87,16 +87,14 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { case DLL_PROCESS_ATTACH: + if (!msvcrt_init_tls()) + return FALSE; msvcrt_init_mt_locks(); if(!MSVCRT_setlocale(0, "C")) { msvcrt_free_mt_locks(); + msvcrt_free_tls_mem(); return FALSE; } - if (!msvcrt_init_tls()) { - _free_locale(MSVCRT_locale); - msvcrt_free_mt_locks(); - return FALSE; - } msvcrt_init_io(); msvcrt_init_console(); msvcrt_init_args();

1 0

Piotr Caban : msvcrt: Change localeconv implementation.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: f2f56d563f68c71b709b829a84806895b6c7d4cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2f56d563f68c71b709b829a8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 15 23:13:18 2010 +0200 msvcrt: Change localeconv implementation. --- dlls/msvcrt/locale.c | 33 +-------------------------------- 1 files changed, 1 insertions(+), 32 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 59d94ae..e8af46b 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -462,38 +462,7 @@ int CDECL __crtGetLocaleInfoW( LCID lcid, LCTYPE type, MSVCRT_wchar_t *buffer, i */ struct MSVCRT_lconv * CDECL MSVCRT_localeconv(void) { - static struct MSVCRT_lconv xlconv; - struct lconv *ylconv = localeconv(); - - xlconv.decimal_point = ylconv->decimal_point; - xlconv.thousands_sep = ylconv->thousands_sep; - xlconv.grouping = ylconv->grouping; /* FIXME: fixup charmax here too */ - xlconv.int_curr_symbol = ylconv->int_curr_symbol; - xlconv.currency_symbol = ylconv->currency_symbol; - xlconv.mon_decimal_point = ylconv->mon_decimal_point; - xlconv.mon_thousands_sep = ylconv->mon_thousands_sep; - xlconv.mon_grouping = ylconv->mon_grouping; - xlconv.positive_sign = ylconv->positive_sign; - xlconv.negative_sign = ylconv->negative_sign; - xlconv.int_frac_digits = ylconv->int_frac_digits; - xlconv.frac_digits = ylconv->frac_digits; - xlconv.p_cs_precedes = ylconv->p_cs_precedes; - xlconv.p_sep_by_space = ylconv->p_sep_by_space; - xlconv.n_cs_precedes = ylconv->n_cs_precedes; - xlconv.n_sep_by_space = ylconv->n_sep_by_space; - xlconv.p_sign_posn = ylconv->p_sign_posn; - xlconv.n_sign_posn = ylconv->n_sign_posn; - - if (ylconv->int_frac_digits == CHAR_MAX) xlconv.int_frac_digits = charmax; - if (ylconv->frac_digits == CHAR_MAX) xlconv.frac_digits = charmax; - if (ylconv->p_cs_precedes == CHAR_MAX) xlconv.p_cs_precedes = charmax; - if (ylconv->p_sep_by_space == CHAR_MAX) xlconv.p_sep_by_space = charmax; - if (ylconv->n_cs_precedes == CHAR_MAX) xlconv.n_cs_precedes = charmax; - if (ylconv->n_sep_by_space == CHAR_MAX) xlconv.n_sep_by_space = charmax; - if (ylconv->p_sign_posn == CHAR_MAX) xlconv.p_sign_posn = charmax; - if (ylconv->n_sign_posn == CHAR_MAX) xlconv.n_sign_posn = charmax; - - return &xlconv; + return get_locale()->locinfo->lconv; } /*********************************************************************

1 0

Vincent Povirk : gdiplus: Add fixmes for unimplemented imageattributes features.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: ede103c699726b6480212a9bdc7e9dc16927f28b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ede103c699726b6480212a9bd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 15 15:31:45 2010 -0500 gdiplus: Add fixmes for unimplemented imageattributes features. --- dlls/gdiplus/graphics.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 94623db..7a6fad3 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2080,6 +2080,14 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (imageAttributes) { + if (imageAttributes->colorkeys[ColorAdjustTypeBitmap].enabled || + imageAttributes->colorkeys[ColorAdjustTypeDefault].enabled) + { + static int fixme; + if (!fixme++) + FIXME("Color keying not implemented\n"); + } + if (imageAttributes->colorremaptables[ColorAdjustTypeBitmap].enabled || imageAttributes->colorremaptables[ColorAdjustTypeDefault].enabled) { @@ -2105,6 +2113,22 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image } } } + + if (imageAttributes->colormatrices[ColorAdjustTypeBitmap].enabled || + imageAttributes->colormatrices[ColorAdjustTypeDefault].enabled) + { + static int fixme; + if (!fixme++) + FIXME("Color transforms not implemented\n"); + } + + if (imageAttributes->gamma_enabled[ColorAdjustTypeBitmap] || + imageAttributes->gamma_enabled[ColorAdjustTypeDefault]) + { + static int fixme; + if (!fixme++) + FIXME("Gamma adjustment not implemented\n"); + } } stat = alpha_blend_pixels(graphics, dst_area.left, dst_area.top,

1 0

Vincent Povirk : gdiplus: Always use software to draw bitmaps to bitmaps.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 8b2543b7503e7bb1b7db1d3a32cad88d70cf3e6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b2543b7503e7bb1b7db1d3a3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 15 15:26:15 2010 -0500 gdiplus: Always use software to draw bitmaps to bitmaps. --- dlls/gdiplus/graphics.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 8efa128..94623db 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1996,16 +1996,9 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image return NotImplemented; if (imageAttributes || + (graphics->image && graphics->image->type == ImageTypeBitmap) || ptf[1].Y != ptf[0].Y || ptf[2].X != ptf[0].X) use_software = 1; - else if (graphics->image && graphics->image->type == ImageTypeBitmap) - { - GpBitmap *dst_bitmap = (GpBitmap*)graphics->image; - if (!(dst_bitmap->format == PixelFormat16bppRGB555 || - dst_bitmap->format == PixelFormat24bppRGB || - dst_bitmap->format == PixelFormat32bppRGB)) - use_software = 1; - } if (use_software) {

1 0

Vincent Povirk : gdiplus: Implement color remapping.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 424724778705069fd85d207518317cb2f778f275 URL: http://source.winehq.org/git/wine.git/?a=commit;h=424724778705069fd85d20751… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 15 15:24:25 2010 -0500 gdiplus: Implement color remapping. --- dlls/gdiplus/graphics.c | 32 +++++++++++++++++++++++++++++++- dlls/gdiplus/tests/image.c | 2 +- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b0cba47..8efa128 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1995,7 +1995,8 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image else return NotImplemented; - if (ptf[1].Y != ptf[0].Y || ptf[2].X != ptf[0].X) + if (imageAttributes || + ptf[1].Y != ptf[0].Y || ptf[2].X != ptf[0].X) use_software = 1; else if (graphics->image && graphics->image->type == ImageTypeBitmap) { @@ -2084,6 +2085,35 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image GdipDeleteMatrix(dst_to_src); + if (imageAttributes) + { + if (imageAttributes->colorremaptables[ColorAdjustTypeBitmap].enabled || + imageAttributes->colorremaptables[ColorAdjustTypeDefault].enabled) + { + const struct color_remap_table *table; + + if (imageAttributes->colorremaptables[ColorAdjustTypeBitmap].enabled) + table = &imageAttributes->colorremaptables[ColorAdjustTypeBitmap]; + else + table = &imageAttributes->colorremaptables[ColorAdjustTypeDefault]; + + for (x=dst_area.left; x<dst_area.right; x++) + for (y=dst_area.top; y<dst_area.bottom; y++) + { + ARGB *src_color; + src_color = (ARGB*)(data + stride * (y - dst_area.top) + sizeof(ARGB) * (x - dst_area.left)); + for (i=0; i<table->mapsize; i++) + { + if (*src_color == table->colormap[i].oldColor.Argb) + { + *src_color = table->colormap[i].newColor.Argb; + break; + } + } + } + } + } + stat = alpha_blend_pixels(graphics, dst_area.left, dst_area.top, data, dst_area.right - dst_area.left, dst_area.bottom - dst_area.top, stride); diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index fdfd2b2..74e6ee1 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1879,7 +1879,7 @@ static void test_remaptable(void) stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); expect(Ok, stat); - todo_wine ok(color_match(0xffff00ff, color, 1), "Expected ffff00ff, got %.8x\n", color); + ok(color_match(0xffff00ff, color, 1), "Expected ffff00ff, got %.8x\n", color); GdipDeleteGraphics(graphics); GdipDisposeImage((GpImage*)bitmap1);

1 0

Vincent Povirk : gdiplus: Correct the coordinate transform for non-rectangular parallelograms.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: bb9c1878c3aeb2b0ee17b57be23c07b661ade45c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb9c1878c3aeb2b0ee17b57be… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 15 15:13:34 2010 -0500 gdiplus: Correct the coordinate transform for non-rectangular parallelograms. Apparently matrices in gdiplus don't work the way I think they do. --- dlls/gdiplus/graphics.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5a75fd0..b0cba47 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2030,11 +2030,11 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image } m11 = (ptf[1].X - ptf[0].X) / srcwidth; - m12 = (ptf[2].X - ptf[0].X) / srcheight; - mdx = ptf[0].X - m11 * srcx - m12 * srcy; - m21 = (ptf[1].Y - ptf[0].Y) / srcwidth; + m21 = (ptf[2].X - ptf[0].X) / srcheight; + mdx = ptf[0].X - m11 * srcx - m21 * srcy; + m12 = (ptf[1].Y - ptf[0].Y) / srcwidth; m22 = (ptf[2].Y - ptf[0].Y) / srcheight; - mdy = ptf[0].Y - m21 * srcx - m22 * srcy; + mdy = ptf[0].Y - m12 * srcx - m22 * srcy; stat = GdipCreateMatrix2(m11, m12, m21, m22, mdx, mdy, &dst_to_src); if (stat != Ok) return stat;

1 0

Vincent Povirk : gdiplus: Transform bitmaps to non-rectangular parallelograms in software.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 7791f02fd9de1e2e89603d55b2f8b693b2a155e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7791f02fd9de1e2e89603d55b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 15 14:48:47 2010 -0500 gdiplus: Transform bitmaps to non-rectangular parallelograms in software. --- dlls/gdiplus/graphics.c | 49 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6a1dc10..5a75fd0 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -197,8 +197,47 @@ static GpStatus alpha_blend_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, } else { - ERR("Not implemented for non-bitmap DC's\n"); - return GenericError; + HDC hdc; + HBITMAP hbitmap, old_hbm=NULL; + BITMAPINFOHEADER bih; + BYTE *temp_bits; + BLENDFUNCTION bf; + + hdc = CreateCompatibleDC(0); + + bih.biSize = sizeof(BITMAPINFOHEADER); + bih.biWidth = src_width; + bih.biHeight = -src_height; + bih.biPlanes = 1; + bih.biBitCount = 32; + bih.biCompression = BI_RGB; + bih.biSizeImage = 0; + bih.biXPelsPerMeter = 0; + bih.biYPelsPerMeter = 0; + bih.biClrUsed = 0; + bih.biClrImportant = 0; + + hbitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, + (void**)&temp_bits, NULL, 0); + + convert_32bppARGB_to_32bppPARGB(src_width, src_height, temp_bits, + 4 * src_width, src, src_stride); + + old_hbm = SelectObject(hdc, hbitmap); + + bf.BlendOp = AC_SRC_OVER; + bf.BlendFlags = 0; + bf.SourceConstantAlpha = 255; + bf.AlphaFormat = AC_SRC_ALPHA; + + GdiAlphaBlend(graphics->hdc, dst_x, dst_y, src_width, src_height, + hdc, 0, 0, src_width, src_height, bf); + + SelectObject(hdc, old_hbm); + DeleteDC(hdc); + DeleteObject(hbitmap); + + return Ok; } } @@ -1895,7 +1934,6 @@ GpStatus WINGDIPAPI GdipDrawImagePointsI(GpGraphics *graphics, GpImage *image, return NotImplemented; } -/* FIXME: partially implemented (only works for rectangular parallelograms) */ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image, GDIPCONST GpPointF *points, INT count, REAL srcx, REAL srcy, REAL srcwidth, REAL srcheight, GpUnit srcUnit, GDIPCONST GpImageAttributes* imageAttributes, @@ -1923,6 +1961,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (image->picture) { + /* FIXME: partially implemented (only works for rectangular parallelograms) */ if(srcUnit == UnitInch) dx = dy = (REAL) INCH_HIMETRIC; else if(srcUnit == UnitPixel){ @@ -1956,7 +1995,9 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image else return NotImplemented; - if (graphics->image && graphics->image->type == ImageTypeBitmap) + if (ptf[1].Y != ptf[0].Y || ptf[2].X != ptf[0].X) + use_software = 1; + else if (graphics->image && graphics->image->type == ImageTypeBitmap) { GpBitmap *dst_bitmap = (GpBitmap*)graphics->image; if (!(dst_bitmap->format == PixelFormat16bppRGB555 ||

1 0

Vincent Povirk : gdiplus: Use a helper function to draw image data from bitmaps in software.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 9c380b1e8e8cf3fb965675285d0bf48c535ac6b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c380b1e8e8cf3fb965675285… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 15 14:11:07 2010 -0500 gdiplus: Use a helper function to draw image data from bitmaps in software. This will make it possible to use the same codepath for non-bitmap graphics objects and to create a software implementation for other drawing operations. --- dlls/gdiplus/graphics.c | 60 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 53 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7b3f64f..6a1dc10 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -173,6 +173,35 @@ static void transform_and_round_points(GpGraphics *graphics, POINT *pti, } } +/* Draw non-premultiplied ARGB data to the given graphics object */ +static GpStatus alpha_blend_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, + const BYTE *src, INT src_width, INT src_height, INT src_stride) +{ + if (graphics->image && graphics->image->type == ImageTypeBitmap) + { + GpBitmap *dst_bitmap = (GpBitmap*)graphics->image; + INT x, y; + + for (x=0; x<src_width; x++) + { + for (y=0; y<src_height; y++) + { + ARGB dst_color, src_color; + GdipBitmapGetPixel(dst_bitmap, x+dst_x, y+dst_y, &dst_color); + src_color = ((ARGB*)(src + src_stride * y))[x]; + GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, color_over(dst_color, src_color)); + } + } + + return Ok; + } + else + { + ERR("Not implemented for non-bitmap DC's\n"); + return GenericError; + } +} + static ARGB blend_colors(ARGB start, ARGB end, REAL position) { ARGB result=0; @@ -1939,9 +1968,10 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (use_software) { RECT src_area, dst_area; - int i, x, y; + int i, x, y, stride; GpMatrix *dst_to_src; REAL m11, m12, m21, m22, mdx, mdy; + LPBYTE data; src_area.left = srcx*dx; src_area.top = srcy*dy; @@ -1975,13 +2005,22 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image return stat; } + data = GdipAlloc(sizeof(ARGB) * (dst_area.right - dst_area.left) * (dst_area.bottom - dst_area.top)); + if (!data) + { + GdipDeleteMatrix(dst_to_src); + return OutOfMemory; + } + + stride = sizeof(ARGB) * (dst_area.right - dst_area.left); + for (x=dst_area.left; x<dst_area.right; x++) { for (y=dst_area.top; y<dst_area.bottom; y++) { GpPointF src_pointf; int src_x, src_y; - ARGB src_color, dst_color; + ARGB *src_color; src_pointf.X = x; src_pointf.Y = y; @@ -1991,18 +2030,25 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image src_x = roundr(src_pointf.X); src_y = roundr(src_pointf.Y); + src_color = (ARGB*)(data + stride * (y - dst_area.top) + sizeof(ARGB) * (x - dst_area.left)); + if (src_x < src_area.left || src_x >= src_area.right || src_y < src_area.top || src_y >= src_area.bottom) /* FIXME: Use wrapmode */ - continue; - - GdipBitmapGetPixel(bitmap, src_x, src_y, &src_color); - GdipBitmapGetPixel((GpBitmap*)graphics->image, x, y, &dst_color); - GdipBitmapSetPixel((GpBitmap*)graphics->image, x, y, color_over(dst_color, src_color)); + *src_color = 0; + else + GdipBitmapGetPixel(bitmap, src_x, src_y, src_color); } } GdipDeleteMatrix(dst_to_src); + + stat = alpha_blend_pixels(graphics, dst_area.left, dst_area.top, + data, dst_area.right - dst_area.left, dst_area.bottom - dst_area.top, stride); + + GdipFree(data); + + return stat; } else {

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2010