/hg/icedtea6: 2 new changesets
dlila at icedtea.classpath.org
dlila at icedtea.classpath.org
Thu Jun 9 10:28:40 PDT 2011
changeset 43513a59c031 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=43513a59c031
author: Denis Lila <dlila at redhat.com>
date: Thu Jun 09 11:16:32 2011 -0400
Fix PR677 and RH711900
changeset 5754a0969579 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5754a0969579
author: Denis Lila <dlila at redhat.com>
date: Thu Jun 09 13:26:53 2011 -0400
merge
diffstat:
ChangeLog | 23 +
Makefile.am | 6 +-
NEWS | 3 +
patches/fonts-rhel-version.patch | 32 +
patches/openjdk/6578583-modality-broken-vista.patch | 1439 +++++++++++++++
patches/openjdk/6610244-modal-fatal-error-windows.patch | 121 +
patches/openjdk/6693253-security_warning.patch | 25 +-
patches/openjdk/6769607-modal-hangs.patch | 161 +
8 files changed, 1796 insertions(+), 14 deletions(-)
diffs (truncated from 1892 to 500 lines):
diff -r e191909a7c6e -r 5754a0969579 ChangeLog
--- a/ChangeLog Mon May 30 19:21:44 2011 +0100
+++ b/ChangeLog Thu Jun 09 13:26:53 2011 -0400
@@ -1,3 +1,26 @@
+2011-06-06 Denis Lila <dlila at redhat.com>
+
+ * Makefile.am: Apply patches.
+ * NEWS: Update with backports.
+ * patches/openjdk/6578583-modality-broken-vista.patch:
+ * patches/openjdk/6610244-modal-fatal-error-windows.patch:
+ * patches/openjdk/6769607-modal-hangs.patch:
+ New patches. The last fixes PR677. The other two are
+ necessary for the last to fully apply.
+ * patches/openjdk/6693253-security_warning.patch:
+ Replsace the awt_Dialog.cpp hunk with the corresponding hunk
+ from the OpenJDK7 changeset of which this patch is a backport.
+ Without this change, this patch doesn't apply unless the
+ previous 3 are removed.
+
+2011-06-09 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am: Added new patch
+ * patches/fonts-rhel-version.patch:
+ Patch which ensures, that only one fontconfig file
+ will be needed on particular RHEL version
+ (ie. only one file for RHEL 6.0, RHEL 6.1 and RHEL 6.2)
+
2011-05-30 Andrew John Hughes <ahughes at redhat.com>
* patches/openjdk/7036220-shark_llvm_29_headers.patch:
diff -r e191909a7c6e -r 5754a0969579 Makefile.am
--- a/Makefile.am Mon May 30 19:21:44 2011 +0100
+++ b/Makefile.am Thu Jun 09 13:26:53 2011 -0400
@@ -195,6 +195,8 @@
ICEDTEA_PATCHES = \
$(SECURITY_PATCHES) \
+ patches/openjdk/6578583-modality-broken-vista.patch \
+ patches/openjdk/6610244-modal-fatal-error-windows.patch \
patches/stdc-limit-macros.patch \
patches/openjdk/4993545-nativeinlightfixer.patch \
patches/openjdk/6637796-set_bounds.patch \
@@ -207,6 +209,7 @@
patches/openjdk/6725214-direct3d-01.patch \
patches/openjdk/6748082-isDisplayLocal.patch \
patches/openjdk/6633275-shaped_translucent_windows.patch \
+ patches/openjdk/6769607-modal-hangs.patch \
patches/openjdk/6791612-opengl-jni-fix.patch \
patches/openjdk/6755274-glgetstring-crash.patch \
patches/openjdk/6984543-onscreen_rendering_resize_test.patch \
@@ -339,7 +342,8 @@
patches/openjdk/7034464-hugepage.patch \
patches/openjdk/7037939-hugepage.patch \
patches/openjdk/7043564-hugepage.patch \
- patches/openjdk/mutter.patch
+ patches/openjdk/mutter.patch \
+ patches/fonts-rhel-version.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
diff -r e191909a7c6e -r 5754a0969579 NEWS
--- a/NEWS Mon May 30 19:21:44 2011 +0100
+++ b/NEWS Thu Jun 09 13:26:53 2011 -0400
@@ -30,6 +30,9 @@
- S7043054: REGRESSION - wrong userBounds in Paint.createContext()
- S7043963, RH698295: Window manager workaround in AWT was not applied to mutter. Now it is.
- S4685768: Focus set to disabled component, can't Tab/Shift-Tab
+ - S6769607, PR677: Modal frame hangs for a while.
+ - S6578583: Modality is broken in windows vista home premium from jdk1.7 b02 onwards.
+ - S6610244: modal dialog closes with fatal error if -Xcheck:jni is set
* Bug fixes
- PR637: make check should exit with an error code if any regression test failed.
- G356743: Support libpng 1.5.
diff -r e191909a7c6e -r 5754a0969579 patches/fonts-rhel-version.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/fonts-rhel-version.patch Thu Jun 09 13:26:53 2011 -0400
@@ -0,0 +1,33 @@
+--- openjdk-orig/jdk/src/solaris/classes/sun/awt/motif/MFontConfiguration.java 2011-06-09 16:04:24.000000000 +0200
++++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MFontConfiguration.java 2011-06-09 16:04:24.000000000 +0200
+@@ -169,7 +169,9 @@
+ osVersion = getVersionString(f);
+ } else if ((f = new File("/etc/redhat-release")).canRead()) {
+ osName = "RedHat";
+- osVersion = getVersionString(f);
++ // At this time we don't need to distinguish
++ // between RHEL 6.0 and RHEL 6.1 for example.
++ osVersion = getMajorVersionString(f);
+ } else if ((f = new File("/etc/turbolinux-release")).canRead()) {
+ osName = "Turbo";
+ osVersion = getVersionString(f);
+@@ -208,6 +210,19 @@
+ return null;
+ }
+
++ /**
++ * Gets the OS major version string from a Linux release-specific file.
++ */
++ private String getMajorVersionString(File f){
++ try {
++ Scanner sc = new Scanner(f);
++ return sc.findInLine("(\\d)+");
++ }
++ catch (Exception e){
++ }
++ return null;
++ }
++
+ private static final String fontsDirPrefix = "$JRE_LIB_FONTS";
+
+ protected String mapFileName(String fileName) {
diff -r e191909a7c6e -r 5754a0969579 patches/openjdk/6578583-modality-broken-vista.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6578583-modality-broken-vista.patch Thu Jun 09 13:26:53 2011 -0400
@@ -0,0 +1,1446 @@
+# HG changeset patch
+# User dcherepanov
+# Date 1205521233 -10800
+# Node ID 15ba7093f8e64e1facdfc48b8929edc6a4fbb0d3
+# Parent 92e3f57c933b45c678abcbccaa47de059dfe926a
+6578583: Regression: Modality is broken in windows vista home premium from jdk1.7 b02 onwards.
+Summary: WS_DISABLED style should be used to fix some modality bugs
+Reviewed-by: art, son
+
+diff -r 92e3f57c933b -r 15ba7093f8e6 src/windows/native/sun/windows/awt_Component.cpp
+--- openjdk.orig/jdk/src/windows/native/sun/windows/awt_Component.cpp Fri Mar 14 20:40:09 2008 +0300
++++ openjdk/jdk/src/windows/native/sun/windows/awt_Component.cpp Fri Mar 14 22:00:33 2008 +0300
+@@ -5425,7 +5425,13 @@
+ void AwtComponent::Enable(BOOL bEnable)
+ {
+ sm_suppressFocusAndActivation = TRUE;
++
++ if (bEnable && IsTopLevel()) {
++ // we should not enable blocked toplevels
++ bEnable = !::IsWindow(AwtWindow::GetModalBlocker(GetHWnd()));
++ }
+ ::EnableWindow(GetHWnd(), bEnable);
++
+ sm_suppressFocusAndActivation = FALSE;
+ CriticalSection::Lock l(GetLock());
+ VerifyState();
+diff -r 92e3f57c933b -r 15ba7093f8e6 src/windows/native/sun/windows/awt_Dialog.cpp
+--- openjdk.orig/jdk/src/windows/native/sun/windows/awt_Dialog.cpp Fri Mar 14 20:40:09 2008 +0300
++++ openjdk/jdk/src/windows/native/sun/windows/awt_Dialog.cpp Fri Mar 14 22:00:33 2008 +0300
+@@ -273,6 +273,10 @@
+ {
+ HWND blocker = AwtWindow::GetModalBlocker(AwtComponent::GetTopLevelParentForWindow(hWnd));
+ HWND topMostBlocker = blocker;
++ HWND prevForegroundWindow = ::GetForegroundWindow();
++ if (::IsWindow(blocker)) {
++ ::BringWindowToTop(hWnd);
++ }
+ while (::IsWindow(blocker)) {
+ topMostBlocker = blocker;
+ ::BringWindowToTop(blocker);
+@@ -282,7 +286,7 @@
+ // no beep/flash if the mouse was clicked in the taskbar menu
+ // or the dialog is currently inactive
+ if ((::WindowFromPoint(mhs->pt) == hWnd) &&
+- (::GetForegroundWindow() == topMostBlocker))
++ (prevForegroundWindow == topMostBlocker))
+ {
+ ::MessageBeep(MB_OK);
+ // some heuristics: 3 times x 64 milliseconds
+@@ -292,6 +296,7 @@
+ ::BringWindowToTop(topMostBlocker);
+ ::SetForegroundWindow(topMostBlocker);
+ }
++ return 1;
+ }
+ }
+ }
+diff -r 92e3f57c933b -r 15ba7093f8e6 src/windows/native/sun/windows/awt_Window.cpp
+--- openjdk.orig/jdk/src/windows/native/sun/windows/awt_Window.cpp Fri Mar 14 20:40:09 2008 +0300
++++ openjdk/jdk/src/windows/native/sun/windows/awt_Window.cpp Fri Mar 14 22:00:33 2008 +0300
+@@ -180,7 +180,6 @@
+ }
+
+ ::RemoveProp(GetHWnd(), ModalBlockerProp);
+- ::RemoveProp(GetHWnd(), ModalSaveWSEXProp);
+
+ if (m_grabbedWindow == this) {
+ Ungrab();
+@@ -1455,20 +1454,17 @@
+ if (!::IsWindow(window)) {
+ return;
+ }
+- DWORD exStyle = ::GetWindowLong(window, GWL_EXSTYLE);
++
+ if (::IsWindow(blocker)) {
+- // save WS_EX_NOACTIVATE and WS_EX_APPWINDOW styles
+- DWORD saveStyle = exStyle & (AWT_WS_EX_NOACTIVATE | WS_EX_APPWINDOW);
+- ::SetProp(window, ModalSaveWSEXProp, reinterpret_cast<HANDLE>(saveStyle));
+- ::SetWindowLong(window, GWL_EXSTYLE, (exStyle | AWT_WS_EX_NOACTIVATE) & ~WS_EX_APPWINDOW);
+ ::SetProp(window, ModalBlockerProp, reinterpret_cast<HANDLE>(blocker));
++ ::EnableWindow(window, FALSE);
+ } else {
+- // restore WS_EX_NOACTIVATE and WS_EX_APPWINDOW styles
+- DWORD saveStyle = reinterpret_cast<DWORD>(::GetProp(window, ModalSaveWSEXProp));
+- ::SetWindowLong(window, GWL_EXSTYLE,
+- (exStyle & ~(AWT_WS_EX_NOACTIVATE | WS_EX_APPWINDOW)) | saveStyle);
+- ::RemoveProp(window, ModalSaveWSEXProp);
+ ::RemoveProp(window, ModalBlockerProp);
++ AwtComponent *comp = AwtComponent::GetComponent(window);
++ // we don't expect to be called with non-java HWNDs
++ DASSERT(comp && comp->IsTopLevel());
++ // we should not unblock disabled toplevels
++ ::EnableWindow(window, comp->isEnabled());
+ }
+ }
+
+diff -r 92e3f57c933b -r 15ba7093f8e6 src/windows/native/sun/windows/awt_Window.h
+--- openjdk.orig/jdk/src/windows/native/sun/windows/awt_Window.h Fri Mar 14 20:40:09 2008 +0300
++++ openjdk/jdk/src/windows/native/sun/windows/awt_Window.h Fri Mar 14 22:00:33 2008 +0300
+@@ -33,7 +33,6 @@
+
+ // property name tagging windows disabled by modality
+ static LPCTSTR ModalBlockerProp = TEXT("SunAwtModalBlockerProp");
+-static LPCTSTR ModalSaveWSEXProp = TEXT("SunAwtModalSaveWSEXProp");
+ static LPCTSTR ModalDialogPeerProp = TEXT("SunAwtModalDialogPeerProp");
+
+ #ifndef WH_MOUSE_LL
+diff -r 92e3f57c933b -r 15ba7093f8e6 test/java/awt/Modal/WsDisabledStyle/CloseBlocker/CloseBlocker.java
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/jdk/test/java/awt/Modal/WsDisabledStyle/CloseBlocker/CloseBlocker.java Fri Mar 14 22:00:33 2008 +0300
+@@ -0,0 +1,466 @@
++/*
++ * Copyright 2007 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++ * CA 95054 USA or visit www.sun.com if you need additional information or
++ * have any questions.
++ */
++
++/*
++ @test %I% %E%
++ @bug 4080029
++ @summary Modal Dialog block input to all frame windows not just its parent.
++ @author dmitry.cherepanov: area=awt.modal
++ @run main/manual CloseBlocker
++*/
++
++/**
++ * ManualMainTest.java
++ *
++ * summary: The test opens and closes blocker dialog, the test verifies
++ * that active window is correct when the dialog is closed.
++ */
++
++import java.awt.*;
++import java.awt.event.*;
++
++public class CloseBlocker
++{
++
++ private static void init()
++ {
++ //*** Create instructions for the user here ***
++
++ String[] instructions =
++ {
++ " the test will be run 6 times, to start next test just close all ",
++ " windows of previous; the instructions are the same for all tests: ",
++ " 1) there are two frames (one the frames has 'show modal' button), ",
++ " 2) press the button to show a dialog, ",
++ " 3) close the dialog (an alternative scenario - activate another",
++ " native window before closing the dialog), ",
++ " 4) the frame with button should become next active window, ",
++ " if it's true, then the test passed, otherwise, it failed. ",
++ " Press 'pass' button only after all of the 6 tests are completed, ",
++ " the number of the currently executed test is displayed on the ",
++ " output window. "
++ };
++ Sysout.createDialog( );
++ Sysout.printInstructions( instructions );
++
++ test(true, true, false);
++ test(true, true, true);
++ test(false, true, false); // 3rd parameter has no affect for ownerless
++
++ test(true, false, false);
++ test(true, false, true);
++ test(false, false, false); // 3rd parameter has no affect for ownerless
++
++ }//End init()
++
++ private static final Object obj = new Object();
++ private static int counter = 0;
++
++ /*
++ * The ownerless parameter indicates whether the blocker dialog
++ * has owner. The usual parameter indicates whether the blocker
++ * dialog is a Java dialog (non-native dialog like file dialog).
++ */
++ private static void test(final boolean ownerless, final boolean usual, final boolean initiallyOwnerIsActive) {
++
++ Sysout.print(" * test #" + (++counter) + " is running ... ");
++
++ final Frame active = new Frame();
++ final Frame nonactive = new Frame();
++ Button button = new Button("show modal");
++ button.addActionListener(new ActionListener() {
++ public void actionPerformed(ActionEvent ae) {
++ Dialog dialog = null;
++ Frame parent = ownerless ? null : (initiallyOwnerIsActive? active : nonactive);
++ if (usual) {
++ dialog = new Dialog(parent, "Sample", true);
++ } else {
++ dialog = new FileDialog(parent, "Sample", FileDialog.LOAD);
++ }
++ dialog.addWindowListener(new WindowAdapter(){
++ public void windowClosing(WindowEvent e){
++ e.getWindow().dispose();
++ }
++ });
++ dialog.setBounds(200, 200, 200, 200);
++ dialog.setVisible(true);
++ }
++ });
++
++ active.add(button);
++ active.setBounds(200, 400, 200, 200);
++ WindowAdapter adapter = new WindowAdapter(){
++ public void windowClosing(WindowEvent e){
++ active.dispose();
++ nonactive.dispose();
++ synchronized(obj) {
++ obj.notify();
++ }
++ }
++ };
++ active.addWindowListener(adapter);
++ active.setVisible(true);
++
++ nonactive.setBounds(400, 400, 200, 200);
++ nonactive.addWindowListener(adapter);
++ nonactive.setVisible(true);
++
++ synchronized(obj) {
++ try{
++ obj.wait();
++ } catch(Exception e) {
++ throw new RuntimeException(e);
++ }
++ }
++
++ Sysout.println(" completed. ");
++
++ }
++
++ /*****************************************************
++ * Standard Test Machinery Section
++ * DO NOT modify anything in this section -- it's a
++ * standard chunk of code which has all of the
++ * synchronisation necessary for the test harness.
++ * By keeping it the same in all tests, it is easier
++ * to read and understand someone else's test, as
++ * well as insuring that all tests behave correctly
++ * with the test harness.
++ * There is a section following this for test-defined
++ * classes
++ ******************************************************/
++ private static boolean theTestPassed = false;
++ private static boolean testGeneratedInterrupt = false;
++ private static String failureMessage = "";
++
++ private static Thread mainThread = null;
++
++ private static int sleepTime = 300000;
++
++ public static void main( String args[] ) throws InterruptedException
++ {
++ mainThread = Thread.currentThread();
++ try
++ {
++ init();
++ }
++ catch( TestPassedException e )
++ {
++ //The test passed, so just return from main and harness will
++ // interepret this return as a pass
++ return;
++ }
++ //At this point, neither test passed nor test failed has been
++ // called -- either would have thrown an exception and ended the
++ // test, so we know we have multiple threads.
++
++ //Test involves other threads, so sleep and wait for them to
++ // called pass() or fail()
++ try
++ {
++ Thread.sleep( sleepTime );
++ //Timed out, so fail the test
++ throw new RuntimeException( "Timed out after " + sleepTime/1000 + " seconds" );
++ }
++ catch (InterruptedException e)
++ {
++ if( ! testGeneratedInterrupt ) throw e;
++
++ //reset flag in case hit this code more than once for some reason (just safety)
++ testGeneratedInterrupt = false;
++ if ( theTestPassed == false )
++ {
++ throw new RuntimeException( failureMessage );
++ }
++ }
++
++ }//main
++
++ public static synchronized void setTimeoutTo( int seconds )
++ {
++ sleepTime = seconds * 1000;
++ }
++
++ public static synchronized void pass()
++ {
++ Sysout.println( "The test passed." );
++ Sysout.println( "The test is over, hit Ctl-C to stop Java VM" );
++ //first check if this is executing in main thread
++ if ( mainThread == Thread.currentThread() )
++ {
++ //Still in the main thread, so set the flag just for kicks,
++ // and throw a test passed exception which will be caught
++ // and end the test.
++ theTestPassed = true;
++ throw new TestPassedException();
++ }
++ //pass was called from a different thread, so set the flag and interrupt
++ // the main thead.
++ theTestPassed = true;
++ testGeneratedInterrupt = true;
++ mainThread.interrupt();
++ }//pass()
++
++ public static synchronized void fail()
++ {
++ //test writer didn't specify why test failed, so give generic
++ fail( "it just plain failed! :-)" );
++ }
++
++ public static synchronized void fail( String whyFailed )
++ {
++ Sysout.println( "The test failed: " + whyFailed );
++ Sysout.println( "The test is over, hit Ctl-C to stop Java VM" );
++ //check if this called from main thread
++ if ( mainThread == Thread.currentThread() )
++ {
++ //If main thread, fail now 'cause not sleeping
++ throw new RuntimeException( whyFailed );
++ }
++ theTestPassed = false;
++ testGeneratedInterrupt = true;
++ failureMessage = whyFailed;
++ mainThread.interrupt();
++ }//fail()
++
++}// class ManualMainTest
++
++//This exception is used to exit from any level of call nesting
++// when it's determined that the test has passed, and immediately
++// end the test.
++class TestPassedException extends RuntimeException
++{
++}
++
++//*********** End Standard Test Machinery Section **********
++
++
++//************ Begin classes defined for the test ****************
++
++// make listeners in a class defined here, and instantiate them in init()
++
++/* Example of a class which may be written as part of a test
++class NewClass implements anInterface
++ {
++ static int newVar = 0;
++
++ public void eventDispatched(AWTEvent e)
++ {
++ //Counting events to see if we get enough
++ eventCount++;
++
++ if( eventCount == 20 )
++ {
++ //got enough events, so pass
++
More information about the distro-pkg-dev
mailing list