Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-04 19:31:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Converted more DbgPrints to DPRINT and allocate bitmaps from paged pool instead of non paged

Browse source 
svn path=/trunk/; revision=1247
This commit is contained in:
Phillip Susi 2000-07-07 01:19:02 +00:00
parent 96e4bf5c1f
commit 4568d2fd4c
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
reactos/subsys/win32k/objects/bitmaps.c
View file

@ -6,8 +6,8 @@
#include <win32k/bitmaps.h> #include <win32k/bitmaps.h>
//#include <win32k/debug.h> //#include <win32k/debug.h>
// #define NDEBUG #define NDEBUG
#include <win32k/debug1.h> #include <debug.h>
BOOL STDCALL W32kBitBlt(HDC hDCDest, BOOL STDCALL W32kBitBlt(HDC hDCDest,
INT XDest, INT XDest,
@ -40,7 +40,7 @@ BOOL STDCALL W32kBitBlt(HDC hDCDest,
SurfDestAlloc = FALSE; SurfDestAlloc = FALSE;
SurfSrcAlloc = FALSE; SurfSrcAlloc = FALSE;
DbgPrint("Get surfdest.. "); DPRINT("Get surfdest.. ");
// Get the SurfDest // Get the SurfDest
if(DCDest->Surface != NULL) if(DCDest->Surface != NULL)
@ -50,12 +50,12 @@ DbgPrint("Get surfdest.. ");
} else } else
return FALSE; return FALSE;
DbgPrint("Get surfsrc.. "); DPRINT("Get surfsrc.. ");
// Get the SurfSrc // Get the SurfSrc
if(DCSrc->Surface != NULL) if(DCSrc->Surface != NULL)
{ {
DbgPrint("from DC's surface\n"); DPRINT("from DC's surface\n");
// Use the DC's surface if it has one // Use the DC's surface if it has one
SurfSrc = AccessUserObject(DCSrc->Surface); SurfSrc = AccessUserObject(DCSrc->Surface);
@ -63,7 +63,7 @@ DbgPrint("from DC's surface\n");
return FALSE; return FALSE;
DbgPrint("Go to EngBitBlt\n"); DPRINT("Go to EngBitBlt\n");
Status = EngBitBlt(SurfDest, SurfSrc, NULL, NULL, NULL, Status = EngBitBlt(SurfDest, SurfSrc, NULL, NULL, NULL,
&DestRect, &SourcePoint, NULL, NULL, NULL, NULL); // FIXME: Color translation (xlateobj) &DestRect, &SourcePoint, NULL, NULL, NULL, NULL); // FIXME: Color translation (xlateobj)
@ -128,7 +128,7 @@ HBITMAP STDCALL W32kCreateBitmap(INT Width,
hBitmap = BITMAPOBJ_PtrToHandle (bmp); hBitmap = BITMAPOBJ_PtrToHandle (bmp);
// Allocate memory for bitmap bits // Allocate memory for bitmap bits
bmp->bitmap.bmBits = ExAllocatePool(NonPagedPool, bmp->bitmap.bmWidthBytes * bmp->bitmap.bmHeight); bmp->bitmap.bmBits = ExAllocatePool(PagedPool, bmp->bitmap.bmWidthBytes * bmp->bitmap.bmHeight);
if (Bits) /* Set bitmap bits */ if (Bits) /* Set bitmap bits */
{ {
@ -137,7 +137,6 @@ HBITMAP STDCALL W32kCreateBitmap(INT Width,
Bits); Bits);
} }
BITMAPOBJ_UnlockBitmap (hBitmap);
return hBitmap; return hBitmap;
} }
@ -448,7 +447,7 @@ LONG STDCALL W32kSetBitmapBits(HBITMAP hBitmap,
/* FIXME: Alloc enough for entire bitmap */ /* FIXME: Alloc enough for entire bitmap */
if (bmp->bitmap.bmBits == NULL) if (bmp->bitmap.bmBits == NULL)
{ {
bmp->bitmap.bmBits = ExAllocatePool (NonPagedPool, Bytes); bmp->bitmap.bmBits = ExAllocatePool (PagedPool, Bytes);
} }
if(!bmp->bitmap.bmBits) if(!bmp->bitmap.bmBits)
{ {