From e4e8dd27da5f74e23943b50c0bb19f5c377354f1 Mon Sep 17 00:00:00 2001
From: anthony <unknown>
Date: Tue, 14 Apr 2009 14:17:31 +0400
Subject: [PATCH] 6825342: Security warning may change Z-order of top-level
 Summary: Added the SWP_NOOWNERZORDER flag when calling ::SetWindowPos()
 Reviewed-by: art, dcherepanov

---
 src/windows/native/sun/windows/awt_Window.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/windows/native/sun/windows/awt_Window.cpp b/src/windows/native/sun/windows/awt_Window.cpp
index 88bcd8ecc..ad0400bc0 100644
--- a/src/windows/native/sun/windows/awt_Window.cpp
+++ b/src/windows/native/sun/windows/awt_Window.cpp
@@ -369,7 +369,8 @@ void AwtWindow::RepositionSecurityWarning(JNIEnv *env)
     ::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 @@ void AwtWindow::StartSecurityAnimation(AnimationKind kind)
     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 @@ void AwtWindow::StopSecurityAnimation()
         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();
-- 
GitLab