Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 02:25:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove WINDOWOBJECT_NEED_BEGINPAINT flag since calling BeginPaint in a

Browse source 
WM_PAINT handler is not strictly required

svn path=/trunk/; revision=4721
This commit is contained in:
Gé van Geldorp 2003-05-18 22:07:02 +00:00
parent 97c3fae178
commit 15073977b6
3 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/subsys/win32k/include/window.h
View file

@ -87,7 +87,7 @@ typedef struct _WINDOW_OBJECT
/* Window flags. */ /* Window flags. */
#define WINDOWOBJECT_NEED_SIZE (0x00000001) #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_ERASEBACKGRD (0x00000004)
#define WINDOWOBJECT_NEED_NCPAINT (0x00000008) #define WINDOWOBJECT_NEED_NCPAINT (0x00000008)
#define WINDOWOBJECT_NEED_INTERNALPAINT (0x00000010) #define WINDOWOBJECT_NEED_INTERNALPAINT (0x00000010)

16
reactos/subsys/win32k/ntuser/message.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * 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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -63,7 +63,6 @@ LRESULT STDCALL
NtUserDispatchMessage(CONST MSG* lpMsg) NtUserDispatchMessage(CONST MSG* lpMsg)
{ {
LRESULT Result; LRESULT Result;
ULONG PaintingFlag;
PWINDOW_OBJECT WindowObject; PWINDOW_OBJECT WindowObject;
NTSTATUS Status; NTSTATUS Status;
@ -95,13 +94,6 @@ NtUserDispatchMessage(CONST MSG* lpMsg)
return(0); return(0);
} }
/* FIXME: Check for paint message. */
PaintingFlag = (lpMsg->message == WM_PAINT);
if (PaintingFlag)
{
WindowObject->Flags |= WINDOWOBJECT_NEED_BEGINPAINT;
}
/* FIXME: Call hook procedures. */ /* FIXME: Call hook procedures. */
/* Call the window procedure. */ /* Call the window procedure. */
@ -111,12 +103,6 @@ NtUserDispatchMessage(CONST MSG* lpMsg)
lpMsg->wParam, lpMsg->wParam,
lpMsg->lParam); lpMsg->lParam);
if (PaintingFlag && WindowObject->Flags & WINDOWOBJECT_NEED_BEGINPAINT &&
WindowObject->UpdateRegion)
{
DbgBreakPoint();
}
return(Result); return(Result);
} }

4
reactos/subsys/win32k/ntuser/painting.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * 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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -781,8 +781,6 @@ NtUserBeginPaint(HWND hWnd, PAINTSTRUCT* lPs)
IsIcon = Window->Style & WS_MINIMIZE && IsIcon = Window->Style & WS_MINIMIZE &&
NtUserGetClassLong(Window->Self, GCL_HICON); NtUserGetClassLong(Window->Self, GCL_HICON);
Window->Flags &= ~WINDOWOBJECT_NEED_BEGINPAINT;
/* Send WM_NCPAINT */ /* Send WM_NCPAINT */
PaintUpdateNCRegion(Window, 0, UNC_UPDATE | UNC_IN_BEGINPAINT); PaintUpdateNCRegion(Window, 0, UNC_UPDATE | UNC_IN_BEGINPAINT);