diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index b805e9f25a..8705ed9d79 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -2386,6 +2386,7 @@ co_WinPosShowWindow(PWND Wnd, INT Cmd) TRACE("co_WinPosShowWindow START hwnd %p Cmd %d usicmd %u\n", Wnd->head.h, Cmd, pti->ppi->usi.wShowWindow); + TRACE("style: 0x%08lX\n"); if ( pti->ppi->usi.dwFlags & STARTF_USESHOWWINDOW ) { @@ -2427,7 +2428,7 @@ co_WinPosShowWindow(PWND Wnd, INT Cmd) { if (!WasVisible) { - //ERR("co_WinPosShowWindow Exit Bad\n"); + ERR("co_WinPosShowWindow Exit Bad\n"); return FALSE; } Swp |= SWP_HIDEWINDOW | SWP_NOSIZE | SWP_NOMOVE; @@ -2452,7 +2453,7 @@ co_WinPosShowWindow(PWND Wnd, INT Cmd) // Fix wine Win test_SetFocus todo #1 & #2, if (Cmd == SW_SHOWMINIMIZED) { - //ERR("co_WinPosShowWindow Set focus 1\n"); + ERR("co_WinPosShowWindow Set focus 1\n"); if ((style & (WS_CHILD | WS_POPUP)) == WS_CHILD) co_UserSetFocus(Wnd->spwndParent); else @@ -2467,7 +2468,7 @@ co_WinPosShowWindow(PWND Wnd, INT Cmd) { if (WasVisible) { - //ERR("co_WinPosShowWindow Exit Good\n"); + ERR("co_WinPosShowWindow Exit Good\n"); return TRUE; } Swp |= SWP_NOSIZE | SWP_NOMOVE; @@ -2490,7 +2491,7 @@ co_WinPosShowWindow(PWND Wnd, INT Cmd) { if (WasVisible) { - //ERR("co_WinPosShowWindow Exit Good 1\n"); + ERR("co_WinPosShowWindow Exit Good 1\n"); return TRUE; } Swp |= SWP_NOSIZE | SWP_NOMOVE; @@ -2525,7 +2526,7 @@ co_WinPosShowWindow(PWND Wnd, INT Cmd) { if (WasVisible) { - //ERR("co_WinPosShowWindow Exit Good 3\n"); + ERR("co_WinPosShowWindow Exit Good 3\n"); return TRUE; } Swp |= SWP_NOSIZE | SWP_NOMOVE; @@ -2537,7 +2538,7 @@ co_WinPosShowWindow(PWND Wnd, INT Cmd) break; default: - //ERR("co_WinPosShowWindow Exit Good 4\n"); + ERR("co_WinPosShowWindow Exit Good 4\n"); return WasVisible; } @@ -2558,7 +2559,7 @@ co_WinPosShowWindow(PWND Wnd, INT Cmd) !(Wnd->ExStyle & WS_EX_MDICHILD) && Cmd != SW_SHOWNA) { - //ERR("SWP Child No active and ZOrder\n"); + ERR("SWP Child No active and ZOrder\n"); Swp |= SWP_NOACTIVATE | SWP_NOZORDER; } @@ -2575,6 +2576,8 @@ co_WinPosShowWindow(PWND Wnd, INT Cmd) } #endif + TRACE("Swp: 0x%08lX\n", Swp); + if (IsChildVisible(Wnd) || Swp & SWP_STATECHANGED) { TRACE("Child is Vis %s or State changed %s. ShowFlag %s Swp %04x\n", @@ -2644,7 +2647,7 @@ co_WinPosShowWindow(PWND Wnd, INT Cmd) // Fix wine Win test_SetFocus todo #3, if (!(style & WS_CHILD)) co_IntSendMessage(UserHMGetHandle(Wnd), WM_ACTIVATE, WA_ACTIVE, 0); } - //ERR("co_WinPosShowWindow EXIT\n"); + ERR("co_WinPosShowWindow EXIT\n"); return WasVisible; }