# HG changeset patch # User anthony # Date 1239704251 -14400 # Node ID 643213b1a0a08bf3b7ae94687f2ef5af25d57bf1 # Parent e7429e3a25297c0e87b37fc0cbfe8d76ec68137b 6825342: Security warning may change Z-order of top-level Summary: Added the SWP_NOOWNERZORDER flag when calling ::SetWindowPos() Reviewed-by: art, dcherepanov diff -r e7429e3a2529 -r 643213b1a0a0 jdk/src/windows/native/sun/windows/awt_Window.cpp --- a/jdk/src/windows/native/sun/windows/awt_Window.cpp Mon Apr 13 21:42:44 2009 +0400 +++ b/jdk/src/windows/native/sun/windows/awt_Window.cpp Tue Apr 14 14:17:31 2009 +0400 @@ -369,7 +369,8 @@ ::SetWindowPos(warningWindow, HWND_NOTOPMOST, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, - SWP_ASYNCWINDOWPOS | SWP_NOACTIVATE | SWP_NOZORDER + SWP_ASYNCWINDOWPOS | SWP_NOACTIVATE | SWP_NOZORDER | + SWP_NOOWNERZORDER ); } @@ -854,7 +855,7 @@ if (securityAnimationKind == akShow) { ::SetWindowPos(warningWindow, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOMOVE | - SWP_SHOWWINDOW); + SWP_SHOWWINDOW | SWP_NOOWNERZORDER); ::SetLayeredWindowAttributes(warningWindow, RGB(0, 0, 0), 0xFF, LWA_ALPHA); @@ -880,7 +881,7 @@ case akPreHide: ::SetWindowPos(warningWindow, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOMOVE | - SWP_HIDEWINDOW); + SWP_HIDEWINDOW | SWP_NOOWNERZORDER); break; case akShow: RepaintWarningWindow();