Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-23 11:04:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[Win32k]

Browse source 
- Fixes wine win.c:test_SetParent last ShowWindow test after popup dies.

svn path=/trunk/; revision=65487
This commit is contained in:
James Tabor 2014-11-25 23:03:43 +00:00
parent fb11517f41
commit d1f8d55254
1 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -327,6 +327,7 @@ co_WinPosActivateOtherWindow(PWND Wnd)
/* If this is popup window, try to activate the owner first. */ /* If this is popup window, try to activate the owner first. */
if ((Wnd->style & WS_POPUP) && (WndTo = Wnd->spwndOwner)) if ((Wnd->style & WS_POPUP) && (WndTo = Wnd->spwndOwner))
{ {
ERR("WPAOW Popup with Owner\n");
WndTo = UserGetAncestor( WndTo, GA_ROOT ); WndTo = UserGetAncestor( WndTo, GA_ROOT );
if (can_activate_window(WndTo)) goto done; if (can_activate_window(WndTo)) goto done;
} }
@ -336,18 +337,41 @@ co_WinPosActivateOtherWindow(PWND Wnd)
WndTo = Wnd; WndTo = Wnd;
for (;;) for (;;)
{ {
if (!(WndTo = WndTo->spwndNext)) break; if (!(WndTo = WndTo->spwndNext)) break;
if (can_activate_window( WndTo )) break; if (can_activate_window( WndTo )) goto done;
}
/*
Fixes wine win.c:test_SetParent last ShowWindow test after popup dies.
Check for previous active window to bring to top.
*/
if (Wnd)
{
WndTo = Wnd->head.pti->MessageQueue->spwndActivePrev;
if (can_activate_window( WndTo )) goto done;
}
// Find any window to bring to top. Works Okay for wine.
WndTo = UserGetDesktopWindow();
WndTo = WndTo->spwndChild;
for (;;)
{
if (WndTo == Wnd)
{
WndTo = NULL;
break;
}
if (can_activate_window( WndTo )) goto done;
if (!(WndTo = WndTo->spwndNext)) break;
} }
done: done:
if (WndTo) UserRefObjectCo(WndTo, &Ref); if (WndTo) UserRefObjectCo(WndTo, &Ref);
if (!gpqForeground || Wnd == gpqForeground->spwndActive) if ((gpqForeground && !gpqForeground->spwndActive) || Wnd == gpqForeground->spwndActive)
{ {
/* ReactOS can pass WndTo = NULL to co_IntSetForegroundWindow and returns FALSE. */ /* ReactOS can pass WndTo = NULL to co_IntSetForegroundWindow and returns FALSE. */
//ERR("WinPosActivateOtherWindow Set FG 0x%p\n",WndTo); //ERR("WinPosActivateOtherWindow Set FG 0x%p hWnd %p\n",WndTo, WndTo ? WndTo->head.h : 0);
if (co_IntSetForegroundWindow(WndTo)) if (co_IntSetForegroundWindow(WndTo))
{ {
if (WndTo) UserDerefObjectCo(WndTo); if (WndTo) UserDerefObjectCo(WndTo);