From fa1e99d9271a2ce613a257ade92a76de3c770ca7 Mon Sep 17 00:00:00 2001 From: Ged Murphy Date: Thu, 1 Nov 2007 15:45:42 +0000 Subject: [PATCH] - don't pass minus values for creating topdown bitmaps. - fixes loading of toolbar bitmaps in abiword svn path=/trunk/; revision=30043 --- reactos/subsystems/win32/win32k/objects/bitmaps.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/reactos/subsystems/win32/win32k/objects/bitmaps.c b/reactos/subsystems/win32/win32k/objects/bitmaps.c index c36b56f1e3d..6918a68877c 100644 --- a/reactos/subsystems/win32/win32k/objects/bitmaps.c +++ b/reactos/subsystems/win32/win32k/objects/bitmaps.c @@ -54,9 +54,9 @@ IntGdiCreateBitmap( return 0; } - WidthBytes = BITMAPOBJ_GetWidthBytes(Width, BitsPixel); + WidthBytes = BITMAPOBJ_GetWidthBytes(Width, Planes * BitsPixel); - Size.cx = Width; + Size.cx = abs(Width); Size.cy = abs(Height); /* Create the bitmap object. */ @@ -108,7 +108,7 @@ NtGdiCreateBitmap( { if (pUnsafeBits) { - UINT cjBits = BITMAPOBJ_GetWidthBytes(Width, BitsPixel) * Height; + UINT cjBits = BITMAPOBJ_GetWidthBytes(Width, BitsPixel) * abs(Height); ProbeForRead(pUnsafeBits, cjBits, 1); } @@ -186,7 +186,7 @@ IntCreateCompatibleBitmap( } else { - Bmp = IntGdiCreateBitmap(Width, Height, 1, Dc->w.bitsPerPixel, NULL); + Bmp = IntGdiCreateBitmap(abs(Width), abs(Height), 1, Dc->w.bitsPerPixel, NULL); } return Bmp;