[ros-diffs] [jimtabor] 45308: - Remove WINDOWOBJECT_NEED_INTERNALPAINT from service.

Author: jimtabor
Date: Fri Jan 29 01:59:20 2010
New Revision: 45308

URL: http://svn.reactos.org/svn/reactos?rev=45308&view=rev
Log:
- Remove WINDOWOBJECT_NEED_INTERNALPAINT from service.

Modified:
    trunk/reactos/subsystems/win32/win32k/include/window.h
    trunk/reactos/subsystems/win32/win32k/ntuser/painting.c

Modified: trunk/reactos/subsystems/win32/win32k/include/window.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] Fri Jan 29 01:59:20 2010
@@ -54,7 +54,6 @@
 #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

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Fri Jan 29 01:59:20 2010
@@ -196,7 +196,7 @@
             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 @@
       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 @@
     */

HadPaintMessage = Window->hrgnUpdate != NULL ||
-                     Window->state & WINDOWOBJECT_NEED_INTERNALPAINT;
+                     Wnd->state & WNDS_INTERNALPAINT;
    HadNCPaintMessage = Window->state & WINDOWOBJECT_NEED_NCPAINT;

/*
@@ -426,12 +426,12 @@

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 @@
     */

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 @@
    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 @@
    }
    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)
    {