October 2012 - Wine-Commits

Alexandre Julliard : gdi32: Use BI_BITFIELDS to indicate that a 32-bpp DIB doesn' t have an alpha channel.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: 76272e077364d3d78ceaf8912e3bc22ff6a31a48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76272e077364d3d78ceaf8912… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 10 17:08:05 2012 +0200 gdi32: Use BI_BITFIELDS to indicate that a 32-bpp DIB doesn't have an alpha channel. --- dlls/gdi32/bitblt.c | 8 ++++++-- dlls/gdi32/dibdrv/bitblt.c | 8 ++++++-- dlls/gdi32/dibdrv/dc.c | 13 +++++++++++++ dlls/winex11.drv/xrender.c | 2 +- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 151434f..ea6d8a7 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -357,6 +357,7 @@ DWORD nulldrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_ BITMAPINFO *dst_info = (BITMAPINFO *)buffer; struct gdi_image_bits dst_bits; struct bitblt_coords orig_dst; + DWORD *masks = (DWORD *)info->bmiColors; DC *dc = get_nulldrv_dc( dev ); DWORD err; @@ -364,7 +365,7 @@ DWORD nulldrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_ if (info->bmiHeader.biBitCount != 32) goto update_format; if (info->bmiHeader.biCompression == BI_BITFIELDS) { - DWORD *masks = (DWORD *)info->bmiColors; + if (blend.AlphaFormat & AC_SRC_ALPHA) return ERROR_INVALID_PARAMETER; if (masks[0] != 0xff0000 || masks[1] != 0x00ff00 || masks[2] != 0x0000ff) goto update_format; } @@ -390,8 +391,11 @@ update_format: info->bmiHeader.biPlanes = 1; info->bmiHeader.biBitCount = 32; - info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biCompression = BI_BITFIELDS; info->bmiHeader.biClrUsed = 0; + masks[0] = 0xff0000; + masks[1] = 0x00ff00; + masks[2] = 0x0000ff; return ERROR_BAD_FORMAT; } diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index bcaa585..ccddac9 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -1001,6 +1001,7 @@ DWORD dibdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_b { dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); dib_info src_dib; + DWORD *masks = (DWORD *)info->bmiColors; TRACE( "%p %p\n", dev, info ); @@ -1008,7 +1009,7 @@ DWORD dibdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_b if (info->bmiHeader.biBitCount != 32) goto update_format; if (info->bmiHeader.biCompression == BI_BITFIELDS) { - DWORD *masks = (DWORD *)info->bmiColors; + if (blend.AlphaFormat & AC_SRC_ALPHA) return ERROR_INVALID_PARAMETER; if (masks[0] != 0xff0000 || masks[1] != 0x00ff00 || masks[2] != 0x0000ff) goto update_format; } @@ -1027,8 +1028,11 @@ update_format: info->bmiHeader.biPlanes = 1; info->bmiHeader.biBitCount = 32; - info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biCompression = BI_BITFIELDS; info->bmiHeader.biClrUsed = 0; + masks[0] = 0xff0000; + masks[1] = 0x00ff00; + masks[2] = 0x0000ff; return ERROR_BAD_FORMAT; } diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 00e2229..0e68f80 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -760,6 +760,19 @@ static DWORD windrv_GetImage( PHYSDEV dev, BITMAPINFO *info, lock_surface( physdev->surface ); dev = GET_NEXT_PHYSDEV( dev, pGetImage ); ret = dev->funcs->pGetImage( dev, info, bits, src ); + + /* don't return alpha if original surface doesn't support it */ + if (info->bmiHeader.biBitCount == 32 && + info->bmiHeader.biCompression == BI_RGB && + physdev->dibdrv->dib.compression == BI_BITFIELDS) + { + DWORD *colors = (DWORD *)info->bmiColors; + colors[0] = 0xff0000; + colors[1] = 0x00ff00; + colors[2] = 0x0000ff; + info->bmiHeader.biCompression = BI_BITFIELDS; + } + if (!bits->is_copy) { /* use the freeing callback to unlock the surface */ diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index bdb8865..d7f0508 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2077,7 +2077,7 @@ static DWORD xrenderdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct format = get_xrender_format_from_bitmapinfo( info ); if (!(func.AlphaFormat & AC_SRC_ALPHA)) format = get_format_without_alpha( format ); - else if (format != WXR_FORMAT_A8R8G8B8) + else if (format != WXR_FORMAT_A8R8G8B8 || info->bmiHeader.biCompression != BI_RGB) return ERROR_INVALID_PARAMETER; if (!(pict_format = pict_formats[format])) goto update_format;

1 0

Alexandre Julliard : gdi32: Handle a missing source alpha directly in the blend_rect primitive instead of modifying the source data .
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: 6e325afaa78f2037521e899838be91fa1dc35a16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e325afaa78f2037521e89983… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 10 17:19:42 2012 +0200 gdi32: Handle a missing source alpha directly in the blend_rect primitive instead of modifying the source data. --- dlls/gdi32/bitblt.c | 8 ++++---- dlls/gdi32/dib.c | 8 ++++---- dlls/gdi32/dibdrv/dc.c | 14 +------------- dlls/gdi32/dibdrv/primitives.c | 14 +++++++++++++- dlls/gdi32/gdi_private.h | 4 ++-- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index ea6d8a7..4750d1b 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -158,7 +158,7 @@ void free_heap_bits( struct gdi_image_bits *bits ) } DWORD convert_bits( const BITMAPINFO *src_info, struct bitblt_coords *src, - BITMAPINFO *dst_info, struct gdi_image_bits *bits, BOOL add_alpha ) + BITMAPINFO *dst_info, struct gdi_image_bits *bits ) { void *ptr; DWORD err; @@ -172,7 +172,7 @@ DWORD convert_bits( const BITMAPINFO *src_info, struct bitblt_coords *src, if (!(ptr = HeapAlloc( GetProcessHeap(), 0, dst_info->bmiHeader.biSizeImage ))) return ERROR_OUTOFMEMORY; - err = convert_bitmapinfo( src_info, bits->ptr, src, dst_info, ptr, add_alpha ); + err = convert_bitmapinfo( src_info, bits->ptr, src, dst_info, ptr ); if (bits->free) bits->free( bits ); bits->ptr = ptr; bits->is_copy = TRUE; @@ -287,7 +287,7 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, get_mono_dc_colors( src_dev->hdc, dst_info, 2 ); } - if (!(err = convert_bits( src_info, src, dst_info, &bits, FALSE ))) + if (!(err = convert_bits( src_info, src, dst_info, &bits ))) { /* get rid of the fake destination table */ dst_info->bmiHeader.biClrUsed = dst_colors; @@ -330,7 +330,7 @@ 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) { - err = convert_bits( src_info, src, dst_info, &bits, TRUE ); + err = convert_bits( src_info, src, dst_info, &bits ); 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 91cfae7..eed57e8 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -572,7 +572,7 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he dst_info->bmiHeader.biClrUsed = 1; } - if (!(err = convert_bits( src_info, &src, dst_info, &src_bits, FALSE ))) + if (!(err = convert_bits( src_info, &src, dst_info, &src_bits ))) { /* get rid of the fake 1-bpp table */ if (dst_info->bmiHeader.biClrUsed == 1) dst_info->bmiHeader.biClrUsed = 0; @@ -738,7 +738,7 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, err = put_image_into_bitmap( bitmap, clip, dst_info, &src_bits, &src, &dst ); if (err == ERROR_BAD_FORMAT) { - err = convert_bits( src_info, &src, dst_info, &src_bits, FALSE ); + err = convert_bits( src_info, &src, dst_info, &src_bits ); if (!err) err = put_image_into_bitmap( bitmap, clip, dst_info, &src_bits, &src, &dst ); } if(err) result = 0; @@ -855,7 +855,7 @@ INT nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD cx, DWOR err = dev->funcs->pPutImage( dev, clip, dst_info, &src_bits, &src, &dst, SRCCOPY ); if (err == ERROR_BAD_FORMAT) { - err = convert_bits( src_info, &src, dst_info, &src_bits, FALSE ); + err = convert_bits( src_info, &src, dst_info, &src_bits ); if (!err) err = dev->funcs->pPutImage( dev, clip, dst_info, &src_bits, &src, &dst, SRCCOPY ); } if (err) lines = 0; @@ -1387,7 +1387,7 @@ INT WINAPI GetDIBits( else dst_info->bmiHeader.biHeight = -src.height; - convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, bits, FALSE ); + convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, bits ); if (src_bits.free) src_bits.free( &src_bits ); ret = lines; } diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 0e68f80..0b6013d 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -214,7 +214,7 @@ void copy_dib_color_info(dib_info *dst, const dib_info *src) } DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, - const BITMAPINFO *dst_info, void *dst_bits, BOOL add_alpha ) + const BITMAPINFO *dst_info, void *dst_bits ) { dib_info src_dib, dst_dib; DWORD ret; @@ -234,24 +234,12 @@ DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bit } __ENDTRY - /* We shared the color tables, so there's no need to free the dib_infos here */ if(!ret) return ERROR_BAD_FORMAT; /* update coordinates, the destination rectangle is always stored at 0,0 */ src->x -= src->visrect.left; src->y -= src->visrect.top; offset_rect( &src->visrect, -src->visrect.left, -src->visrect.top ); - - if (add_alpha && dst_dib.funcs == &funcs_8888 && src_dib.funcs != &funcs_8888) - { - DWORD *pixel = dst_dib.bits.ptr; - int x, y; - - for (y = src->visrect.top; y < src->visrect.bottom; y++, pixel += dst_dib.stride / 4) - for (x = src->visrect.left; x < src->visrect.right; x++) - pixel[x] |= 0xff000000; - } - return ERROR_SUCCESS; } diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 07dd1d5..6feb819 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -3838,6 +3838,14 @@ static inline DWORD blend_argb_constant_alpha( DWORD dst, DWORD src, DWORD alpha blend_color( dst >> 24, src >> 24, alpha ) << 24); } +static inline DWORD blend_argb_no_src_alpha( DWORD dst, DWORD src, DWORD alpha ) +{ + return (blend_color( dst, src, alpha ) | + blend_color( dst >> 8, src >> 8, alpha ) << 8 | + blend_color( dst >> 16, src >> 16, alpha ) << 16 | + blend_color( dst >> 24, 255, alpha ) << 24); +} + static inline DWORD blend_argb( DWORD dst, DWORD src ) { BYTE b = (BYTE)src; @@ -3898,10 +3906,14 @@ static void blend_rect_8888(const dib_info *dst, const RECT *rc, for (x = 0; x < rc->right - rc->left; x++) dst_ptr[x] = blend_argb_alpha( dst_ptr[x], src_ptr[x], blend.SourceConstantAlpha ); } - else + else if (src->compression == BI_RGB) for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride / 4, src_ptr += src->stride / 4) for (x = 0; x < rc->right - rc->left; x++) dst_ptr[x] = blend_argb_constant_alpha( dst_ptr[x], src_ptr[x], blend.SourceConstantAlpha ); + else + for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride / 4, src_ptr += src->stride / 4) + for (x = 0; x < rc->right - rc->left; x++) + dst_ptr[x] = blend_argb_no_src_alpha( dst_ptr[x], src_ptr[x], blend.SourceConstantAlpha ); } static void blend_rect_32(const dib_info *dst, const RECT *rc, diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 29d4286..5b79526 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -222,7 +222,7 @@ extern BOOL BIDI_Reorder( HDC hDC, LPCWSTR lpString, INT uCount, DWORD dwFlags, /* bitblt.c */ extern DWORD convert_bits( const BITMAPINFO *src_info, struct bitblt_coords *src, - BITMAPINFO *dst_info, struct gdi_image_bits *bits, BOOL add_alpha ) DECLSPEC_HIDDEN; + BITMAPINFO *dst_info, struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; extern BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_coords *src ) DECLSPEC_HIDDEN; extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src, BITMAPINFO *dst_info, struct bitblt_coords *dst, @@ -264,7 +264,7 @@ extern void fill_default_color_table( BITMAPINFO *info ) DECLSPEC_HIDDEN; extern void get_ddb_bitmapinfo( BITMAPOBJ *bmp, BITMAPINFO *info ) DECLSPEC_HIDDEN; extern BITMAPINFO *copy_packed_dib( const BITMAPINFO *src_info, UINT usage ) DECLSPEC_HIDDEN; extern DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, - const BITMAPINFO *dst_info, void *dst_bits, BOOL add_alpha ) DECLSPEC_HIDDEN; + const BITMAPINFO *dst_info, void *dst_bits ) DECLSPEC_HIDDEN; extern DWORD stretch_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, const BITMAPINFO *dst_info, void *dst_bits, struct bitblt_coords *dst,

1 0

Alexandre Julliard : gdi32: Return the full DIB height in GetImage instead of clipping to the visible rect .
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: 86cf1126a5cc6035e21db3df01088827f5b2245d URL: http://source.winehq.org/git/wine.git/?a=commit;h=86cf1126a5cc6035e21db3df0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 10 17:05:41 2012 +0200 gdi32: Return the full DIB height in GetImage instead of clipping to the visible rect. --- dlls/gdi32/dibdrv/bitblt.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index bac5a60..bcaa585 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -812,12 +812,11 @@ static DWORD get_image_dib_info( dib_info *dib, BITMAPINFO *info, { info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biPlanes = 1; - info->bmiHeader.biCompression = BI_RGB; info->bmiHeader.biXPelsPerMeter = 0; info->bmiHeader.biYPelsPerMeter = 0; info->bmiHeader.biClrImportant = 0; info->bmiHeader.biWidth = dib->width; - info->bmiHeader.biHeight = dib->rect.bottom - dib->rect.top; + info->bmiHeader.biHeight = dib->height - dib->rect.top; info->bmiHeader.biBitCount = dib->bit_count; info->bmiHeader.biSizeImage = info->bmiHeader.biHeight * abs( dib->stride ); if (dib->stride > 0) info->bmiHeader.biHeight = -info->bmiHeader.biHeight;

1 0

Daniel Lehman : msvcp: Flip fclose result check in filebuf<>::close.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: c152c54084ac3c1a096563de9f7227f9a0be8f9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c152c54084ac3c1a096563de9… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Oct 8 12:14:24 2012 -0700 msvcp: Flip fclose result check in filebuf<>::close. --- dlls/msvcp100/ios.c | 4 ++-- dlls/msvcp60/ios.c | 4 ++-- dlls/msvcp71/ios.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c index 6b1fcc8..8122ad1 100644 --- a/dlls/msvcp100/ios.c +++ b/dlls/msvcp100/ios.c @@ -1993,7 +1993,7 @@ static basic_filebuf_char* basic_filebuf_char_close(basic_filebuf_char *this) /* TODO: handle exceptions */ if(!basic_filebuf_char__Endwrite(this)) ret = NULL; - if(!fclose(this->file)) + if(fclose(this->file)) ret = NULL; basic_filebuf_char__Init(this, NULL, INITFL_close); @@ -2482,7 +2482,7 @@ static basic_filebuf_wchar* basic_filebuf_wchar_close(basic_filebuf_wchar *this) /* TODO: handle exceptions */ if(!basic_filebuf_wchar__Endwrite(this)) ret = NULL; - if(!fclose(this->file)) + if(fclose(this->file)) ret = NULL; basic_filebuf_wchar__Init(this, NULL, INITFL_close); diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 2b06716..43bd10b 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -2331,7 +2331,7 @@ basic_filebuf_char* __thiscall basic_filebuf_char_close(basic_filebuf_char *this /* TODO: handle exceptions */ if(!basic_filebuf_char__Endwrite(this)) ret = NULL; - if(!fclose(this->file)) + if(fclose(this->file)) ret = NULL; basic_filebuf_char__Init(this, NULL, INITFL_close); @@ -2901,7 +2901,7 @@ basic_filebuf_wchar* __thiscall basic_filebuf_wchar_close(basic_filebuf_wchar *t /* TODO: handle exceptions */ if(!basic_filebuf_wchar__Endwrite(this)) ret = NULL; - if(!fclose(this->file)) + if(fclose(this->file)) ret = NULL; basic_filebuf_wchar__Init(this, NULL, INITFL_close); diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index d2a1eb6..32e3941 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -2414,7 +2414,7 @@ basic_filebuf_char* __thiscall basic_filebuf_char_close(basic_filebuf_char *this /* TODO: handle exceptions */ if(!basic_filebuf_char__Endwrite(this)) ret = NULL; - if(!fclose(this->file)) + if(fclose(this->file)) ret = NULL; basic_filebuf_char__Init(this, NULL, INITFL_close); @@ -2974,7 +2974,7 @@ basic_filebuf_wchar* __thiscall basic_filebuf_wchar_close(basic_filebuf_wchar *t /* TODO: handle exceptions */ if(!basic_filebuf_wchar__Endwrite(this)) ret = NULL; - if(!fclose(this->file)) + if(fclose(this->file)) ret = NULL; basic_filebuf_wchar__Init(this, NULL, INITFL_close);

1 0

Alexandre Julliard : gdi32: Limit the allocation size to the useful data when converting DIB bits.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: 34b70728f386eda7b67eb77aa4ebae8c00c4a3d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34b70728f386eda7b67eb77aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 10 17:06:06 2012 +0200 gdi32: Limit the allocation size to the useful data when converting DIB bits. --- dlls/gdi32/bitblt.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 7a1f06f..151434f 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -162,9 +162,12 @@ DWORD convert_bits( const BITMAPINFO *src_info, struct bitblt_coords *src, { void *ptr; DWORD err; + BOOL top_down = dst_info->bmiHeader.biHeight < 0; dst_info->bmiHeader.biWidth = src->visrect.right - src->visrect.left; + dst_info->bmiHeader.biHeight = src->visrect.bottom - src->visrect.top; dst_info->bmiHeader.biSizeImage = get_dib_image_size( dst_info ); + if (top_down) dst_info->bmiHeader.biHeight = -dst_info->bmiHeader.biHeight; if (!(ptr = HeapAlloc( GetProcessHeap(), 0, dst_info->bmiHeader.biSizeImage ))) return ERROR_OUTOFMEMORY;

1 0

Nikolay Sivov : dwrite: Implement GetFontStretch().
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: 0a6663908d9eb2156e92ca25f5e2b5655c51822e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a6663908d9eb2156e92ca25f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 10 08:37:55 2012 -0400 dwrite: Implement GetFontStretch(). --- dlls/dwrite/font.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 94 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 4acd35f..c218c25 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -27,6 +27,69 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); +/* PANOSE is 10 bytes in size, need to pack the structure properly */ +#include "pshpack2.h" +typedef struct +{ + USHORT version; + SHORT xAvgCharWidth; + USHORT usWeightClass; + USHORT usWidthClass; + SHORT fsType; + SHORT ySubscriptXSize; + SHORT ySubscriptYSize; + SHORT ySubscriptXOffset; + SHORT ySubscriptYOffset; + SHORT ySuperscriptXSize; + SHORT ySuperscriptYSize; + SHORT ySuperscriptXOffset; + SHORT ySuperscriptYOffset; + SHORT yStrikeoutSize; + SHORT yStrikeoutPosition; + SHORT sFamilyClass; + PANOSE panose; + ULONG ulUnicodeRange1; + ULONG ulUnicodeRange2; + ULONG ulUnicodeRange3; + ULONG ulUnicodeRange4; + CHAR achVendID[4]; + USHORT fsSelection; + USHORT usFirstCharIndex; + USHORT usLastCharIndex; + /* According to the Apple spec, original version didn't have the below fields, + * version numbers were taken from the OpenType spec. + */ + /* version 0 (TrueType 1.5) */ + USHORT sTypoAscender; + USHORT sTypoDescender; + USHORT sTypoLineGap; + USHORT usWinAscent; + USHORT usWinDescent; + /* version 1 (TrueType 1.66) */ + ULONG ulCodePageRange1; + ULONG ulCodePageRange2; + /* version 2 (OpenType 1.2) */ + SHORT sxHeight; + SHORT sCapHeight; + USHORT usDefaultChar; + USHORT usBreakChar; + USHORT usMaxContext; +} TT_OS2_V2; +#include "poppack.h" + +#ifdef WORDS_BIGENDIAN +#define GET_BE_WORD(x) (x) +#define GET_BE_DWORD(x) (x) +#else +#define GET_BE_WORD(x) MAKEWORD(HIBYTE(x), LOBYTE(x)) +#define GET_BE_DWORD(x) MAKELONG(GET_BE_WORD(HIWORD(x)), GET_BE_WORD(LOWORD(x))); +#endif + +#define MS_MAKE_TAG(ch0, ch1, ch2, ch3) \ + ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ + ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) +#define MS_OS2_TAG MS_MAKE_TAG('O','S','/','2') + struct dwrite_fontfamily { IDWriteFontFamily IDWriteFontFamily_iface; LONG ref; @@ -41,6 +104,7 @@ struct dwrite_font { IDWriteFontFamily *family; IDWriteFontFace *face; DWRITE_FONT_STYLE style; + DWRITE_FONT_STRETCH stretch; }; struct dwrite_fontface { @@ -314,8 +378,8 @@ static DWRITE_FONT_WEIGHT WINAPI dwritefont_GetWeight(IDWriteFont *iface) static DWRITE_FONT_STRETCH WINAPI dwritefont_GetStretch(IDWriteFont *iface) { struct dwrite_font *This = impl_from_IDWriteFont(iface); - FIXME("(%p): stub\n", This); - return DWRITE_FONT_STRETCH_UNDEFINED; + TRACE("(%p)\n", This); + return This->stretch; } static DWRITE_FONT_STYLE WINAPI dwritefont_GetStyle(IDWriteFont *iface) @@ -528,12 +592,37 @@ static HRESULT create_fontfamily(const WCHAR *familyname, IDWriteFontFamily **fa return S_OK; } +static DWRITE_FONT_STRETCH get_font_stretch(HDC hdc) +{ + DWRITE_FONT_STRETCH stretch; + TT_OS2_V2 tt_os2; + LONG size; + + /* default stretch to normal */ + stretch = DWRITE_FONT_STRETCH_NORMAL; + + size = GetFontData(hdc, MS_OS2_TAG, 0, NULL, 0); + if (size == GDI_ERROR) return stretch; + + if (size > sizeof(tt_os2)) size = sizeof(tt_os2); + + memset(&tt_os2, 0, sizeof(tt_os2)); + if (GetFontData(hdc, MS_OS2_TAG, 0, &tt_os2, size) != size) return stretch; + + /* DWRITE_FONT_STRETCH enumeration values directly match font data values */ + if (GET_BE_WORD(tt_os2.usWeightClass) <= DWRITE_FONT_STRETCH_ULTRA_EXPANDED) + stretch = GET_BE_WORD(tt_os2.usWeightClass); + + return stretch; +} + HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) { const WCHAR* facename, *familyname; struct dwrite_font *This; IDWriteFontFamily *family; OUTLINETEXTMETRICW *otm; + DWRITE_FONT_STRETCH stretch; HRESULT hr; HFONT hfont; HDC hdc; @@ -552,6 +641,8 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) otm->otmSize = ret; ret = GetOutlineTextMetricsW(hdc, otm->otmSize, otm); + stretch = get_font_stretch(hdc); + DeleteDC(hdc); DeleteObject(hfont); @@ -575,6 +666,7 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) This->face = NULL; This->family = family; This->style = logfont->lfItalic ? DWRITE_FONT_STYLE_ITALIC : DWRITE_FONT_STYLE_NORMAL; + This->stretch = stretch; *font = &This->IDWriteFont_iface;

1 0

Andrew Eikum : vbscript: Undefined variables resolve as EMPTY without Option Explicit.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: 39d345320990ea9b581963ad1b2bdb3b456cde27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39d345320990ea9b581963ad1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 10 10:16:27 2012 -0500 vbscript: Undefined variables resolve as EMPTY without Option Explicit. --- dlls/vbscript/interp.c | 20 +++++++++++++++++--- dlls/vbscript/tests/run.c | 10 ++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 3a5d9b2..eace041 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -206,7 +206,8 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ return S_OK; } -static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, BOOL is_const, VARIANT *val, BOOL own_val) +static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, + BOOL is_const, VARIANT *val, BOOL own_val, VARIANT **out_var) { dynamic_var_t *new_var; vbsheap_t *heap; @@ -245,6 +246,9 @@ static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, BOOL is_const ctx->dynamic_vars = new_var; } + if(out_var) + *out_var = &new_var->v; + return S_OK; } @@ -526,6 +530,16 @@ static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res) } break; case REF_NONE: + if(res && !ctx->func->code_ctx->option_explicit && arg_cnt == 0) { + VARIANT v, *new; + VariantInit(&v); + hres = add_dynamic_var(ctx, identifier, FALSE, &v, FALSE, &new); + if(FAILED(hres)) + return hres; + V_VT(res) = VT_BYREF|VT_VARIANT; + V_BYREF(res) = new; + break; + } FIXME("%s not found\n", debugstr_w(identifier)); return DISP_E_UNKNOWNNAME; } @@ -653,7 +667,7 @@ static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, DISPPARAMS *dp) } TRACE("creating variable %s\n", debugstr_w(name)); - hres = add_dynamic_var(ctx, name, FALSE, dp->rgvarg, FALSE); + hres = add_dynamic_var(ctx, name, FALSE, dp->rgvarg, FALSE, NULL); } } @@ -810,7 +824,7 @@ static HRESULT interp_const(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - return add_dynamic_var(ctx, arg, TRUE, val.v, val.owned); + return add_dynamic_var(ctx, arg, TRUE, val.v, val.owned, NULL); } static HRESULT interp_val(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 8c541bd..24a3c8d 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -1780,6 +1780,8 @@ static void run_from_res(const char *name) static void run_tests(void) { + HRESULT hres; + strict_dispid_check = TRUE; parse_script_a(""); @@ -1880,6 +1882,14 @@ static void run_tests(void) "End Sub\n" "Call testsub()"); + parse_script_a("Call ok(getVT(x) = \"VT_EMPTY*\", \"getVT(x) = \" & getVT(x))\n"); + parse_script_a("Call ok(x = \"\", \"x = \" & x)\n"); + parse_script_a("x = y\n" + "Call ok(getVT(x) = \"VT_EMPTY*\", \"getVT(x) = \" & getVT(x))\n" + "Call ok(getVT(y) = \"VT_EMPTY*\", \"getVT(y) = \" & getVT(y))"); + hres = parse_script_ar("x = y(\"a\")"); + ok(FAILED(hres), "script didn't fail\n"); + run_from_res("lang.vbs"); run_from_res("api.vbs");

1 0

Daniel Lehman : msvcp90: Initialize state in mb_to_wc.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: 650ccf598e5e6b5d01be22484d8ce184aa0a95de URL: http://source.winehq.org/git/wine.git/?a=commit;h=650ccf598e5e6b5d01be22484… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Oct 2 00:04:22 2012 -0700 msvcp90: Initialize state in mb_to_wc. --- dlls/msvcp90/locale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 010284e..501443c 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -4397,7 +4397,7 @@ num_get* num_get_short_use_facet(const locale *loc) static inline wchar_t mb_to_wc(char ch, const _Cvtvec *cvt) { - int state; + int state = 0; wchar_t ret; return _Mbrtowc(&ret, &ch, 1, &state, cvt) == 1 ? ret : 0;

1 0

Daniel Lehman : msvcp90: Copy facetvec element pointer in copy ctor.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: 4f5f2e8e1b29ee43dfe899fdb7530dd993f8a1b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f5f2e8e1b29ee43dfe899fdb… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Oct 3 16:49:37 2012 -0700 msvcp90: Copy facetvec element pointer in copy ctor. --- dlls/msvcp90/locale.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 501443c..9a79933 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -7798,8 +7798,11 @@ locale__Locimp* __thiscall locale__Locimp_copy_ctor(locale__Locimp *this, const return NULL; } for(i=0; i<this->facet_cnt; i++) + { + this->facetvec[i] = copy->facetvec[i]; if(this->facetvec[i]) locale_facet__Incref(this->facetvec[i]); + } } MSVCP_basic_string_char_copy_ctor(&this->name, &copy->name); _Lockit_dtor(&lock);

1 0

Alexandre Julliard : winex11: Don' t return an alpha channel for DIBs read from the screen.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: wine Branch: master Commit: fad3ca07e6972920eb463935e1e125f0af4dd2be URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad3ca07e6972920eb463935e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 10 17:09:01 2012 +0200 winex11: Don't return an alpha channel for DIBs read from the screen. --- dlls/winex11.drv/bitblt.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index c3cf056..17ebde7 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -946,7 +946,7 @@ static inline int get_dib_image_size( const BITMAPINFO *info ) } /* store the palette or color mask data in the bitmap info structure */ -static void set_color_info( const XVisualInfo *vis, BITMAPINFO *info ) +static void set_color_info( const XVisualInfo *vis, BITMAPINFO *info, BOOL has_alpha ) { DWORD *colors = (DWORD *)((char *)info + info->bmiHeader.biSize); @@ -984,7 +984,7 @@ static void set_color_info( const XVisualInfo *vis, BITMAPINFO *info ) colors[0] = vis->red_mask; colors[1] = vis->green_mask; colors[2] = vis->blue_mask; - if (colors[0] != 0xff0000 || colors[1] != 0x00ff00 || colors[2] != 0x0000ff) + if (colors[0] != 0xff0000 || colors[1] != 0x00ff00 || colors[2] != 0x0000ff || !has_alpha) info->bmiHeader.biCompression = BI_BITFIELDS; break; } @@ -1291,7 +1291,7 @@ update_format: info->bmiHeader.biPlanes = 1; info->bmiHeader.biBitCount = format->bits_per_pixel; if (info->bmiHeader.biHeight > 0) info->bmiHeader.biHeight = -info->bmiHeader.biHeight; - set_color_info( &vis, info ); + set_color_info( &vis, info, FALSE ); return ERROR_BAD_FORMAT; } @@ -1339,7 +1339,7 @@ DWORD X11DRV_GetImage( PHYSDEV dev, BITMAPINFO *info, info->bmiHeader.biXPelsPerMeter = 0; info->bmiHeader.biYPelsPerMeter = 0; info->bmiHeader.biClrImportant = 0; - set_color_info( &vis, info ); + set_color_info( &vis, info, FALSE ); if (!bits) return ERROR_SUCCESS; /* just querying the color information */ @@ -1445,7 +1445,7 @@ update_format: info->bmiHeader.biPlanes = 1; info->bmiHeader.biBitCount = format->bits_per_pixel; if (info->bmiHeader.biHeight > 0) info->bmiHeader.biHeight = -info->bmiHeader.biHeight; - set_color_info( vis, info ); + set_color_info( vis, info, FALSE ); return ERROR_BAD_FORMAT; } @@ -1525,7 +1525,7 @@ DWORD get_pixmap_image( Pixmap pixmap, int width, int height, const XVisualInfo info->bmiHeader.biXPelsPerMeter = 0; info->bmiHeader.biYPelsPerMeter = 0; info->bmiHeader.biClrImportant = 0; - set_color_info( vis, info ); + set_color_info( vis, info, FALSE ); if (!bits) return ERROR_SUCCESS; /* just querying the color information */ @@ -1992,7 +1992,7 @@ struct window_surface *create_surface( Window window, const XVisualInfo *vis, co surface->info.bmiHeader.biPlanes = 1; surface->info.bmiHeader.biBitCount = format->bits_per_pixel; surface->info.bmiHeader.biSizeImage = get_dib_image_size( &surface->info ); - set_color_info( vis, &surface->info ); + set_color_info( vis, &surface->info, use_alpha ); InitializeCriticalSection( &surface->crit ); surface->crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": surface");

1 0