wine-commits November 2011

wine-commits@winehq.org

2 participants
852 discussions

Alexandre Julliard : gdi32: Use the CopyBitmap entry point to copy the bitmap of a pattern brush.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 0c5d619bd38554d406b11973cdd5653192137025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c5d619bd38554d406b11973c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 22:06:57 2011 +0100 gdi32: Use the CopyBitmap entry point to copy the bitmap of a pattern brush. --- dlls/gdi32/bitmap.c | 53 ---------------------------------------------- dlls/gdi32/brush.c | 16 +++++++++++++- dlls/gdi32/gdi_private.h | 1 - 3 files changed, 15 insertions(+), 55 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 9042b88..282e22b 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -510,59 +510,6 @@ LONG WINAPI SetBitmapBits( return count; } -/********************************************************************** - * BITMAP_CopyBitmap - * - */ -HBITMAP BITMAP_CopyBitmap(HBITMAP hbitmap) -{ - HBITMAP res; - DIBSECTION dib; - BITMAPOBJ *bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ); - - if (!bmp) return 0; - if (bmp->dib) - { - void *bits; - BITMAPINFO *bi; - HDC dc; - - dib = *bmp->dib; - GDI_ReleaseObj( hbitmap ); - dc = CreateCompatibleDC( NULL ); - - if (!dc) return 0; - if (!(bi = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) - { - DeleteDC( dc ); - return 0; - } - bi->bmiHeader = dib.dsBmih; - - /* Get the color table or the color masks */ - GetDIBits( dc, hbitmap, 0, 0, NULL, bi, DIB_RGB_COLORS ); - bi->bmiHeader.biHeight = dib.dsBmih.biHeight; - - res = CreateDIBSection( dc, bi, DIB_RGB_COLORS, &bits, NULL, 0 ); - if (res) SetDIBits( dc, res, 0, dib.dsBm.bmHeight, dib.dsBm.bmBits, bi, DIB_RGB_COLORS ); - HeapFree( GetProcessHeap(), 0, bi ); - DeleteDC( dc ); - return res; - } - dib.dsBm = bmp->bitmap; - dib.dsBm.bmBits = NULL; - GDI_ReleaseObj( hbitmap ); - - res = CreateBitmapIndirect( &dib.dsBm ); - if(res) { - char *buf = HeapAlloc( GetProcessHeap(), 0, dib.dsBm.bmWidthBytes * dib.dsBm.bmHeight ); - GetBitmapBits (hbitmap, dib.dsBm.bmWidthBytes * dib.dsBm.bmHeight, buf); - SetBitmapBits (res, dib.dsBm.bmWidthBytes * dib.dsBm.bmHeight, buf); - HeapFree( GetProcessHeap(), 0, buf ); - } - return res; -} - static void set_initial_bitmap_bits( HBITMAP hbitmap, BITMAPOBJ *bmp ) { diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index ccd1369..579e9fd 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -99,8 +99,22 @@ static BOOL copy_bitmap( BRUSHOBJ *brush, HBITMAP bitmap ) if (!bmp->dib) { + if ((brush->bitmap = CreateBitmap( bmp->bitmap.bmWidth, bmp->bitmap.bmHeight, + bmp->bitmap.bmPlanes, bmp->bitmap.bmBitsPixel, NULL ))) + { + if (bmp->funcs->pCopyBitmap( bitmap, brush->bitmap )) + { + BITMAPOBJ *copy = GDI_GetObjPtr( brush->bitmap, OBJ_BITMAP ); + copy->funcs = bmp->funcs; + GDI_ReleaseObj( copy ); + } + else + { + DeleteObject( brush->bitmap ); + brush->bitmap = 0; + } + } GDI_ReleaseObj( bitmap ); - brush->bitmap = BITMAP_CopyBitmap( bitmap ); return brush->bitmap != 0; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index ab5cf25..3b3022a 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -229,7 +229,6 @@ extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src struct gdi_image_bits *bits, int mode ) DECLSPEC_HIDDEN; /* bitmap.c */ -extern HBITMAP BITMAP_CopyBitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) DECLSPEC_HIDDEN; extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : winex11: Implement the CopyBitmap entry point.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: d9a45745a71f379d00aff0b06cf4923633a378e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9a45745a71f379d00aff0b06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 22:04:00 2011 +0100 winex11: Implement the CopyBitmap entry point. --- dlls/winex11.drv/bitmap.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xrender.c | 10 +++++++++- 4 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index ea1c7ac..09da565 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -199,6 +199,42 @@ BOOL X11DRV_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap ) } +/**************************************************************************** + * CopyBitmap (X11DRV.@) + */ +BOOL X11DRV_CopyBitmap( HBITMAP src, HBITMAP dst ) +{ + X_PHYSBITMAP *phys_src, *phys_dst; + BITMAP bitmap; + + if (!(phys_src = X11DRV_get_phys_bitmap( src ))) return FALSE; + if (!GetObjectW( dst, sizeof(bitmap), &bitmap )) return FALSE; + + TRACE("%p->%p %dx%d %d bpp\n", src, dst, bitmap.bmWidth, bitmap.bmHeight, bitmap.bmBitsPixel); + + if (!(phys_dst = X11DRV_init_phys_bitmap( dst ))) return FALSE; + + phys_dst->depth = phys_src->depth; + phys_dst->trueColor = phys_src->trueColor; + if (phys_dst->trueColor) phys_dst->color_shifts = phys_src->color_shifts; + + wine_tsx11_lock(); + phys_dst->pixmap = XCreatePixmap( gdi_display, root_window, + bitmap.bmWidth, bitmap.bmHeight, phys_dst->depth ); + XCopyArea( gdi_display, phys_src->pixmap, phys_dst->pixmap, + get_bitmap_gc(phys_dst->depth), 0, 0, bitmap.bmWidth, bitmap.bmHeight, 0, 0 ); + wine_tsx11_unlock(); + + if (!phys_dst->pixmap) + { + WARN("Can't create Pixmap\n"); + HeapFree( GetProcessHeap(), 0, phys_dst ); + return FALSE; + } + return TRUE; +} + + /*********************************************************************** * DeleteBitmap (X11DRV.@) */ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 6574270..8d61b5b 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -476,7 +476,7 @@ static const struct gdi_dc_funcs x11drv_funcs = X11DRV_ChoosePixelFormat, /* pChoosePixelFormat */ X11DRV_Chord, /* pChord */ NULL, /* pCloseFigure */ - NULL, /* pCopyBitmap */ + X11DRV_CopyBitmap, /* pCopyBitmap */ X11DRV_CreateBitmap, /* pCreateBitmap */ X11DRV_CreateCompatibleDC, /* pCreateCompatibleDC */ X11DRV_CreateDC, /* pCreateDC */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 1d6ce53..4967866 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -181,6 +181,7 @@ extern BOOL X11DRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL X11DRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_CopyBitmap( HBITMAP src, HBITMAP dst ) DECLSPEC_HIDDEN; extern BOOL X11DRV_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern HBITMAP X11DRV_CreateDIBSection( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *bmi, UINT usage ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 30b9553..7ba61a3 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1276,6 +1276,14 @@ static INT xrenderdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID } /**************************************************************************** + * xrenderdrv_CopyBitmap + */ +static BOOL xrenderdrv_CopyBitmap( HBITMAP src, HBITMAP dst ) +{ + return X11DRV_CopyBitmap( src, dst ); +} + +/**************************************************************************** * xrenderdrv_CreateBitmap */ static BOOL xrenderdrv_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap ) @@ -3060,7 +3068,7 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pChoosePixelFormat */ NULL, /* pChord */ NULL, /* pCloseFigure */ - NULL, /* pCopyBitmap */ + xrenderdrv_CopyBitmap, /* pCopyBitmap */ xrenderdrv_CreateBitmap, /* pCreateBitmap */ xrenderdrv_CreateCompatibleDC, /* pCreateCompatibleDC */ xrenderdrv_CreateDC, /* pCreateDC */

1 0

Alexandre Julliard : gdi32: Implement the CopyBitmap entry point in the null driver.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 26f5e2c6e74832bcbdcf9fc0e0718b73be204201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26f5e2c6e74832bcbdcf9fc0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 22:14:50 2011 +0100 gdi32: Implement the CopyBitmap entry point in the null driver. --- dlls/gdi32/bitmap.c | 21 +++++++++++++++++++++ dlls/gdi32/dibdrv/dc.c | 10 +++++++++- dlls/gdi32/driver.c | 5 ----- dlls/gdi32/gdi_private.h | 1 + 4 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 7407906..9042b88 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -65,6 +65,27 @@ DWORD nulldrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *inf return dib_driver.pPutImage( NULL, hbitmap, clip, info, bits, src, dst, rop ); } +BOOL nulldrv_CopyBitmap( HBITMAP src, HBITMAP dst ) +{ + BOOL ret = TRUE; + BITMAPOBJ *src_bmp = GDI_GetObjPtr( src, OBJ_BITMAP ); + + if (!src_bmp) return FALSE; + if (src_bmp->bitmap.bmBits) + { + BITMAPOBJ *dst_bmp = GDI_GetObjPtr( dst, OBJ_BITMAP ); + int stride = get_dib_stride( dst_bmp->bitmap.bmWidth, dst_bmp->bitmap.bmBitsPixel ); + dst_bmp->bitmap.bmBits = HeapAlloc( GetProcessHeap(), 0, dst_bmp->bitmap.bmHeight * stride ); + if (dst_bmp->bitmap.bmBits) + memcpy( dst_bmp->bitmap.bmBits, src_bmp->bitmap.bmBits, dst_bmp->bitmap.bmHeight * stride ); + else + ret = FALSE; + GDI_ReleaseObj( dst ); + } + GDI_ReleaseObj( src ); + return ret; +} + /****************************************************************************** * CreateBitmap [GDI32.@] diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 3adf246..a91de78 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -391,6 +391,14 @@ static BOOL dibdrv_DeleteDC( PHYSDEV dev ) } /*********************************************************************** + * dibdrv_CopyBitmap + */ +static BOOL dibdrv_CopyBitmap( HBITMAP src, HBITMAP dst ) +{ + return nulldrv_CopyBitmap( src, dst ); +} + +/*********************************************************************** * dibdrv_DeleteBitmap */ static BOOL dibdrv_DeleteBitmap( HBITMAP bitmap ) @@ -523,7 +531,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pChoosePixelFormat */ NULL, /* pChord */ NULL, /* pCloseFigure */ - NULL, /* pCopyBitmap */ + dibdrv_CopyBitmap, /* pCopyBitmap */ NULL, /* pCreateBitmap */ NULL, /* pCreateCompatibleDC */ dibdrv_CreateDC, /* pCreateDC */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index b72d6d7..9b951d0 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -209,11 +209,6 @@ static BOOL nulldrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom return TRUE; } -static BOOL nulldrv_CopyBitmap( HBITMAP src, HBITMAP dst ) -{ - return TRUE; -} - static BOOL nulldrv_CreateBitmap( PHYSDEV dev, HBITMAP bitmap ) { return TRUE; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 9e40fc5..ab5cf25 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -357,6 +357,7 @@ extern BOOL nulldrv_BeginPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern DWORD nulldrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits, struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION func ) DECLSPEC_HIDDEN; extern BOOL nulldrv_CloseFigure( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_CopyBitmap( HBITMAP src, HBITMAP dst ) DECLSPEC_HIDDEN; extern BOOL nulldrv_EndPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern INT nulldrv_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern INT nulldrv_ExtSelectClipRgn( PHYSDEV dev, HRGN rgn, INT mode ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Add a CopyBitmap driver entry point.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: 9391c6a757bb9441064c27250d8733ab596b3563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9391c6a757bb9441064c27250… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 21:46:25 2011 +0100 gdi32: Add a CopyBitmap driver entry point. --- dlls/gdi32/dibdrv/dc.c | 1 + dlls/gdi32/driver.c | 6 ++++++ dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/freetype.c | 1 + dlls/gdi32/mfdrv/init.c | 1 + dlls/gdi32/path.c | 1 + dlls/wineps.drv/init.c | 1 + dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/xrender.c | 1 + include/wine/gdi_driver.h | 3 ++- 10 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 5a7d011..3adf246 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -523,6 +523,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pChoosePixelFormat */ NULL, /* pChord */ NULL, /* pCloseFigure */ + NULL, /* pCopyBitmap */ NULL, /* pCreateBitmap */ NULL, /* pCreateCompatibleDC */ dibdrv_CreateDC, /* pCreateDC */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 0986d68..b72d6d7 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -209,6 +209,11 @@ static BOOL nulldrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom return TRUE; } +static BOOL nulldrv_CopyBitmap( HBITMAP src, HBITMAP dst ) +{ + return TRUE; +} + static BOOL nulldrv_CreateBitmap( PHYSDEV dev, HBITMAP bitmap ) { return TRUE; @@ -747,6 +752,7 @@ const struct gdi_dc_funcs null_driver = nulldrv_ChoosePixelFormat, /* pChoosePixelFormat */ nulldrv_Chord, /* pChord */ nulldrv_CloseFigure, /* pCloseFigure */ + nulldrv_CopyBitmap, /* pCopyBitmap */ nulldrv_CreateBitmap, /* pCreateBitmap */ nulldrv_CreateCompatibleDC, /* pCreateCompatibleDC */ nulldrv_CreateDC, /* pCreateDC */ diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 11918c1..f4fa4d3 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -47,6 +47,7 @@ static const struct gdi_dc_funcs EMFDRV_Funcs = NULL, /* pChoosePixelFormat */ EMFDRV_Chord, /* pChord */ EMFDRV_CloseFigure, /* pCloseFigure */ + NULL, /* pCopyBitmap */ NULL, /* pCreateBitmap */ NULL, /* pCreateCompatibleDC */ NULL, /* pCreateDC */ diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1fedc74..9137322 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7117,6 +7117,7 @@ static const struct gdi_dc_funcs freetype_funcs = NULL, /* pChoosePixelFormat */ NULL, /* pChord */ NULL, /* pCloseFigure */ + NULL, /* pCopyBitmap */ NULL, /* pCreateBitmap */ NULL, /* pCreateCompatibleDC */ freetype_CreateDC, /* pCreateDC */ diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index d738725..b837d84 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -92,6 +92,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pChoosePixelFormat */ MFDRV_Chord, /* pChord */ MFDRV_CloseFigure, /* pCloseFigure */ + NULL, /* pCopyBitmap */ NULL, /* pCreateBitmap */ MFDRV_CreateCompatibleDC, /* pCreateCompatibleDC */ NULL, /* pCreateDC */ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index d908774..dfe15ed 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -2265,6 +2265,7 @@ const struct gdi_dc_funcs path_driver = NULL, /* pChoosePixelFormat */ pathdrv_Chord, /* pChord */ pathdrv_CloseFigure, /* pCloseFigure */ + NULL, /* pCopyBitmap */ NULL, /* pCreateBitmap */ NULL, /* pCreateCompatibleDC */ pathdrv_CreateDC, /* pCreateDC */ diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index e6a0254..e61df3e 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -829,6 +829,7 @@ static const struct gdi_dc_funcs psdrv_funcs = NULL, /* pChoosePixelFormat */ PSDRV_Chord, /* pChord */ NULL, /* pCloseFigure */ + NULL, /* pCopyBitmap */ NULL, /* pCreateBitmap */ PSDRV_CreateCompatibleDC, /* pCreateCompatibleDC */ PSDRV_CreateDC, /* pCreateDC */ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 484ab7f..6574270 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -476,6 +476,7 @@ static const struct gdi_dc_funcs x11drv_funcs = X11DRV_ChoosePixelFormat, /* pChoosePixelFormat */ X11DRV_Chord, /* pChord */ NULL, /* pCloseFigure */ + NULL, /* pCopyBitmap */ X11DRV_CreateBitmap, /* pCreateBitmap */ X11DRV_CreateCompatibleDC, /* pCreateCompatibleDC */ X11DRV_CreateDC, /* pCreateDC */ diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index a61568e..30b9553 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -3060,6 +3060,7 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pChoosePixelFormat */ NULL, /* pChord */ NULL, /* pCloseFigure */ + NULL, /* pCopyBitmap */ xrenderdrv_CreateBitmap, /* pCreateBitmap */ xrenderdrv_CreateCompatibleDC, /* pCreateCompatibleDC */ xrenderdrv_CreateDC, /* pCreateDC */ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index cb12145..d996fb4 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -65,6 +65,7 @@ struct gdi_dc_funcs INT (*pChoosePixelFormat)(PHYSDEV,const PIXELFORMATDESCRIPTOR *); BOOL (*pChord)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT); BOOL (*pCloseFigure)(PHYSDEV); + BOOL (*pCopyBitmap)(HBITMAP,HBITMAP); BOOL (*pCreateBitmap)(PHYSDEV,HBITMAP); BOOL (*pCreateCompatibleDC)(PHYSDEV,PHYSDEV*); BOOL (*pCreateDC)(PHYSDEV*,LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*); @@ -204,7 +205,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 18 +#define WINE_GDI_DRIVER_VERSION 19 static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset ) {

1 0

Alexandre Julliard : gdi32: Grab the bits directly for DIB pattern brushes instead of duplicating the bitmap .
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: cc673f44c7696fd38c6bd23266fda1b76065849e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc673f44c7696fd38c6bd2326… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 3 21:14:42 2011 +0100 gdi32: Grab the bits directly for DIB pattern brushes instead of duplicating the bitmap. --- dlls/gdi32/brush.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 5cbae61..ccd1369 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -90,6 +90,44 @@ static BOOL store_bitmap_bits( BRUSHOBJ *brush, BITMAPOBJ *bmp ) return TRUE; } +static BOOL copy_bitmap( BRUSHOBJ *brush, HBITMAP bitmap ) +{ + BITMAPINFO *info; + BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, OBJ_BITMAP ); + + if (!bmp) return FALSE; + + if (!bmp->dib) + { + GDI_ReleaseObj( bitmap ); + brush->bitmap = BITMAP_CopyBitmap( bitmap ); + return brush->bitmap != 0; + } + + info = HeapAlloc( GetProcessHeap(), 0, + bitmap_info_size( (BITMAPINFO *)&bmp->dib->dsBmih, DIB_RGB_COLORS )); + if (!info) goto done; + info->bmiHeader = bmp->dib->dsBmih; + if (bmp->dib->dsBmih.biCompression == BI_BITFIELDS) + memcpy( &info->bmiHeader + 1, bmp->dib->dsBitfields, sizeof(bmp->dib->dsBitfields) ); + else if (bmp->nb_colors) + memcpy( &info->bmiHeader + 1, bmp->color_table, bmp->nb_colors * sizeof(RGBQUAD) ); + if (!(brush->bits.ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( info )))) + { + HeapFree( GetProcessHeap(), 0, info ); + goto done; + } + memcpy( brush->bits.ptr, bmp->dib->dsBm.bmBits, get_dib_image_size( info )); + brush->bits.is_copy = TRUE; + brush->bits.free = free_heap_bits; + brush->info = info; + brush->usage = DIB_RGB_COLORS; + +done: + GDI_ReleaseObj( bitmap ); + return brush->info != NULL; +} + BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) { BRUSHOBJ *brush; @@ -159,8 +197,7 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) ptr->logbrush.lbStyle = BS_PATTERN; /* fall through */ case BS_PATTERN: - ptr->bitmap = BITMAP_CopyBitmap( (HBITMAP)ptr->logbrush.lbHatch ); - if (!ptr->bitmap) goto error; + if (!copy_bitmap( ptr, (HBITMAP)ptr->logbrush.lbHatch )) goto error; ptr->logbrush.lbColor = 0; break;

1 0

Alexandre Julliard : gdi32: Get rid of the get_bitmap_image helper.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: wine Branch: master Commit: c88f4d452fe56088b317fce165818513a05da4aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=c88f4d452fe56088b317fce16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 2 11:06:32 2011 +0100 gdi32: Get rid of the get_bitmap_image helper. --- dlls/gdi32/bitmap.c | 21 --------------------- dlls/gdi32/gdi_private.h | 1 - 2 files changed, 0 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index a158735..7407906 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -297,27 +297,6 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) } -/* convenience wrapper for GetImage to retrieve the full contents of a bitmap */ -BOOL get_bitmap_image( HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits ) -{ - struct bitblt_coords src; - BOOL ret = FALSE; - BITMAPOBJ *bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ); - - if (bmp) - { - const struct gdi_dc_funcs *funcs = get_bitmap_funcs( bmp ); - src.visrect.left = src.x = 0; - src.visrect.top = src.y = 0; - src.visrect.right = src.width = bmp->bitmap.bmWidth; - src.visrect.bottom = src.height = bmp->bitmap.bmHeight; - ret = !funcs->pGetImage( NULL, hbitmap, info, bits, &src ); - GDI_ReleaseObj( hbitmap ); - } - return ret; -} - - /*********************************************************************** * GetBitmapBits [GDI32.@] * diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 3dfd9a5..9e40fc5 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -229,7 +229,6 @@ extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src struct gdi_image_bits *bits, int mode ) DECLSPEC_HIDDEN; /* bitmap.c */ -extern BOOL get_bitmap_image( HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; extern HBITMAP BITMAP_CopyBitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : winegecko: Added 1.4 release.
by Alexandre Julliard 09 Nov '11

09 Nov '11

Module: tools Branch: master Commit: aa3be3c61cba02e9f634753d5c8c28a9d3b3fa91 URL: http://source.winehq.org/git/tools.git/?a=commit;h=aa3be3c61cba02e9f634753d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 9 18:11:27 2011 +0100 winegecko: Added 1.4 release. --- winegecko.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/winegecko.php b/winegecko.php index 5be7585..05d6f33 100644 --- a/winegecko.php +++ b/winegecko.php @@ -60,7 +60,9 @@ $aFileSizes = array( '1.2.0-x86'=>12604928, '1.2.0-x86_64'=>12841472, '1.3-x86'=>13609984, - '1.3-x86_64'=>13835776 + '1.3-x86_64'=>13835776, + '1.4-x86'=>14732288, + '1.4-x86_64'=>14980096 ); // Exact size of the file:

1 0

Austin English : apphelp: Add a stub for ApphelpCheckShellObject.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: e423abf5a528579b66945729d6050e39cf663971 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e423abf5a528579b66945729d… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Nov 8 10:41:00 2011 -0600 apphelp: Add a stub for ApphelpCheckShellObject. --- dlls/apphelp/apphelp.c | 6 ++++++ dlls/apphelp/apphelp.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c index 4a3cd96..9394cf3 100644 --- a/dlls/apphelp/apphelp.c +++ b/dlls/apphelp/apphelp.c @@ -67,3 +67,9 @@ PDB WINAPI SdbCreateDatabase( LPCWSTR path, PATH_TYPE type ) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return NULL; } + +BOOL WINAPI ApphelpCheckShellObject( REFCLSID clsid, BOOL shim, ULONGLONG *flags ) +{ + FIXME("stub: %s %p\n", debugstr_guid(clsid), flags ); + return TRUE; +} diff --git a/dlls/apphelp/apphelp.spec b/dlls/apphelp/apphelp.spec index e8ebccb..76af9ad 100644 --- a/dlls/apphelp/apphelp.spec +++ b/dlls/apphelp/apphelp.spec @@ -4,7 +4,7 @@ @ stdcall ApphelpCheckMsiPackage(ptr wstr) @ stub ApphelpCheckRunApp @ stub ApphelpCheckRunAppEx -@ stub ApphelpCheckShellObject +@ stdcall ApphelpCheckShellObject(ptr long ptr) @ stub ApphelpCreateAppcompatData @ stub ApphelpFixMsiPackage @ stub ApphelpFixMsiPackageExe

1 0

Vincent Povirk : gdiplus: Fix center point calculation in GdipAddPathPie.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 006e2d97b3ca33d6140e24308a43c37b54dfe402 URL: http://source.winehq.org/git/wine.git/?a=commit;h=006e2d97b3ca33d6140e24308… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 8 10:18:22 2011 -0600 gdiplus: Fix center point calculation in GdipAddPathPie. --- dlls/gdiplus/graphicspath.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 971ab31..120802c 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -744,7 +744,7 @@ GpStatus WINGDIPAPI GdipAddPathPie(GpPath *path, REAL x, REAL y, REAL width, REA arc2polybezier(ptf, x, y, width, height, startAngle, sweepAngle); - status = GdipAddPathLine(path, (width - x)/2, (height - y)/2, ptf[0].X, ptf[0].Y); + status = GdipAddPathLine(path, x + width/2, y + height/2, ptf[0].X, ptf[0].Y); if(status != Ok){ GdipFree(ptf); return status;

1 0

Aric Stewart : usp10/tests: Add Kannada shaping test.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: c5db60200f00966c9a6cb65a117481026433c505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5db60200f00966c9a6cb65a1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 8 10:33:37 2011 -0600 usp10/tests: Add Kannada shaping test. --- dlls/usp10/tests/usp10.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 6655ba6..955e19d 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -843,6 +843,16 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}} }; + /* Kannada */ + static const WCHAR test_kannada[] = {0x0c95, 0x0ca8, 0x0ccd, 0x0ca8, 0x0ca1}; + static const shapeTest_char kannada_c[] = {{0,{0,0}},{1,{0,0}},{1,{0,0}},{1,{0,0}},{3,{0,0}}}; + static const shapeTest_glyph kannada_g[] = { + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}} }; + if (!pScriptItemizeOpenType || !pScriptShapeOpenType) { win_skip("ScriptShapeOpenType not available on this platform\n"); @@ -1003,6 +1013,14 @@ static void test_ScriptShapeOpenType(HDC hdc) SelectObject(hdc, hfont_orig); DeleteObject(hfont); } + + test_valid = find_font_for_range(hdc, "Tunga", 22, test_kannada[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_kannada, 5, &Control, &State, 0, 4, kannada_c, kannada_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } } static void test_ScriptShape(HDC hdc)

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
86
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 November 2011