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

Fix some forgotten EngCreateBitmap() calls

Browse source 
svn path=/trunk/; revision=9863
This commit is contained in:
Gé van Geldorp 2004-06-24 19:43:49 +00:00
parent 730275c800
commit f477796b79
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/subsys/win32k/eng/misc.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * 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> #include <w32k.h>
BOOL STDCALL BOOL STDCALL
@ -63,7 +63,7 @@ IntEngEnter(PINTENG_ENTER_LEAVE EnterLeave,
Width = DIB_GetDIBWidthBytes(BitmapSize.cx, BitsPerFormat(DestObj->iBitmapFormat)); Width = DIB_GetDIBWidthBytes(BitmapSize.cx, BitsPerFormat(DestObj->iBitmapFormat));
EnterLeave->OutputBitmap = EngCreateBitmap(BitmapSize, Width, EnterLeave->OutputBitmap = EngCreateBitmap(BitmapSize, Width,
DestObj->iBitmapFormat, DestObj->iBitmapFormat,
BMF_NOZEROINIT, NULL); BMF_TOPDOWN | BMF_NOZEROINIT, NULL);
*OutputObj = (SURFOBJ *) AccessUserObject((ULONG) EnterLeave->OutputBitmap); *OutputObj = (SURFOBJ *) AccessUserObject((ULONG) EnterLeave->OutputBitmap);
EnterLeave->DestRect.left = 0; EnterLeave->DestRect.left = 0;

8
reactos/subsys/win32k/eng/mouse.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * 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 * PROJECT: ReactOS kernel
* PURPOSE: Mouse * PURPOSE: Mouse
@ -554,7 +554,7 @@ EngSetPointerShape(
memcpy(Bits, psoColor->pvBits, psoColor->cjBits); memcpy(Bits, psoColor->pvBits, psoColor->cjBits);
ppdev->PointerColorSurface = (HSURF)EngCreateBitmap(Size, ppdev->PointerColorSurface = (HSURF)EngCreateBitmap(Size,
psoColor->lDelta, psoColor->iBitmapFormat, 0, Bits); psoColor->lDelta, psoColor->iBitmapFormat, BMF_TOPDOWN, Bits);
} }
else else
{ {
@ -571,7 +571,7 @@ EngSetPointerShape(
memcpy(Bits, psoMask->pvBits, psoMask->cjBits); memcpy(Bits, psoMask->pvBits, psoMask->cjBits);
ppdev->PointerMaskSurface = (HSURF)EngCreateBitmap(Size, ppdev->PointerMaskSurface = (HSURF)EngCreateBitmap(Size,
psoMask->lDelta, psoMask->iBitmapFormat, 0, Bits); psoMask->lDelta, psoMask->iBitmapFormat, BMF_TOPDOWN, Bits);
} }
/* /*
@ -626,7 +626,7 @@ EngSetPointerShape(
} }
ppdev->PointerSaveSurface = (HSURF)EngCreateBitmap( ppdev->PointerSaveSurface = (HSURF)EngCreateBitmap(
Size, lDelta, pso->iBitmapFormat, BMF_NOZEROINIT, NULL); Size, lDelta, pso->iBitmapFormat, BMF_TOPDOWN | BMF_NOZEROINIT, NULL);
} }
IntShowMousePointer(ppdev, pso); IntShowMousePointer(ppdev, pso);

5
reactos/subsys/win32k/objects/objconv.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * 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> #include <w32k.h>
HBITMAP FASTCALL BitmapToSurf(PBITMAPOBJ BitmapObj, HDEV GDIDevice) HBITMAP FASTCALL BitmapToSurf(PBITMAPOBJ BitmapObj, HDEV GDIDevice)
@ -31,7 +31,8 @@ HBITMAP FASTCALL BitmapToSurf(PBITMAPOBJ BitmapObj, HDEV GDIDevice)
{ {
BitmapHandle = EngCreateBitmap(Size, BitmapObj->dib->dsBm.bmWidthBytes, BitmapHandle = EngCreateBitmap(Size, BitmapObj->dib->dsBm.bmWidthBytes,
BitmapFormat(BitmapObj->dib->dsBm.bmBitsPixel, BI_RGB), 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 else
{ {