August 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : gdi32: Reimplement SetBitmapBits using the PutImage driver entry point.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 107849916fff56e0322bec7901ed5a10d205b345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=107849916fff56e0322bec790… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 3 11:12:05 2011 +0200 gdi32: Reimplement SetBitmapBits using the PutImage driver entry point. --- dlls/gdi32/bitmap.c | 93 ++++++++++++++++++++++++++++++++++---------------- 1 files changed, 63 insertions(+), 30 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index bce5183..f0c5764 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -518,8 +518,13 @@ LONG WINAPI SetBitmapBits( LONG count, /* [in] Number of bytes in bitmap array */ LPCVOID bits) /* [in] Address of array with bitmap bits */ { + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *info = (BITMAPINFO *)buffer; BITMAPOBJ *bmp; - LONG height, ret; + DWORD err; + int i, src_stride, dst_stride; + struct bitblt_coords src, dst; + struct gdi_image_bits src_bits; if (!bits) return 0; @@ -531,43 +536,71 @@ LONG WINAPI SetBitmapBits( count = -count; } - if (bmp->dib) /* simply copy the bits into the DIB */ - { - DIBSECTION *dib = bmp->dib; - char *dest = dib->dsBm.bmBits; - LONG max = dib->dsBm.bmWidthBytes * dib->dsBm.bmHeight; - if (count > max) count = max; - ret = count; + if (bmp->dib) src_stride = get_bitmap_stride( bmp->dib->dsBmih.biWidth, bmp->dib->dsBmih.biBitCount ); + else src_stride = get_bitmap_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); + + dst_stride = get_dib_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); + + 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 = min( count / src_stride, bmp->bitmap.bmHeight ); + dst = src; + + /* Only set entire lines */ + count = src.height * src_stride; - if (bmp->dib->dsBmih.biHeight >= 0) /* not top-down, need to flip contents vertically */ + TRACE("(%p, %d, %p) %dx%d %d bpp fetched height: %d\n", + hbitmap, count, bits, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight, + bmp->bitmap.bmBitsPixel, src.height ); + + if (src_stride == dst_stride) + { + src_bits.ptr = (void *)bits; + src_bits.is_copy = FALSE; + src_bits.free = NULL; + } + else + { + if (!(src_bits.ptr = HeapAlloc( GetProcessHeap(), 0, dst.height * dst_stride ))) { - dest += dib->dsBm.bmWidthBytes * dib->dsBm.bmHeight; - while (count > 0) - { - dest -= dib->dsBm.bmWidthBytes; - memcpy( dest, bits, min( count, dib->dsBm.bmWidthBytes ) ); - bits = (const char *)bits + dib->dsBm.bmWidthBytes; - count -= dib->dsBm.bmWidthBytes; - } + GDI_ReleaseObj( hbitmap ); + return 0; } - else memcpy( dest, bits, count ); - - GDI_ReleaseObj( hbitmap ); - return ret; + src_bits.is_copy = TRUE; + src_bits.free = free_heap_bits; + for (i = 0; i < dst.height; i++) + memcpy( (char *)src_bits.ptr + i * dst_stride, (char *)bits + i * src_stride, src_stride ); } - /* Only get entire lines */ - height = count / bmp->bitmap.bmWidthBytes; - if (height > bmp->bitmap.bmHeight) height = bmp->bitmap.bmHeight; - count = height * bmp->bitmap.bmWidthBytes; + /* query the color info */ + 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; + info->bmiHeader.biWidth = 0; + info->bmiHeader.biHeight = 0; + info->bmiHeader.biSizeImage = 0; + err = bmp->funcs->pPutImage( NULL, hbitmap, 0, info, NULL, NULL, NULL, SRCCOPY ); - 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 ); + if (!err || err == ERROR_BAD_FORMAT) + { + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel; + info->bmiHeader.biWidth = bmp->bitmap.bmWidth; + info->bmiHeader.biHeight = -dst.height; + info->bmiHeader.biSizeImage = dst.height * dst_stride; + err = bmp->funcs->pPutImage( NULL, hbitmap, 0, info, &src_bits, &src, &dst, SRCCOPY ); + } + if (err) count = 0; - ret = bmp->funcs->pSetBitmapBits( hbitmap, bits, count ); + if (src_bits.free) src_bits.free( &src_bits ); GDI_ReleaseObj( hbitmap ); - return ret; + return count; } /**********************************************************************

1 0

Alexandre Julliard : gdi32: Set the initial bits of a bitmap from the gdi side.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 09eb59d3c654681f2e6b3246275378c604f88d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=09eb59d3c654681f2e6b32462… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 3 11:37:02 2011 +0200 gdi32: Set the initial bits of a bitmap from the gdi side. --- dlls/gdi32/bitmap.c | 14 ++++++++++++-- dlls/gdi32/driver.c | 2 +- dlls/winex11.drv/bitmap.c | 24 ++++++++---------------- dlls/winex11.drv/x11drv.h | 2 +- include/wine/gdi_driver.h | 4 ++-- 5 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index f0c5764..5970d7f 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -657,6 +657,12 @@ HBITMAP BITMAP_CopyBitmap(HBITMAP hbitmap) } +static void set_initial_bitmap_bits( HBITMAP hbitmap, BITMAPOBJ *bmp ) +{ + if (!bmp->bitmap.bmBits) return; + SetBitmapBits( hbitmap, bmp->bitmap.bmHeight * bmp->bitmap.bmWidthBytes, bmp->bitmap.bmBits ); +} + /*********************************************************************** * BITMAP_SetOwnerDC * @@ -681,8 +687,12 @@ BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) { if (physdev->funcs->pCreateBitmap) { - ret = physdev->funcs->pCreateBitmap( physdev, hbitmap, bitmap->bitmap.bmBits ); - if (ret) bitmap->funcs = physdev->funcs; + ret = physdev->funcs->pCreateBitmap( physdev, hbitmap ); + if (ret) + { + bitmap->funcs = physdev->funcs; + set_initial_bitmap_bits( hbitmap, bitmap ); + } } else { diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index dc4a33b..9d958d8 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -213,7 +213,7 @@ static BOOL nulldrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom return TRUE; } -static BOOL nulldrv_CreateBitmap( PHYSDEV dev, HBITMAP bitmap, LPVOID bits ) +static BOOL nulldrv_CreateBitmap( PHYSDEV dev, HBITMAP bitmap ) { return TRUE; } diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index 15ecb05..503f3bb 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -132,7 +132,7 @@ HBITMAP X11DRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) * * Returns TRUE on success else FALSE */ -BOOL X11DRV_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap, LPVOID bmBits ) +BOOL X11DRV_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap ) { X_PHYSBITMAP *physBitmap; BITMAP bitmap; @@ -178,6 +178,13 @@ BOOL X11DRV_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap, LPVOID bmBits ) /* Create the pixmap */ physBitmap->pixmap = XCreatePixmap(gdi_display, root_window, bitmap.bmWidth, bitmap.bmHeight, physBitmap->pixmap_depth); + if (physBitmap->pixmap) + { + GC gc = get_bitmap_gc(physBitmap->pixmap_depth); + XSetFunction( gdi_display, gc, GXclear ); + XFillRectangle( gdi_display, physBitmap->pixmap, gc, 0, 0, bitmap.bmWidth, bitmap.bmHeight ); + XSetFunction( gdi_display, gc, GXcopy ); + } wine_tsx11_unlock(); if (!physBitmap->pixmap) { @@ -185,21 +192,6 @@ BOOL X11DRV_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap, LPVOID bmBits ) HeapFree( GetProcessHeap(), 0, physBitmap ); return FALSE; } - - if (bmBits) /* Set bitmap bits */ - { - X11DRV_SetBitmapBits( hbitmap, bmBits, bitmap.bmHeight * bitmap.bmWidthBytes ); - } - else /* else clear the bitmap */ - { - GC gc = get_bitmap_gc(physBitmap->pixmap_depth); - wine_tsx11_lock(); - XSetFunction( gdi_display, gc, GXclear ); - XFillRectangle( gdi_display, physBitmap->pixmap, gc, 0, 0, - bitmap.bmWidth, bitmap.bmHeight ); - XSetFunction( gdi_display, gc, GXcopy ); - wine_tsx11_unlock(); - } return TRUE; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 30fc62e..d54dda7 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -187,7 +187,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_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap, LPVOID bmBits ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern HBITMAP X11DRV_CreateDIBSection( PHYSDEV dev, HBITMAP hbitmap, const BITMAPINFO *bmi, UINT usage ) DECLSPEC_HIDDEN; extern BOOL X11DRV_DeleteBitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index cffd3f6..5cd867e 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -64,7 +64,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 (*pCreateBitmap)(PHYSDEV,HBITMAP,LPVOID); + BOOL (*pCreateBitmap)(PHYSDEV,HBITMAP); BOOL (*pCreateDC)(HDC,PHYSDEV *,LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*); HBITMAP (*pCreateDIBSection)(PHYSDEV,HBITMAP,const BITMAPINFO *,UINT); BOOL (*pDeleteBitmap)(HBITMAP); @@ -189,7 +189,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 9 +#define WINE_GDI_DRIVER_VERSION 10 static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset ) {

1 0

Alexandre Julliard : gdi32: Get rid of the SetBitmapBits driver entry point .
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 6d00196aead1b1dae4263fff6e36bc08e545b8a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d00196aead1b1dae4263fff6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 3 11:46:08 2011 +0200 gdi32: Get rid of the SetBitmapBits driver entry point. --- dlls/gdi32/bitmap.c | 19 ------- 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/bitmap.c | 123 -------------------------------------------- dlls/winex11.drv/init.c | 1 - dlls/winex11.drv/x11drv.h | 1 - include/wine/gdi_driver.h | 3 +- 11 files changed, 1 insertions(+), 152 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d00196aead1b1dae4263…

1 0

Alexandre Julliard : gdi32: Use GetImage to retrieve the brush bits in metafiles.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 91976a5b7461d7cae28f1c7622fb2eea3a2ef395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91976a5b7461d7cae28f1c762… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 3 13:01:29 2011 +0200 gdi32: Use GetImage to retrieve the brush bits in metafiles. --- dlls/gdi32/bitmap.c | 20 ++++++ dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/mfdrv/objects.c | 141 ++++++++++++-------------------------------- 3 files changed, 59 insertions(+), 103 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index cfe9fc1..3d7e1a2 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -414,6 +414,26 @@ 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) + { + 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 ); + GDI_ReleaseObj( hbitmap ); + } + return ret; +} + + /*********************************************************************** * GetBitmapBits [GDI32.@] * diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 4479316..f0fb825 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -309,6 +309,7 @@ extern BOOL BIDI_Reorder( HDC hDC, LPCWSTR lpString, INT uCount, DWORD dwFlags, LPWSTR lpOutString, INT uCountOut, UINT *lpOrder, WORD **lpGlyphs, INT* cGlyphs ) 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; diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c index d9c9f95..674e7e1 100644 --- a/dlls/gdi32/mfdrv/objects.c +++ b/dlls/gdi32/mfdrv/objects.c @@ -142,69 +142,6 @@ HBITMAP MFDRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) return 0; } -/*********************************************************************** - * Internal helper for MFDRV_CreateBrushIndirect(): - * Change the padding of a bitmap from 16 (BMP) to 32 (DIB) bits. - */ -static inline void MFDRV_PadTo32(LPBYTE lpRows, int height, int width) -{ - int bytes16 = 2 * ((width + 15) / 16); - int bytes32 = 4 * ((width + 31) / 32); - LPBYTE lpSrc, lpDst; - int i; - - if (!height) - return; - - height = abs(height) - 1; - lpSrc = lpRows + height * bytes16; - lpDst = lpRows + height * bytes32; - - /* Note that we work backwards so we can re-pad in place */ - while (height >= 0) - { - for (i = bytes32; i > bytes16; i--) - lpDst[i - 1] = 0; /* Zero the padding bytes */ - for (; i > 0; i--) - lpDst[i - 1] = lpSrc[i - 1]; /* Move image bytes into alignment */ - lpSrc -= bytes16; - lpDst -= bytes32; - height--; - } -} - -/*********************************************************************** - * Internal helper for MFDRV_CreateBrushIndirect(): - * Reverse order of bitmap rows in going from BMP to DIB. - */ -static inline void MFDRV_Reverse(LPBYTE lpRows, int height, int width) -{ - int bytes = 4 * ((width + 31) / 32); - LPBYTE lpSrc, lpDst; - BYTE temp; - int i; - - if (!height) - return; - - lpSrc = lpRows; - lpDst = lpRows + (height-1) * bytes; - height = height/2; - - while (height > 0) - { - for (i = 0; i < bytes; i++) - { - temp = lpDst[i]; - lpDst[i] = lpSrc[i]; - lpSrc[i] = temp; - } - lpSrc += bytes; - lpDst -= bytes; - height--; - } -} - /****************************************************************** * MFDRV_CreateBrushIndirect */ @@ -238,59 +175,57 @@ INT16 MFDRV_CreateBrushIndirect(PHYSDEV dev, HBRUSH hBrush ) } case BS_PATTERN: { - BITMAP bm; - BITMAPINFO *info; - DWORD bmSize; + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *dst_info, *src_info = (BITMAPINFO *)buffer; + struct gdi_image_bits bits; COLORREF cref; - GetObjectA((HANDLE)logbrush.lbHatch, sizeof(bm), &bm); - if(bm.bmBitsPixel != 1 || bm.bmPlanes != 1) { + if (!get_bitmap_image( (HANDLE)logbrush.lbHatch, src_info, &bits )) goto done; + if (src_info->bmiHeader.biBitCount != 1) + { FIXME("Trying to store a colour pattern brush\n"); + if (bits.free) bits.free( &bits ); goto done; } - bmSize = get_dib_stride( bm.bmWidth, bm.bmBitsPixel) * bm.bmHeight; - - size = sizeof(METARECORD) + sizeof(WORD) + sizeof(BITMAPINFO) + - sizeof(RGBQUAD) + bmSize; + size = FIELD_OFFSET( METARECORD, rdParm[2] ) + + FIELD_OFFSET( BITMAPINFO, bmiColors[2] ) + src_info->bmiHeader.biSizeImage; - mr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - if(!mr) goto done; + if (!(mr = HeapAlloc( GetProcessHeap(), 0, size ))) + { + if (bits.free) bits.free( &bits ); + goto done; + } mr->rdFunction = META_DIBCREATEPATTERNBRUSH; mr->rdSize = size / 2; mr->rdParm[0] = BS_PATTERN; mr->rdParm[1] = DIB_RGB_COLORS; - info = (BITMAPINFO *)(mr->rdParm + 2); - - info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - info->bmiHeader.biWidth = bm.bmWidth; - info->bmiHeader.biHeight = bm.bmHeight; - info->bmiHeader.biPlanes = 1; - info->bmiHeader.biBitCount = 1; - info->bmiHeader.biSizeImage = bmSize; - - GetBitmapBits((HANDLE)logbrush.lbHatch, - bm.bmHeight * get_bitmap_stride(bm.bmWidth, bm.bmBitsPixel), - (LPBYTE)info + sizeof(BITMAPINFO) + sizeof(RGBQUAD)); - - /* Change the padding to be DIB compatible if needed */ - if(bm.bmWidth & 31) - MFDRV_PadTo32((LPBYTE)info + sizeof(BITMAPINFO) + sizeof(RGBQUAD), - bm.bmWidth, bm.bmHeight); - /* BMP and DIB have opposite row order conventions */ - MFDRV_Reverse((LPBYTE)info + sizeof(BITMAPINFO) + sizeof(RGBQUAD), - bm.bmWidth, bm.bmHeight); - + dst_info = (BITMAPINFO *)(mr->rdParm + 2); + dst_info->bmiHeader = src_info->bmiHeader; cref = GetTextColor( dev->hdc ); - info->bmiColors[0].rgbRed = GetRValue(cref); - info->bmiColors[0].rgbGreen = GetGValue(cref); - info->bmiColors[0].rgbBlue = GetBValue(cref); - info->bmiColors[0].rgbReserved = 0; + dst_info->bmiColors[0].rgbRed = GetRValue(cref); + dst_info->bmiColors[0].rgbGreen = GetGValue(cref); + dst_info->bmiColors[0].rgbBlue = GetBValue(cref); + dst_info->bmiColors[0].rgbReserved = 0; cref = GetBkColor( dev->hdc ); - info->bmiColors[1].rgbRed = GetRValue(cref); - info->bmiColors[1].rgbGreen = GetGValue(cref); - info->bmiColors[1].rgbBlue = GetBValue(cref); - info->bmiColors[1].rgbReserved = 0; + dst_info->bmiColors[1].rgbRed = GetRValue(cref); + dst_info->bmiColors[1].rgbGreen = GetGValue(cref); + dst_info->bmiColors[1].rgbBlue = GetBValue(cref); + dst_info->bmiColors[1].rgbReserved = 0; + + /* always return a bottom-up DIB */ + if (dst_info->bmiHeader.biHeight < 0) + { + int i, width_bytes = get_dib_stride( dst_info->bmiHeader.biWidth, + dst_info->bmiHeader.biBitCount ); + char *dst_ptr = (char *)&dst_info->bmiColors[2]; + dst_info->bmiHeader.biHeight = -dst_info->bmiHeader.biHeight; + dst_ptr += (dst_info->bmiHeader.biHeight - 1) * width_bytes; + for (i = 0; i < dst_info->bmiHeader.biHeight; i++, dst_ptr -= width_bytes) + memcpy( dst_ptr, (char *)bits.ptr + i * width_bytes, width_bytes ); + } + else memcpy( &dst_info->bmiColors[2], bits.ptr, dst_info->bmiHeader.biSizeImage ); + if (bits.free) bits.free( &bits ); break; }

1 0

Alexandre Julliard : gdi32: Use GetImage to retrieve the brush bits in enhanced metafiles.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 1aa35bea9a7ffdd087d2a5aebb25525a69a1e3ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aa35bea9a7ffdd087d2a5aeb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 3 13:08:34 2011 +0200 gdi32: Use GetImage to retrieve the brush bits in enhanced metafiles. --- dlls/gdi32/enhmfdrv/objects.c | 84 +++++++++++------------------------------ 1 files changed, 22 insertions(+), 62 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index fca6f63..454c6cb 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -105,36 +105,6 @@ HBITMAP EMFDRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) } -/* Internal helper for EMFDRV_CreateBrushIndirect(): - * Change the padding of a bitmap from 16 (BMP) to 32 (DIB) bits. - */ -static inline void EMFDRV_PadTo32(LPBYTE lpRows, int height, int width) -{ - int bytes16 = 2 * ((width + 15) / 16); - int bytes32 = 4 * ((width + 31) / 32); - LPBYTE lpSrc, lpDst; - int i; - - if (!height) - return; - - height = abs(height) - 1; - lpSrc = lpRows + height * bytes16; - lpDst = lpRows + height * bytes32; - - /* Note that we work backwards so we can re-pad in place */ - while (height >= 0) - { - for (i = bytes32; i > bytes16; i--) - lpDst[i - 1] = 0; /* Zero the padding bytes */ - for (; i > 0; i--) - lpDst[i - 1] = lpSrc[i - 1]; /* Move image bytes into alignment */ - lpSrc -= bytes16; - lpDst -= bytes32; - height--; - } -} - /*********************************************************************** * EMFDRV_CreateBrushIndirect */ @@ -197,46 +167,36 @@ DWORD EMFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) case BS_PATTERN: { EMRCREATEDIBPATTERNBRUSHPT *emr; - BITMAPINFOHEADER *info; - BITMAP bm; - DWORD bmSize, biSize, size; + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *dst_info, *src_info = (BITMAPINFO *)buffer; + struct gdi_image_bits bits; + DWORD size; - GetObjectA((HANDLE)logbrush.lbHatch, sizeof(bm), &bm); - - if (bm.bmBitsPixel != 1 || bm.bmPlanes != 1) + if (!get_bitmap_image( (HANDLE)logbrush.lbHatch, src_info, &bits )) break; + if (src_info->bmiHeader.biBitCount != 1) { FIXME("Trying to create a color pattern brush\n"); + if (bits.free) bits.free( &bits ); break; } - /* BMP will be aligned to 32 bits, not 16 */ - bmSize = get_dib_stride(bm.bmWidth, bm.bmBitsPixel) * bm.bmHeight; - - biSize = sizeof(BITMAPINFOHEADER); /* FIXME: There is an extra DWORD written by native before the BMI. * Not sure what its meant to contain. */ - size = sizeof(EMRCREATEDIBPATTERNBRUSHPT) + biSize + bmSize + sizeof(DWORD); + size = sizeof(EMRCREATEDIBPATTERNBRUSHPT) + sizeof(DWORD) + + sizeof(BITMAPINFOHEADER) + src_info->bmiHeader.biSizeImage; emr = HeapAlloc( GetProcessHeap(), 0, size ); if(!emr) - break; - - info = (BITMAPINFOHEADER *)((LPBYTE)emr + - sizeof(EMRCREATEDIBPATTERNBRUSHPT) + sizeof(DWORD)); - info->biSize = sizeof(BITMAPINFOHEADER); - info->biWidth = bm.bmWidth; - info->biHeight = bm.bmHeight; - info->biPlanes = bm.bmPlanes; - info->biBitCount = bm.bmBitsPixel; - info->biSizeImage = bmSize; - GetBitmapBits((HANDLE)logbrush.lbHatch, - bm.bmHeight * get_bitmap_stride(bm.bmWidth, bm.bmBitsPixel), - (LPBYTE)info + sizeof(BITMAPINFOHEADER)); - - /* Change the padding to be DIB compatible if needed */ - if (bm.bmWidth & 31) - EMFDRV_PadTo32((LPBYTE)info + sizeof(BITMAPINFOHEADER), bm.bmWidth, bm.bmHeight); + { + if (bits.free) bits.free( &bits ); + break; + } + + dst_info = (BITMAPINFO *)((LPBYTE)(emr + 1) + sizeof(DWORD)); + dst_info->bmiHeader = src_info->bmiHeader; + memcpy( &dst_info->bmiHeader + 1, bits.ptr, dst_info->bmiHeader.biSizeImage ); + if (bits.free) bits.free( &bits ); emr->emr.iType = EMR_CREATEMONOBRUSH; emr->emr.nSize = size; @@ -249,10 +209,10 @@ DWORD EMFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) * FIXME: It may be that the DIB functions themselves accept this value. */ emr->iUsage = DIB_PAL_MONO; - emr->offBmi = (LPBYTE)info - (LPBYTE)emr; - emr->cbBmi = biSize; - emr->offBits = emr->offBmi + biSize; - emr->cbBits = bmSize; + emr->offBmi = (LPBYTE)dst_info - (LPBYTE)emr; + emr->cbBmi = sizeof( BITMAPINFOHEADER ); + emr->offBits = emr->offBmi + emr->cbBmi; + emr->cbBits = dst_info->bmiHeader.biSizeImage; if(!EMFDRV_WriteRecord( dev, &emr->emr )) index = 0;

1 0

Nikolay Sivov : include: Fix definition name.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 7381858e9860b8de8ba3d33ef30c64b3eb5d9c61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7381858e9860b8de8ba3d33ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 3 13:11:20 2011 +0400 include: Fix definition name. --- include/winnt.h | 2 +- server/token.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 0be6040..5c58656 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4041,7 +4041,7 @@ typedef struct _ACL_SIZE_INFORMATION #define SE_PRIVILEGE_ENABLED_BY_DEFAULT 0x00000001 #define SE_PRIVILEGE_ENABLED 0x00000002 -#define SE_PRIVILEGE_REMOVE 0x00000004 +#define SE_PRIVILEGE_REMOVED 0x00000004 #define SE_PRIVILEGE_USED_FOR_ACCESS 0x80000000 #define PRIVILEGE_SET_ALL_NECESSARY 1 diff --git a/server/token.c b/server/token.c index e8e85fc..ab07a81 100644 --- a/server/token.c +++ b/server/token.c @@ -724,7 +724,7 @@ static unsigned int token_adjust_privileges( struct token *token, const LUID_AND continue; } - if (privs[i].Attributes & SE_PRIVILEGE_REMOVE) + if (privs[i].Attributes & SE_PRIVILEGE_REMOVED) privilege_remove( privilege ); else {

1 0

Henri Verbeet : wined3d: Set the read buffer to GL_NONE in surface_load_ds_location().
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: e4efcea2232254b2cf1ad0a7de7c90f1c3ae8df2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4efcea2232254b2cf1ad0a7d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 2 21:42:13 2011 +0200 wined3d: Set the read buffer to GL_NONE in surface_load_ds_location(). On GL implementations that don't support GL_ARB_ES2_compatibility the framebuffer's read buffer has to be valid, even if we're not reading from it. --- dlls/wined3d/surface.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c13beb0..6fb704e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5743,6 +5743,7 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, NULL, surface, SFLAG_INTEXTURE); context_set_draw_buffer(context, GL_NONE); + glReadBuffer(GL_NONE); /* Do the actual blit */ surface_depth_blt(surface, gl_info, device->depth_blt_texture, 0, 0, w, h, bind_target);

1 0

Henri Verbeet : wined3d: Fix switching color keying on / off.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: cf1c641cbbccd986b6192e279217908d5889a6d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf1c641cbbccd986b6192e279… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 2 21:42:14 2011 +0200 wined3d: Fix switching color keying on / off. --- dlls/wined3d/surface.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6fb704e..02bf4c4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2539,6 +2539,7 @@ static BOOL surface_convert_color_to_float(const struct wined3d_surface *surface HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb) { DWORD flag = srgb ? SFLAG_INSRGBTEX : SFLAG_INTEXTURE; + BOOL ck_changed; TRACE("surface %p, srgb %#x.\n", surface, srgb); @@ -2548,14 +2549,11 @@ HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb) return WINED3DERR_INVALIDCALL; } - if (!(surface->flags & flag)) - { - TRACE("Reloading because surface is dirty\n"); - } + ck_changed = !(surface->flags & SFLAG_GLCKEY) != !(surface->CKeyFlags & WINEDDSD_CKSRCBLT); + /* Reload if either the texture and sysmem have different ideas about the * color key, or the actual key values changed. */ - else if (!(surface->flags & SFLAG_GLCKEY) != !(surface->CKeyFlags & WINEDDSD_CKSRCBLT) - || ((surface->CKeyFlags & WINEDDSD_CKSRCBLT) + if (ck_changed || ((surface->CKeyFlags & WINEDDSD_CKSRCBLT) && (surface->glCKey.dwColorSpaceLowValue != surface->SrcBltCKey.dwColorSpaceLowValue || surface->glCKey.dwColorSpaceHighValue != surface->SrcBltCKey.dwColorSpaceHighValue))) { @@ -2568,6 +2566,13 @@ HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb) * this kills performance though :( */ /* TODO: This is not necessarily needed with hw palettized texture support. */ surface_modify_location(surface, SFLAG_INSYSMEM, TRUE); + /* Switching color keying on / off may change the internal format. */ + if (ck_changed) + surface_force_reload(surface); + } + else if (!(surface->flags & flag)) + { + TRACE("Reloading because surface is dirty.\n"); } else {

1 0

Henri Verbeet : wined3d: Add WINED3DFMT_P8_UINT support to wined3d_format_convert_from_float().
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 111e8fe77cc85162cde2eaf35edd290739482920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=111e8fe77cc85162cde2eaf35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 2 21:42:15 2011 +0200 wined3d: Add WINED3DFMT_P8_UINT support to wined3d_format_convert_from_float(). --- dlls/wined3d/surface.c | 2 +- dlls/wined3d/utils.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 02bf4c4..d9060ff 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -7355,7 +7355,7 @@ static HRESULT cpu_blit_color_fill(struct wined3d_device *device, struct wined3d memset(&BltFx, 0, sizeof(BltFx)); BltFx.dwSize = sizeof(BltFx); - BltFx.u5.dwFillColor = wined3d_format_convert_from_float(dst_surface->resource.format, color); + BltFx.u5.dwFillColor = wined3d_format_convert_from_float(dst_surface, color); return wined3d_surface_blt(dst_surface, dst_rect, NULL, NULL, WINEDDBLT_COLORFILL, &BltFx, WINED3DTEXF_POINT); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 177f071..68e6d75 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2622,7 +2622,7 @@ BOOL getDepthStencilBits(const struct wined3d_format *format, BYTE *depthSize, B /* Note: It's the caller's responsibility to ensure values can be expressed * in the requested format. UNORM formats for example can only express values * in the range 0.0f -> 1.0f. */ -DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, const WINED3DCOLORVALUE *color) +DWORD wined3d_format_convert_from_float(const struct wined3d_surface *surface, const WINED3DCOLORVALUE *color) { static const struct { @@ -2653,6 +2653,7 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con {WINED3DFMT_B10G10R10A2_UNORM, 1023.0f, 1023.0f, 1023.0f, 3.0f, 20, 10, 0, 30}, {WINED3DFMT_R10G10B10A2_UNORM, 1023.0f, 1023.0f, 1023.0f, 3.0f, 0, 10, 20, 30}, }; + const struct wined3d_format *format = surface->resource.format; unsigned int i; TRACE("Converting color {%.8e %.8e %.8e %.8e} to format %s.\n", @@ -2674,6 +2675,40 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con return ret; } + if (format->id == WINED3DFMT_P8_UINT) + { + PALETTEENTRY *e; + BYTE r, g, b, a; + + if (!surface->palette) + { + WARN("Surface doesn't have a palette, returning 0.\n"); + return 0; + } + + r = (BYTE)((color->r * 255.0f) + 0.5f); + g = (BYTE)((color->g * 255.0f) + 0.5f); + b = (BYTE)((color->b * 255.0f) + 0.5f); + a = (BYTE)((color->a * 255.0f) + 0.5f); + + e = &surface->palette->palents[a]; + if (e->peRed == r && e->peGreen == g && e->peBlue == b) + return a; + + WARN("Alpha didn't match index, searching full palette.\n"); + + for (i = 0; i < 256; ++i) + { + e = &surface->palette->palents[i]; + if (e->peRed == r && e->peGreen == g && e->peBlue == b) + return i; + } + + FIXME("Unable to convert color to palette index.\n"); + + return 0; + } + FIXME("Conversion for format %s not implemented.\n", debug_d3dformat(format->id)); return 0; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 17e8b41..e7cc3eb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2805,7 +2805,7 @@ const struct wined3d_format *wined3d_get_format(const struct wined3d_gl_info *gl enum wined3d_format_id format_id) DECLSPEC_HIDDEN; UINT wined3d_format_calculate_size(const struct wined3d_format *format, UINT alignment, UINT width, UINT height) DECLSPEC_HIDDEN; -DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, +DWORD wined3d_format_convert_from_float(const struct wined3d_surface *surface, const WINED3DCOLORVALUE *color) DECLSPEC_HIDDEN; static inline BOOL use_vs(const struct wined3d_state *state)

1 0

Henri Verbeet : wined3d: Go to the fallbacks for cross-swapchain blits.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: c12627562b32b36bab095fee59b96a8785e2fa4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c12627562b32b36bab095fee5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 2 21:42:16 2011 +0200 wined3d: Go to the fallbacks for cross-swapchain blits. --- dlls/wined3d/surface.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d9060ff..267da66 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1285,6 +1285,7 @@ static HRESULT surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_ struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const WINEDDBLTFX *fx, WINED3DTEXTUREFILTERTYPE filter) { + const struct wined3d_swapchain *src_swapchain, *dst_swapchain; struct wined3d_device *device = dst_surface->resource.device; DWORD src_ds_flags, dst_ds_flags; static const DWORD simple_blit = WINEDDBLT_ASYNC @@ -1310,6 +1311,27 @@ static HRESULT surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_ goto fallback; } + if (src_surface && src_surface->container.type == WINED3D_CONTAINER_SWAPCHAIN) + src_swapchain = src_surface->container.u.swapchain; + else + src_swapchain = NULL; + + if (dst_surface->container.type == WINED3D_CONTAINER_SWAPCHAIN) + dst_swapchain = dst_surface->container.u.swapchain; + else + dst_swapchain = NULL; + + /* This isn't strictly needed. FBO blits for example could deal with + * cross-swapchain blits by first downloading the source to a texture + * before switching to the destination context. We just have this here to + * not have to deal with the issue, since cross-swapchain blits should be + * rare. */ + if (src_swapchain && dst_swapchain && src_swapchain != dst_swapchain) + { + FIXME("Using fallback for cross-swapchain blit.\n"); + goto fallback; + } + dst_ds_flags = dst_surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); if (src_surface) src_ds_flags = src_surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL);

1 0