Author: jimtabor
Date: Mon Oct 13 17:15:04 2014
New Revision: 64730
URL: http://svn.reactos.org/svn/reactos?rev=64730&view=rev
Log:
[Win32k]
- Remove code that breaks API SetActiveWindow tests. See CORE-7447.
- Dedicated to Victor Martinez Calvo.
Modified:
trunk/reactos/win32ss/user/ntuser/winpos.c
Modified: trunk/reactos/win32ss/user/ntuser/winpos.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos.c?rev=64730&r1=64729&r2=64730&view=diff
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Mon Oct 13
17:15:04 2014
@@ -1544,22 +1544,17 @@
WinPos->flags |= SWP_NOMOVE;
}
- if (WinPos->hwnd == UserGetForegroundWindow())
- {
- WinPos->flags |= SWP_NOACTIVATE; /* Already active */
- }
- else
- if ((Wnd->style & (WS_POPUP | WS_CHILD)) != WS_CHILD)
- {
- /* Bring to the top when activating */
- if (!(WinPos->flags & (SWP_NOACTIVATE|SWP_HIDEWINDOW)) &&
- (WinPos->flags & SWP_NOZORDER ||
- (WinPos->hwndInsertAfter != HWND_TOPMOST &&
WinPos->hwndInsertAfter != HWND_NOTOPMOST)))
- {
- WinPos->flags &= ~SWP_NOZORDER;
- WinPos->hwndInsertAfter = (0 != (Wnd->ExStyle & WS_EX_TOPMOST) ?
HWND_TOPMOST : HWND_TOP);
- }
- }
+ if (WinPos->hwnd != UserGetForegroundWindow() && (Wnd->style & (WS_POPUP |
WS_CHILD)) != WS_CHILD)
+ {
+ /* Bring to the top when activating */
+ if (!(WinPos->flags & (SWP_NOACTIVATE|SWP_HIDEWINDOW)) &&
+ (WinPos->flags & SWP_NOZORDER ||
+ (WinPos->hwndInsertAfter != HWND_TOPMOST && WinPos->hwndInsertAfter
!= HWND_NOTOPMOST)))
+ {
+ WinPos->flags &= ~SWP_NOZORDER;
+ WinPos->hwndInsertAfter = (0 != (Wnd->ExStyle & WS_EX_TOPMOST) ?
HWND_TOPMOST : HWND_TOP);
+ }
+ }
/* Check hwndInsertAfter */
if (!(WinPos->flags & SWP_NOZORDER))
