Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-17 16:27:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32K]

Browse source 
- Properly check for CBM_INIT bit in CreateDIBitmap.
 - Take into account the fact that we could be passed a BITMAPCOREHEADER
CORE-8695

svn path=/trunk/; revision=64969
This commit is contained in:
Jérôme Gardou 2014-10-24 18:45:25 +00:00
parent 2252d516b0
commit 5acaa31a62
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
reactos/win32ss/gdi/ntgdi/dibobj.c
View file

@ -1336,7 +1336,7 @@ IntCreateDIBitmap(
// colors, which are black followed by white, nothing else. In all other cases, we create a color bitmap.
if (BmpFormat != BMF_1BPP) fColor = TRUE;
else if ((coloruse > DIB_RGB_COLORS) || (init != CBM_INIT) || !data) fColor = FALSE;
else if ((coloruse > DIB_RGB_COLORS) || ((init & CBM_INIT) == 0) || !data) fColor = FALSE;
else
{
const RGBQUAD *rgb = (RGBQUAD*)((PBYTE)data + data->bmiHeader.biSize);
@ -1448,7 +1448,7 @@ NtGdiCreateDIBitmapInternal(
PBYTE safeBits = NULL;
HBITMAP hbmResult = NULL;
if(pjInit && (fInit == CBM_INIT))
if(pjInit && (fInit & CBM_INIT))
{
if (cjMaxBits == 0) return NULL;
safeBits = ExAllocatePoolWithTag(PagedPool, cjMaxBits, TAG_DIB);
@ -1462,7 +1462,7 @@ NtGdiCreateDIBitmapInternal(
_SEH2_TRY
{
if(pbmi) ProbeForRead(pbmi, cjMaxInitInfo, 1);
if(pjInit && (fInit == CBM_INIT))
if(pjInit && (fInit & CBM_INIT))
{
ProbeForRead(pjInit, cjMaxBits, 1);
RtlCopyMemory(safeBits, pjInit, cjMaxBits);
@ -1540,9 +1540,19 @@ GreCreateDIBitmapInternal(
* if bpp != 1 and ignore the real value that was passed */
if (pbmi)
{
bpp = pbmi->bmiHeader.biBitCount;
planes = pbmi->bmiHeader.biPlanes;
compression = pbmi->bmiHeader.biCompression;
if (pbmi->bmiHeader.biSize == sizeof(BITMAPCOREHEADER))
{
BITMAPCOREHEADER* CoreHeader = (BITMAPCOREHEADER*)&pbmi->bmiHeader;
bpp = CoreHeader->bcBitCount;
planes = CoreHeader->bcPlanes;
compression = BI_RGB;
}
else
{
bpp = pbmi->bmiHeader.biBitCount;
planes = pbmi->bmiHeader.biPlanes;
compression = pbmi->bmiHeader.biCompression;
}
}
else
{