Skip to content

W
wine-cw
Commit 869e9caf authored by Huw Davies's avatar Huw Davies Committed by Alexandre Julliard
Browse files
Options

If a device doesn't support device bitmaps, then store the bits on the

gdi side.
parent d2fc4892
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 13 deletions
dlls/gdi/bitmap.c
View file @ 869e9caf
...@@ -265,16 +265,10 @@ LONG WINAPI GetBitmapBits( ...@@ -265,16 +265,10 @@ LONG WINAPI GetBitmapBits(
hbitmap, count, bits, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight, hbitmap, count, bits, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight,
1 << bmp->bitmap.bmBitsPixel, height ); 1 << bmp->bitmap.bmBitsPixel, height );
if(bmp->funcs) if(bmp->funcs && bmp->funcs->pGetBitmapBits)
{ {
TRACE("Calling device specific BitmapBits\n"); TRACE("Calling device specific BitmapBits\n");
if(bmp->funcs->pGetBitmapBits) ret = bmp->funcs->pGetBitmapBits(hbitmap, bits, count);
ret = bmp->funcs->pGetBitmapBits(hbitmap, bits, count);
else
{
memset( bits, 0, count );
ret = count;
}
} else { } else {
if(!bmp->bitmap.bmBits) { if(!bmp->bitmap.bmBits) {
...@@ -326,13 +320,10 @@ LONG WINAPI SetBitmapBits( ...@@ -326,13 +320,10 @@ LONG WINAPI SetBitmapBits(
hbitmap, count, bits, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight, hbitmap, count, bits, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight,
1 << bmp->bitmap.bmBitsPixel, height ); 1 << bmp->bitmap.bmBitsPixel, height );
if(bmp->funcs) { if(bmp->funcs && bmp->funcs->pSetBitmapBits) {
TRACE("Calling device specific BitmapBits\n"); TRACE("Calling device specific BitmapBits\n");
if(bmp->funcs->pSetBitmapBits) ret = bmp->funcs->pSetBitmapBits(hbitmap, bits, count);
ret = bmp->funcs->pSetBitmapBits(hbitmap, bits, count);
else
ret = 0;
} else { } else {
if(!bmp->bitmap.bmBits) /* Alloc enough for entire bitmap */ if(!bmp->bitmap.bmBits) /* Alloc enough for entire bitmap */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment