commit fd8746b43ce24e209dd22c0bb1a4fe3ea38720a6
author Michael Karcher <wine@mkarcher.dialup.fu-berlin.de> Sun Jun 29 13:30:01 2008 +0200
committer Alexandre Julliard <julliard@winehq.org> Tue Jul 01 14:58:54 2008 +0200
tree e8bacb3178476825a420e81d7d74c186d786f070
parent 3f64708818ffce26255fed1fb350acf0d4a45567

gdi32: Fix palette of 1bpp DIB in GetDIBits.

Windows always generates a black/white palette for 1 bit DIBs
generated from DDBs. Copying from the current palette only takes place
for color DDBs (not explicitly mentioned in MSDN), and only if depth
equal (MSDN states it, explicitly).

dlls/gdi32/dib.c

diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c
index 46be0f0..677cda5 100644
--- a/dlls/gdi32/dib.c
+++ b/dlls/gdi32/dib.c
@@ -705,8 +705,10 @@
                 for (i = 0; i < (1 << bpp); i++)
                     ((WORD *)colorPtr)[i] = (WORD)i;
             }
-            else if(bpp >= bmp->bitmap.bmBitsPixel) {
-                /* Generate the color map from the selected palette */
+            else if(bpp > 1 && bpp == bmp->bitmap.bmBitsPixel) {
+                /* For color DDBs in native depth (mono DDBs always have
+                   a black/white palette):
+                   Generate the color map from the selected palette */
                 PALETTEENTRY palEntry[256];
 
                 memset( palEntry, 0, sizeof(palEntry) );