April 2010 - Wine-commits - list.winehq.org

Piotr Caban : msvcrt: Added multiple locales parsing to _create_locale.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: 5efff1641384622e1b49b804a45723d2aca60510 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5efff1641384622e1b49b804a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 15 14:26:17 2010 +0200 msvcrt: Added multiple locales parsing to _create_locale. --- dlls/msvcrt/locale.c | 129 +++++++++++++++++++++++++++++++++---------------- 1 files changed, 87 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5efff1641384622e1b49b…

1 0

Piotr Caban : msvcrt: Make setlocale working with per thread locales.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: 87dee43b0accad4f26806d75277c954e670dacb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87dee43b0accad4f26806d752… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 15 14:26:33 2010 +0200 msvcrt: Make setlocale working with per thread locales. --- dlls/msvcrt/locale.c | 122 ++++++++++++++++++++++++++------------------------ 1 files changed, 63 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=87dee43b0accad4f26806…

1 0

Piotr Caban : msvcrt: Use per thread locale in many functions.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: d1fa8b64e42a646b7452fd0cc1a480531d0180c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1fa8b64e42a646b7452fd0cc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 15 14:26:47 2010 +0200 msvcrt: Use per thread locale in many functions. --- dlls/msvcrt/ctype.c | 12 ++++--- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/locale.c | 2 +- dlls/msvcrt/mbcs.c | 75 ++++++++++++++++++++++++++------------------------ 4 files changed, 48 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1fa8b64e42a646b7452f…

1 0

Alistair Leslie-Hughes : msxml4: Add Schema interfaces.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: cf087f749b893611a0ad217cc877faffe4dbf57b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf087f749b893611a0ad217cc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 15 21:14:08 2010 +1000 msxml4: Add Schema interfaces. --- include/msxml2.idl | 610 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/msxml2did.h | 82 +++++++ 2 files changed, 692 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf087f749b893611a0ad2…

1 0

Roderick Colenbrander : wined3d: Remove temporary conv_byte_count fixup from d3dfmt_get_conv.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: 1a61f46bbb198c31da3245ea3a3d475624183117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a61f46bbb198c31da3245ea3… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Apr 15 12:41:57 2010 +0200 wined3d: Remove temporary conv_byte_count fixup from d3dfmt_get_conv. --- dlls/wined3d/surface.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 309a62a..9e3cef9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2138,6 +2138,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ RECT rect = {0, 0, This->pow2Width, This->pow2Height}; /* Copy the default values from the surface. Below we might perform fixups */ + /* TODO: get rid of color keying desc fixups by using e.g. a table. */ *desc = *This->resource.format_desc; *convert = NO_CONVERSION; @@ -2192,6 +2193,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ desc->glFormat = GL_RGBA; desc->glInternal = GL_RGB5_A1; desc->glType = GL_UNSIGNED_SHORT_5_5_5_1; + desc->conv_byte_count = 2; } break; @@ -2201,6 +2203,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ desc->glFormat = GL_BGRA; desc->glInternal = GL_RGB5_A1; desc->glType = GL_UNSIGNED_SHORT_1_5_5_5_REV; + desc->conv_byte_count = 2; } break; @@ -2220,6 +2223,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ desc->glFormat = GL_RGBA; desc->glInternal = GL_RGBA8; desc->glType = GL_UNSIGNED_INT_8_8_8_8; + desc->conv_byte_count = 4; } break; @@ -2227,14 +2231,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ break; } - /* At the moment we don't override the byte_count when it is the same before - * and after conversion. Until that is fixed (which mostly applies to non-ck formats), - * make sure we explicitly set conv_byte_count. - * TODO: get rid of this. - */ - if(!desc->conv_byte_count) - desc->conv_byte_count = desc->byte_count; - return WINED3D_OK; }

1 0

Alexandre Julliard : winex11: Define a structure to hold coordinates information for BitBlt operations.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: 39493b0660bfed2661e31a3837de06788cae5516 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39493b0660bfed2661e31a383… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 14 20:27:17 2010 +0200 winex11: Define a structure to hold coordinates information for BitBlt operations. --- dlls/winex11.drv/bitblt.c | 226 ++++++++++++++++++++++---------------------- dlls/winex11.drv/x11drv.h | 13 ++- dlls/winex11.drv/xrender.c | 27 +++--- 3 files changed, 135 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=39493b0660bfed2661e31…

1 0

Alexandre Julliard : winex11: Move logical to physical mapping into the BITBLT_GetVisRectangles helper function .
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: 439223d43a20353bf6b0efcf4d3d7e622e72818a URL: http://source.winehq.org/git/wine.git/?a=commit;h=439223d43a20353bf6b0efcf4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 14 20:41:18 2010 +0200 winex11: Move logical to physical mapping into the BITBLT_GetVisRectangles helper function. --- dlls/winex11.drv/bitblt.c | 76 ++++++++++++++++++-------------------------- 1 files changed, 31 insertions(+), 45 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 297fb73..ee247fe 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1165,20 +1165,33 @@ static BOOL BITBLT_GetVisRectangles( X11DRV_PDEVICE *physDevDst, X11DRV_PDEVICE rect.top = dst->y; rect.right = dst->x + dst->width; rect.bottom = dst->y + dst->height; + LPtoDP( physDevDst->hdc, (POINT *)&rect, 2 ); + dst->x = rect.left; + dst->y = rect.top; + dst->width = rect.right - rect.left; + dst->height = rect.bottom - rect.top; if (dst->width < 0) SWAP_INT32( &rect.left, &rect.right ); if (dst->height < 0) SWAP_INT32( &rect.top, &rect.bottom ); + GetRgnBox( physDevDst->region, &clipRect ); if (!IntersectRect( &dst->visrect, &rect, &clipRect )) return FALSE; /* Get the source visible rectangle */ if (!physDevSrc) return TRUE; + rect.left = src->x; rect.top = src->y; rect.right = src->x + src->width; rect.bottom = src->y + src->height; + LPtoDP( physDevSrc->hdc, (POINT *)&rect, 2 ); + src->x = rect.left; + src->y = rect.top; + src->width = rect.right - rect.left; + src->height = rect.bottom - rect.top; if (src->width < 0) SWAP_INT32( &rect.left, &rect.right ); if (src->height < 0) SWAP_INT32( &rect.top, &rect.bottom ); + /* Apparently the clipping and visible regions are only for output, so just check against dc extent here to avoid BadMatch errors */ clipRect = physDevSrc->drawable_rect; @@ -1376,7 +1389,6 @@ BOOL CDECL X11DRV_StretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, IN const BYTE *opcode; Pixmap pixmaps[3] = { 0, 0, 0 }; /* pixmaps for DST, SRC, TMP */ GC tmpGC = 0; - POINT pts[2]; /* compensate for off-by-one shifting for negative widths and heights */ if (widthDst < 0) @@ -1393,65 +1405,39 @@ BOOL CDECL X11DRV_StretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, IN useDst = (((rop >> 1) & 0x550000) != (rop & 0x550000)); if (!physDevSrc && useSrc) return FALSE; - /* Map the coordinates to device coords */ - - pts[0].x = xDst; - pts[0].y = yDst; - pts[1].x = xDst + widthDst; - pts[1].y = yDst + heightDst; - LPtoDP(physDevDst->hdc, pts, 2); - xDst = pts[0].x; - yDst = pts[0].y; - widthDst = pts[1].x - pts[0].x; - heightDst = pts[1].y - pts[0].y; - - TRACE(" rectdst=%d,%d-%d,%d orgdst=%d,%d\n", - xDst, yDst, widthDst, heightDst, - physDevDst->dc_rect.left, physDevDst->dc_rect.top ); + src.x = xSrc; + src.y = ySrc; + src.width = widthSrc; + src.height = heightSrc; + dst.x = xDst; + dst.y = yDst; + dst.width = widthDst; + dst.height = heightDst; if (useSrc) { - pts[0].x = xSrc; - pts[0].y = ySrc; - pts[1].x = xSrc + widthSrc; - pts[1].y = ySrc + heightSrc; - LPtoDP(physDevSrc->hdc, pts, 2); - xSrc = pts[0].x; - ySrc = pts[0].y; - widthSrc = pts[1].x - pts[0].x; - heightSrc = pts[1].y - pts[0].y; - - fStretch = (widthSrc != widthDst) || (heightSrc != heightDst); - TRACE(" rectsrc=%d,%d-%d,%d orgsrc=%d,%d\n", - xSrc, ySrc, widthSrc, heightSrc, - physDevSrc->dc_rect.left, physDevSrc->dc_rect.top ); - src.x = xSrc; - src.y = ySrc; - src.width = widthSrc; - src.height = heightSrc; - dst.x = xDst; - dst.y = yDst; - dst.width = widthDst; - dst.height = heightDst; if (!BITBLT_GetVisRectangles( physDevDst, physDevSrc, &dst, &src )) return TRUE; - TRACE(" vissrc=%s visdst=%s\n", - wine_dbgstr_rect( &src.visrect ), wine_dbgstr_rect( &dst.visrect ) ); + fStretch = (src.width != dst.width) || (src.height != dst.height); + if (physDevDst != physDevSrc) sSrc = X11DRV_LockDIBSection( physDevSrc, DIB_Status_None ); } else { fStretch = FALSE; - dst.x = xDst; - dst.y = yDst; - dst.width = widthDst; - dst.height = heightDst; if (!BITBLT_GetVisRectangles( physDevDst, NULL, &dst, NULL )) return TRUE; - TRACE(" vissrc=none visdst=%s\n", wine_dbgstr_rect( &dst.visrect ) ); } + TRACE(" rectdst=%d,%d %dx%d orgdst=%d,%d visdst=%s\n", + dst.x, dst.y, dst.width, dst.height, + physDevDst->dc_rect.left, physDevDst->dc_rect.top, wine_dbgstr_rect( &dst.visrect ) ); + if (useSrc) + TRACE(" rectsrc=%d,%d %dx%d orgsrc=%d,%d vissrc=%s\n", + src.x, src.y, src.width, src.height, + physDevSrc->dc_rect.left, physDevSrc->dc_rect.top, wine_dbgstr_rect( &src.visrect ) ); + width = dst.visrect.right - dst.visrect.left; height = dst.visrect.bottom - dst.visrect.top;

1 0

Alexandre Julliard : winex11: Use the BITBLT_GetVisRectangles helper function for AlphaBlend too.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: 246e3732c032b8659795909dbc17a3c0eed800f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=246e3732c032b8659795909db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 14 20:41:18 2010 +0200 winex11: Use the BITBLT_GetVisRectangles helper function for AlphaBlend too. --- dlls/winex11.drv/bitblt.c | 33 +++++++++++++++++ dlls/winex11.drv/x11drv.h | 3 ++ dlls/winex11.drv/xrender.c | 85 +++++++++++++------------------------------ 3 files changed, 62 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=246e3732c032b86597959…

1 0

Alexandre Julliard : winex11: Rewrite AlphaBlend to do everything on the server side, and support all types of source bitmaps.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: a53a3f50ad02997167de0438f12ea992d6236e27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a53a3f50ad02997167de0438f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 15 11:39:41 2010 +0200 winex11: Rewrite AlphaBlend to do everything on the server side, and support all types of source bitmaps. --- dlls/winex11.drv/xrender.c | 239 +++++++++++++++---------------------------- 1 files changed, 84 insertions(+), 155 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a53a3f50ad02997167de0…

1 0

Alexandre Julliard : winex11: Add support for big-endian 32-bpp Xrender formats.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: 5cafb7c917f35d46945b198e22aaff0d38cd6f7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cafb7c917f35d46945b198e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 15 15:55:40 2010 +0200 winex11: Add support for big-endian 32-bpp Xrender formats. --- dlls/winex11.drv/xrender.c | 54 +++++++++++++++++++++++++++++-------------- 1 files changed, 36 insertions(+), 18 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 4708139..83f8048 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -55,7 +55,6 @@ static BOOL X11DRV_XRender_Installed = FALSE; #define RepeatReflect 3 #endif -#define MAX_FORMATS 10 typedef enum wine_xrformat { WXR_FORMAT_MONO, @@ -67,7 +66,10 @@ typedef enum wine_xrformat WXR_FORMAT_R8G8B8, WXR_FORMAT_B8G8R8, WXR_FORMAT_A8R8G8B8, + WXR_FORMAT_B8G8R8A8, WXR_FORMAT_X8R8G8B8, + WXR_FORMAT_B8G8R8X8, + WXR_NB_FORMATS } WXRFormat; typedef struct wine_xrender_format_template @@ -84,7 +86,7 @@ typedef struct wine_xrender_format_template unsigned int blueMask; } WineXRenderFormatTemplate; -static const WineXRenderFormatTemplate wxr_formats_template[] = +static const WineXRenderFormatTemplate wxr_formats_template[WXR_NB_FORMATS] = { /* Format depth alpha mask red mask green mask blue mask*/ {WXR_FORMAT_MONO, 1, 0, 0x01, 0, 0, 0, 0, 0, 0 }, @@ -96,7 +98,9 @@ static const WineXRenderFormatTemplate wxr_formats_template[] = {WXR_FORMAT_R8G8B8, 24, 0, 0, 16, 0xff, 8, 0xff, 0, 0xff }, {WXR_FORMAT_B8G8R8, 24, 0, 0, 0, 0xff, 8, 0xff, 16, 0xff }, {WXR_FORMAT_A8R8G8B8, 32, 24, 0xff, 16, 0xff, 8, 0xff, 0, 0xff }, - {WXR_FORMAT_X8R8G8B8, 32, 0, 0, 16, 0xff, 8, 0xff, 0, 0xff } + {WXR_FORMAT_B8G8R8A8, 32, 0, 0xff, 8, 0xff, 16, 0xff, 24, 0xff }, + {WXR_FORMAT_X8R8G8B8, 32, 0, 0, 16, 0xff, 8, 0xff, 0, 0xff }, + {WXR_FORMAT_B8G8R8X8, 32, 0, 0, 8, 0xff, 16, 0xff, 24, 0xff }, }; typedef struct wine_xrender_format @@ -105,7 +109,7 @@ typedef struct wine_xrender_format XRenderPictFormat *pict_format; } WineXRenderFormat; -static WineXRenderFormat wxr_formats[MAX_FORMATS]; +static WineXRenderFormat wxr_formats[WXR_NB_FORMATS]; static int WineXRenderFormatsListSize = 0; static WineXRenderFormat *default_format = NULL; @@ -208,6 +212,16 @@ static CRITICAL_SECTION xrender_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; #define NATIVE_BYTE_ORDER LSBFirst #endif +static WXRFormat get_format_without_alpha( WXRFormat format ) +{ + switch (format) + { + case WXR_FORMAT_A8R8G8B8: return WXR_FORMAT_X8R8G8B8; + case WXR_FORMAT_B8G8R8A8: return WXR_FORMAT_B8G8R8X8; + default: return format; + } +} + static BOOL get_xrender_template(const WineXRenderFormatTemplate *fmt, XRenderPictFormat *templ, unsigned long *mask) { templ->id = 0; @@ -1510,7 +1524,7 @@ static Picture get_tile_pict(const WineXRenderFormat *wxr_format, int text_pixel Pixmap xpm; Picture pict; int current_color; - } tiles[MAX_FORMATS], *tile; + } tiles[WXR_NB_FORMATS], *tile; XRenderColor col; tile = &tiles[wxr_format->format]; @@ -1992,7 +2006,7 @@ static void xrender_mono_blit( Picture src_pict, Picture mask_pict, Picture dst_ BOOL XRender_AlphaBlend( X11DRV_PDEVICE *devDst, X11DRV_PDEVICE *devSrc, struct bitblt_coords *dst, struct bitblt_coords *src, BLENDFUNCTION blendfn ) { - Picture dst_pict, src_pict, mask_pict = 0, tmp_pict = 0; + Picture dst_pict, src_pict = 0, mask_pict = 0, tmp_pict = 0; struct xrender_info *src_info = get_xrender_info( devSrc ); double xscale, yscale; BOOL use_repeat; @@ -2015,22 +2029,26 @@ BOOL XRender_AlphaBlend( X11DRV_PDEVICE *devDst, X11DRV_PDEVICE *devSrc, } else xscale = yscale = 1; /* no scaling needed with a repeating source */ - if (!(blendfn.AlphaFormat & AC_SRC_ALPHA) && - src_info->format && src_info->format->format == WXR_FORMAT_A8R8G8B8) + if (!(blendfn.AlphaFormat & AC_SRC_ALPHA) && src_info->format) { /* we need a source picture with no alpha */ - XRenderPictureAttributes pa; - const WineXRenderFormat *fmt = get_xrender_format( WXR_FORMAT_X8R8G8B8 ); + WXRFormat format = get_format_without_alpha( src_info->format->format ); + if (format != src_info->format->format) + { + XRenderPictureAttributes pa; + const WineXRenderFormat *fmt = get_xrender_format( format ); - wine_tsx11_lock(); - pa.subwindow_mode = IncludeInferiors; - pa.repeat = use_repeat ? RepeatNormal : RepeatNone; - tmp_pict = pXRenderCreatePicture( gdi_display, devSrc->drawable, fmt->pict_format, - CPSubwindowMode|CPRepeat, &pa ); - wine_tsx11_unlock(); - src_pict = tmp_pict; + wine_tsx11_lock(); + pa.subwindow_mode = IncludeInferiors; + pa.repeat = use_repeat ? RepeatNormal : RepeatNone; + tmp_pict = pXRenderCreatePicture( gdi_display, devSrc->drawable, fmt->pict_format, + CPSubwindowMode|CPRepeat, &pa ); + wine_tsx11_unlock(); + src_pict = tmp_pict; + } } - else src_pict = get_xrender_picture_source( devSrc, use_repeat ); + + if (!src_pict) src_pict = get_xrender_picture_source( devSrc, use_repeat ); EnterCriticalSection( &xrender_cs ); mask_pict = get_mask_pict( blendfn.SourceConstantAlpha * 257 );

1 0