reactos/subsys/win32k/eng
diff -u -r1.6 -r1.7
--- misc.c 10 May 2004 17:07:17 -0000 1.6
+++ misc.c 24 Jun 2004 19:43:48 -0000 1.7
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: misc.c,v 1.6 2004/05/10 17:07:17 weiden Exp $ */
+/* $Id: misc.c,v 1.7 2004/06/24 19:43:48 gvg Exp $ */
#include <w32k.h>
BOOL STDCALL
@@ -63,7 +63,7 @@
Width = DIB_GetDIBWidthBytes(BitmapSize.cx, BitsPerFormat(DestObj->iBitmapFormat));
EnterLeave->OutputBitmap = EngCreateBitmap(BitmapSize, Width,
DestObj->iBitmapFormat,
- BMF_NOZEROINIT, NULL);
+ BMF_TOPDOWN | BMF_NOZEROINIT, NULL);
*OutputObj = (SURFOBJ *) AccessUserObject((ULONG) EnterLeave->OutputBitmap);
EnterLeave->DestRect.left = 0;
reactos/subsys/win32k/eng
diff -u -r1.72 -r1.73
--- mouse.c 20 Jun 2004 12:34:17 -0000 1.72
+++ mouse.c 24 Jun 2004 19:43:48 -0000 1.73
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: mouse.c,v 1.72 2004/06/20 12:34:17 navaraf Exp $
+/* $Id: mouse.c,v 1.73 2004/06/24 19:43:48 gvg Exp $
*
* PROJECT: ReactOS kernel
* PURPOSE: Mouse
@@ -554,7 +554,7 @@
memcpy(Bits, psoColor->pvBits, psoColor->cjBits);
ppdev->PointerColorSurface = (HSURF)EngCreateBitmap(Size,
- psoColor->lDelta, psoColor->iBitmapFormat, 0, Bits);
+ psoColor->lDelta, psoColor->iBitmapFormat, BMF_TOPDOWN, Bits);
}
else
{
@@ -571,7 +571,7 @@
memcpy(Bits, psoMask->pvBits, psoMask->cjBits);
ppdev->PointerMaskSurface = (HSURF)EngCreateBitmap(Size,
- psoMask->lDelta, psoMask->iBitmapFormat, 0, Bits);
+ psoMask->lDelta, psoMask->iBitmapFormat, BMF_TOPDOWN, Bits);
}
/*
@@ -626,7 +626,7 @@
}
ppdev->PointerSaveSurface = (HSURF)EngCreateBitmap(
- Size, lDelta, pso->iBitmapFormat, BMF_NOZEROINIT, NULL);
+ Size, lDelta, pso->iBitmapFormat, BMF_TOPDOWN | BMF_NOZEROINIT, NULL);
}
IntShowMousePointer(ppdev, pso);
reactos/subsys/win32k/objects
diff -u -r1.19 -r1.20
--- objconv.c 23 Jun 2004 07:31:22 -0000 1.19
+++ objconv.c 24 Jun 2004 19:43:49 -0000 1.20
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: objconv.c,v 1.19 2004/06/23 07:31:22 gvg Exp $ */
+/* $Id: objconv.c,v 1.20 2004/06/24 19:43:49 gvg Exp $ */
#include <w32k.h>
HBITMAP FASTCALL BitmapToSurf(PBITMAPOBJ BitmapObj, HDEV GDIDevice)
@@ -31,7 +31,8 @@
{
BitmapHandle = EngCreateBitmap(Size, BitmapObj->dib->dsBm.bmWidthBytes,
BitmapFormat(BitmapObj->dib->dsBm.bmBitsPixel, BI_RGB),
- BMF_TOPDOWN, BitmapObj->dib->dsBm.bmBits);
+ BitmapObj->dib->dsBmih.biHeight < 0 ? BMF_TOPDOWN : 0,
+ BitmapObj->dib->dsBm.bmBits);
}
else
{