From 05b34b61ef00a30dc2d2a08c41aa0af55af3f4de Mon Sep 17 00:00:00 2001
From: Giannis Adamopoulos <gadamopoulos@reactos.org>
Date: Sun, 2 Oct 2011 23:09:03 +0000
Subject: [PATCH] [win32k] - Fix RECTL_bPointInRect to work like PtInRect - Use
 the fixed RECTL_bPointInRect in DIB_XXBPP_FloodFillSolid to fix a bugchek See
 issue #6437 for more details.

svn path=/trunk/; revision=53946
---
 reactos/subsystems/win32/win32k/dib/floodfill.c | 3 +--
 reactos/subsystems/win32/win32k/include/rect.h  | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/reactos/subsystems/win32/win32k/dib/floodfill.c b/reactos/subsystems/win32/win32k/dib/floodfill.c
index c31c262d9fc..a24ade73a3d 100644
--- a/reactos/subsystems/win32/win32k/dib/floodfill.c
+++ b/reactos/subsystems/win32/win32k/dib/floodfill.c
@@ -59,8 +59,7 @@ static __inline VOID addItemFlood(FLOODINFO *info,
                                   ULONG Color, 
                                   BOOL isSurf)
 {
-  if (x >= DstRect->left && x <= DstRect->right &&
-    y >= DstRect->top && y <= DstRect->bottom)
+  if (RECTL_bPointInRect(DstRect,x,y))
   {
     if (isSurf == TRUE && 
       DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_GetPixel(DstSurf, x, y) != Color)
diff --git a/reactos/subsystems/win32/win32k/include/rect.h b/reactos/subsystems/win32/win32k/include/rect.h
index e24bc4b0127..e5c73fa8a79 100644
--- a/reactos/subsystems/win32/win32k/include/rect.h
+++ b/reactos/subsystems/win32/win32k/include/rect.h
@@ -41,8 +41,8 @@ BOOL
 FORCEINLINE
 RECTL_bPointInRect(const RECTL *prcl, INT x, INT y)
 {
-    return (x >= prcl->left && x <= prcl->right &&
-            y >= prcl->top  && y <= prcl->bottom);
+    return (x >= prcl->left && x < prcl->right &&
+            y >= prcl->top  && y < prcl->bottom);
 }
 
 BOOL