winex11.drv: Don't use the specified DC when mapping RGB colors for a DIB.
The DC palette only matters for DIB_PAL_COLORS.
This commit is contained in:
parent
4659870d0d
commit
d5ee62342a
|
@ -1107,10 +1107,10 @@ static void test_GetDIBits_selected_DIB(UINT bpp)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
todo_wine
|
if (bpp != 1)
|
||||||
{
|
ok(equalContents, "GetDIBits with %d bpp DIB selected in DC: Invalid DIB bits\n",bpp);
|
||||||
ok(equalContents, "GetDIBits with DIB selected in DC: Invalid DIB bits\n");
|
else
|
||||||
}
|
todo_wine ok(equalContents, "GetDIBits with %d bpp DIB selected in DC: Invalid DIB bits\n",bpp);
|
||||||
|
|
||||||
HeapFree(GetProcessHeap(), 0, bits2);
|
HeapFree(GetProcessHeap(), 0, bits2);
|
||||||
DeleteDC(dc);
|
DeleteDC(dc);
|
||||||
|
|
|
@ -312,7 +312,7 @@ static int *X11DRV_DIB_GenColorMap( X11DRV_PDEVICE *physDev, int *colorMapping,
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
for (i = start; i < end; i++, rgb++)
|
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->rgbGreen,
|
||||||
rgb->rgbBlue));
|
rgb->rgbBlue));
|
||||||
}
|
}
|
||||||
|
@ -336,7 +336,7 @@ static int *X11DRV_DIB_GenColorMap( X11DRV_PDEVICE *physDev, int *colorMapping,
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
for (i = start; i < end; i++, rgb++)
|
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->rgbtGreen,
|
||||||
rgb->rgbtBlue));
|
rgb->rgbtBlue));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue