Michael Karcher : winex11: Fix GetDIBits with monochrome pixmaps.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3843d5beee4550f26eb97451653714eff5bc163c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3843d5beee4550f26eb9745165...

Author: Michael Karcher 
Date:   Sat Aug 16 13:23:49 2008 +0200

winex11: Fix GetDIBits with monochrome pixmaps.

---

dlls/gdi32/tests/bitmap.c |    1 -
 dlls/winex11.drv/dib.c    |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c
index 4c4abe0..12224c9 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 9348281..b2a5b5a 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 );
   }