Alexandre Julliard : winex11.drv: Don' t use the specified DC when mapping RGB colors for a DIB.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Mon Nov 27 17:04:19 2006 +0100

winex11.drv: Don't use the specified DC when mapping RGB colors for a DIB.

The DC palette only matters for DIB_PAL_COLORS.

---

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

diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c
index 9701a00..be4088c 100644
--- a/dlls/gdi32/tests/bitmap.c
+++ b/dlls/gdi32/tests/bitmap.c
@@ -1107,10 +1107,10 @@ static void test_GetDIBits_selected_DIB(
             break;
         }
     }
-    todo_wine
-    {
-        ok(equalContents, "GetDIBits with DIB selected in DC: Invalid DIB bits\n");
-    }
+    if (bpp != 1)
+        ok(equalContents, "GetDIBits with %d bpp DIB selected in DC: Invalid DIB bits\n",bpp);
+    else
+        todo_wine ok(equalContents, "GetDIBits with %d bpp DIB selected in DC: Invalid DIB bits\n",bpp);

HeapFree(GetProcessHeap(), 0, bits2);
     DeleteDC(dc);
diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c
index 1c0c7c2..5ece5a3 100644
--- a/dlls/winex11.drv/dib.c
+++ b/dlls/winex11.drv/dib.c
@@ -312,7 +312,7 @@ static int *X11DRV_DIB_GenColorMap( X11D
             }
             else
                 for (i = start; i < end; i++, rgb++)
-                    colorMapping[i] = X11DRV_PALETTE_ToPhysical( physDev, RGB(rgb->rgbRed,
+                    colorMapping[i] = X11DRV_PALETTE_ToPhysical( NULL, RGB(rgb->rgbRed,
                                                                 rgb->rgbGreen,
                                                                 rgb->rgbBlue));
         }
@@ -336,7 +336,7 @@ static int *X11DRV_DIB_GenColorMap( X11D
             }
             else
                 for (i = start; i < end; i++, rgb++)
-                    colorMapping[i] = X11DRV_PALETTE_ToPhysical( physDev, RGB(rgb->rgbtRed,
+                    colorMapping[i] = X11DRV_PALETTE_ToPhysical( NULL, RGB(rgb->rgbtRed,
                                                                rgb->rgbtGreen,
                                                                rgb->rgbtBlue));
         }