From 15073977b673f126bc13496e43d5a82f87c24bf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Sun, 18 May 2003 22:07:02 +0000
Subject: [PATCH] Remove WINDOWOBJECT_NEED_BEGINPAINT flag since calling
 BeginPaint in a WM_PAINT handler is not strictly required

svn path=/trunk/; revision=4721
---
 reactos/subsys/win32k/include/window.h  |  2 +-
 reactos/subsys/win32k/ntuser/message.c  | 16 +---------------
 reactos/subsys/win32k/ntuser/painting.c |  4 +---
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/reactos/subsys/win32k/include/window.h b/reactos/subsys/win32k/include/window.h
index 2b48a5ab31c..0ecd484bb9e 100644
--- a/reactos/subsys/win32k/include/window.h
+++ b/reactos/subsys/win32k/include/window.h
@@ -87,7 +87,7 @@ typedef struct _WINDOW_OBJECT
 
 /* Window flags. */
 #define WINDOWOBJECT_NEED_SIZE            (0x00000001)
-#define WINDOWOBJECT_NEED_BEGINPAINT      (0x00000002)
+/* Not used anymore: define WINDOWOBJECT_NEED_BEGINPAINT      (0x00000002) */
 #define WINDOWOBJECT_NEED_ERASEBACKGRD    (0x00000004)
 #define WINDOWOBJECT_NEED_NCPAINT         (0x00000008)
 #define WINDOWOBJECT_NEED_INTERNALPAINT   (0x00000010)
diff --git a/reactos/subsys/win32k/ntuser/message.c b/reactos/subsys/win32k/ntuser/message.c
index d8ddfb4398e..7ad93e80f3d 100644
--- a/reactos/subsys/win32k/ntuser/message.c
+++ b/reactos/subsys/win32k/ntuser/message.c
@@ -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: message.c,v 1.18 2003/05/18 17:16:17 ea Exp $
+/* $Id: message.c,v 1.19 2003/05/18 22:07:02 gvg Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -63,7 +63,6 @@ LRESULT STDCALL
 NtUserDispatchMessage(CONST MSG* lpMsg)
 {
   LRESULT Result;
-  ULONG PaintingFlag;
   PWINDOW_OBJECT WindowObject;
   NTSTATUS Status;
 
@@ -95,13 +94,6 @@ NtUserDispatchMessage(CONST MSG* lpMsg)
       return(0);
     }
 
-  /* FIXME: Check for paint message. */
-  PaintingFlag = (lpMsg->message == WM_PAINT);
-  if (PaintingFlag)
-    {
-      WindowObject->Flags |= WINDOWOBJECT_NEED_BEGINPAINT;
-    }
-
   /* FIXME: Call hook procedures. */
 
   /* Call the window procedure. */
@@ -111,12 +103,6 @@ NtUserDispatchMessage(CONST MSG* lpMsg)
 			      lpMsg->wParam,
 			      lpMsg->lParam);
 
-  if (PaintingFlag && WindowObject->Flags & WINDOWOBJECT_NEED_BEGINPAINT &&
-      WindowObject->UpdateRegion)
-    {
-      DbgBreakPoint();
-    }
-
   return(Result);
 }
 
diff --git a/reactos/subsys/win32k/ntuser/painting.c b/reactos/subsys/win32k/ntuser/painting.c
index 6bf66e74607..97a8fc64ced 100644
--- a/reactos/subsys/win32k/ntuser/painting.c
+++ b/reactos/subsys/win32k/ntuser/painting.c
@@ -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: painting.c,v 1.13 2003/05/18 17:16:17 ea Exp $
+/* $Id: painting.c,v 1.14 2003/05/18 22:07:02 gvg Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -781,8 +781,6 @@ NtUserBeginPaint(HWND hWnd, PAINTSTRUCT* lPs)
   IsIcon = Window->Style & WS_MINIMIZE &&
     NtUserGetClassLong(Window->Self, GCL_HICON);
 
-  Window->Flags &= ~WINDOWOBJECT_NEED_BEGINPAINT;
-
   /* Send WM_NCPAINT */
   PaintUpdateNCRegion(Window, 0, UNC_UPDATE | UNC_IN_BEGINPAINT);