Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 16:02:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Remove WINDOWOBJECT_NEED_INTERNALPAINT from service.

Browse source 
svn path=/trunk/; revision=45308
This commit is contained in:
James Tabor 2010-01-29 00:59:20 +00:00
parent 49439aff5f
commit 3b6e1e135b
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
reactos/subsystems/win32/win32k/include/window.h
View file

@ -54,7 +54,6 @@ typedef struct _WINDOW_OBJECT
#define WINDOWOBJECT_NEED_SIZE WNDS_SENDSIZEMOVEMSGS #define WINDOWOBJECT_NEED_SIZE WNDS_SENDSIZEMOVEMSGS
#define WINDOWOBJECT_NEED_ERASEBKGND WNDS_ERASEBACKGROUND #define WINDOWOBJECT_NEED_ERASEBKGND WNDS_ERASEBACKGROUND
#define WINDOWOBJECT_NEED_NCPAINT WNDS_SENDNCPAINT #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 WINDOWOBJECT_RESTOREMAX (0x00000020) // Set/Clr WS_MAXIMIZE && Clr/Set WS_EX2_VERTICALLYMAXIMIZEDLEFT/RIGHT
#define WINDOWSTATUS_DESTROYING WNDS2_INDESTROY #define WINDOWSTATUS_DESTROYING WNDS2_INDESTROY

18
reactos/subsystems/win32/win32k/ntuser/painting.c
View file

@ -196,7 +196,7 @@ IntGetNCUpdateRgn(PWINDOW_OBJECT Window, BOOL Validate)
IntGdiSetRegionOwner(Window->hrgnUpdate, GDI_OBJ_HMGR_POWNED); IntGdiSetRegionOwner(Window->hrgnUpdate, GDI_OBJ_HMGR_POWNED);
REGION_FreeRgnByHandle(Window->hrgnUpdate); REGION_FreeRgnByHandle(Window->hrgnUpdate);
Window->hrgnUpdate = NULL; Window->hrgnUpdate = NULL;
if (!(Window->state & WINDOWOBJECT_NEED_INTERNALPAINT)) if (!(Window->Wnd->state & WNDS_INTERNALPAINT))
MsqDecPaintCountQueue(Window->pti->MessageQueue); MsqDecPaintCountQueue(Window->pti->MessageQueue);
} }
} }
@ -238,7 +238,7 @@ co_IntPaintWindows(PWINDOW_OBJECT Window, ULONG Flags, BOOL Recurse)
if (Flags & RDW_UPDATENOW) if (Flags & RDW_UPDATENOW)
{ {
if (Window->hrgnUpdate != NULL || if (Window->hrgnUpdate != NULL ||
Window->state & WINDOWOBJECT_NEED_INTERNALPAINT) Wnd->state & WNDS_INTERNALPAINT)
{ {
co_IntSendMessage(hWnd, WM_PAINT, 0, 0); co_IntSendMessage(hWnd, WM_PAINT, 0, 0);
} }
@ -372,7 +372,7 @@ IntInvalidateWindows(PWINDOW_OBJECT Window, HRGN hRgn, ULONG Flags)
*/ */
HadPaintMessage = Window->hrgnUpdate != NULL || HadPaintMessage = Window->hrgnUpdate != NULL ||
Window->state & WINDOWOBJECT_NEED_INTERNALPAINT; Wnd->state & WNDS_INTERNALPAINT;
HadNCPaintMessage = Window->state & WINDOWOBJECT_NEED_NCPAINT; HadNCPaintMessage = Window->state & WINDOWOBJECT_NEED_NCPAINT;
/* /*
@ -426,12 +426,12 @@ IntInvalidateWindows(PWINDOW_OBJECT Window, HRGN hRgn, ULONG Flags)
if (Flags & RDW_INTERNALPAINT) if (Flags & RDW_INTERNALPAINT)
{ {
Window->state |= WINDOWOBJECT_NEED_INTERNALPAINT; Wnd->state |= WNDS_INTERNALPAINT;
} }
if (Flags & RDW_NOINTERNALPAINT) 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 || HasPaintMessage = Window->hrgnUpdate != NULL ||
Window->state & WINDOWOBJECT_NEED_INTERNALPAINT; Wnd->state & WNDS_INTERNALPAINT;
HasNCPaintMessage = Window->state & WINDOWOBJECT_NEED_NCPAINT; HasNCPaintMessage = Window->state & WINDOWOBJECT_NEED_NCPAINT;
if (HasPaintMessage != HadPaintMessage) if (HasPaintMessage != HadPaintMessage)
@ -620,7 +620,7 @@ IntIsWindowDirty(PWINDOW_OBJECT Window)
PWND Wnd = Window->Wnd; PWND Wnd = Window->Wnd;
return (Wnd->style & WS_VISIBLE) && return (Wnd->style & WS_VISIBLE) &&
((Window->hrgnUpdate != NULL) || ((Window->hrgnUpdate != NULL) ||
(Window->state & WINDOWOBJECT_NEED_INTERNALPAINT) || (Wnd->state & WNDS_INTERNALPAINT) ||
(Window->state & WINDOWOBJECT_NEED_NCPAINT)); (Window->state & WINDOWOBJECT_NEED_NCPAINT));
} }
@ -818,13 +818,13 @@ NtUserBeginPaint(HWND hWnd, PAINTSTRUCT* UnsafePs)
} }
else else
{ {
if (Window->state & WINDOWOBJECT_NEED_INTERNALPAINT) if (Wnd->state & WNDS_INTERNALPAINT)
MsqDecPaintCountQueue(Window->pti->MessageQueue); MsqDecPaintCountQueue(Window->pti->MessageQueue);
IntGetClientRect(Window, &Ps.rcPaint); IntGetClientRect(Window, &Ps.rcPaint);
} }
Window->state &= ~WINDOWOBJECT_NEED_INTERNALPAINT; Wnd->state &= ~WNDS_INTERNALPAINT;
if (Window->state & WINDOWOBJECT_NEED_ERASEBKGND) if (Window->state & WINDOWOBJECT_NEED_ERASEBKGND)
{ {