July 2011 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Release the onscreen depth / stencil reference on reset.
by Alexandre Julliard July 26, 2011

July 26, 2011

Module: wine Branch: master Commit: 11955307951540b0c51d3517ef01364038cf96b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11955307951540b0c51d3517e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 25 20:45:10 2011 +0200 wined3d: Release the onscreen depth / stencil reference on reset. No need to save the contents, after a reset it's all undefined anyway. --- dlls/wined3d/device.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2db0e3f..d3ee3f7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5638,6 +5638,11 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, { wined3d_device_set_texture(device, i, NULL); } + if (device->onscreen_depth_stencil) + { + wined3d_surface_decref(device->onscreen_depth_stencil); + device->onscreen_depth_stencil = NULL; + } LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) {

1 0

Alexandre Julliard : gdi32: Add an inline helper to retrieve a DDB byte width.
by Alexandre Julliard July 26, 2011

July 26, 2011

Module: wine Branch: master Commit: d33e0d2c866f14f195fa72ad82ef1649a7f18303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d33e0d2c866f14f195fa72ad8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 25 15:24:12 2011 +0200 gdi32: Add an inline helper to retrieve a DDB byte width. --- dlls/gdi32/bitmap.c | 41 +++-------------------------------------- dlls/gdi32/enhmfdrv/objects.c | 2 +- dlls/gdi32/gdi_private.h | 6 +++++- dlls/gdi32/mfdrv/objects.c | 2 +- 4 files changed, 10 insertions(+), 41 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 620e75c..2e23f6e 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -137,41 +137,6 @@ done: } -/*********************************************************************** - * BITMAP_GetWidthBytes - * - * Return number of bytes taken by a scanline of 16-bit aligned Windows DDB - * data. - */ -INT BITMAP_GetWidthBytes( INT bmWidth, INT bpp ) -{ - switch(bpp) - { - case 1: - return 2 * ((bmWidth+15) >> 4); - - case 24: - bmWidth *= 3; /* fall through */ - case 8: - return bmWidth + (bmWidth & 1); - - case 32: - return bmWidth * 4; - - case 16: - case 15: - return bmWidth * 2; - - case 4: - return 2 * ((bmWidth+3) >> 2); - - default: - WARN("Unknown depth %d, please report.\n", bpp ); - } - return -1; -} - - /****************************************************************************** * CreateBitmap [GDI32.@] * @@ -196,7 +161,7 @@ HBITMAP WINAPI CreateBitmap( INT width, INT height, UINT planes, bm.bmType = 0; bm.bmWidth = width; bm.bmHeight = height; - bm.bmWidthBytes = BITMAP_GetWidthBytes( width, bpp ); + bm.bmWidthBytes = get_bitmap_stride( width, bpp ); bm.bmPlanes = planes; bm.bmBitsPixel = bpp; bm.bmBits = (LPVOID)bits; @@ -363,7 +328,7 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) } /* Windows ignores the provided bm.bmWidthBytes */ - bm.bmWidthBytes = BITMAP_GetWidthBytes( bm.bmWidth, bm.bmBitsPixel ); + bm.bmWidthBytes = get_bitmap_stride( bm.bmWidth, bm.bmBitsPixel ); /* XP doesn't allow to create bitmaps larger than 128 Mb */ if (bm.bmHeight > 128 * 1024 * 1024 / bm.bmWidthBytes) { @@ -426,7 +391,7 @@ LONG WINAPI GetBitmapBits( { DIBSECTION *dib = bmp->dib; const char *src = dib->dsBm.bmBits; - INT width_bytes = BITMAP_GetWidthBytes(dib->dsBm.bmWidth, dib->dsBm.bmBitsPixel); + INT width_bytes = get_bitmap_stride(dib->dsBm.bmWidth, dib->dsBm.bmBitsPixel); LONG max = width_bytes * bmp->bitmap.bmHeight; if (!bits) diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index a3d976e..fca6f63 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -231,7 +231,7 @@ DWORD EMFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) info->biBitCount = bm.bmBitsPixel; info->biSizeImage = bmSize; GetBitmapBits((HANDLE)logbrush.lbHatch, - bm.bmHeight * BITMAP_GetWidthBytes(bm.bmWidth, bm.bmBitsPixel), + bm.bmHeight * get_bitmap_stride(bm.bmWidth, bm.bmBitsPixel), (LPBYTE)info + sizeof(BITMAPINFOHEADER)); /* Change the padding to be DIB compatible if needed */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index bdd9606..b825df9 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -311,7 +311,6 @@ extern BOOL BIDI_Reorder( HDC hDC, LPCWSTR lpString, INT uCount, DWORD dwFlags, /* bitmap.c */ extern HBITMAP BITMAP_CopyBitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) DECLSPEC_HIDDEN; -extern INT BITMAP_GetWidthBytes( INT bmWidth, INT bpp ) DECLSPEC_HIDDEN; /* clipping.c */ extern int get_clip_box( DC *dc, RECT *rect ) DECLSPEC_HIDDEN; @@ -549,6 +548,11 @@ static inline void offset_rect( RECT *rect, int offset_x, int offset_y ) rect->bottom += offset_y; } +static inline int get_bitmap_stride( int width, int bpp ) +{ + return ((width * bpp + 15) >> 3) & ~1; +} + static inline int get_dib_stride( int width, int bpp ) { return ((width * bpp + 31) >> 3) & ~3; diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c index 3054950..d9c9f95 100644 --- a/dlls/gdi32/mfdrv/objects.c +++ b/dlls/gdi32/mfdrv/objects.c @@ -270,7 +270,7 @@ INT16 MFDRV_CreateBrushIndirect(PHYSDEV dev, HBRUSH hBrush ) info->bmiHeader.biSizeImage = bmSize; GetBitmapBits((HANDLE)logbrush.lbHatch, - bm.bmHeight * BITMAP_GetWidthBytes (bm.bmWidth, bm.bmBitsPixel), + bm.bmHeight * get_bitmap_stride(bm.bmWidth, bm.bmBitsPixel), (LPBYTE)info + sizeof(BITMAPINFO) + sizeof(RGBQUAD)); /* Change the padding to be DIB compatible if needed */

1 0

Alexandre Julliard : gdi32: Implement GetImage in the DIB driver.
by Alexandre Julliard July 26, 2011

July 26, 2011

Module: wine Branch: master Commit: dcfe0c48ead211c1d4cd30ae6ba4743d97c3f7e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcfe0c48ead211c1d4cd30ae6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 25 15:30:33 2011 +0200 gdi32: Implement GetImage in the DIB driver. --- dlls/gdi32/dib.c | 9 +--- dlls/gdi32/dibdrv/dc.c | 126 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 123 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 4f5b970..94a69a7 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1032,18 +1032,12 @@ INT WINAPI GetDIBits( if (bits && lines) { - PHYSDEV physdev; char src_bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *src_info = (BITMAPINFO *)src_bmibuf; struct gdi_image_bits src_bits; struct bitblt_coords src; DWORD err; - /* FIXME: will need updating once the dib driver has pGetImage. */ - physdev = GET_DC_PHYSDEV( dc, pGetImage ); - - if (!BITMAP_SetOwnerDC( hbitmap, physdev )) lines = 0; - src.visrect.left = 0; src.visrect.right = min( width, bmp->bitmap.bmWidth ); @@ -1062,8 +1056,7 @@ INT WINAPI GetDIBits( src.width = src.visrect.right - src.visrect.left; src.height = src.visrect.bottom - src.visrect.top; - err = physdev->funcs->pGetImage( physdev, hbitmap, src_info, &src_bits, &src ); - + err = bmp->funcs->pGetImage( NULL, hbitmap, src_info, &src_bits, &src ); if(err) { lines = 0; diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index c78a111..eaa187f 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -27,6 +27,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dib); +static const DWORD bit_fields_888[3] = {0xff0000, 0x00ff00, 0x0000ff}; +static const DWORD bit_fields_555[3] = {0x7c00, 0x03e0, 0x001f}; + static void calc_shift_and_len(DWORD mask, int *shift, int *len) { int s, l; @@ -66,9 +69,6 @@ static void init_bit_fields(dib_info *dib, const DWORD *bit_fields) static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit_fields, RGBQUAD *color_table, int color_table_size, void *bits, enum dib_info_flags flags) { - static const DWORD bit_fields_888[3] = {0xff0000, 0x00ff00, 0x0000ff}; - static const DWORD bit_fields_555[3] = {0x7c00, 0x03e0, 0x001f}; - dib->bit_count = bi->biBitCount; dib->width = bi->biWidth; dib->height = bi->biHeight; @@ -313,6 +313,124 @@ static BOOL dibdrv_DeleteDC( PHYSDEV dev ) } /*********************************************************************** + * dibdrv_GetImage + */ +static DWORD dibdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, + struct gdi_image_bits *bits, struct bitblt_coords *src ) +{ + TRACE( "%p %p %p\n", dev, hbitmap, 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.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + + if (hbitmap) + { + BITMAPOBJ *bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ); + + if (!bmp) return ERROR_INVALID_HANDLE; + assert(bmp->dib); + + info->bmiHeader.biWidth = bmp->dib->dsBmih.biWidth; + info->bmiHeader.biHeight = bmp->dib->dsBmih.biHeight; + info->bmiHeader.biBitCount = bmp->dib->dsBmih.biBitCount; + info->bmiHeader.biSizeImage = get_dib_image_size( (BITMAPINFO *)&bmp->dib->dsBmih ); + + switch (info->bmiHeader.biBitCount) + { + case 1: + case 4: + case 8: + if (bmp->color_table) + { + info->bmiHeader.biClrUsed = min( bmp->nb_colors, 1 << info->bmiHeader.biBitCount ); + memcpy( info->bmiColors, bmp->color_table, info->bmiHeader.biClrUsed * sizeof(RGBQUAD) ); + } + break; + case 16: + if (bmp->dib->dsBmih.biCompression == BI_BITFIELDS && + memcmp( bmp->dib->dsBitfields, bit_fields_555, sizeof(bmp->dib->dsBitfields) )) + { + info->bmiHeader.biCompression = BI_BITFIELDS; + memcpy( info->bmiColors, bmp->dib->dsBitfields, sizeof(bmp->dib->dsBitfields) ); + } + break; + case 32: + if (bmp->dib->dsBmih.biCompression == BI_BITFIELDS && + memcmp( bmp->dib->dsBitfields, bit_fields_888, sizeof(bmp->dib->dsBitfields) )) + { + info->bmiHeader.biCompression = BI_BITFIELDS; + memcpy( info->bmiColors, bmp->dib->dsBitfields, sizeof(bmp->dib->dsBitfields) ); + } + break; + } + if (bits) + { + bits->ptr = bmp->dib->dsBm.bmBits; + bits->is_copy = FALSE; + bits->free = NULL; + } + GDI_ReleaseObj( hbitmap ); + } + else + { + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + + info->bmiHeader.biWidth = pdev->dib.width; + info->bmiHeader.biHeight = pdev->dib.stride > 0 ? -pdev->dib.height : pdev->dib.height; + info->bmiHeader.biBitCount = pdev->dib.bit_count; + info->bmiHeader.biSizeImage = pdev->dib.height * abs(pdev->dib.stride); + + switch (info->bmiHeader.biBitCount) + { + case 1: + case 4: + case 8: + if (pdev->dib.color_table) + { + info->bmiHeader.biClrUsed = min( pdev->dib.color_table_size, 1 << pdev->dib.bit_count ); + memcpy( info->bmiColors, pdev->dib.color_table, + info->bmiHeader.biClrUsed * sizeof(RGBQUAD) ); + } + break; + case 16: + if (pdev->dib.funcs != &funcs_555) + { + DWORD *masks = (DWORD *)info->bmiColors; + masks[0] = pdev->dib.red_mask; + masks[1] = pdev->dib.green_mask; + masks[2] = pdev->dib.blue_mask; + info->bmiHeader.biCompression = BI_BITFIELDS; + } + break; + case 32: + if (pdev->dib.funcs != &funcs_8888) + { + DWORD *masks = (DWORD *)info->bmiColors; + masks[0] = pdev->dib.red_mask; + masks[1] = pdev->dib.green_mask; + masks[2] = pdev->dib.blue_mask; + info->bmiHeader.biCompression = BI_BITFIELDS; + } + break; + } + if (bits) + { + bits->ptr = pdev->dib.bits; + if (pdev->dib.stride < 0) + bits->ptr = (char *)bits->ptr + (pdev->dib.height - 1) * pdev->dib.stride; + bits->is_copy = FALSE; + bits->free = NULL; + } + } + return ERROR_SUCCESS; +} + +/*********************************************************************** * dibdrv_SelectBitmap */ static HBITMAP dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) @@ -473,7 +591,7 @@ const DC_FUNCTIONS dib_driver = NULL, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ NULL, /* pGetICMProfile */ - NULL, /* pGetImage */ + dibdrv_GetImage, /* pGetImage */ NULL, /* pGetNearestColor */ NULL, /* pGetPixel */ NULL, /* pGetPixelFormat */

1 0

Alexandre Julliard : gdi32: Get rid of the SetDIBits driver entry point.
by Alexandre Julliard July 26, 2011

July 26, 2011

Module: wine Branch: master Commit: 8a906250eb038bd8e06958547d1dae7cca68c8e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a906250eb038bd8e06958547… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 25 19:47:03 2011 +0200 gdi32: Get rid of the SetDIBits driver entry point. --- dlls/gdi32/bitmap.c | 7 ------- dlls/gdi32/dib.c | 4 ++-- dlls/gdi32/dibdrv/dc.c | 1 - dlls/gdi32/driver.c | 1 - dlls/gdi32/enhmfdrv/init.c | 1 - dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/mfdrv/init.c | 1 - dlls/wineps.drv/init.c | 1 - dlls/winex11.drv/init.c | 1 - include/wine/gdi_driver.h | 3 +-- 10 files changed, 3 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 0c745d9..e0df88d 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -79,13 +79,6 @@ LONG nulldrv_SetBitmapBits( HBITMAP bitmap, const void *bits, LONG size ) return size; } -INT nulldrv_SetDIBits( PHYSDEV dev, HBITMAP bitmap, UINT start, UINT lines, - const void *bits, const BITMAPINFO *info, UINT coloruse ) -{ - /* FIXME: transfer bits to bmp->bitmap.bmBits */ - return 0; -} - /*********************************************************************** * BITMAP_GetWidthBytes * diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index f7b9037..4f5b970 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -397,8 +397,8 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he HBITMAP hBitmap; HDC hdcMem; - /* make sure we have a real implementation for StretchBlt and SetDIBits */ - if (GET_DC_PHYSDEV( dc, pStretchBlt ) == dev || GET_DC_PHYSDEV( dc, pSetDIBits ) == dev) + /* make sure we have a real implementation for StretchBlt and PutImage */ + if (GET_DC_PHYSDEV( dc, pStretchBlt ) == dev || GET_DC_PHYSDEV( dc, pPutImage ) == dev) return 0; if (DIB_GetBitmapInfo( &info->bmiHeader, &width, &height, &planes, &bpp, &compr, &size ) == -1) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 00dfddc..c78a111 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -522,7 +522,6 @@ const DC_FUNCTIONS dib_driver = dibdrv_SetDCBrushColor, /* pSetDCBrushColor */ dibdrv_SetDCPenColor, /* pSetDCPenColor */ dibdrv_SetDIBColorTable, /* pSetDIBColorTable */ - NULL, /* pSetDIBits */ NULL, /* pSetDIBitsToDevice */ dibdrv_SetDeviceClipping, /* pSetDeviceClipping */ NULL, /* pSetDeviceGammaRamp */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 56f9879..7ef76d8 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -762,7 +762,6 @@ const DC_FUNCTIONS null_driver = nulldrv_SetDCBrushColor, /* pSetDCBrushColor */ nulldrv_SetDCPenColor, /* pSetDCPenColor */ nulldrv_SetDIBColorTable, /* pSetDIBColorTable */ - nulldrv_SetDIBits, /* pSetDIBits */ nulldrv_SetDIBitsToDevice, /* pSetDIBitsToDevice */ nulldrv_SetDeviceClipping, /* pSetDeviceClipping */ nulldrv_SetDeviceGammaRamp, /* pSetDeviceGammaRamp */ diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 8d8e326..b4b9e6e 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -125,7 +125,6 @@ static const DC_FUNCTIONS EMFDRV_Funcs = EMFDRV_SetDCBrushColor, /* pSetDCBrushColor*/ EMFDRV_SetDCPenColor, /* pSetDCPenColor*/ NULL, /* pSetDIBColorTable */ - NULL, /* pSetDIBits */ EMFDRV_SetDIBitsToDevice, /* pSetDIBitsToDevice */ NULL, /* pSetDeviceClipping */ NULL, /* pSetDeviceGammaRamp */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index ea01d1b..0744a44 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -499,7 +499,6 @@ extern BOOL nulldrv_ScaleViewportExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT extern BOOL nulldrv_ScaleWindowExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL nulldrv_SelectClipPath( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern LONG nulldrv_SetBitmapBits( HBITMAP bitmap, const void *bits, LONG size ) DECLSPEC_HIDDEN; -extern INT nulldrv_SetDIBits( PHYSDEV dev, HBITMAP bitmap, UINT start, UINT lines, const void *bits, const BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; extern INT nulldrv_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern BOOL nulldrv_SetViewportExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL nulldrv_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 65487fd..1474014 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -169,7 +169,6 @@ static const DC_FUNCTIONS MFDRV_Funcs = MFDRV_SetDCBrushColor, /* pSetDCBrushColor*/ MFDRV_SetDCPenColor, /* pSetDCPenColor*/ NULL, /* pSetDIBColorTable */ - NULL, /* pSetDIBits */ MFDRV_SetDIBitsToDevice, /* pSetDIBitsToDevice */ NULL, /* pSetDeviceClipping */ NULL, /* pSetDeviceGammaRamp */ diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index e9b0a04..f038a66 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -891,7 +891,6 @@ static const struct gdi_dc_funcs psdrv_funcs = PSDRV_SetDCBrushColor, /* pSetDCBrushColor */ PSDRV_SetDCPenColor, /* pSetDCPenColor */ NULL, /* pSetDIBColorTable */ - NULL, /* pSetDIBits */ NULL, /* pSetDIBitsToDevice */ NULL, /* pSetDeviceClipping */ NULL, /* pSetDeviceGammaRamp */ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index b3449a8..26a7973 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -534,7 +534,6 @@ static const struct gdi_dc_funcs x11drv_funcs = X11DRV_SetDCBrushColor, /* pSetDCBrushColor */ X11DRV_SetDCPenColor, /* pSetDCPenColor */ X11DRV_SetDIBColorTable, /* pSetDIBColorTable */ - NULL, /* pSetDIBits */ X11DRV_SetDIBitsToDevice, /* pSetDIBitsToDevice */ X11DRV_SetDeviceClipping, /* pSetDeviceClipping */ X11DRV_SetDeviceGammaRamp, /* pSetDeviceGammaRamp */ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 87c12d7..5a251a1 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -143,7 +143,6 @@ struct gdi_dc_funcs COLORREF (*pSetDCBrushColor)(PHYSDEV, COLORREF); COLORREF (*pSetDCPenColor)(PHYSDEV, COLORREF); UINT (*pSetDIBColorTable)(PHYSDEV,UINT,UINT,const RGBQUAD*); - INT (*pSetDIBits)(PHYSDEV,HBITMAP,UINT,UINT,LPCVOID,const BITMAPINFO*,UINT); INT (*pSetDIBitsToDevice)(PHYSDEV,INT,INT,DWORD,DWORD,INT,INT,UINT,UINT,LPCVOID,const BITMAPINFO*,UINT); VOID (*pSetDeviceClipping)(PHYSDEV,HRGN,HRGN); BOOL (*pSetDeviceGammaRamp)(PHYSDEV,LPVOID); @@ -191,7 +190,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 7 +#define WINE_GDI_DRIVER_VERSION 8 static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset ) {

1 0

Alexandre Julliard : gdi32: Implement GetImage in the null driver.
by Alexandre Julliard July 26, 2011

July 26, 2011

Module: wine Branch: master Commit: bb3a1bdcacdd06ed8af19755a95617acc99e1c27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb3a1bdcacdd06ed8af19755a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 25 15:26:39 2011 +0200 gdi32: Implement GetImage in the null driver. --- dlls/gdi32/bitmap.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/driver.c | 6 ---- dlls/gdi32/gdi_private.h | 1 + 3 files changed, 59 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index e0df88d..620e75c 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -79,6 +79,64 @@ LONG nulldrv_SetBitmapBits( HBITMAP bitmap, const void *bits, LONG size ) return size; } +DWORD nulldrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, + struct gdi_image_bits *bits, struct bitblt_coords *src ) +{ + BITMAPOBJ *bmp; + int height, width_bytes; + + if (!hbitmap) return ERROR_NOT_SUPPORTED; + if (!(bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ))) return ERROR_INVALID_HANDLE; + + info->bmiHeader.biSize = sizeof(info->bmiHeader); + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel; + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + if (!bits) goto done; + + height = src->visrect.bottom - src->visrect.top; + width_bytes = get_dib_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); + info->bmiHeader.biWidth = bmp->bitmap.bmWidth; + info->bmiHeader.biHeight = -height; + info->bmiHeader.biSizeImage = height * width_bytes; + + /* make the source rectangle relative to the returned bits */ + src->y -= src->visrect.top; + offset_rect( &src->visrect, 0, -src->visrect.top ); + + if (bmp->bitmap.bmBits && bmp->bitmap.bmWidthBytes == width_bytes) + { + bits->ptr = (char *)bmp->bitmap.bmBits + src->visrect.top * width_bytes; + bits->is_copy = FALSE; + bits->free = NULL; + } + else + { + bits->ptr = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ); + bits->is_copy = TRUE; + bits->free = free_heap_bits; + if (bmp->bitmap.bmBits) + { + /* fixup the line alignment */ + char *src = bmp->bitmap.bmBits, *dst = bits->ptr; + for ( ; height > 0; height--, src += bmp->bitmap.bmWidthBytes, dst += width_bytes) + { + memcpy( dst, src, bmp->bitmap.bmWidthBytes ); + memset( dst + bmp->bitmap.bmWidthBytes, 0, width_bytes - bmp->bitmap.bmWidthBytes ); + } + } + else memset( bits->ptr, 0, info->bmiHeader.biSizeImage ); + } +done: + GDI_ReleaseObj( hbitmap ); + return ERROR_SUCCESS; +} + + /*********************************************************************** * BITMAP_GetWidthBytes * diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 7ef76d8..4a65b8d 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -347,12 +347,6 @@ static BOOL nulldrv_GetICMProfile( PHYSDEV dev, LPDWORD size, LPWSTR filename ) return FALSE; } -static DWORD nulldrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, - struct gdi_image_bits *bits, struct bitblt_coords *src ) -{ - return ERROR_NOT_SUPPORTED; -} - static COLORREF nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) { return 0; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 0744a44..bdd9606 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -482,6 +482,7 @@ extern BOOL nulldrv_FillRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush ) DECLSPEC_HIDD extern BOOL nulldrv_FlattenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL nulldrv_FrameRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush, INT width, INT height ) DECLSPEC_HIDDEN; extern LONG nulldrv_GetBitmapBits( HBITMAP bitmap, void *bits, LONG size ) DECLSPEC_HIDDEN; +extern DWORD nulldrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits, struct bitblt_coords *src ) DECLSPEC_HIDDEN; extern COLORREF nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern INT nulldrv_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern BOOL nulldrv_InvertRgn( PHYSDEV dev, HRGN rgn ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : winex11: Get rid of the no longer used SetDIBits implementation.
by Alexandre Julliard July 26, 2011

July 26, 2011

Module: wine Branch: master Commit: 65997a2a2dcfcdc5fb489f44709a67ac7e236b41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65997a2a2dcfcdc5fb489f447… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 25 19:46:13 2011 +0200 winex11: Get rid of the no longer used SetDIBits implementation. --- dlls/winex11.drv/dib.c | 117 --------------------------------------------- dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/x11drv.h | 2 - 3 files changed, 1 insertions(+), 120 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 7274f0c..609e5c2 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -3955,123 +3955,6 @@ INT X11DRV_SetDIBitsToDevice( PHYSDEV dev, INT xDest, INT yDest, DWORD cx, DWORD } /*********************************************************************** - * SetDIBits (X11DRV.@) - */ -INT X11DRV_SetDIBits( PHYSDEV dev, HBITMAP hbitmap, UINT startscan, - UINT lines, LPCVOID bits, const BITMAPINFO *info, UINT coloruse ) -{ - X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); - X_PHYSBITMAP *physBitmap = X11DRV_get_phys_bitmap( hbitmap ); - X11DRV_DIB_IMAGEBITS_DESCR descr; - DIBSECTION ds; - LONG width, height, tmpheight; - INT result; - - descr.physDev = physDev; - - if (!physBitmap) return 0; - - if (DIB_GetBitmapInfo( &info->bmiHeader, &width, &height, - &descr.infoBpp, &descr.compression ) == -1) - return 0; - - tmpheight = height; - if (height < 0) height = -height; - if (!lines || (startscan >= height)) - return 0; - - if (!GetObjectW( hbitmap, sizeof(ds), &ds )) return 0; - - if (startscan + lines > height) lines = height - startscan; - - switch (descr.infoBpp) - { - case 1: - case 4: - case 8: - descr.colorMap = (RGBQUAD *)X11DRV_DIB_BuildColorMap( - descr.physDev, coloruse, - physBitmap->pixmap_depth, - info, &descr.nColorMap ); - if (!descr.colorMap) return 0; - descr.rMask = descr.gMask = descr.bMask = 0; - break; - case 15: - case 16: - descr.rMask = (descr.compression == BI_BITFIELDS) ? *(const DWORD *)info->bmiColors : 0x7c00; - descr.gMask = (descr.compression == BI_BITFIELDS) ? *((const DWORD *)info->bmiColors + 1) : 0x03e0; - descr.bMask = (descr.compression == BI_BITFIELDS) ? *((const DWORD *)info->bmiColors + 2) : 0x001f; - descr.colorMap = 0; - break; - - case 24: - case 32: - descr.rMask = (descr.compression == BI_BITFIELDS) ? *(const DWORD *)info->bmiColors : 0xff0000; - descr.gMask = (descr.compression == BI_BITFIELDS) ? *((const DWORD *)info->bmiColors + 1) : 0x00ff00; - descr.bMask = (descr.compression == BI_BITFIELDS) ? *((const DWORD *)info->bmiColors + 2) : 0x0000ff; - descr.colorMap = 0; - break; - - default: break; - } - - descr.bits = bits; - descr.image = NULL; - descr.palentry = NULL; - descr.infoWidth = width; - descr.lines = tmpheight >= 0 ? lines : -lines; - descr.depth = physBitmap->pixmap_depth; - descr.shifts = physBitmap->trueColor ? &physBitmap->pixmap_color_shifts : NULL; - descr.drawable = physBitmap->pixmap; - descr.gc = get_bitmap_gc(physBitmap->pixmap_depth); - descr.xSrc = 0; - descr.ySrc = 0; - descr.xDest = 0; - descr.yDest = height - startscan - lines; - descr.width = ds.dsBm.bmWidth; - descr.height = lines; - descr.shm_mode = X11DRV_SHM_NONE; - descr.dibpitch = ((descr.infoWidth * descr.infoBpp + 31) &~31) / 8; - descr.physBitmap = NULL; - X11DRV_DIB_Lock( physBitmap, DIB_Status_GdiMod ); - result = X11DRV_DIB_SetImageBits( &descr ); - - /* optimisation for the case where the input bits are in exactly the same - * format as the internal representation and copying to the app bits is - * cheap - saves a round trip to the X server */ - if (descr.compression == BI_RGB && - coloruse == DIB_RGB_COLORS && - descr.infoBpp == ds.dsBm.bmBitsPixel && - physBitmap->base && physBitmap->size < 65536) - { - unsigned int srcwidthb = X11DRV_DIB_GetDIBWidthBytes( width, descr.infoBpp ); - int dstwidthb = ds.dsBm.bmWidthBytes; - LPBYTE dbits = physBitmap->base + startscan * dstwidthb; - const BYTE *sbits = bits; - int widthb; - UINT y; - - TRACE("syncing compatible set bits to app bits\n"); - if ((tmpheight < 0) ^ physBitmap->topdown) - { - dbits += dstwidthb * (lines-1); - dstwidthb = -dstwidthb; - } - X11DRV_DIB_DoProtectDIBSection( physBitmap, PAGE_READWRITE ); - widthb = min(srcwidthb, abs(dstwidthb)); - for (y = 0; y < lines; y++, dbits += dstwidthb, sbits += srcwidthb) - memcpy(dbits, sbits, widthb); - X11DRV_DIB_DoProtectDIBSection( physBitmap, PAGE_READONLY ); - physBitmap->status = DIB_Status_InSync; - } - X11DRV_DIB_Unlock( physBitmap, TRUE ); - - HeapFree(GetProcessHeap(), 0, descr.colorMap); - - return result; -} - -/*********************************************************************** * X11DRV_DIB_DoCopyDIBSection */ static void X11DRV_DIB_DoCopyDIBSection(X_PHYSBITMAP *physBitmap, BOOL toDIB, diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 4e374c7..b3449a8 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -534,7 +534,7 @@ static const struct gdi_dc_funcs x11drv_funcs = X11DRV_SetDCBrushColor, /* pSetDCBrushColor */ X11DRV_SetDCPenColor, /* pSetDCPenColor */ X11DRV_SetDIBColorTable, /* pSetDIBColorTable */ - X11DRV_SetDIBits, /* pSetDIBits */ + NULL, /* pSetDIBits */ X11DRV_SetDIBitsToDevice, /* pSetDIBitsToDevice */ X11DRV_SetDeviceClipping, /* pSetDeviceClipping */ X11DRV_SetDeviceGammaRamp, /* pSetDeviceGammaRamp */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index deec898..8da451a 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -238,8 +238,6 @@ extern COLORREF X11DRV_SetDCPenColor( PHYSDEV dev, COLORREF crColor ) DECLSPEC_H extern void X11DRV_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) DECLSPEC_HIDDEN; extern BOOL X11DRV_SetDeviceGammaRamp( PHYSDEV dev, LPVOID ramp ) DECLSPEC_HIDDEN; extern UINT X11DRV_SetDIBColorTable( PHYSDEV dev, UINT start, UINT count, const RGBQUAD *colors ) DECLSPEC_HIDDEN; -extern INT X11DRV_SetDIBits( PHYSDEV dev, HBITMAP hbitmap, UINT startscan, UINT lines, - LPCVOID bits, const BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; extern INT X11DRV_SetDIBitsToDevice( PHYSDEV dev, INT xDest, INT yDest, DWORD cx, DWORD cy, INT xSrc, INT ySrc, UINT startscan, UINT lines, LPCVOID bits, const BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; extern COLORREF X11DRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Get rid of the GetBitmapBits driver entry point .
by Alexandre Julliard July 26, 2011

July 26, 2011

Module: wine Branch: master Commit: 366174b2133e50978014493695b6ac720b39d0ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=366174b2133e5097801449369… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 25 20:32:41 2011 +0200 gdi32: Get rid of the GetBitmapBits driver entry point. --- dlls/gdi32/bitmap.c | 10 ---------- dlls/gdi32/dibdrv/dc.c | 1 - dlls/gdi32/driver.c | 1 - dlls/gdi32/enhmfdrv/init.c | 1 - dlls/gdi32/mfdrv/init.c | 1 - dlls/wineps.drv/init.c | 1 - dlls/winex11.drv/init.c | 1 - include/wine/gdi_driver.h | 3 +-- 8 files changed, 1 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index a1838fd..93bfe77 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -50,16 +50,6 @@ static const struct gdi_obj_funcs bitmap_funcs = * null driver fallback implementations */ -LONG nulldrv_GetBitmapBits( HBITMAP bitmap, void *bits, LONG size ) -{ - BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, OBJ_BITMAP ); - - if (bmp->bitmap.bmBits) memcpy( bits, bmp->bitmap.bmBits, size ); - else memset( bits, 0, size ); - GDI_ReleaseObj( bitmap ); - return size; -} - LONG nulldrv_SetBitmapBits( HBITMAP bitmap, const void *bits, LONG size ) { BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, OBJ_BITMAP ); diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index eaa187f..50ceffe 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -586,7 +586,6 @@ const DC_FUNCTIONS dib_driver = NULL, /* pFlattenPath */ NULL, /* pFrameRgn */ NULL, /* pGdiComment */ - NULL, /* pGetBitmapBits */ NULL, /* pGetCharWidth */ NULL, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 4a65b8d..290a30d 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -702,7 +702,6 @@ const DC_FUNCTIONS null_driver = nulldrv_FlattenPath, /* pFlattenPath */ nulldrv_FrameRgn, /* pFrameRgn */ nulldrv_GdiComment, /* pGdiComment */ - nulldrv_GetBitmapBits, /* pGetBitmapBits */ nulldrv_GetCharWidth, /* pGetCharWidth */ nulldrv_GetDeviceCaps, /* pGetDeviceCaps */ nulldrv_GetDeviceGammaRamp, /* pGetDeviceGammaRamp */ diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index b4b9e6e..a73ea00 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -71,7 +71,6 @@ static const DC_FUNCTIONS EMFDRV_Funcs = EMFDRV_FlattenPath, /* pFlattenPath */ EMFDRV_FrameRgn, /* pFrameRgn */ EMFDRV_GdiComment, /* pGdiComment */ - NULL, /* pGetBitmapBits */ NULL, /* pGetCharWidth */ EMFDRV_GetDeviceCaps, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 1474014..83edb1b 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -115,7 +115,6 @@ static const DC_FUNCTIONS MFDRV_Funcs = MFDRV_FlattenPath, /* pFlattenPath */ MFDRV_FrameRgn, /* pFrameRgn */ NULL, /* pGdiComment */ - NULL, /* pGetBitmapBits */ NULL, /* pGetCharWidth */ MFDRV_GetDeviceCaps, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index f038a66..554e0f8 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -837,7 +837,6 @@ static const struct gdi_dc_funcs psdrv_funcs = NULL, /* pFlattenPath */ NULL, /* pFrameRgn */ NULL, /* pGdiComment */ - NULL, /* pGetBitmapBits */ PSDRV_GetCharWidth, /* pGetCharWidth */ PSDRV_GetDeviceCaps, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 5e12e27..d73b91f 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -480,7 +480,6 @@ static const struct gdi_dc_funcs x11drv_funcs = NULL, /* pFlattenPath */ NULL, /* pFrameRgn */ NULL, /* pGdiComment */ - NULL, /* pGetBitmapBits */ X11DRV_GetCharWidth, /* pGetCharWidth */ X11DRV_GetDeviceCaps, /* pGetDeviceCaps */ X11DRV_GetDeviceGammaRamp, /* pGetDeviceGammaRamp */ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 5a251a1..cffd3f6 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -89,7 +89,6 @@ struct gdi_dc_funcs BOOL (*pFlattenPath)(PHYSDEV); BOOL (*pFrameRgn)(PHYSDEV,HRGN,HBRUSH,INT,INT); BOOL (*pGdiComment)(PHYSDEV,UINT,CONST BYTE*); - LONG (*pGetBitmapBits)(HBITMAP,void*,LONG); BOOL (*pGetCharWidth)(PHYSDEV,UINT,UINT,LPINT); INT (*pGetDeviceCaps)(PHYSDEV,INT); BOOL (*pGetDeviceGammaRamp)(PHYSDEV,LPVOID); @@ -190,7 +189,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 8 +#define WINE_GDI_DRIVER_VERSION 9 static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset ) {

1 0

Alexandre Julliard : winex11: Get rid of the no longer used GetBitmapBits implementation.
by Alexandre Julliard July 26, 2011

July 26, 2011

Module: wine Branch: master Commit: 96c1b3bbc23e7a0f880507f3274e700a7ecdaaaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=96c1b3bbc23e7a0f880507f32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 25 20:32:17 2011 +0200 winex11: Get rid of the no longer used GetBitmapBits implementation. --- dlls/winex11.drv/bitmap.c | 123 --------------------------------------------- dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/x11drv.h | 1 - 3 files changed, 1 insertions(+), 125 deletions(-) diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index 7ed008a..15ecb05 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -204,129 +204,6 @@ BOOL X11DRV_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap, LPVOID bmBits ) } -/*********************************************************************** - * GetBitmapBits (X11DRV.@) - * - * RETURNS - * Success: Number of bytes copied - * Failure: 0 - */ -LONG X11DRV_GetBitmapBits( HBITMAP hbitmap, void *buffer, LONG count ) -{ - BITMAP bitmap; - X_PHYSBITMAP *physBitmap = X11DRV_get_phys_bitmap( hbitmap ); - LONG height; - XImage *image; - LPBYTE tbuf, startline; - int h, w; - - if (!physBitmap || !GetObjectW( hbitmap, sizeof(bitmap), &bitmap )) return 0; - - TRACE("(bmp=%p, buffer=%p, count=0x%x)\n", hbitmap, buffer, count); - - wine_tsx11_lock(); - height = count / bitmap.bmWidthBytes; - image = XGetImage( gdi_display, physBitmap->pixmap, 0, 0, - bitmap.bmWidth, height, AllPlanes, ZPixmap ); - - /* copy XImage to 16 bit padded image buffer with real bitsperpixel */ - - startline = buffer; - switch (bitmap.bmBitsPixel) - { - case 1: - for (h=0;h<height;h++) - { - tbuf = startline; - *tbuf = 0; - for (w=0;w<bitmap.bmWidth;w++) - { - if ((w%8) == 0) - *tbuf = 0; - *tbuf |= XGetPixel(image,w,h)<<(7-(w&7)); - if ((w&7) == 7) ++tbuf; - } - startline += bitmap.bmWidthBytes; - } - break; - case 4: - for (h=0;h<height;h++) - { - tbuf = startline; - for (w=0;w<bitmap.bmWidth;w++) - { - if (!(w & 1)) *tbuf = XGetPixel( image, w, h) << 4; - else *tbuf++ |= XGetPixel( image, w, h) & 0x0f; - } - startline += bitmap.bmWidthBytes; - } - break; - case 8: - for (h=0;h<height;h++) - { - tbuf = startline; - for (w=0;w<bitmap.bmWidth;w++) - *tbuf++ = XGetPixel(image,w,h); - startline += bitmap.bmWidthBytes; - } - break; - case 15: - case 16: - for (h=0;h<height;h++) - { - tbuf = startline; - for (w=0;w<bitmap.bmWidth;w++) - { - long pixel = XGetPixel(image,w,h); - - *tbuf++ = pixel & 0xff; - *tbuf++ = (pixel>>8) & 0xff; - } - startline += bitmap.bmWidthBytes; - } - break; - case 24: - for (h=0;h<height;h++) - { - tbuf = startline; - for (w=0;w<bitmap.bmWidth;w++) - { - long pixel = XGetPixel(image,w,h); - - *tbuf++ = pixel & 0xff; - *tbuf++ = (pixel>> 8) & 0xff; - *tbuf++ = (pixel>>16) & 0xff; - } - startline += bitmap.bmWidthBytes; - } - break; - - case 32: - for (h=0;h<height;h++) - { - tbuf = startline; - for (w=0;w<bitmap.bmWidth;w++) - { - long pixel = XGetPixel(image,w,h); - - *tbuf++ = pixel & 0xff; - *tbuf++ = (pixel>> 8) & 0xff; - *tbuf++ = (pixel>>16) & 0xff; - *tbuf++ = (pixel>>24) & 0xff; - } - startline += bitmap.bmWidthBytes; - } - break; - default: - FIXME("Unhandled bits:%d\n", bitmap.bmBitsPixel); - } - XDestroyImage( image ); - wine_tsx11_unlock(); - return count; -} - - - /****************************************************************************** * SetBitmapBits (X11DRV.@) * diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 26a7973..5e12e27 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -480,7 +480,7 @@ static const struct gdi_dc_funcs x11drv_funcs = NULL, /* pFlattenPath */ NULL, /* pFrameRgn */ NULL, /* pGdiComment */ - X11DRV_GetBitmapBits, /* pGetBitmapBits */ + NULL, /* pGetBitmapBits */ X11DRV_GetCharWidth, /* pGetCharWidth */ X11DRV_GetDeviceCaps, /* pGetDeviceCaps */ X11DRV_GetDeviceGammaRamp, /* pGetDeviceGammaRamp */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8da451a..30fc62e 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -198,7 +198,6 @@ extern INT X11DRV_EnumICMProfiles( PHYSDEV dev, ICMENUMPROCW proc, LPARAM lparam extern BOOL X11DRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillType ) DECLSPEC_HIDDEN; extern BOOL X11DRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR str, UINT count, const INT *lpDx ) DECLSPEC_HIDDEN; -extern LONG X11DRV_GetBitmapBits( HBITMAP hbitmap, void *bits, LONG count ) DECLSPEC_HIDDEN; extern BOOL X11DRV_GetCharWidth( PHYSDEV dev, UINT firstChar, UINT lastChar, LPINT buffer ) DECLSPEC_HIDDEN; extern BOOL X11DRV_GetDeviceGammaRamp( PHYSDEV dev, LPVOID ramp ) DECLSPEC_HIDDEN; extern BOOL X11DRV_GetICMProfile( PHYSDEV dev, LPDWORD size, LPWSTR filename ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Reimplement GetBitmapBits using the GetImage driver function.
by Alexandre Julliard July 26, 2011

July 26, 2011

Module: wine Branch: master Commit: 1724c735344c211462c603a3b2342ef8d5fd958d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1724c735344c211462c603a3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 25 15:31:46 2011 +0200 gdi32: Reimplement GetBitmapBits using the GetImage driver function. --- dlls/gdi32/bitmap.c | 103 +++++++++++++++++++------------------------------- 1 files changed, 39 insertions(+), 64 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 2e23f6e..a1838fd 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -382,83 +382,58 @@ LONG WINAPI GetBitmapBits( LONG count, /* [in] Number of bytes to copy */ LPVOID bits) /* [out] Pointer to buffer to receive bits */ { + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *info = (BITMAPINFO *)buffer; + struct gdi_image_bits src_bits; + struct bitblt_coords src; + int dst_stride, max, ret; BITMAPOBJ *bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ); - LONG height, ret; if (!bmp) return 0; - if (bmp->dib) /* simply copy the bits from the DIB */ - { - DIBSECTION *dib = bmp->dib; - const char *src = dib->dsBm.bmBits; - INT width_bytes = get_bitmap_stride(dib->dsBm.bmWidth, dib->dsBm.bmBitsPixel); - LONG max = width_bytes * bmp->bitmap.bmHeight; - - if (!bits) - { - ret = max; - goto done; - } + if (bmp->dib) dst_stride = get_bitmap_stride( bmp->dib->dsBmih.biWidth, bmp->dib->dsBmih.biBitCount ); + else dst_stride = get_bitmap_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); - if (count > max) count = max; - ret = count; + ret = max = dst_stride * bmp->bitmap.bmHeight; + if (!bits) goto done; + if (count > max) count = max; + ret = count; + + src.visrect.left = 0; + src.visrect.right = bmp->bitmap.bmWidth; + src.visrect.top = 0; + src.visrect.bottom = (count + dst_stride - 1) / dst_stride; + src.x = src.y = 0; + src.width = src.visrect.right - src.visrect.left; + src.height = src.visrect.bottom - src.visrect.top; + + if (!bmp->funcs->pGetImage( NULL, hbitmap, info, &src_bits, &src )) + { + const char *src_ptr = src_bits.ptr; + int src_stride = get_dib_stride( info->bmiHeader.biWidth, info->bmiHeader.biBitCount ); - /* GetBitmapBits returns not 32-bit aligned data */ + /* GetBitmapBits returns 16-bit aligned data */ - if (bmp->dib->dsBmih.biHeight >= 0) /* not top-down, need to flip contents vertically */ + if (info->bmiHeader.biHeight > 0) { - src += dib->dsBm.bmWidthBytes * dib->dsBm.bmHeight; - while (count > 0) - { - src -= dib->dsBm.bmWidthBytes; - memcpy( bits, src, min( count, width_bytes ) ); - bits = (char *)bits + width_bytes; - count -= width_bytes; - } + src_ptr += (info->bmiHeader.biHeight - 1) * src_stride; + src_stride = -src_stride; } - else + src_ptr += src.visrect.top * src_stride; + + if (src_stride == dst_stride) memcpy( bits, src_ptr, count ); + else while (count > 0) { - while (count > 0) - { - memcpy( bits, src, min( count, width_bytes ) ); - src += dib->dsBm.bmWidthBytes; - bits = (char *)bits + width_bytes; - count -= width_bytes; - } + memcpy( bits, src_ptr, min( count, dst_stride ) ); + src_ptr += src_stride; + bits = (char *)bits + dst_stride; + count -= dst_stride; } - goto done; + if (src_bits.free) src_bits.free( &src_bits ); } + else ret = 0; - /* If the bits vector is null, the function should return the read size */ - if(bits == NULL) - { - ret = bmp->bitmap.bmWidthBytes * bmp->bitmap.bmHeight; - goto done; - } - - if (count < 0) { - WARN("(%d): Negative number of bytes passed???\n", count ); - count = -count; - } - - /* Only get entire lines */ - height = count / bmp->bitmap.bmWidthBytes; - if (height > bmp->bitmap.bmHeight) height = bmp->bitmap.bmHeight; - count = height * bmp->bitmap.bmWidthBytes; - if (count == 0) - { - WARN("Less than one entire line requested\n"); - ret = 0; - goto done; - } - - - TRACE("(%p, %d, %p) %dx%d %d colors fetched height: %d\n", - hbitmap, count, bits, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight, - 1 << bmp->bitmap.bmBitsPixel, height ); - - ret = bmp->funcs->pGetBitmapBits( hbitmap, bits, count ); - done: +done: GDI_ReleaseObj( hbitmap ); return ret; }

1 0

André Hentschel : Fix typo in German translation
by Jeremy Newman July 25, 2011

July 25, 2011

Module: website Branch: master Commit: 78f99a4bda44cee9f1c6d9b7a6ca66c827a78f15 URL: http://source.winehq.org/git/website.git/?a=commit;h=78f99a4bda44cee9f1c6d9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jul 25 21:36:02 2011 +0200 Fix typo in German translation --- news/de/2011072201.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/news/de/2011072201.xml b/news/de/2011072201.xml index ca891c0..d31301b 100644 --- a/news/de/2011072201.xml +++ b/news/de/2011072201.xml @@ -7,7 +7,7 @@ <ul> <li>Audio Unterstützung auf Basis der Win7 Architektur umgeschrieben.</li> <li>Old-Style Audiotreiber für Jack, NAS und ESD wurden entfernt.</li> - <li>Grafiktreiber Architektur für die DIB Enginge geändert.</li> + <li>Grafiktreiber Architektur für die DIB Engine geändert.</li> <li>Verbessertes Handling des Shell Papierkorbs.</li> <li>Bessere Joystick Unterstützung in DirectInput.</li> <li>Anfägliche Basis für VBScript Unterstützung.</li>

1 0