Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-12 09:28:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32K]

Browse source 
- Handle allocation failures in FixupDIBBrushPalette
- In IntCreateDIBitmap make sure to the absolute height to GreCreateBitmap

svn path=/trunk/; revision=66883
This commit is contained in:
Timo Kreuzer 2015-03-25 22:26:52 +00:00
parent dcc59fc583
commit e431dd155c
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
reactos/win32ss/gdi/eng/engbrush.c
View file

@ -9,7 +9,7 @@
#include <win32k.h> #include <win32k.h>
DBG_DEFAULT_CHANNEL(GdiFont); DBG_DEFAULT_CHANNEL(EngBrush);
static const ULONG gaulHatchBrushes[HS_DDI_MAX][8] = static const ULONG gaulHatchBrushes[HS_DDI_MAX][8] =
{ {
@ -271,6 +271,11 @@ FixupDIBBrushPalette(
0, 0,
0, 0,
0); 0);
if (ppalNew == NULL)
{
ERR("Failed to allcate palette for brush\n");
return NULL;
}
/* Loop all colors */ /* Loop all colors */
for (i = 0; i < ppalDIB->NumColors; i++) for (i = 0; i < ppalDIB->NumColors; i++)
@ -357,6 +362,12 @@ EBRUSHOBJ_bRealizeBrush(EBRUSHOBJ *pebo, BOOL bCallDriver)
{ {
/* Create a palette with the colors from the DC */ /* Create a palette with the colors from the DC */
ppalPattern = FixupDIBBrushPalette(psurfPattern->ppal, pebo->ppalDC); ppalPattern = FixupDIBBrushPalette(psurfPattern->ppal, pebo->ppalDC);
if (ppalPattern == NULL)
{
ERR("FixupDIBBrushPalette() failed.\n");
return FALSE;
}
pebo->ppalDIB = ppalPattern; pebo->ppalDIB = ppalPattern;
} }
else else

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

@ -1379,7 +1379,7 @@ IntCreateDIBitmap(
else else
{ {
handle = GreCreateBitmap(width, handle = GreCreateBitmap(width,
height, abs(height),
1, 1,
1, 1,
NULL); NULL);