Wine-Commits

wine-commits@list.winehq.org

November 2011

2 participants
852 discussions

Alexandre Julliard : gdi32: Emulate DDB support using the DIB driver when the graphics driver doesn' t support bitmaps.
by Alexandre Julliard Nov. 1, 2011

Nov. 1, 2011

Module: wine Branch: master Commit: f1f5f334687a90842acff555bdb987c901d59f6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f5f334687a90842acff555b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 31 20:21:15 2011 +0100 gdi32: Emulate DDB support using the DIB driver when the graphics driver doesn't support bitmaps. --- dlls/gdi32/bitmap.c | 11 +++-------- dlls/gdi32/dibdrv/dc.c | 11 +++++++++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index fe9deb7..8aea89c 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -609,11 +609,7 @@ BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) set_initial_bitmap_bits( hbitmap, bitmap ); } } - else - { - WARN( "Trying to select bitmap %p in DC that doesn't support it\n", hbitmap ); - ret = FALSE; - } + else bitmap->funcs = &dib_driver; /* use the DIB driver to emulate DDB support */ } else { @@ -666,7 +662,8 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) if(old_physdev == dc->dibdrv) old_physdev = pop_dc_driver( &dc->physDev ); - if(bitmap->dib) + physdev = GET_DC_PHYSDEV( dc, pSelectBitmap ); + if (bitmap->dib || physdev->funcs == &null_driver) { physdev = dc->dibdrv; if (physdev) push_dc_driver( &dc->physDev, physdev, physdev->funcs ); @@ -676,8 +673,6 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) dc->dibdrv = physdev = dc->physDev; } } - else - physdev = GET_DC_PHYSDEV( dc, pSelectBitmap ); if (!BITMAP_SetOwnerDC( handle, physdev )) { diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 0b67974..b312fab 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -404,6 +404,14 @@ static BOOL dibdrv_DeleteDC( PHYSDEV dev ) } /*********************************************************************** + * dibdrv_DeleteBitmap + */ +static BOOL dibdrv_DeleteBitmap( HBITMAP bitmap ) +{ + return TRUE; +} + +/*********************************************************************** * dibdrv_SelectBitmap */ static HBITMAP dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) @@ -414,7 +422,6 @@ static HBITMAP dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) TRACE("(%p, %p)\n", dev, bitmap); if (!bmp) return 0; - assert(bmp->dib); free_dib_info(&pdev->dib); pdev->defer = 0; @@ -533,7 +540,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pCreateCompatibleDC */ dibdrv_CreateDC, /* pCreateDC */ NULL, /* pCreateDIBSection */ - NULL, /* pDeleteBitmap */ + dibdrv_DeleteBitmap, /* pDeleteBitmap */ dibdrv_DeleteDC, /* pDeleteDC */ NULL, /* pDeleteObject */ NULL, /* pDescribePixelFormat */

1 0

Alexandre Julliard : gdi32: Allocate the bits for a DDB the first time it' s used in any DIB driver call.
by Alexandre Julliard Nov. 1, 2011

Nov. 1, 2011

Module: wine Branch: master Commit: c9bdcbafabb532e1b7e10a8b682c13343c897205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9bdcbafabb532e1b7e10a8b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 31 20:06:37 2011 +0100 gdi32: Allocate the bits for a DDB the first time it's used in any DIB driver call. --- dlls/gdi32/bitmap.c | 47 +++-------------------------------------------- dlls/gdi32/dibdrv/dc.c | 7 +++++++ 2 files changed, 10 insertions(+), 44 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 8295e9a..fe9deb7 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -53,57 +53,15 @@ static const struct gdi_obj_funcs bitmap_funcs = DWORD nulldrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits, struct bitblt_coords *src ) { - BITMAPOBJ *bmp; - DWORD ret; - if (!hbitmap) return ERROR_NOT_SUPPORTED; - if (!(bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ))) return ERROR_INVALID_HANDLE; - - if (bmp->bitmap.bmBits || !bits) - { - ret = dib_driver.pGetImage( 0, hbitmap, info, bits, src ); - } - else if (!(ret = dib_driver.pGetImage( 0, hbitmap, info, NULL, src ))) - { - info->bmiHeader.biHeight = -(src->visrect.bottom - src->visrect.top); - info->bmiHeader.biSizeImage = get_dib_image_size( info ); - - /* make the source rectangle relative to the returned bits */ - src->y -= src->visrect.top; - offset_rect( &src->visrect, 0, -src->visrect.top ); - - /* return all-zero bits */ - bits->ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, info->bmiHeader.biSizeImage ); - bits->is_copy = TRUE; - bits->free = free_heap_bits; - } - GDI_ReleaseObj( hbitmap ); - return ret; + return dib_driver.pGetImage( 0, hbitmap, info, bits, src ); } DWORD nulldrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info, const struct gdi_image_bits *bits, struct bitblt_coords *src, struct bitblt_coords *dst, DWORD rop ) { - BITMAPOBJ *bmp; - if (!hbitmap) return ERROR_SUCCESS; - - if (bits) - { - if (!(bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ))) return ERROR_INVALID_HANDLE; - if (!bmp->bitmap.bmBits) - { - int width_bytes = get_dib_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); - if (!(bmp->bitmap.bmBits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - bmp->bitmap.bmHeight * width_bytes ))) - { - GDI_ReleaseObj( hbitmap ); - return ERROR_OUTOFMEMORY; - } - } - GDI_ReleaseObj( hbitmap ); - } return dib_driver.pPutImage( NULL, hbitmap, clip, info, bits, src, dst, rop ); } @@ -348,11 +306,12 @@ BOOL get_bitmap_image( HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits 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 = !bmp->funcs->pGetImage( NULL, hbitmap, info, bits, &src ); + ret = !funcs->pGetImage( NULL, hbitmap, info, bits, &src ); GDI_ReleaseObj( hbitmap ); } return ret; diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index ae9f328..0b67974 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -219,6 +219,13 @@ BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_f BITMAPINFO *info = (BITMAPINFO *)buffer; get_ddb_bitmapinfo( bmp, info ); + if (!bmp->bitmap.bmBits) + { + int width_bytes = get_dib_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); + bmp->bitmap.bmBits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, + bmp->bitmap.bmHeight * width_bytes ); + if (!bmp->bitmap.bmBits) return FALSE; + } return init_dib_info_from_bitmapinfo( dib, info, bmp->bitmap.bmBits, flags | private_color_table ); }

1 0

Jump to page: