src/java.desktop/windows/native/libawt/windows/awt_Dialog.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 115,125 ****
          JNI_CHECK_NULL_GOTO(target, "null target", done);
  
          if (parent != NULL) {
              JNI_CHECK_PEER_GOTO(parent, done);
              awtParent = (AwtWindow *)(JNI_GET_PDATA(parent));
!             hwndParent = awtParent->GetHWnd();
          } else {
              // There is no way to prevent a parentless dialog from showing on
              //  the taskbar other than to specify an invisible parent and set
              //  WS_POPUP style for the dialog. Using toolkit window here. That
              //  will also excludes the dialog from appearing in window list while
--- 115,126 ----
          JNI_CHECK_NULL_GOTO(target, "null target", done);
  
          if (parent != NULL) {
              JNI_CHECK_PEER_GOTO(parent, done);
              awtParent = (AwtWindow *)(JNI_GET_PDATA(parent));
!             HWND oHWnd = awtParent->GetOverriddenHWnd();
!             hwndParent = oHWnd ? oHWnd : awtParent->GetHWnd();
          } else {
              // There is no way to prevent a parentless dialog from showing on
              //  the taskbar other than to specify an invisible parent and set
              //  WS_POPUP style for the dialog. Using toolkit window here. That
              //  will also excludes the dialog from appearing in window list while