From 7b9adffa48d22980158f2964a1daaa272480095d Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Tue, 15 Aug 2000 12:50:35 +0000 Subject: [PATCH] Fixed some warnings svn path=/trunk/; revision=1302 --- reactos/subsys/win32k/eng/bitblt.c | 2 +- reactos/subsys/win32k/eng/brush.c | 3 ++- reactos/subsys/win32k/eng/handle.h | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/reactos/subsys/win32k/eng/bitblt.c b/reactos/subsys/win32k/eng/bitblt.c index 71f14b2a04e..947576e71cc 100644 --- a/reactos/subsys/win32k/eng/bitblt.c +++ b/reactos/subsys/win32k/eng/bitblt.c @@ -78,7 +78,7 @@ BOOL EngBitBlt(SURFOBJ *Dest, SURFOBJ *Source, // If we don't have to do anything special, we can punt to DrvCopyBits // if it exists if( (Mask == NULL) && (MaskRect == NULL) && (Brush == NULL) && - (BrushOrigin == NULL) && (rop4 == NULL) ) + (BrushOrigin == NULL) && (rop4 == 0) ) { canCopyBits = TRUE; } else diff --git a/reactos/subsys/win32k/eng/brush.c b/reactos/subsys/win32k/eng/brush.c index 9584c88ef5d..404d2302b42 100644 --- a/reactos/subsys/win32k/eng/brush.c +++ b/reactos/subsys/win32k/eng/brush.c @@ -13,7 +13,8 @@ PVOID BRUSHOBJ_pvAllocRbrush(IN PBRUSHOBJ BrushObj, IN ULONG ObjSize) { - BrushObj->pvRbrush=EngAllocMem(NULL, ObjSize, 0); + BrushObj->pvRbrush=EngAllocMem(0, ObjSize, 0); + return BrushObj->pvRbrush; } PVOID BRUSHOBJ_pvGetRbrush(IN PBRUSHOBJ BrushObj) diff --git a/reactos/subsys/win32k/eng/handle.h b/reactos/subsys/win32k/eng/handle.h index 0727fbcd805..c7ca00c0263 100644 --- a/reactos/subsys/win32k/eng/handle.h +++ b/reactos/subsys/win32k/eng/handle.h @@ -19,3 +19,5 @@ typedef struct _GDI_HANDLE { GDI_HANDLE GDIHandles[MAX_GDI_HANDLES]; ULONG HandleCounter = 1; + +