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

[NtUser]

Browse source 
- Fix regression from r66350. See CORE-11324 for more details.

svn path=/trunk/; revision=72102
This commit is contained in:
James Tabor 2016-08-03 17:41:22 +00:00
parent ae5f46e58e
commit e04a9f0689
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1759,7 +1759,7 @@ co_WinPosSetWindowPos(
RECTL CopyRect; RECTL CopyRect;
PWND Ancestor; PWND Ancestor;
BOOL bPointerInWindow; BOOL bPointerInWindow;
PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); //PTHREADINFO pti = PsGetCurrentThreadWin32Thread();
ASSERT_REFS_CO(Window); ASSERT_REFS_CO(Window);
@ -2126,6 +2126,7 @@ co_WinPosSetWindowPos(
{ {
co_IntSendMessageNoWait(WinPos.hwnd, WM_CHILDACTIVATE, 0, 0); co_IntSendMessageNoWait(WinPos.hwnd, WM_CHILDACTIVATE, 0, 0);
} }
#if 0 ////// Break see CORE-11324
/* Do not allow setting if already active. /* Do not allow setting if already active.
Fix A : wine msg test_SetParent:WmSetParentSeq_2:25 msg! Fix A : wine msg test_SetParent:WmSetParentSeq_2:25 msg!
Recursion broke the tests. Recursion broke the tests.
@ -2142,6 +2143,16 @@ co_WinPosSetWindowPos(
co_IntSetForegroundWindow(Window); co_IntSetForegroundWindow(Window);
} }
} }
#else //////
else
{
//ERR("SetWindowPos Set FG Window!\n");
if (Window->state & WNDS_BEINGACTIVATED) // Inside SAW?
co_IntSetActiveWindow(Window, FALSE, TRUE, FALSE); // Fixes Api AttachThreadInput tests.
else
co_IntSetForegroundWindow(Window); // Fixes SW_HIDE issues. Wine win test_SetActiveWindow & test_SetForegroundWindow.
}
#endif
} }
// Fix wine msg test_SetFocus, prevents sending WM_WINDOWPOSCHANGED. // Fix wine msg test_SetFocus, prevents sending WM_WINDOWPOSCHANGED.
@ -2449,7 +2460,8 @@ co_WinPosShowWindow(PWND Wnd, INT Cmd)
((Cmd == SW_SHOW) || (Cmd == SW_NORMAL))) ((Cmd == SW_SHOW) || (Cmd == SW_NORMAL)))
{ {
ERR("WinPosShowWindow Set active\n"); ERR("WinPosShowWindow Set active\n");
UserSetActiveWindow(Wnd); //UserSetActiveWindow(Wnd);
co_IntSetForegroundWindow(Wnd); // HACK
Swp |= SWP_NOACTIVATE | SWP_NOZORDER; Swp |= SWP_NOACTIVATE | SWP_NOZORDER;
} }
#endif #endif