From 3843d5beee4550f26eb97451653714eff5bc163c Mon Sep 17 00:00:00 2001 From: Michael Karcher Date: Sat, 16 Aug 2008 13:23:49 +0200 Subject: [PATCH] winex11: Fix GetDIBits with monochrome pixmaps. --- dlls/gdi32/tests/bitmap.c | 1 - dlls/winex11.drv/dib.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 4c4abe09150..12224c9110f 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1552,7 +1552,6 @@ todo_wine } /* returned bits are DWORD aligned and upside down */ -todo_wine ok(!memcmp(buf, dib_bits_24, sizeof(dib_bits_24)), "DIB bits don't match\n"); DeleteObject(hbmp); diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 93482816587..b2a5b5ab071 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4039,7 +4039,7 @@ INT X11DRV_GetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan, bitmap_type = DIB_GetBitmapInfo( (BITMAPINFOHEADER*)info, &width, &tempHeight, &descr.infoBpp, &descr.compression); - if (physDev->depth > 1) + if (physBitmap->pixmap_depth > 1) { GetPaletteEntries( GetCurrentObject( physDev->hdc, OBJ_PAL ), 0, 256, palette ); }