commit baceb8d07e0ae08a00aaaac39c15b14f872c9d97
author Alexandre Julliard <julliard@winehq.org> Mon Apr 21 11:57:30 2008 +0200
committer Alexandre Julliard <julliard@winehq.org> Mon Apr 21 12:10:37 2008 +0200
tree 8b44720a08ee9eced01ffd8d9213c6bd4e266255
parent 22d2abbacb176c2186125fb3cdb36e6cbd75037f

gdi32: Return bitmask for 32-bit bitmaps too in GetDIBits.

dlls/gdi32/dib.c

diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c
index caf3e6c..de5a5a4 100644
--- a/dlls/gdi32/dib.c
+++ b/dlls/gdi32/dib.c
@@ -640,19 +640,17 @@
                 DIB_GetDIBImageBytes( bmp->bitmap.bmWidth,
                                       bmp->bitmap.bmHeight,
                                       bmp->bitmap.bmBitsPixel );
+            info->bmiHeader.biCompression = (bmp->bitmap.bmBitsPixel > 8) ? BI_BITFIELDS : BI_RGB;
             switch(bmp->bitmap.bmBitsPixel)
             {
             case 15:
                 info->bmiHeader.biBitCount = 16;
-                info->bmiHeader.biCompression = BI_RGB;
                 break;
-            case 16:
-                info->bmiHeader.biBitCount = 16;
-                info->bmiHeader.biCompression = BI_BITFIELDS;
+            case 24:
+                info->bmiHeader.biBitCount = 32;
                 break;
             default:
                 info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel;
-                info->bmiHeader.biCompression = BI_RGB;
                 break;
             }
             info->bmiHeader.biXPelsPerMeter = 0;
@@ -824,6 +822,16 @@
             ((PDWORD)info->bmiColors)[2] = 0x001f;
         }
         break;
+
+    case 24:
+    case 32:
+        if (info->bmiHeader.biCompression == BI_BITFIELDS)
+        {
+            ((PDWORD)info->bmiColors)[0] = 0xff0000;
+            ((PDWORD)info->bmiColors)[1] = 0x00ff00;
+            ((PDWORD)info->bmiColors)[2] = 0x0000ff;
+        }
+        break;
     }
 
     if (bits && lines)