src/windows/native/sun/windows/awt_Frame.cpp

rev 12527 : 8165543: Better window framing
Reviewed-by: serb

*** 1576,1591 ****
      jobject blockerPeer = nmbs->blockerPeer;
      jboolean blocked = nmbs->blocked;
  
      PDATA pData;
  
!     pData = JNI_GET_PDATA(peer);
      AwtFrame *f = (AwtFrame *)pData;
  
      // dialog here may be NULL, for example, if the blocker is a native dialog
      // however, we need to install/unistall modal hooks anyway
!     pData = JNI_GET_PDATA(blockerPeer);
      AwtDialog *d = (AwtDialog *)pData;
  
      if ((f != NULL) && ::IsWindow(f->GetHWnd()))
      {
          // get an HWND of the toplevel window this embedded frame is within
--- 1576,1591 ----
      jobject blockerPeer = nmbs->blockerPeer;
      jboolean blocked = nmbs->blocked;
  
      PDATA pData;
  
!     JNI_CHECK_PEER_GOTO(peer, ret);
      AwtFrame *f = (AwtFrame *)pData;
  
      // dialog here may be NULL, for example, if the blocker is a native dialog
      // however, we need to install/unistall modal hooks anyway
!     JNI_CHECK_PEER_GOTO(blockerPeer, ret);
      AwtDialog *d = (AwtDialog *)pData;
  
      if ((f != NULL) && ::IsWindow(f->GetHWnd()))
      {
          // get an HWND of the toplevel window this embedded frame is within
*** 1633,1643 ****
                      }
                  }
              }
          }
      }
! 
      env->DeleteGlobalRef(self);
      env->DeleteGlobalRef(peer);
      env->DeleteGlobalRef(blockerPeer);
  
      delete nmbs;
--- 1633,1643 ----
                      }
                  }
              }
          }
      }
! ret:
      env->DeleteGlobalRef(self);
      env->DeleteGlobalRef(peer);
      env->DeleteGlobalRef(blockerPeer);
  
      delete nmbs;
*** 1805,1816 ****
      TRY;
  
      AwtToolkit::CreateComponent(self, parent,
                                  (AwtToolkit::ComponentFactory)
                                  AwtFrame::Create);
-     PDATA pData;
-     JNI_CHECK_PEER_CREATION_RETURN(self);
  
      CATCH_BAD_ALLOC;
  }
  
  /*
--- 1805,1814 ----
*** 1920,1931 ****
  
      JNI_CHECK_NULL_RETURN(self, "peer");
      AwtToolkit::CreateComponent(self, parent,
                                  (AwtToolkit::ComponentFactory)
                                  AwtFrame::Create);
-     PDATA pData;
-     JNI_CHECK_PEER_CREATION_RETURN(self);
  
      CATCH_BAD_ALLOC;
  }
  
  JNIEXPORT jobject JNICALL
--- 1918,1927 ----