Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NtUser]

Browse source 
- Fix wine msg test_SetFocus tests. Use send message for WM_WINDOWPOSCHANGING. If nothing has been drawn and the no position changed bits set, set no Z order and no redraw. See CORE-7447.

svn path=/trunk/; revision=66332
This commit is contained in:
James Tabor 2015-02-17 08:25:43 +00:00
parent 9424c41250
commit ec53fab6c4
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,9 +17,9 @@ DBG_DEFAULT_CHANNEL(UserWinpos);
#define SWP_EX_PAINTSELF 0x0002 #define SWP_EX_PAINTSELF 0x0002
#define SWP_AGG_NOGEOMETRYCHANGE \ #define SWP_AGG_NOGEOMETRYCHANGE \
(SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE) (SWP_NOSIZE | SWP_NOCLIENTSIZE | SWP_NOZORDER)
#define SWP_AGG_NOPOSCHANGE \ #define SWP_AGG_NOPOSCHANGE \
(SWP_AGG_NOGEOMETRYCHANGE | SWP_NOZORDER) (SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOZORDER)
#define SWP_AGG_STATUSFLAGS \ #define SWP_AGG_STATUSFLAGS \
(SWP_AGG_NOPOSCHANGE | SWP_FRAMECHANGED | SWP_HIDEWINDOW | SWP_SHOWWINDOW) (SWP_AGG_NOPOSCHANGE | SWP_FRAMECHANGED | SWP_HIDEWINDOW | SWP_SHOWWINDOW)
@ -1287,7 +1287,7 @@ co_WinPosDoWinPosChanging(PWND Window,
if (!(WinPos->flags & SWP_NOSENDCHANGING)) if (!(WinPos->flags & SWP_NOSENDCHANGING))
{ {
TRACE("Sending WM_WINDOWPOSCHANGING to hwnd %p.\n", Window->head.h); TRACE("Sending WM_WINDOWPOSCHANGING to hwnd %p.\n", Window->head.h);
co_IntSendMessageNoWait(Window->head.h, WM_WINDOWPOSCHANGING, 0, (LPARAM) WinPos); co_IntSendMessage(Window->head.h, WM_WINDOWPOSCHANGING, 0, (LPARAM) WinPos);
} }
/* Calculate new position and size */ /* Calculate new position and size */
@ -1604,7 +1604,9 @@ WinPosFixupFlags(WINDOWPOS *WinPos, PWND Wnd)
WinPos->hwndInsertAfter = HWND_TOPMOST; WinPos->hwndInsertAfter = HWND_TOPMOST;
if (IntGetWindow(WinPos->hwnd, GW_HWNDFIRST) == WinPos->hwnd) if (IntGetWindow(WinPos->hwnd, GW_HWNDFIRST) == WinPos->hwnd)
{
WinPos->flags |= SWP_NOZORDER; WinPos->flags |= SWP_NOZORDER;
}
} }
else if (WinPos->hwndInsertAfter == HWND_BOTTOM) else if (WinPos->hwndInsertAfter == HWND_BOTTOM)
{ {
@ -2069,6 +2071,16 @@ co_WinPosSetWindowPos(
} }
} }
// Fix wine msg test_SetFocus, prevents sending WM_WINDOWPOSCHANGED.
if ( VisBefore == NULL &&
VisBeforeJustClient == NULL &&
!(Window->ExStyle & WS_EX_TOPMOST) &&
(WinPos.flags & SWP_AGG_STATUSFLAGS) == (SWP_AGG_NOPOSCHANGE & ~SWP_NOZORDER))
{
TRACE("No drawing, set no Z order and no redraw!\n");
WinPos.flags |= SWP_NOZORDER|SWP_NOREDRAW;
}
/* And last, send the WM_WINDOWPOSCHANGED message */ /* And last, send the WM_WINDOWPOSCHANGED message */
TRACE("\tstatus flags = %04x\n", WinPos.flags & SWP_AGG_STATUSFLAGS); TRACE("\tstatus flags = %04x\n", WinPos.flags & SWP_AGG_STATUSFLAGS);
@ -2082,6 +2094,7 @@ co_WinPosSetWindowPos(
WinPos.y = NewWindowRect.top; WinPos.y = NewWindowRect.top;
WinPos.cx = NewWindowRect.right - NewWindowRect.left; WinPos.cx = NewWindowRect.right - NewWindowRect.left;
WinPos.cy = NewWindowRect.bottom - NewWindowRect.top; WinPos.cy = NewWindowRect.bottom - NewWindowRect.top;
TRACE("WM_WINDOWPOSCHANGED hwnd %p Flags %04x\n",WinPos.hwnd,(WinPos.flags&SWP_AGG_STATUSFLAGS));
co_IntSendMessageNoWait(WinPos.hwnd, WM_WINDOWPOSCHANGED, 0, (LPARAM) &WinPos); co_IntSendMessageNoWait(WinPos.hwnd, WM_WINDOWPOSCHANGED, 0, (LPARAM) &WinPos);
} }