Commit in reactos/subsys/win32k on MAIN
eng/transblt.c+3-11.18 -> 1.19
include/intgdi.h+7-31.13 -> 1.14
objects/region.c+2-141.52 -> 1.53
+12-18
3 modified files
replaced UnsafeIntCreateRectRgnIndirect() and UnsafeIntUnionRectWithRgn() with macros to directly call the appropriate function

reactos/subsys/win32k/eng
transblt.c 1.18 -> 1.19
diff -u -r1.18 -r1.19
--- transblt.c	10 May 2004 17:07:17 -0000	1.18
+++ transblt.c	16 May 2004 09:51:26 -0000	1.19
@@ -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: transblt.c,v 1.18 2004/05/10 17:07:17 weiden Exp $
+/* $Id: transblt.c,v 1.19 2004/05/16 09:51:26 weiden Exp $
  * 
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -268,8 +268,10 @@
   
   if(!Ret)
   {
+    IntLockGDIDriver(SurfGDIDest);
     Ret = EngTransparentBlt(Dest, Source, Clip, ColorTranslation, &OutputRect, 
                             SourceRect, iTransColor, Reserved);
+    IntUnLockGDIDriver(SurfGDIDest);
   }
   
   if(Ret)

reactos/subsys/win32k/include
intgdi.h 1.13 -> 1.14
diff -u -r1.13 -r1.14
--- intgdi.h	10 May 2004 17:07:17 -0000	1.13
+++ intgdi.h	16 May 2004 09:51:27 -0000	1.14
@@ -102,12 +102,16 @@
 			     LPRECT rc);
 
 HRGN FASTCALL REGION_CropRgn(HRGN hDst, HRGN hSrc, const PRECT lpRect, PPOINT lpPt);
-
-HRGN FASTCALL UnsafeIntCreateRectRgnIndirect(CONST PRECT rc);
+void FASTCALL REGION_UnionRectWithRegion(const RECT *rect, ROSRGNDATA *rgn);
 INT FASTCALL UnsafeIntGetRgnBox(PROSRGNDATA Rgn, LPRECT pRect);
-VOID FASTCALL UnsafeIntUnionRectWithRgn(PROSRGNDATA RgnDest, CONST PRECT Rect);
 BOOL FASTCALL UnsafeIntRectInRegion(PROSRGNDATA Rgn, CONST LPRECT rc);
 
+#define UnsafeIntCreateRectRgnIndirect(prc) \
+  NtGdiCreateRectRgn((prc)->left, (prc)->top, (prc)->right, (prc)->bottom)
+
+#define UnsafeIntUnionRectWithRgn(rgndest, prc) \
+  REGION_UnionRectWithRegion((prc), (rgndest))
+
 /* DC functions */
 
 BOOL FASTCALL

reactos/subsys/win32k/objects
region.c 1.52 -> 1.53
diff -u -r1.52 -r1.53
--- region.c	14 May 2004 16:56:48 -0000	1.52
+++ region.c	16 May 2004 09:51:27 -0000	1.53
@@ -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: region.c,v 1.52 2004/05/14 16:56:48 navaraf Exp $ */
+/* $Id: region.c,v 1.53 2004/05/16 09:51:27 weiden Exp $ */
 #include <w32k.h>
 #include <win32k/float.h>
 
@@ -1387,7 +1387,7 @@
 /*!
  * Adds a rectangle to a REGION
  */
-static void FASTCALL REGION_UnionRectWithRegion(const RECT *rect, ROSRGNDATA *rgn)
+void FASTCALL REGION_UnionRectWithRegion(const RECT *rect, ROSRGNDATA *rgn)
 {
     ROSRGNDATA region;
 
@@ -1742,12 +1742,6 @@
   return(UnsafeIntCreateRectRgnIndirect(&SafeRc));
 }
 
-HRGN FASTCALL
-UnsafeIntCreateRectRgnIndirect(CONST PRECT  rc)
-{
-  return(NtGdiCreateRectRgn(rc->left, rc->top, rc->right, rc->bottom));
-}
-
 HRGN
 STDCALL
 NtGdiCreateRoundRectRgn(INT left, INT top, INT right, INT bottom,
@@ -2258,12 +2252,6 @@
   return TRUE;
 }
 
-VOID FASTCALL
-UnsafeIntUnionRectWithRgn(PROSRGNDATA RgnDest, CONST PRECT Rect)
-{
-  REGION_UnionRectWithRegion(Rect, RgnDest);
-}
-
 HRGN STDCALL
 NtGdiUnionRectWithRgn(HRGN hDest, CONST PRECT UnsafeRect)
 {
CVSspam 0.2.8