stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8079595: Resizing dialog which is JWindow parent makes JVM crash

Browse Source 
Reviewed-by: alexsch, serb
This commit is contained in:
Semyon Sadetsky 2015-10-05 15:29:23 +03:00
parent 93b4711948
commit 4a3dff3ee5
2 changed files with 95 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp
View File

@ -4058,14 +4058,19 @@ HWND AwtComponent::GetProxyFocusOwner()
return (HWND)NULL;
}
/* Call DefWindowProc for the focus proxy, if any */
/* Redirects message to the focus proxy, if any */
void AwtComponent::CallProxyDefWindowProc(UINT message, WPARAM wParam,
LPARAM lParam, LRESULT &retVal, MsgRouting &mr)
{
if (mr != mrConsume) {
HWND proxy = GetProxyFocusOwner();
if (proxy != NULL && ::IsWindowEnabled(proxy)) {
retVal = ComCtl32Util::GetInstance().DefWindowProc(NULL, proxy, message, wParam, lParam);
if (proxy != GetHWnd()) {
retVal = ::SendMessage(proxy, message, wParam, lParam);
} else {
retVal = ComCtl32Util::GetInstance().DefWindowProc(NULL,
proxy, message, wParam, lParam);
}
mr = mrConsume;
}
}

88
jdk/test/java/awt/Frame/FrameResize/ShowChildWhileResizingTest.java Normal file
View File

@ -0,0 +1,88 @@
/*
* Copyright (c) 2015 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.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/* @test
@bug 8079595
@summary Resizing dialog which is JWindow parent makes JVM crash
@author Semyon Sadetsky
*/
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.InputEvent;
public class ShowChildWhileResizingTest {
private static Window dialog;
private static Timer timer;
private static Point point;
public static void main(String[] args) throws Exception {
dialog = new Frame();
dialog.add(new JPanel());
dialog.setVisible(true);
dialog.setBounds(100, 100, 200, 200);
SwingUtilities.invokeAndWait(new Runnable() {
@Override
public void run() {
final Window dependentWindow = new JWindow(dialog);
JPanel panel = new JPanel();
panel.add(new JButton("button"));
dependentWindow.add(panel);
dependentWindow.setVisible(true);
dependentWindow.setBounds(0, 0, 50, 50);
timer = new Timer(100, new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
dependentWindow
.setVisible(!dependentWindow.isVisible());
}
});
timer.start();
}
});
Robot robot = new Robot();
robot.setAutoDelay(5);
robot.delay(300);
SwingUtilities.invokeAndWait(new Runnable() {
@Override
public void run() {
point = dialog.getLocationOnScreen();
}
});
robot.mouseMove(point.x + 200 - dialog.getInsets().right/2,
point.y + 200 - dialog.getInsets().bottom/2);
robot.mousePress(InputEvent.BUTTON1_MASK);
for(int i = 0; i < 100; i++) {
robot.mouseMove(point.x + 200 + i, point.y + 200 + i);
}
robot.mouseRelease(InputEvent.BUTTON1_MASK);
timer.stop();
dialog.dispose();
System.out.println("ok");
}
}