Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-05 22:12:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NtUser]

Browse source 
- Fixed one of the msg:msg_paint:test_paint_messages while looking for another issue. See CORE-7166.

svn path=/trunk/; revision=72523
This commit is contained in:
James Tabor 2016-08-31 20:38:09 +00:00
parent 684902c4cc
commit 1ed7f14359
3 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
reactos/win32ss/user/ntuser/painting.c
View file

@ -9,9 +9,6 @@
#include <win32k.h> #include <win32k.h>
DBG_DEFAULT_CHANNEL(UserPainting); DBG_DEFAULT_CHANNEL(UserPainting);
#define RDW_CLIPCHILDREN 4096
#define RDW_NOUPDATEDIRTY 32768
/* PRIVATE FUNCTIONS **********************************************************/ /* PRIVATE FUNCTIONS **********************************************************/
/** /**

5
reactos/win32ss/user/ntuser/painting.h
View file

@ -12,6 +12,9 @@
#define PRGN_WINDOW ((PREGION)1) /* region from window rcWindow */ #define PRGN_WINDOW ((PREGION)1) /* region from window rcWindow */
#define PRGN_MONITOR ((PREGION)2) /* region from monitor region. */ #define PRGN_MONITOR ((PREGION)2) /* region from monitor region. */
#define RDW_CLIPCHILDREN 4096
#define RDW_NOUPDATEDIRTY 32768
#define GreCreateRectRgnIndirect(prc) \ #define GreCreateRectRgnIndirect(prc) \
NtGdiCreateRectRgn((prc)->left, (prc)->top, (prc)->right, (prc)->bottom) NtGdiCreateRectRgn((prc)->left, (prc)->top, (prc)->right, (prc)->bottom)
@ -36,4 +39,4 @@ BOOL FASTCALL IntIntersectWithParents(PWND, RECTL *);
BOOL FASTCALL IntIsWindowDrawable(PWND); BOOL FASTCALL IntIsWindowDrawable(PWND);
BOOL UserDrawCaption(PWND,HDC,RECTL*,HFONT,HICON,const PUNICODE_STRING,UINT); BOOL UserDrawCaption(PWND,HDC,RECTL*,HFONT,HICON,const PUNICODE_STRING,UINT);
VOID FASTCALL UpdateThreadWindows(PWND,PTHREADINFO,HRGN); VOID FASTCALL UpdateThreadWindows(PWND,PTHREADINFO,HRGN);
VOID FASTCALL UserSyncAndPaintWindows(PWND pWnd, ULONG Flags);

15
reactos/win32ss/user/ntuser/winpos.c
View file

@ -2241,6 +2241,19 @@ co_WinPosSetWindowPos(
#endif #endif
} }
if ( !PosChanged &&
(WinPos.flags & SWP_FRAMECHANGED) &&
!(WinPos.flags & SWP_DEFERERASE) && // Prevent sending WM_SYNCPAINT message.
VisAfter )
{
PWND Parent = Window->spwndParent;
if ( !(Window->style & WS_CHILD) && (Parent) && (Parent->style & WS_CLIPCHILDREN))
{
TRACE("SWP_FRAMECHANGED Parent WS_CLIPCHILDREN\n");
UserSyncAndPaintWindows( Parent, RDW_CLIPCHILDREN);
}
}
// Fix wine msg test_SetFocus, prevents sending WM_WINDOWPOSCHANGED. // Fix wine msg test_SetFocus, prevents sending WM_WINDOWPOSCHANGED.
if ( VisBefore == NULL && if ( VisBefore == NULL &&
VisBeforeJustClient == NULL && VisBeforeJustClient == NULL &&
@ -3396,7 +3409,7 @@ NtUserSetWindowRgn(
} }
else else
{ {
Window->hrgnNewFrame = (HRGN) 1; Window->hrgnNewFrame = HRGN_WINDOW;
} }
//// HACK 2 //// HACK 2
Ret = co_WinPosSetWindowPos(Window, HWND_TOP, 0, 0, 0, 0, bRedraw ? flags : (flags|SWP_NOREDRAW) ); Ret = co_WinPosSetWindowPos(Window, HWND_TOP, 0, 0, 0, 0, bRedraw ? flags : (flags|SWP_NOREDRAW) );