Commit d5ee6234 authored by Alexandre Julliard's avatar Alexandre Julliard

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

The DC palette only matters for DIB_PAL_COLORS.
parent 4659870d
......@@ -1107,10 +1107,10 @@ static void test_GetDIBits_selected_DIB(UINT bpp)
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);
......
......@@ -312,7 +312,7 @@ static int *X11DRV_DIB_GenColorMap( X11DRV_PDEVICE *physDev, int *colorMapping,
}
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( X11DRV_PDEVICE *physDev, int *colorMapping,
}
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));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment