From 3b6e1e135bc2be28c9845e809b657cb150652aa8 Mon Sep 17 00:00:00 2001
From: James Tabor <james.tabor@reactos.org>
Date: Fri, 29 Jan 2010 00:59:20 +0000
Subject: [PATCH] - Remove WINDOWOBJECT_NEED_INTERNALPAINT from service.

svn path=/trunk/; revision=45308
---
 .../subsystems/win32/win32k/include/window.h   |  1 -
 .../subsystems/win32/win32k/ntuser/painting.c  | 18 +++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/reactos/subsystems/win32/win32k/include/window.h b/reactos/subsystems/win32/win32k/include/window.h
index ce525d3f594..82c9e512f48 100644
--- a/reactos/subsystems/win32/win32k/include/window.h
+++ b/reactos/subsystems/win32/win32k/include/window.h
@@ -54,7 +54,6 @@ typedef struct _WINDOW_OBJECT
 #define WINDOWOBJECT_NEED_SIZE            WNDS_SENDSIZEMOVEMSGS
 #define WINDOWOBJECT_NEED_ERASEBKGND      WNDS_ERASEBACKGROUND
 #define WINDOWOBJECT_NEED_NCPAINT         WNDS_SENDNCPAINT
-#define WINDOWOBJECT_NEED_INTERNALPAINT   WNDS_INTERNALPAINT
 #define WINDOWOBJECT_RESTOREMAX           (0x00000020) // Set/Clr WS_MAXIMIZE && Clr/Set WS_EX2_VERTICALLYMAXIMIZEDLEFT/RIGHT
 
 #define WINDOWSTATUS_DESTROYING         WNDS2_INDESTROY
diff --git a/reactos/subsystems/win32/win32k/ntuser/painting.c b/reactos/subsystems/win32/win32k/ntuser/painting.c
index 2711072167e..86ed104c2e3 100644
--- a/reactos/subsystems/win32/win32k/ntuser/painting.c
+++ b/reactos/subsystems/win32/win32k/ntuser/painting.c
@@ -196,7 +196,7 @@ IntGetNCUpdateRgn(PWINDOW_OBJECT Window, BOOL Validate)
             IntGdiSetRegionOwner(Window->hrgnUpdate, GDI_OBJ_HMGR_POWNED);
             REGION_FreeRgnByHandle(Window->hrgnUpdate);
             Window->hrgnUpdate = NULL;
-            if (!(Window->state & WINDOWOBJECT_NEED_INTERNALPAINT))
+            if (!(Window->Wnd->state & WNDS_INTERNALPAINT))
                MsqDecPaintCountQueue(Window->pti->MessageQueue);
          }
       }
@@ -238,7 +238,7 @@ co_IntPaintWindows(PWINDOW_OBJECT Window, ULONG Flags, BOOL Recurse)
       if (Flags & RDW_UPDATENOW)
       {
          if (Window->hrgnUpdate != NULL ||
-             Window->state & WINDOWOBJECT_NEED_INTERNALPAINT)
+             Wnd->state & WNDS_INTERNALPAINT)
          {
             co_IntSendMessage(hWnd, WM_PAINT, 0, 0);
          }
@@ -372,7 +372,7 @@ IntInvalidateWindows(PWINDOW_OBJECT Window, HRGN hRgn, ULONG Flags)
     */
 
    HadPaintMessage = Window->hrgnUpdate != NULL ||
-                     Window->state & WINDOWOBJECT_NEED_INTERNALPAINT;
+                     Wnd->state & WNDS_INTERNALPAINT;
    HadNCPaintMessage = Window->state & WINDOWOBJECT_NEED_NCPAINT;
 
    /*
@@ -426,12 +426,12 @@ IntInvalidateWindows(PWINDOW_OBJECT Window, HRGN hRgn, ULONG Flags)
 
    if (Flags & RDW_INTERNALPAINT)
    {
-      Window->state |= WINDOWOBJECT_NEED_INTERNALPAINT;
+      Wnd->state |= WNDS_INTERNALPAINT;
    }
 
    if (Flags & RDW_NOINTERNALPAINT)
    {
-      Window->state &= ~WINDOWOBJECT_NEED_INTERNALPAINT;
+      Wnd->state &= ~WNDS_INTERNALPAINT;
    }
 
    /*
@@ -464,7 +464,7 @@ IntInvalidateWindows(PWINDOW_OBJECT Window, HRGN hRgn, ULONG Flags)
     */
 
    HasPaintMessage = Window->hrgnUpdate != NULL ||
-                     Window->state & WINDOWOBJECT_NEED_INTERNALPAINT;
+                     Wnd->state & WNDS_INTERNALPAINT;
    HasNCPaintMessage = Window->state & WINDOWOBJECT_NEED_NCPAINT;
 
    if (HasPaintMessage != HadPaintMessage)
@@ -620,7 +620,7 @@ IntIsWindowDirty(PWINDOW_OBJECT Window)
    PWND Wnd = Window->Wnd;
    return (Wnd->style & WS_VISIBLE) &&
           ((Window->hrgnUpdate != NULL) ||
-           (Window->state & WINDOWOBJECT_NEED_INTERNALPAINT) ||
+           (Wnd->state & WNDS_INTERNALPAINT) ||
            (Window->state & WINDOWOBJECT_NEED_NCPAINT));
 }
 
@@ -818,13 +818,13 @@ NtUserBeginPaint(HWND hWnd, PAINTSTRUCT* UnsafePs)
    }
    else
    {
-      if (Window->state & WINDOWOBJECT_NEED_INTERNALPAINT)
+      if (Wnd->state & WNDS_INTERNALPAINT)
          MsqDecPaintCountQueue(Window->pti->MessageQueue);
 
       IntGetClientRect(Window, &Ps.rcPaint);
    }
 
-   Window->state &= ~WINDOWOBJECT_NEED_INTERNALPAINT;
+   Wnd->state &= ~WNDS_INTERNALPAINT;
 
    if (Window->state & WINDOWOBJECT_NEED_ERASEBKGND)
    {