commit fddf5ce12c9d92e39859f5429011d8bf02216373
author Huw Davies <huw@codeweavers.com> Tue Mar 30 20:38:45 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Mar 30 20:38:45 2004 +0000
tree f2b11b9d84efda5836946c99bcc877543e1c039a
parent 96db7b27f809b42ca224a93578942b678fcb4381

Select the dibsection into a dc before calling GetDIBColorTable.

objects/dib.c

diff --git a/objects/dib.c b/objects/dib.c
index ba623f2..cae5978 100644
--- a/objects/dib.c
+++ b/objects/dib.c
@@ -415,12 +415,19 @@
     DC * dc;
     BITMAPOBJ * bmp;
     int i;
+    HDC memdc;
 
     if (!info) return 0;
-    if (!(dc = DC_GetDCUpdate( hdc ))) return 0;
+    memdc = CreateCompatibleDC(hdc);
+    if (!(dc = DC_GetDCUpdate( hdc )))
+    {
+        DeleteDC(memdc);
+        return 0;
+    }
     if (!(bmp = (BITMAPOBJ *)GDI_GetObjPtr( hbitmap, BITMAP_MAGIC )))
     {
         GDI_ReleaseObj( hdc );
+        DeleteDC(memdc);
 	return 0;
     }
 
@@ -433,8 +440,12 @@
 	/* If the bitmap object already has a dib section at the
 	   same color depth then get the color map from it */
 	if (bmp->dib && bmp->dib->dsBm.bmBitsPixel == info->bmiHeader.biBitCount) {
-            if(coloruse == DIB_RGB_COLORS)
-                GetDIBColorTable(hdc, 0, 1 << info->bmiHeader.biBitCount, info->bmiColors);
+            if(coloruse == DIB_RGB_COLORS) {
+                HBITMAP oldbm;
+                oldbm = SelectObject(memdc, hbitmap);
+                GetDIBColorTable(memdc, 0, 1 << info->bmiHeader.biBitCount, info->bmiColors);
+                SelectObject(memdc, oldbm);
+            }
             else {
                 WORD *index = (WORD*)info->bmiColors;
                 int i;
@@ -450,6 +461,7 @@
                 if (!(palette = (PALETTEOBJ*)GDI_GetObjPtr( dc->hPalette, PALETTE_MAGIC ))) {
                     GDI_ReleaseObj( hdc );
                     GDI_ReleaseObj( hbitmap );
+                    DeleteDC(memdc);
                     return 0;
                 }
                 palEntry = palette->logpalette.palPalEntry;
@@ -742,7 +754,7 @@
 
     GDI_ReleaseObj( hdc );
     GDI_ReleaseObj( hbitmap );
-
+    DeleteDC(memdc);
     return lines;
 }