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

revert r33403 for it break abiword

Browse source 
we need fixing gdi32.dll bugs before we can fix it correct

svn path=/trunk/; revision=33404
This commit is contained in:
Magnus Olsen 2008-05-10 11:42:00 +00:00
parent 608264fa22
commit dc6e9467cc
1 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
reactos/subsystems/win32/win32k/objects/bitmaps.c
View file

@ -43,14 +43,11 @@ IntGdiCreateBitmap(
SIZEL Size; SIZEL Size;
LONG WidthBytes; LONG WidthBytes;
/* NOTE: Windows also doesn't store nr. of planes separately! */ /* NOTE: Windows also doesn't store nr. of planes separately! */
BitsPixel = BITMAPOBJ_GetRealBitsPixel(BitsPixel * Planes); BitsPixel = BITMAPOBJ_GetRealBitsPixel(BitsPixel * Planes);
/* Check parameters */ /* Check parameters */
if (BitsPixel == 0 || Width < 0)
if ( (Height <= 0) || (Width <= 0) || (Width > 0x7FFFFFFF) ||
(Planes > 32) || (BitsPixel > 32) || (BitsPixel == 0) )
{ {
DPRINT1("Width = %d, Height = %d BitsPixel = %d\n", Width, Height, BitsPixel); DPRINT1("Width = %d, Height = %d BitsPixel = %d\n", Width, Height, BitsPixel);
SetLastWin32Error(ERROR_INVALID_PARAMETER); SetLastWin32Error(ERROR_INVALID_PARAMETER);
@ -59,8 +56,9 @@ IntGdiCreateBitmap(
WidthBytes = BITMAPOBJ_GetWidthBytes(Width, Planes * BitsPixel); WidthBytes = BITMAPOBJ_GetWidthBytes(Width, Planes * BitsPixel);
Size.cx = Width; Size.cx = abs(Width);
Size.cy = Height; Size.cy = abs(Height);
/* Create the bitmap object. */ /* Create the bitmap object. */
hBitmap = IntCreateBitmap(Size, WidthBytes, hBitmap = IntCreateBitmap(Size, WidthBytes,
BitmapFormat(BitsPixel, BI_RGB), BitmapFormat(BitsPixel, BI_RGB),
@ -114,8 +112,15 @@ NtGdiCreateBitmap(
ProbeForRead(pUnsafeBits, cjBits, 1); ProbeForRead(pUnsafeBits, cjBits, 1);
} }
if (0 == Width || 0 == Height)
{
hBitmap = IntGdiCreateBitmap (1, 1, 1, 1, NULL);
}
else
{
hBitmap = IntGdiCreateBitmap(Width, Height, Planes, BitsPixel, pUnsafeBits); hBitmap = IntGdiCreateBitmap(Width, Height, Planes, BitsPixel, pUnsafeBits);
} }
}
_SEH_HANDLE _SEH_HANDLE
{ {
hBitmap = 0; hBitmap = 0;