If the {@code '#'} flag is given then an {@link
* FormatFlagsConversionMismatchException} will be thrown.
*
- *
| {@code 'f'}
* | '\u0066'
* | Requires the output to be formatted using decimal
* format. The localization algorithm is
@@ -1465,7 +1465,7 @@
*
* The number of digits in the result for the fractional part of
* m or a is equal to the precision. If the precision is not
- * specified then the default value is 6. If the precision is
+ * specified then the default value is {@code 6}. If the precision is
* less than the number of digits which would appear after the decimal
* point in the string returned by {@link Float#toString(float)} or {@link
* Double#toString(double)} respectively, then the value will be rounded
@@ -1479,7 +1479,7 @@
* All flags defined for Byte, Short, Integer, and
* Long apply.
*
- * If the '#' flag is given, then the decimal separator will
+ * If the {@code '#'} flag is given, then the decimal separator will
* always be present.
*
* The default behavior when no flags are
@@ -1491,114 +1491,114 @@
*
*
*
- * This conversion may be applied to long, {@link Long}, {@link
+ * This conversion may be applied to {@code long}, {@link Long}, {@link
* Calendar}, and {@link Date}.
*
*
*
- * | 't'
+ * | | {@code 't'}
* | '\u0074'
* | Prefix for date and time conversion characters.
- * | | 'T'
+ * | | {@code 'T'}
* | '\u0054'
- * | The upper-case variant of 't'.
+ * | The upper-case variant of {@code 't'}.
*
* |
*
* The following date and time conversion character suffixes are defined
- * for the 't' and 'T' conversions. The types are similar to
- * but not completely identical to those defined by GNU date and
- * POSIX strftime(3c). Additional conversion types are provided to
- * access Java-specific functionality (e.g. 'L' for milliseconds
+ * for the {@code 't'} and {@code 'T'} conversions. The types are similar to
+ * but not completely identical to those defined by GNU {@code date} and
+ * POSIX {@code strftime(3c)}. Additional conversion types are provided to
+ * access Java-specific functionality (e.g. {@code 'L'} for milliseconds
* within the second).
*
* The following conversion characters are used for formatting times:
*
*
*
- * | 'H'
+ * | | {@code 'H'}
* | '\u0048'
* | Hour of the day for the 24-hour clock, formatted as two digits with
- * a leading zero as necessary i.e. 00 - 23. 00
+ * a leading zero as necessary i.e. {@code 00 - 23}. {@code 00}
* corresponds to midnight.
*
- * | | 'I'
+ * | | {@code 'I'}
* | '\u0049'
* | Hour for the 12-hour clock, formatted as two digits with a leading
- * zero as necessary, i.e. 01 - 12. 01 corresponds to
+ * zero as necessary, i.e. {@code 01 - 12}. {@code 01} corresponds to
* one o'clock (either morning or afternoon).
*
- * | | 'k'
+ * | | {@code 'k'}
* | '\u006b'
- * | Hour of the day for the 24-hour clock, i.e. 0 - 23.
- * 0 corresponds to midnight.
- *
- * | | 'l'
+ * | Hour of the day for the 24-hour clock, i.e. {@code 0 - 23}.
+ * {@code 0} corresponds to midnight.
+ *
+ * | | {@code 'l'}
* | '\u006c'
- * | Hour for the 12-hour clock, i.e. 1 - 12. 1
+ * | Hour for the 12-hour clock, i.e. {@code 1 - 12}. {@code 1}
* corresponds to one o'clock (either morning or afternoon).
*
- * | | 'M'
+ * | | {@code 'M'}
* | '\u004d'
* | Minute within the hour formatted as two digits with a leading zero
- * as necessary, i.e. 00 - 59.
- *
- * | | 'S'
+ * as necessary, i.e. {@code 00 - 59}.
+ *
+ * | | {@code 'S'}
* | '\u0053'
* | Seconds within the minute, formatted as two digits with a leading
- * zero as necessary, i.e. 00 - 60 ("60" is a special
+ * zero as necessary, i.e. {@code 00 - 60} ("{@code 60}" is a special
* value required to support leap seconds).
*
- * | | 'L'
+ * | | {@code 'L'}
* | '\u004c'
* | Millisecond within the second formatted as three digits with
- * leading zeros as necessary, i.e. 000 - 999.
- *
- * | | 'N'
+ * leading zeros as necessary, i.e. {@code 000 - 999}.
+ *
+ * | | {@code 'N'}
* | '\u004e'
* | Nanosecond within the second, formatted as nine digits with leading
- * zeros as necessary, i.e. 000000000 - 999999999. The precision
+ * zeros as necessary, i.e. {@code 000000000 - 999999999}. The precision
* of this value is limited by the resolution of the underlying operating
* system or hardware.
*
- * | | 'p'
+ * | | {@code 'p'}
* | '\u0070'
* | Locale-specific {@linkplain
* java.text.DateFormatSymbols#getAmPmStrings morning or afternoon} marker
- * in lower case, e.g."am" or "pm". Use of the
- * conversion prefix 'T' forces this output to upper case. (Note
- * that 'p' produces lower-case output. This is different from
- * GNU date and POSIX strftime(3c) which produce
+ * in lower case, e.g."{@code am}" or "{@code pm}". Use of the
+ * conversion prefix {@code 'T'} forces this output to upper case. (Note
+ * that {@code 'p'} produces lower-case output. This is different from
+ * GNU {@code date} and POSIX {@code strftime(3c)} which produce
* upper-case output.)
*
- * | | 'z'
+ * | | {@code 'z'}
* | '\u007a'
* | RFC 822
- * style numeric time zone offset from GMT, e.g. -0800. This
+ * style numeric time zone offset from GMT, e.g. {@code -0800}. This
* value will be adjusted as necessary for Daylight Saving Time. For
- * long, {@link Long}, and {@link Date} the time zone used is
- * the {@plainlink TimeZone#getDefault() default time zone} for this
+ * {@code long}, {@link Long}, and {@link Date} the time zone used is
+ * the {@linkplain TimeZone#getDefault() default time zone} for this
* instance of the Java virtual machine.
*
- * | | 'Z'
+ * | | {@code 'Z'}
* | A string representing the abbreviation for the time zone. This
* value will be adjusted as necessary for Daylight Saving Time. For
- * long, {@link Long}, and {@link Date} the time zone used is
- * the {@plainlink TimeZone#getDefault() default time zone} for this
+ * {@code long}, {@link Long}, and {@link Date} the time zone used is
+ * the {@linkplain TimeZone#getDefault() default time zone} for this
* instance of the Java virtual machine. The Formatter's locale will
* supersede the locale of the argument (if any).
*
- * | | 's'
+ * | | {@code 's'}
* | '\u0073'
* | Seconds since the beginning of the epoch starting at 1 January 1970
- * 00:00:00 UTC, i.e. Long.MIN_VALUE/1000 to
- * Long.MAX_VALUE/1000.
- *
- * | | 'Q'
+ * {@code 00:00:00} UTC, i.e. {@code Long.MIN_VALUE/1000} to
+ * {@code Long.MAX_VALUE/1000}.
+ *
+ * | | {@code 'Q'}
* | '\u004f'
* | Milliseconds since the beginning of the epoch starting at 1 January
- * 1970 00:00:00 UTC, i.e. Long.MIN_VALUE to
- * Long.MAX_VALUE. The precision of this value is limited by
+ * 1970 {@code 00:00:00} UTC, i.e. {@code Long.MIN_VALUE} to
+ * {@code Long.MAX_VALUE}. The precision of this value is limited by
* the resolution of the underlying operating system or hardware.
*
* |
@@ -1607,71 +1607,71 @@
*
*
*
- * | 'B'
+ * | | {@code 'B'}
* | '\u0042'
* | Locale-specific {@linkplain java.text.DateFormatSymbols#getMonths
- * full month name}, e.g. "January", "February".
- *
- * | | 'b'
+ * full month name}, e.g. {@code "January"}, {@code "February"}.
+ *
+ * | | {@code 'b'}
* | '\u0062'
* | Locale-specific {@linkplain
* java.text.DateFormatSymbols#getShortMonths abbreviated month name},
- * e.g. "Jan", "Feb".
- *
- * | | 'h'
+ * e.g. {@code "Jan"}, {@code "Feb"}.
+ *
+ * | | {@code 'h'}
* | '\u0068'
- * | Same as 'b'.
- *
- * | | 'A'
+ * | Same as {@code 'b'}.
+ *
+ * | | {@code 'A'}
* | '\u0041'
* | Locale-specific full name of the {@linkplain
* java.text.DateFormatSymbols#getWeekdays day of the week},
- * e.g. "Sunday", "Monday"
- *
- * | | 'a'
+ * e.g. {@code "Sunday"}, {@code "Monday"}
+ *
+ * | | {@code 'a'}
* | '\u0061'
* | Locale-specific short name of the {@linkplain
* java.text.DateFormatSymbols#getShortWeekdays day of the week},
- * e.g. "Sun", "Mon"
- *
- * | | 'C'
+ * e.g. {@code "Sun"}, {@code "Mon"}
+ *
+ * | | {@code 'C'}
* | '\u0043'
- * | Four-digit year divided by 100, formatted as two digits
- * with leading zero as necessary, i.e. 00 - 99
- *
- * | | 'Y'
+ * | Four-digit year divided by {@code 100}, formatted as two digits
+ * with leading zero as necessary, i.e. {@code 00 - 99}
+ *
+ * | | {@code 'Y'}
* | '\u0059' | Year, formatted to at least
- * four digits with leading zeros as necessary, e.g. 0092 equals
- * 92 CE for the Gregorian calendar.
- *
- * | | 'y'
+ * four digits with leading zeros as necessary, e.g. {@code 0092} equals
+ * {@code 92} CE for the Gregorian calendar.
+ *
+ * | | {@code 'y'}
* | '\u0079'
* | Last two digits of the year, formatted with leading zeros as
- * necessary, i.e. 00 - 99.
- *
- * | | 'j'
+ * necessary, i.e. {@code 00 - 99}.
+ *
+ * | | {@code 'j'}
* | '\u006a'
* | Day of year, formatted as three digits with leading zeros as
- * necessary, e.g. 001 - 366 for the Gregorian calendar.
- * 001 corresponds to the first day of the year.
- *
- * | | 'm'
+ * necessary, e.g. {@code 001 - 366} for the Gregorian calendar.
+ * {@code 001} corresponds to the first day of the year.
+ *
+ * | | {@code 'm'}
* | '\u006d'
* | Month, formatted as two digits with leading zeros as necessary,
- * i.e. 01 - 13, where "01" is the first month of the
- * year and ("13" is a special value required to support lunar
+ * i.e. {@code 01 - 13}, where "{@code 01}" is the first month of the
+ * year and ("{@code 13}" is a special value required to support lunar
* calendars).
*
- * | | 'd'
+ * | | {@code 'd'}
* | '\u0064'
* | Day of month, formatted as two digits with leading zeros as
- * necessary, i.e. 01 - 31, where "01" is the first day
+ * necessary, i.e. {@code 01 - 31}, where "{@code 01}" is the first day
* of the month.
*
- * | | 'e'
+ * | | {@code 'e'}
* | '\u0065'
- * | Day of month, formatted as two digits, i.e. 1 - 31 where
- * "1" is the first day of the month.
+ * | Day of month, formatted as two digits, i.e. {@code 1 - 31} where
+ * "{@code 1}" is the first day of the month.
*
* |
*
@@ -1680,45 +1680,45 @@
*
*
*
- * | 'R'
+ * | | {@code 'R'}
* | '\u0052'
- * | Time formatted for the 24-hour clock as "%tH:%tM"
- *
- * | | 'T'
+ * | Time formatted for the 24-hour clock as {@code "%tH:%tM"}
+ *
+ * | | {@code 'T'}
* | '\u0054'
- * | Time formatted for the 24-hour clock as "%tH:%tM:%tS".
- *
- * | | 'r'
+ * | Time formatted for the 24-hour clock as {@code "%tH:%tM:%tS"}.
+ *
+ * | | {@code 'r'}
* | '\u0072'
- * | Time formatted for the 12-hour clock as "%tI:%tM:%tS
- * %Tp". The location of the morning or afternoon marker
- * ('%Tp') may be locale-dependent.
- *
- * | | 'D'
+ * | Time formatted for the 12-hour clock as {@code "%tI:%tM:%tS
+ * %Tp"}. The location of the morning or afternoon marker
+ * ({@code '%Tp'}) may be locale-dependent.
+ *
+ * | | {@code 'D'}
* | '\u0044'
- * | Date formatted as "%tm/%td/%ty".
- *
- * | | 'F'
+ * | Date formatted as {@code "%tm/%td/%ty"}.
+ *
+ * | | {@code 'F'}
* | '\u0046'
* | ISO 8601
- * complete date formatted as "%tY-%tm-%td".
- *
- * | | 'c'
+ * complete date formatted as {@code "%tY-%tm-%td"}.
+ *
+ * | | {@code 'c'}
* | '\u0063'
- * | Date and time formatted as "%ta %tb %td %tT %tZ %tY",
- * e.g. "Sun Jul 20 16:17:00 EDT 1969".
+ * | Date and time formatted as {@code "%ta %tb %td %tT %tZ %tY"},
+ * e.g. {@code "Sun Jul 20 16:17:00 EDT 1969"}.
*
* |
*
- * The '-' flag defined for General
- * conversions applies. If the '#' flag is given, then a {@link
+ * The {@code '-'} flag defined for General
+ * conversions applies. If the {@code '#'} flag is given, then a {@link
* FormatFlagsConversionMismatchException} will be thrown.
*
* The width is the minimum number of characters to
* be written to the output. If the length of the converted value is less than
- * the width then the output will be padded by spaces
+ * the {@code width} then the output will be padded by spaces
* ('\u0020') until the total number of characters equals width.
- * The padding is on the left by default. If the '-' flag is given
+ * The padding is on the left by default. If the {@code '-'} flag is given
* then the padding will be on the right. If width is not specified then there
* is no minimum.
*
@@ -1731,17 +1731,17 @@
*
*
*
- * | '%'
- * | The result is a literal '%' ('\u0025')
+ * | | {@code '%'}
+ * | The result is a literal {@code '%'} ('\u0025')
*
* The width is the minimum number of characters to
- * be written to the output including the '%'. If the length of the
- * converted value is less than the width then the output will be
+ * be written to the output including the {@code '%'}. If the length of the
+ * converted value is less than the {@code width} then the output will be
* padded by spaces ('\u0020') until the total number of
* characters equals width. The padding is on the left. If width is not
- * specified then just the '%' is output.
- *
- * The '-' flag defined for General
+ * specified then just the {@code '%'} is output.
+ *
+ * The {@code '-'} flag defined for General
* conversions applies. If any other flags are provided, then a
* {@link FormatFlagsConversionMismatchException} will be thrown.
*
@@ -1756,7 +1756,7 @@
*
*
*
- * | 'n'
+ * | | {@code 'n'}
* | the platform-specific line separator as returned by {@link
* System#getProperty System.getProperty("line.separator")}.
*
@@ -1775,7 +1775,7 @@
* Explicit indexing is used when the format specifier contains an
* argument index. The argument index is a decimal integer indicating the
* position of the argument in the argument list. The first argument is
- * referenced by "1$", the second by "2$", etc. An argument
+ * referenced by "{@code 1$}", the second by "{@code 2$}", etc. An argument
* may be referenced more than once.
*
* For example:
@@ -1787,7 +1787,7 @@
*
*
* Relative indexing is used when the format specifier contains a
- * '<' ('\u003c') flag which causes the argument for
+ * {@code '<'} ('\u003c') flag which causes the argument for
* the previous format specifier to be re-used. If there is no previous
* argument, then a {@link MissingFormatArgumentException} is thrown.
*
@@ -1798,7 +1798,7 @@
*
*
* Ordinary indexing is used when the format specifier contains
- * neither an argument index nor a '<' flag. Each format specifier
+ * neither an argument index nor a {@code '<'} flag. Each format specifier
* which uses ordinary indexing is assigned a sequential implicit index into
* argument list which is independent of the indices used by explicit or
* relative indexing.
@@ -1828,7 +1828,7 @@
* If there are more arguments than format specifiers, the extra arguments
* are ignored.
*
- * Unless otherwise specified, passing a null argument to any
+ * Unless otherwise specified, passing a {@code null} argument to any
* method or constructor in this class will cause a {@link
* NullPointerException} to be thrown.
*
@@ -1876,8 +1876,8 @@
* locale} for this instance of the Java virtual machine.
*
* @param a
- * Destination for the formatted output. If a is
- * null then a {@link StringBuilder} will be created.
+ * Destination for the formatted output. If {@code a} is
+ * {@code null} then a {@link StringBuilder} will be created.
*/
public Formatter(Appendable a) {
if (a == null)
@@ -1895,7 +1895,7 @@
*
* @param l
* The {@linkplain java.util.Locale locale} to apply during
- * formatting. If l is null then no localization
+ * formatting. If {@code l} is {@code null} then no localization
* is applied.
*/
public Formatter(Locale l) {
@@ -1906,12 +1906,12 @@
* Constructs a new formatter with the specified destination and locale.
*
* @param a
- * Destination for the formatted output. If a is
- * null then a {@link StringBuilder} will be created.
+ * Destination for the formatted output. If {@code a} is
+ * {@code null} then a {@link StringBuilder} will be created.
*
* @param l
* The {@linkplain java.util.Locale locale} to apply during
- * formatting. If l is null then no localization
+ * formatting. If {@code l} is {@code null} then no localization
* is applied.
*/
public Formatter(Appendable a, Locale l) {
@@ -2004,7 +2004,7 @@
*
* @param l
* The {@linkplain java.util.Locale locale} to apply during
- * formatting. If l is null then no localization
+ * formatting. If {@code l} is {@code null} then no localization
* is applied.
*
* @throws FileNotFoundException
@@ -2112,7 +2112,7 @@
*
* @param l
* The {@linkplain java.util.Locale locale} to apply during
- * formatting. If l is null then no localization
+ * formatting. If {@code l} is {@code null} then no localization
* is applied.
*
* @throws FileNotFoundException
@@ -2212,7 +2212,7 @@
*
* @param l
* The {@linkplain java.util.Locale locale} to apply during
- * formatting. If l is null then no localization
+ * formatting. If {@code l} is {@code null} then no localization
* is applied.
*
* @throws UnsupportedEncodingException
@@ -2237,7 +2237,7 @@
* The {@link #format(java.util.Locale,String,Object...) format} method
* for this object which has a locale argument does not change this value.
*
- * @return null if no localization is applied, otherwise a
+ * @return {@code null} if no localization is applied, otherwise a
* locale
*
* @throws FormatterClosedException
@@ -2264,7 +2264,7 @@
}
/**
- * Returns the result of invoking toString() on the destination
+ * Returns the result of invoking {@code toString()} on the destination
* for the output. For example, the following code formats text into a
* {@link StringBuilder} then retrieves the resultant string:
*
@@ -2281,13 +2281,13 @@
*
* out().toString()
*
- * Depending on the specification of toString for the {@link
+ * Depending on the specification of {@code toString} for the {@link
* Appendable}, the returned string may or may not contain the characters
* written to the destination. For instance, buffers typically return
- * their contents in toString(), but streams cannot since the
+ * their contents in {@code toString()}, but streams cannot since the
* data is discarded.
*
- * @return The result of invoking toString() on the destination
+ * @return The result of invoking {@code toString()} on the destination
* for the output
*
* @throws FormatterClosedException
@@ -2301,7 +2301,7 @@
/**
* Flushes this formatter. If the destination implements the {@link
- * java.io.Flushable} interface, its flush method will be invoked.
+ * java.io.Flushable} interface, its {@code flush} method will be invoked.
*
* Flushing a formatter writes any buffered output in the destination
* to the underlying stream.
@@ -2323,7 +2323,7 @@
/**
* Closes this formatter. If the destination implements the {@link
- * java.io.Closeable} interface, its close method will be invoked.
+ * java.io.Closeable} interface, its {@code close} method will be invoked.
*
* Closing a formatter allows it to release resources it may be holding
* (such as open files). If the formatter is already closed, then invoking
@@ -2352,13 +2352,13 @@
}
/**
- * Returns the IOException last thrown by this formatter's {@link
+ * Returns the {@code IOException} last thrown by this formatter's {@link
* Appendable}.
*
- * If the destination's append() method never throws
- * IOException, then this method will always return null.
+ * If the destination's {@code append()} method never throws
+ * {@code IOException}, then this method will always return {@code null}.
*
- * @return The last exception thrown by the Appendable or null if
+ * @return The last exception thrown by the Appendable or {@code null} if
* no such exception exists.
*/
public IOException ioException() {
@@ -2406,7 +2406,7 @@
*
* @param l
* The {@linkplain java.util.Locale locale} to apply during
- * formatting. If l is null then no localization
+ * formatting. If {@code l} is {@code null} then no localization
* is applied. This does not change this object's locale that was
* set during construction.
*
@@ -4196,7 +4196,7 @@
}
}
- // Returns a string representation of the current Flags.
+ // Returns a string representation of the current {@code Flags}.
public static String toString(Flags f) {
return f.toString();
}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/share/classes/java/util/logging/Logger.java
--- a/jdk/src/share/classes/java/util/logging/Logger.java Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/share/classes/java/util/logging/Logger.java Wed Jul 05 16:47:27 2017 +0200
@@ -27,6 +27,7 @@
package java.util.logging;
import java.util.*;
+import java.util.concurrent.CopyOnWriteArrayList;
import java.security.*;
import java.lang.ref.WeakReference;
@@ -165,10 +166,11 @@
private static final int offValue = Level.OFF.intValue();
private LogManager manager;
private String name;
- private ArrayList handlers;
+ private final CopyOnWriteArrayList handlers =
+ new CopyOnWriteArrayList();
private String resourceBundleName;
- private boolean useParentHandlers = true;
- private Filter filter;
+ private volatile boolean useParentHandlers = true;
+ private volatile Filter filter;
private boolean anonymous;
private ResourceBundle catalog; // Cached resource bundle
@@ -180,9 +182,9 @@
private static Object treeLock = new Object();
// We keep weak references from parents to children, but strong
// references from children to parents.
- private Logger parent; // our nearest parent.
+ private volatile Logger parent; // our nearest parent.
private ArrayList> kids; // WeakReferences to loggers that have us as parent
- private Level levelObject;
+ private volatile Level levelObject;
private volatile int levelValue; // current effective level value
/**
@@ -438,7 +440,7 @@
* @exception SecurityException if a security manager exists and if
* the caller does not have LoggingPermission("control").
*/
- public synchronized void setFilter(Filter newFilter) throws SecurityException {
+ public void setFilter(Filter newFilter) throws SecurityException {
checkAccess();
filter = newFilter;
}
@@ -448,7 +450,7 @@
*
* @return a filter object (may be null)
*/
- public synchronized Filter getFilter() {
+ public Filter getFilter() {
return filter;
}
@@ -465,10 +467,9 @@
if (record.getLevel().intValue() < levelValue || levelValue == offValue) {
return;
}
- synchronized (this) {
- if (filter != null && !filter.isLoggable(record)) {
- return;
- }
+ Filter theFilter = filter;
+ if (theFilter != null && !theFilter.isLoggable(record)) {
+ return;
}
// Post the LogRecord to all our Handlers, and then to
@@ -476,12 +477,8 @@
Logger logger = this;
while (logger != null) {
- Handler targets[] = logger.getHandlers();
-
- if (targets != null) {
- for (int i = 0; i < targets.length; i++) {
- targets[i].publish(record);
- }
+ for (Handler handler : logger.handlers) {
+ handler.publish(record);
}
if (!logger.getUseParentHandlers()) {
@@ -1182,13 +1179,10 @@
* @exception SecurityException if a security manager exists and if
* the caller does not have LoggingPermission("control").
*/
- public synchronized void addHandler(Handler handler) throws SecurityException {
+ public void addHandler(Handler handler) throws SecurityException {
// Check for null handler
handler.getClass();
checkAccess();
- if (handlers == null) {
- handlers = new ArrayList();
- }
handlers.add(handler);
}
@@ -1201,14 +1195,11 @@
* @exception SecurityException if a security manager exists and if
* the caller does not have LoggingPermission("control").
*/
- public synchronized void removeHandler(Handler handler) throws SecurityException {
+ public void removeHandler(Handler handler) throws SecurityException {
checkAccess();
if (handler == null) {
return;
}
- if (handlers == null) {
- return;
- }
handlers.remove(handler);
}
@@ -1217,11 +1208,8 @@
*
* @return an array of all registered Handlers
*/
- public synchronized Handler[] getHandlers() {
- if (handlers == null) {
- return emptyHandlers;
- }
- return handlers.toArray(new Handler[handlers.size()]);
+ public Handler[] getHandlers() {
+ return handlers.toArray(emptyHandlers);
}
/**
@@ -1235,7 +1223,7 @@
* @exception SecurityException if a security manager exists and if
* the caller does not have LoggingPermission("control").
*/
- public synchronized void setUseParentHandlers(boolean useParentHandlers) {
+ public void setUseParentHandlers(boolean useParentHandlers) {
checkAccess();
this.useParentHandlers = useParentHandlers;
}
@@ -1246,7 +1234,7 @@
*
* @return true if output is to be sent to the logger's parent
*/
- public synchronized boolean getUseParentHandlers() {
+ public boolean getUseParentHandlers() {
return useParentHandlers;
}
@@ -1354,9 +1342,12 @@
* @return nearest existing parent Logger
*/
public Logger getParent() {
- synchronized (treeLock) {
- return parent;
- }
+ // Note: this used to be synchronized on treeLock. However, this only
+ // provided memory semantics, as there was no guarantee that the caller
+ // would synchronize on treeLock (in fact, there is no way for external
+ // callers to so synchronize). Therefore, we have made parent volatile
+ // instead.
+ return parent;
}
/**
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/share/classes/javax/swing/JRootPane.java
--- a/jdk/src/share/classes/javax/swing/JRootPane.java Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/share/classes/javax/swing/JRootPane.java Wed Jul 05 16:47:27 2017 +0200
@@ -34,6 +34,7 @@
import java.util.Vector;
import java.io.Serializable;
import javax.swing.border.*;
+import sun.awt.AWTAccessor;
import sun.security.action.GetBooleanAction;
@@ -688,6 +689,9 @@
throw new NullPointerException("glassPane cannot be set to null.");
}
+ AWTAccessor.getComponentAccessor().setMixingCutoutShape(glass,
+ new Rectangle());
+
boolean visible = false;
if (glassPane != null && glassPane.getParent() == this) {
this.remove(glassPane);
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/share/classes/sun/awt/AWTAccessor.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/sun/awt/AWTAccessor.java Wed Jul 05 16:47:27 2017 +0200
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2009 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package sun.awt;
+
+import java.awt.*;
+import sun.misc.Unsafe;
+
+/** The AWTAccessor utility class.
+ * The main purpose of this class is to enable accessing
+ * private and package-private fields of classes from
+ * different classes/packages. See sun.misc.SharedSecretes
+ * for another example.
+ */
+public final class AWTAccessor {
+ private static final Unsafe unsafe = Unsafe.getUnsafe();
+
+ /** We don't need any objects of this class.
+ * It's rather a collection of static methods
+ * and interfaces.
+ */
+ private AWTAccessor() {
+ }
+
+ /** An accessor for the java.awt.Component class.
+ */
+ public interface ComponentAccessor {
+ // See 6797587
+ // Also see: 6776743, 6768307, and 6768332.
+ /**
+ * Sets the shape of a lw component to cut out from hw components.
+ */
+ void setMixingCutoutShape(Component comp, Shape shape);
+ }
+
+ /* The java.awt.Component class accessor object.
+ */
+ private static ComponentAccessor componentAccessor;
+
+ /** Set an accessor object for the java.awt.Component class.
+ */
+ public static void setComponentAccessor(ComponentAccessor ca) {
+ componentAccessor = ca;
+ }
+
+ /** Retrieve the accessor object for the java.awt.Window class.
+ */
+ public static ComponentAccessor getComponentAccessor() {
+ if (componentAccessor == null) {
+ unsafe.ensureClassInitialized(Component.class);
+ }
+
+ return componentAccessor;
+ }
+}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/share/classes/sun/awt/HeadlessToolkit.java
--- a/jdk/src/share/classes/sun/awt/HeadlessToolkit.java Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/share/classes/sun/awt/HeadlessToolkit.java Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 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
@@ -456,6 +456,10 @@
return tk.getAWTEventListeners();
}
+ public AWTEventListener[] getAWTEventListeners(long eventMask) {
+ return tk.getAWTEventListeners(eventMask);
+ }
+
public boolean isDesktopSupported() {
return false;
}
@@ -464,4 +468,8 @@
throws HeadlessException{
throw new HeadlessException();
}
+
+ public boolean areExtraMouseButtonsEnabled() throws HeadlessException{
+ throw new HeadlessException();
+ }
}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/share/classes/sun/awt/SunToolkit.java
--- a/jdk/src/share/classes/sun/awt/SunToolkit.java Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/share/classes/sun/awt/SunToolkit.java Wed Jul 05 16:47:27 2017 +0200
@@ -1972,6 +1972,21 @@
AWTAutoShutdown.getInstance().dumpPeers(aLog);
}
+ private static Boolean sunAwtDisableMixing = null;
+
+ /**
+ * Returns the value of "sun.awt.disableMixing" property. Default
+ * value is {@code false}.
+ */
+ public synchronized static boolean getSunAwtDisableMixing() {
+ if (sunAwtDisableMixing == null) {
+ sunAwtDisableMixing = Boolean.valueOf(
+ AccessController.doPrivileged(
+ new GetBooleanAction("sun.awt.disableMixing")));
+ }
+ return sunAwtDisableMixing.booleanValue();
+ }
+
/**
* Returns true if the native GTK libraries are available. The
* default implementation returns false, but UNIXToolkit overrides this
@@ -2008,26 +2023,12 @@
/*
* Continually post pending AWTEvents to the Java EventQueue.
*/
- public void flush() {
- if (queueHead != null) {
- EventQueueItem tempQueue;
- /*
- * We have to execute the loop inside the synchronized block
- * to ensure that the flush is completed before a new event
- * can be posted to this queue.
- */
- synchronized (this) {
- tempQueue = queueHead;
- queueHead = queueTail = null;
- /*
- * If this PostEventQueue is flushed in parallel on two
- * different threads tempQueue will be null for one of them.
- */
- while (tempQueue != null) {
- eventQueue.postEvent(tempQueue.event);
- tempQueue = tempQueue.next;
- }
- }
+ public synchronized void flush() {
+ EventQueueItem tempQueue = queueHead;
+ queueHead = queueTail = null;
+ while (tempQueue != null) {
+ eventQueue.postEvent(tempQueue.event);
+ tempQueue = tempQueue.next;
}
}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/share/classes/sun/java2d/pipe/Region.java
--- a/jdk/src/share/classes/sun/java2d/pipe/Region.java Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/share/classes/sun/java2d/pipe/Region.java Wed Jul 05 16:47:27 2017 +0200
@@ -28,6 +28,7 @@
import java.awt.Rectangle;
import java.awt.Shape;
import java.awt.geom.AffineTransform;
+import java.awt.geom.RectangularShape;
/**
* This class encapsulates a definition of a two dimensional region which
@@ -63,11 +64,28 @@
static final int INIT_SIZE = 50;
static final int GROW_SIZE = 50;
- static final Region EMPTY_REGION = new Region(0, 0, 0, 0);
- static final Region WHOLE_REGION = new Region(Integer.MIN_VALUE,
- Integer.MIN_VALUE,
- Integer.MAX_VALUE,
- Integer.MAX_VALUE);
+ /**
+ * Immutable Region.
+ */
+ private static final class ImmutableRegion extends Region {
+ protected ImmutableRegion(int lox, int loy, int hix, int hiy) {
+ super(lox, loy, hix, hiy);
+ }
+
+ // Override all the methods that mutate the object
+ public void appendSpans(sun.java2d.pipe.SpanIterator si) {}
+ public void setOutputArea(java.awt.Rectangle r) {}
+ public void setOutputAreaXYWH(int x, int y, int w, int h) {}
+ public void setOutputArea(int[] box) {}
+ public void setOutputAreaXYXY(int lox, int loy, int hix, int hiy) {}
+ }
+
+ public static final Region EMPTY_REGION = new ImmutableRegion(0, 0, 0, 0);
+ public static final Region WHOLE_REGION = new ImmutableRegion(
+ Integer.MIN_VALUE,
+ Integer.MIN_VALUE,
+ Integer.MAX_VALUE,
+ Integer.MAX_VALUE);
int lox;
int loy;
@@ -113,7 +131,7 @@
return newv;
}
- private Region(int lox, int loy, int hix, int hiy) {
+ protected Region(int lox, int loy, int hix, int hiy) {
this.lox = lox;
this.loy = loy;
this.hix = hix;
@@ -194,6 +212,13 @@
public static Region getInstance(Region devBounds, boolean normalize,
Shape s, AffineTransform at)
{
+ // Optimize for empty shapes to avoid involving the SpanIterator
+ if (s instanceof RectangularShape &&
+ ((RectangularShape)s).isEmpty())
+ {
+ return EMPTY_REGION;
+ }
+
int box[] = new int[4];
ShapeSpanIterator sr = new ShapeSpanIterator(normalize);
try {
@@ -1206,7 +1231,7 @@
return false;
}
if (r.lox != this.lox || r.loy != this.loy ||
- r.hiy != this.hiy || r.hiy != this.hiy)
+ r.hix != this.hix || r.hiy != this.hiy)
{
return false;
}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/share/classes/sun/misc/URLClassPath.java
--- a/jdk/src/share/classes/sun/misc/URLClassPath.java Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/share/classes/sun/misc/URLClassPath.java Wed Jul 05 16:47:27 2017 +0200
@@ -25,17 +25,7 @@
package sun.misc;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Hashtable;
-import java.util.NoSuchElementException;
-import java.util.Stack;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.StringTokenizer;
-import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.*;
import java.util.jar.JarFile;
import sun.misc.JarIndex;
import sun.misc.InvalidJarIndexException;
@@ -52,12 +42,7 @@
import java.net.HttpURLConnection;
import java.net.URLStreamHandler;
import java.net.URLStreamHandlerFactory;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
+import java.io.*;
import java.security.AccessController;
import java.security.AccessControlException;
import java.security.CodeSigner;
@@ -100,6 +85,9 @@
/* The jar protocol handler to use when creating new URLs */
private URLStreamHandler jarHandler;
+ /* Whether this URLClassLoader has been closed yet */
+ private boolean closed = false;
+
/**
* Creates a new URLClassPath for the given URLs. The URLs will be
* searched in the order specified for classes and resources. A URL
@@ -124,6 +112,22 @@
this(urls, null);
}
+ public synchronized List closeLoaders() {
+ if (closed) {
+ return Collections.emptyList();
+ }
+ List result = new LinkedList();
+ for (Loader loader : loaders) {
+ try {
+ loader.close();
+ } catch (IOException e) {
+ result.add (e);
+ }
+ }
+ closed = true;
+ return result;
+ }
+
/**
* Appends the specified URL to the search path of directory and JAR
* file URLs from which to load classes and resources.
@@ -293,6 +297,9 @@
* if the specified index is out of range.
*/
private synchronized Loader getLoader(int index) {
+ if (closed) {
+ return null;
+ }
// Expand URL search path until the request can be satisfied
// or the URL stack is empty.
while (loaders.size() < index + 1) {
@@ -453,7 +460,7 @@
* Inner class used to represent a loader of resources and classes
* from a base URL.
*/
- private static class Loader {
+ private static class Loader implements Closeable {
private final URL base;
/*
@@ -545,6 +552,12 @@
}
/*
+ * close this loader and release all resources
+ * method overridden in sub-classes
+ */
+ public void close () throws IOException {}
+
+ /*
* Returns the local class path for this loader, or null if none.
*/
URL[] getClassPath() throws IOException {
@@ -562,6 +575,7 @@
private MetaIndex metaIndex;
private URLStreamHandler handler;
private HashMap lmap;
+ private boolean closed = false;
/*
* Creates a new JarLoader for the specified URL referring to
@@ -604,6 +618,17 @@
}
}
+ @Override
+ public void close () throws IOException {
+ // closing is synchronized at higher level
+ if (!closed) {
+ closed = true;
+ // in case not already open.
+ ensureOpen();
+ jar.close();
+ }
+ }
+
JarFile getJarFile () {
return jar;
}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/share/classes/sun/security/krb5/Config.java
--- a/jdk/src/share/classes/sun/security/krb5/Config.java Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/share/classes/sun/security/krb5/Config.java Wed Jul 05 16:47:27 2017 +0200
@@ -39,7 +39,6 @@
import java.io.InputStreamReader;
import java.io.IOException;
import java.util.Enumeration;
-import java.util.List;
import java.util.StringTokenizer;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -156,11 +155,7 @@
configFile = loadConfigFile();
stanzaTable = parseStanzaTable(configFile);
} catch (IOException ioe) {
- KrbException ke = new KrbException("Could not load " +
- "configuration file " +
- ioe.getMessage());
- ke.initCause(ioe);
- throw(ke);
+ // No krb5.conf, no problem. We'll use DNS etc.
}
}
}
@@ -1057,7 +1052,12 @@
public boolean useDNS(String name) {
String value = getDefault(name, "libdefaults");
if (value == null) {
- return getDefaultBooleanValue("dns_fallback", "libdefaults");
+ value = getDefault("dns_fallback", "libdefaults");
+ if ("false".equalsIgnoreCase(value)) {
+ return false;
+ } else {
+ return true;
+ }
} else {
return value.equalsIgnoreCase("true");
}
@@ -1079,12 +1079,39 @@
/**
* Gets default realm.
+ * @throws KrbException where no realm can be located
+ * @return the default realm, always non null
*/
public String getDefaultRealm() throws KrbException {
+ Exception cause = null;
String realm = getDefault("default_realm", "libdefaults");
if ((realm == null) && useDNS_Realm()) {
// use DNS to locate Kerberos realm
- realm = getRealmFromDNS();
+ try {
+ realm = getRealmFromDNS();
+ } catch (KrbException ke) {
+ cause = ke;
+ }
+ }
+ if (realm == null) {
+ realm = java.security.AccessController.doPrivileged(
+ new java.security.PrivilegedAction() {
+ @Override
+ public String run() {
+ String osname = System.getProperty("os.name");
+ if (osname.startsWith("Windows")) {
+ return System.getenv("USERDNSDOMAIN");
+ }
+ return null;
+ }
+ });
+ }
+ if (realm == null) {
+ KrbException ke = new KrbException("Cannot locate default realm");
+ if (cause != null) {
+ ke.initCause(cause);
+ }
+ throw ke;
}
return realm;
}
@@ -1092,17 +1119,48 @@
/**
* Returns a list of KDC's with each KDC separated by a space
*
- * @param realm the realm for which the master KDC is desired
- * @return the list of KDCs
+ * @param realm the realm for which the KDC list is desired
+ * @throws KrbException if there's no way to find KDC for the realm
+ * @return the list of KDCs separated by a space, always non null
*/
public String getKDCList(String realm) throws KrbException {
if (realm == null) {
realm = getDefaultRealm();
}
+ Exception cause = null;
String kdcs = getDefault("kdc", realm);
if ((kdcs == null) && useDNS_KDC()) {
// use DNS to locate KDC
- kdcs = getKDCFromDNS(realm);
+ try {
+ kdcs = getKDCFromDNS(realm);
+ } catch (KrbException ke) {
+ cause = ke;
+ }
+ }
+ if (kdcs == null) {
+ kdcs = java.security.AccessController.doPrivileged(
+ new java.security.PrivilegedAction() {
+ @Override
+ public String run() {
+ String osname = System.getProperty("os.name");
+ if (osname.startsWith("Windows")) {
+ String logonServer = System.getenv("LOGONSERVER");
+ if (logonServer != null
+ && logonServer.startsWith("\\\\")) {
+ logonServer = logonServer.substring(2);
+ }
+ return logonServer;
+ }
+ return null;
+ }
+ });
+ }
+ if (kdcs == null) {
+ KrbException ke = new KrbException("Cannot locate KDC");
+ if (cause != null) {
+ ke.initCause(cause);
+ }
+ throw ke;
}
return kdcs;
}
@@ -1117,7 +1175,7 @@
String realm = null;
String hostName = null;
try {
- hostName = InetAddress.getLocalHost().getHostName();
+ hostName = InetAddress.getLocalHost().getCanonicalHostName();
} catch (UnknownHostException e) {
KrbException ke = new KrbException(Krb5.KRB_ERR_GENERIC,
"Unable to locate Kerberos realm: " + e.getMessage());
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/share/classes/sun/security/krb5/KrbServiceLocator.java
--- a/jdk/src/share/classes/sun/security/krb5/KrbServiceLocator.java Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/share/classes/sun/security/krb5/KrbServiceLocator.java Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2006-2009 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
@@ -133,7 +133,7 @@
*/
static String[] getKerberosService(String realmName, String protocol) {
- String dnsUrl = "dns:///_kerberos." + protocol + realmName;
+ String dnsUrl = "dns:///_kerberos." + protocol + "." + realmName;
String[] hostports = null;
try {
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/solaris/classes/sun/awt/X11/WindowDimensions.java
--- a/jdk/src/solaris/classes/sun/awt/X11/WindowDimensions.java Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/solaris/classes/sun/awt/X11/WindowDimensions.java Wed Jul 05 16:47:27 2017 +0200
@@ -32,10 +32,18 @@
private Insets insets;
private boolean isClientSizeSet;
+ /**
+ * If isClient is true, the bounds represent the client window area.
+ * Otherwise, they represent the entire window area, with the insets included
+ */
public WindowDimensions(int x, int y, int width, int height, boolean isClient) {
this(new Rectangle(x, y, width, height), null, isClient);
}
+ /**
+ * If isClient is true, the bounds represent the client window area.
+ * Otherwise, they represent the entire window area, with the insets included
+ */
public WindowDimensions(Rectangle rec, Insets ins, boolean isClient) {
if (rec == null) {
throw new IllegalArgumentException("Client bounds can't be null");
@@ -46,10 +54,18 @@
setInsets(ins);
}
+ /**
+ * If isClient is true, the bounds represent the client window area.
+ * Otherwise, they represent the entire window area, with the insets included
+ */
public WindowDimensions(Point loc, Dimension size, Insets in, boolean isClient) {
this(new Rectangle(loc, size), in, isClient);
}
+ /**
+ * If isClient is true, the bounds represent the client window area.
+ * Otherwise, they represent the entire window area, with the insets included
+ */
public WindowDimensions(Rectangle bounds, boolean isClient) {
this(bounds, null, isClient);
}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/solaris/classes/sun/awt/X11/XBaseWindow.java
--- a/jdk/src/solaris/classes/sun/awt/X11/XBaseWindow.java Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/solaris/classes/sun/awt/X11/XBaseWindow.java Wed Jul 05 16:47:27 2017 +0200
@@ -979,8 +979,13 @@
*/
public void handleButtonPressRelease(XEvent xev) {
XButtonEvent xbe = xev.get_xbutton();
- final int buttonState = xbe.get_state() & (XConstants.Button1Mask | XConstants.Button2Mask
- | XConstants.Button3Mask | XConstants.Button4Mask | XConstants.Button5Mask);
+ int buttonState = 0;
+ for (int i = 0; i XToolkit.getNumMouseButtons()) {
+ return buttonState == 0;
+ } else {
+ return buttonState == XConstants.buttonsMask[button - 1];
}
- return buttonState == 0;
}
static boolean isGrabbedEvent(XEvent ev, XBaseWindow target) {
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/solaris/classes/sun/awt/X11/XComponentPeer.java
--- a/jdk/src/solaris/classes/sun/awt/X11/XComponentPeer.java Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/solaris/classes/sun/awt/X11/XComponentPeer.java Wed Jul 05 16:47:27 2017 +0200
@@ -1534,13 +1534,23 @@
}
XToolkit.awtLock();
try {
- XlibWrapper.SetRectangularShape(
- XToolkit.getDisplay(),
- getWindow(),
- shape.getLoX(), shape.getLoY(),
- shape.getHiX(), shape.getHiY(),
- (shape.isRectangular() ? null : shape)
- );
+ if (shape != null) {
+ XlibWrapper.SetRectangularShape(
+ XToolkit.getDisplay(),
+ getWindow(),
+ shape.getLoX(), shape.getLoY(),
+ shape.getHiX(), shape.getHiY(),
+ (shape.isRectangular() ? null : shape)
+ );
+ } else {
+ XlibWrapper.SetRectangularShape(
+ XToolkit.getDisplay(),
+ getWindow(),
+ 0, 0,
+ 0, 0,
+ null
+ );
+ }
} finally {
XToolkit.awtUnlock();
}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/solaris/classes/sun/awt/X11/XConstants.java
--- a/jdk/src/solaris/classes/sun/awt/X11/XConstants.java Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/solaris/classes/sun/awt/X11/XConstants.java Wed Jul 05 16:47:27 2017 +0200
@@ -197,12 +197,30 @@
/* button masks. Used in same manner as Key masks above. Not to be confused
with button names below. */
-
- public static final int Button1Mask = (1<<8) ;
- public static final int Button2Mask = (1<<9) ;
- public static final int Button3Mask = (1<<10) ;
- public static final int Button4Mask = (1<<11) ;
- public static final int Button5Mask = (1<<12) ;
+ public static final int [] buttonsMask = new int []{ 1<<8,
+ 1<<9,
+ 1<<10,
+ 1<<11,
+ 1<<12,
+ 1<<13,
+ 1<<14,
+ 1<<15,
+ 1<<16,
+ 1<<17,
+ 1<<18,
+ 1<<19,
+ 1<<20,
+ 1<<21,
+ 1<<22,
+ 1<<23,
+ 1<<24,
+ 1<<25,
+ 1<<26,
+ 1<<27,
+ 1<<28,
+ 1<<29,
+ 1<<30,
+ 1<<31 };
public static final int AnyModifier = (1<<15) ; /* used in GrabButton, GrabKey */
@@ -211,11 +229,7 @@
and ButtonRelease events. Not to be confused with button masks above.
Note that 0 is already defined above as "AnyButton". */
- public static final int Button1 = 1 ;
- public static final int Button2 = 2 ;
- public static final int Button3 = 3 ;
- public static final int Button4 = 4 ;
- public static final int Button5 = 5 ;
+ public static final int buttons [] = new int [] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24};
/* Notify modes */
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java
--- a/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java Wed Jul 05 16:47:27 2017 +0200
@@ -492,7 +492,14 @@
// do nothing but accept it.
Rectangle reqBounds = newDimensions.getBounds();
Rectangle newBounds = constrainBounds(reqBounds.x, reqBounds.y, reqBounds.width, reqBounds.height);
- newDimensions = new WindowDimensions(newBounds, newDimensions.getInsets(), newDimensions.isClientSizeSet());
+ Insets insets = newDimensions.getInsets();
+ // Inherit isClientSizeSet from newDimensions
+ if (newDimensions.isClientSizeSet()) {
+ newBounds = new Rectangle(newBounds.x, newBounds.y,
+ newBounds.width - insets.left - insets.right,
+ newBounds.height - insets.top - insets.bottom);
+ }
+ newDimensions = new WindowDimensions(newBounds, insets, newDimensions.isClientSizeSet());
}
XToolkit.awtLock();
try {
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/solaris/classes/sun/awt/X11/XDragSourceContextPeer.java
--- a/jdk/src/solaris/classes/sun/awt/X11/XDragSourceContextPeer.java Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/solaris/classes/sun/awt/X11/XDragSourceContextPeer.java Wed Jul 05 16:47:27 2017 +0200
@@ -694,8 +694,8 @@
} finally {
xmotion.dispose();
}
- if (xbutton.get_button() == XConstants.Button1
- || xbutton.get_button() == XConstants.Button2) {
+ if (xbutton.get_button() == XConstants.buttons[0]
+ || xbutton.get_button() == XConstants.buttons[1]) {
// drag is initiated with Button1 or Button2 pressed and
// ended on release of either of these buttons (as the same
// behavior was with our old Motif DnD-based implementation)
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/solaris/classes/sun/awt/X11/XEmbedClientHelper.java
--- a/jdk/src/solaris/classes/sun/awt/X11/XEmbedClientHelper.java Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/solaris/classes/sun/awt/X11/XEmbedClientHelper.java Wed Jul 05 16:47:27 2017 +0200
@@ -31,6 +31,9 @@
import java.awt.Component;
import java.awt.Container;
+import sun.awt.X11GraphicsConfig;
+import sun.awt.X11GraphicsDevice;
+
/**
* Helper class implementing XEmbed protocol handling routines(client side)
* Window which wants to participate in a protocol should create an instance,
@@ -39,20 +42,34 @@
public class XEmbedClientHelper extends XEmbedHelper implements XEventDispatcher {
private static final Logger xembedLog = Logger.getLogger("sun.awt.X11.xembed.XEmbedClientHelper");
- private XEmbeddedFramePeer embedded;
+ private XEmbeddedFramePeer embedded; // XEmbed client
+ private long server; // XEmbed server
+
private boolean active;
- private long server;
private boolean applicationActive;
XEmbedClientHelper() {
super();
}
- void install(XEmbeddedFramePeer embedded) {
- this.embedded = embedded;
+ void setClient(XEmbeddedFramePeer client) {
+ if (xembedLog.isLoggable(Level.FINE)) {
+ xembedLog.fine("XEmbed client: " + client);
+ }
+ if (embedded != null) {
+ XToolkit.removeEventDispatcher(embedded.getWindow(), this);
+ active = false;
+ }
+ embedded = client;
+ if (embedded != null) {
+ XToolkit.addEventDispatcher(embedded.getWindow(), this);
+ }
+ }
- if (xembedLog.isLoggable(Level.FINE)) xembedLog.fine("Installing xembedder on " + embedded);
- XToolkit.addEventDispatcher(embedded.getWindow(), this);
+ void install() {
+ if (xembedLog.isLoggable(Level.FINE)) {
+ xembedLog.fine("Installing xembedder on " + embedded);
+ }
long[] info = new long[] { XEMBED_VERSION, XEMBED_MAPPED };
long data = Native.card32ToData(info);
try {
@@ -155,7 +172,24 @@
}
public void handleReparentNotify(XEvent xev) {
XReparentEvent re = xev.get_xreparent();
- server = re.get_parent();
+ long newParent = re.get_parent();
+ if (active) {
+ // unregister accelerators, etc. for old parent
+ embedded.notifyStopped();
+ // check if newParent is a root window
+ X11GraphicsConfig gc = (X11GraphicsConfig)embedded.getGraphicsConfiguration();
+ X11GraphicsDevice gd = (X11GraphicsDevice)gc.getDevice();
+ if ((newParent == XlibUtil.getRootWindow(gd.getScreen())) ||
+ (newParent == XToolkit.getDefaultRootWindow()))
+ {
+ // reparenting to root means XEmbed termination
+ active = false;
+ } else {
+ // continue XEmbed with a new parent
+ server = newParent;
+ embedded.notifyStarted();
+ }
+ }
}
boolean requestFocus() {
if (active && embedded.focusAllowedFor()) {
@@ -201,12 +235,16 @@
}
void registerAccelerator(AWTKeyStroke stroke, int id) {
- long sym = getX11KeySym(stroke);
- long mods = getX11Mods(stroke);
- sendMessage(server, XEMBED_REGISTER_ACCELERATOR, id, sym, mods);
+ if (active) {
+ long sym = getX11KeySym(stroke);
+ long mods = getX11Mods(stroke);
+ sendMessage(server, XEMBED_REGISTER_ACCELERATOR, id, sym, mods);
+ }
}
void unregisterAccelerator(int id) {
- sendMessage(server, XEMBED_UNREGISTER_ACCELERATOR, id, 0, 0);
+ if (active) {
+ sendMessage(server, XEMBED_UNREGISTER_ACCELERATOR, id, 0, 0);
+ }
}
long getX11KeySym(AWTKeyStroke stroke) {
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/solaris/classes/sun/awt/X11/XEmbeddedFramePeer.java
--- a/jdk/src/solaris/classes/sun/awt/X11/XEmbeddedFramePeer.java Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/solaris/classes/sun/awt/X11/XEmbeddedFramePeer.java Wed Jul 05 16:47:27 2017 +0200
@@ -63,7 +63,10 @@
void postInit(XCreateWindowParams params) {
super.postInit(params);
if (embedder != null) {
- embedder.install(this);
+ // install X11 event dispatcher
+ embedder.setClient(this);
+ // reparent to XEmbed server
+ embedder.install();
} else if (getParentWindowHandle() != 0) {
XToolkit.awtLock();
try {
@@ -77,6 +80,15 @@
}
}
+ @Override
+ public void dispose() {
+ if (embedder != null) {
+ // uninstall X11 event dispatcher
+ embedder.setClient(null);
+ }
+ super.dispose();
+ }
+
public void updateMinimumSize() {
}
@@ -249,6 +261,14 @@
// XEmbed.
updateDropTarget();
}
+ void notifyStopped() {
+ if (embedder != null && embedder.isActive()) {
+ for (int i = strokes.size() - 1; i >= 0; i--) {
+ embedder.unregisterAccelerator(i);
+ }
+ }
+ }
+
long getFocusTargetWindow() {
return getWindow();
}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/solaris/classes/sun/awt/X11/XKeysym.java
--- a/jdk/src/solaris/classes/sun/awt/X11/XKeysym.java Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/solaris/classes/sun/awt/X11/XKeysym.java Wed Jul 05 16:47:27 2017 +0200
@@ -63,6 +63,8 @@
// TODO: or not to do: add reverse lookup javakeycode2keysym,
// for robot only it seems to me. After that, we can remove lookup table
// from XWindow.c altogether.
+ // Another use for reverse lookup: query keyboard state, for some keys.
+ static Hashtable javaKeycode2KeysymHash = new Hashtable();
static long keysym_lowercase = unsafe.allocateMemory(Native.getLongSize());
static long keysym_uppercase = unsafe.allocateMemory(Native.getLongSize());
public static char convertKeysym( long ks, int state ) {
@@ -196,6 +198,10 @@
Keysym2JavaKeycode jkc = getJavaKeycode( ev );
return jkc == null ? java.awt.event.KeyEvent.VK_UNDEFINED : jkc.getJavaKeycode();
}
+ static long javaKeycode2Keysym( int jkey ) {
+ Long ks = javaKeycode2KeysymHash.get( jkey );
+ return (ks == null ? 0 : ks.longValue());
+ }
/**
Return keysym derived from a keycode and modifiers.
Usually an input method does this. However non-system input methods (e.g. Java IMs) do not.
@@ -1583,6 +1589,14 @@
keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.hpXK_mute_asciitilde), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_DEAD_TILDE, java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
keysym2JavaKeycodeHash.put( Long.valueOf(XConstants.NoSymbol), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_UNDEFINED, java.awt.event.KeyEvent.KEY_LOCATION_UNKNOWN));
+
+ /* Reverse search of keysym by keycode. */
+
+ /* Add keyboard locking codes. */
+ javaKeycode2KeysymHash.put( java.awt.event.KeyEvent.VK_CAPS_LOCK, XKeySymConstants.XK_Caps_Lock);
+ javaKeycode2KeysymHash.put( java.awt.event.KeyEvent.VK_NUM_LOCK, XKeySymConstants.XK_Num_Lock);
+ javaKeycode2KeysymHash.put( java.awt.event.KeyEvent.VK_SCROLL_LOCK, XKeySymConstants.XK_Scroll_Lock);
+ javaKeycode2KeysymHash.put( java.awt.event.KeyEvent.VK_KANA_LOCK, XKeySymConstants.XK_Kana_Lock);
};
}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/solaris/classes/sun/awt/X11/XRobotPeer.java
--- a/jdk/src/solaris/classes/sun/awt/X11/XRobotPeer.java Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/solaris/classes/sun/awt/X11/XRobotPeer.java Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2008 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
@@ -81,11 +81,16 @@
return pixelArray;
}
+ public int getNumberOfButtons(){
+ return getNumberOfButtonsImpl();
+ }
+
private static native synchronized void setup();
private static native synchronized void mouseMoveImpl(X11GraphicsConfig xgc, int x, int y);
private static native synchronized void mousePressImpl(int buttons);
private static native synchronized void mouseReleaseImpl(int buttons);
+ private static native synchronized int getNumberOfButtonsImpl();
private static native synchronized void mouseWheelImpl(int wheelAmt);
private static native synchronized void keyPressImpl(int keycode);
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/solaris/classes/sun/awt/X11/XToolkit.java
--- a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java Wed Jul 05 16:47:27 2017 +0200
@@ -27,6 +27,7 @@
import java.awt.*;
import java.awt.event.InputEvent;
import java.awt.event.MouseEvent;
+import java.awt.event.KeyEvent;
import java.awt.datatransfer.Clipboard;
import java.awt.dnd.DragSource;
import java.awt.dnd.DragGestureListener;
@@ -61,6 +62,10 @@
private static Logger keyEventLog = Logger.getLogger("sun.awt.X11.kye.XToolkit");
private static final Logger backingStoreLog = Logger.getLogger("sun.awt.X11.backingStore.XToolkit");
+ //There is 400 ms is set by default on Windows and 500 by default on KDE and GNOME.
+ //We use the same hardcoded constant.
+ private final static int AWT_MULTICLICK_DEFAULT_TIME = 500;
+
static final boolean PRIMARY_LOOP = false;
static final boolean SECONDARY_LOOP = true;
@@ -74,6 +79,25 @@
// Dynamic Layout Resize client code setting
protected static boolean dynamicLayoutSetting = false;
+ //Is it allowed to generate events assigned to extra mouse buttons.
+ //Set to true by default.
+ private static boolean areExtraMouseButtonsEnabled = true;
+
+ /**
+ * Number of buttons.
+ * By default it's taken from the system. If system value does not
+ * fit into int type range, use our own MAX_BUTTONS_SUPPORT value.
+ */
+ private static int numberOfButtons = 0;
+
+ /* XFree standard mention 24 buttons as maximum:
+ * http://www.xfree86.org/current/mouse.4.html
+ * We workaround systems supporting more than 24 buttons.
+ * Otherwise, we have to use long type values as masks
+ * which leads to API change.
+ */
+ private static int MAX_BUTTONS_SUPPORT = 24;
+
/**
* True when the x settings have been loaded.
*/
@@ -273,6 +297,9 @@
arrowCursor = XlibWrapper.XCreateFontCursor(XToolkit.getDisplay(),
XCursorFontConstants.XC_arrow);
+ areExtraMouseButtonsEnabled = Boolean.parseBoolean(System.getProperty("sun.awt.enableExtraMouseButtons", "true"));
+ //set system property if not yet assigned
+ System.setProperty("sun.awt.enableExtraMouseButtons", ""+areExtraMouseButtonsEnabled);
} finally {
awtUnlock();
}
@@ -1080,6 +1107,19 @@
public Map mapInputMethodHighlight(InputMethodHighlight highlight) {
return XInputMethod.mapInputMethodHighlight(highlight);
}
+ @Override
+ public boolean getLockingKeyState(int key) {
+ if (! (key == KeyEvent.VK_CAPS_LOCK || key == KeyEvent.VK_NUM_LOCK ||
+ key == KeyEvent.VK_SCROLL_LOCK || key == KeyEvent.VK_KANA_LOCK)) {
+ throw new IllegalArgumentException("invalid key for Toolkit.getLockingKeyState");
+ }
+ awtLock();
+ try {
+ return getModifierState( key );
+ } finally {
+ awtUnlock();
+ }
+ }
public Clipboard getSystemClipboard() {
SecurityManager security = System.getSecurityManager();
@@ -1216,7 +1256,6 @@
String multiclick_time_query = XlibWrapper.XGetDefault(XToolkit.getDisplay(), "*", "multiClickTime");
if (multiclick_time_query != null) {
awt_multiclick_time = (int)Long.parseLong(multiclick_time_query);
- // awt_multiclick_time = XtGetMultiClickTime(awt_display);
} else {
multiclick_time_query = XlibWrapper.XGetDefault(XToolkit.getDisplay(),
"OpenWindows", "MultiClickTimeout");
@@ -1226,20 +1265,19 @@
milliseconds */
awt_multiclick_time = (int)Long.parseLong(multiclick_time_query) * 100;
} else {
- awt_multiclick_time = 200;
- // awt_multiclick_time = XtGetMultiClickTime(awt_display);
+ awt_multiclick_time = AWT_MULTICLICK_DEFAULT_TIME;
}
}
} catch (NumberFormatException nf) {
- awt_multiclick_time = 200;
+ awt_multiclick_time = AWT_MULTICLICK_DEFAULT_TIME;
} catch (NullPointerException npe) {
- awt_multiclick_time = 200;
+ awt_multiclick_time = AWT_MULTICLICK_DEFAULT_TIME;
}
} finally {
awtUnlock();
}
if (awt_multiclick_time == 0) {
- awt_multiclick_time = 200;
+ awt_multiclick_time = AWT_MULTICLICK_DEFAULT_TIME;
}
}
@@ -1383,10 +1421,15 @@
}
}
- private int getNumMouseButtons() {
+ public static int getNumMouseButtons() {
awtLock();
try {
- return XlibWrapper.XGetPointerMapping(XToolkit.getDisplay(), 0, 0);
+ if (numberOfButtons == 0) {
+ numberOfButtons = Math.min(
+ XlibWrapper.XGetPointerMapping(XToolkit.getDisplay(), 0, 0),
+ MAX_BUTTONS_SUPPORT);
+ }
+ return numberOfButtons;
} finally {
awtUnlock();
}
@@ -1542,6 +1585,66 @@
awtUnlock();
}
}
+ static boolean getModifierState( int jkc ) {
+ int iKeyMask = 0;
+ long ks = XKeysym.javaKeycode2Keysym( jkc );
+ int kc = XlibWrapper.XKeysymToKeycode(getDisplay(), ks);
+ if (kc == 0) {
+ return false;
+ }
+ awtLock();
+ try {
+ XModifierKeymap modmap = new XModifierKeymap(
+ XlibWrapper.XGetModifierMapping(getDisplay()));
+
+ int nkeys = modmap.get_max_keypermod();
+
+ long map_ptr = modmap.get_modifiermap();
+ for( int k = 0; k < 8; k++ ) {
+ for (int i = 0; i < nkeys; ++i) {
+ int keycode = Native.getUByte(map_ptr, k * nkeys + i);
+ if (keycode == 0) {
+ continue; // ignore zero keycode
+ }
+ if (kc == keycode) {
+ iKeyMask = 1 << k;
+ break;
+ }
+ }
+ if( iKeyMask != 0 ) {
+ break;
+ }
+ }
+ XlibWrapper.XFreeModifiermap(modmap.pData);
+ if (iKeyMask == 0 ) {
+ return false;
+ }
+ // Now we know to which modifier is assigned the keycode
+ // correspondent to the keysym correspondent to the java
+ // keycode. We are going to check a state of this modifier.
+ // If a modifier is a weird one, we cannot help it.
+ long window = 0;
+ try{
+ // get any application window
+ window = ((Long)(winMap.firstKey())).longValue();
+ }catch(NoSuchElementException nex) {
+ // get root window
+ window = getDefaultRootWindow();
+ }
+ boolean res = XlibWrapper.XQueryPointer(getDisplay(), window,
+ XlibWrapper.larg1, //root
+ XlibWrapper.larg2, //child
+ XlibWrapper.larg3, //root_x
+ XlibWrapper.larg4, //root_y
+ XlibWrapper.larg5, //child_x
+ XlibWrapper.larg6, //child_y
+ XlibWrapper.larg7);//mask
+ int mask = Native.getInt(XlibWrapper.larg7);
+ return ((mask & iKeyMask) != 0);
+ } finally {
+ awtUnlock();
+ }
+ }
/* Assign meaning - alt, meta, etc. - to X modifiers mod1 ... mod5.
* Only consider primary symbols on keycodes attached to modifiers.
@@ -2166,4 +2269,8 @@
}
public static native void setNoisyXErrorHandler();
+
+ public boolean areExtraMouseButtonsEnabled() throws HeadlessException {
+ return areExtraMouseButtonsEnabled;
+ }
}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/solaris/classes/sun/awt/X11/XWindow.java
--- a/jdk/src/solaris/classes/sun/awt/X11/XWindow.java Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/solaris/classes/sun/awt/X11/XWindow.java Wed Jul 05 16:47:27 2017 +0200
@@ -553,6 +553,10 @@
}
static int getModifiers(int state, int button, int keyCode) {
+ return getModifiers(state, button, keyCode, 0, false);
+ }
+
+ static int getModifiers(int state, int button, int keyCode, int type, boolean wheel_mouse) {
int modifiers = 0;
if (((state & XConstants.ShiftMask) != 0) ^ (keyCode == KeyEvent.VK_SHIFT)) {
@@ -570,14 +574,23 @@
if (((state & XToolkit.modeSwitchMask) != 0) ^ (keyCode == KeyEvent.VK_ALT_GRAPH)) {
modifiers |= InputEvent.ALT_GRAPH_DOWN_MASK;
}
- if (((state & XConstants.Button1Mask) != 0) ^ (button == MouseEvent.BUTTON1)) {
- modifiers |= InputEvent.BUTTON1_DOWN_MASK;
- }
- if (((state & XConstants.Button2Mask) != 0) ^ (button == MouseEvent.BUTTON2)) {
- modifiers |= InputEvent.BUTTON2_DOWN_MASK;
- }
- if (((state & XConstants.Button3Mask) != 0) ^ (button == MouseEvent.BUTTON3)) {
- modifiers |= InputEvent.BUTTON3_DOWN_MASK;
+ //InputEvent.BUTTON_DOWN_MASK array is starting from BUTTON1_DOWN_MASK on index == 0.
+ // button currently reflects a real button number and starts from 1. (except NOBUTTON which is zero )
+
+ /* this is an attempt to refactor button IDs in : MouseEvent, InputEvent, XlibWrapper and XWindow.*/
+
+ //reflects a button number similar to MouseEvent.BUTTON1, 2, 3 etc.
+ for (int i = 0; i < XConstants.buttonsMask.length; i ++){
+ //modifier should be added if :
+ // 1) current button is now still in PRESSED state (means that user just pressed mouse but not released yet) or
+ // 2) if Xsystem reports that "state" represents that button was just released. This only happens on RELEASE with 1,2,3 buttons.
+ // ONLY one of these conditions should be TRUE to add that modifier.
+ if (((state & XConstants.buttonsMask[i]) != 0) != (button == XConstants.buttons[i])){
+ //exclude wheel buttons from adding their numbers as modifiers
+ if (!wheel_mouse) {
+ modifiers |= InputEvent.getMaskForButton(i+1);
+ }
+ }
}
return modifiers;
}
@@ -603,17 +616,6 @@
return res;
}
- private static int getButtonMask(long mouseButton) {
- if (mouseButton == XConstants.Button1) {
- return XConstants.Button1Mask;
- } else if (mouseButton == XConstants.Button2) {
- return XConstants.Button2Mask;
- } else if (mouseButton == XConstants.Button3) {
- return XConstants.Button3Mask;
- }
- return 0;
- }
-
/**
* Returns true if this event is disabled and shouldn't be passed to Java.
* Default implementation returns false for all events.
@@ -648,7 +650,7 @@
boolean popupTrigger = false;
int button=0;
boolean wheel_mouse = false;
- long lbutton = xbe.get_button();
+ int lbutton = xbe.get_button();
int type = xev.get_type();
when = xbe.get_time();
long jWhen = XToolkit.nowMillisUTC_offset(when);
@@ -663,7 +665,7 @@
if (type == XConstants.ButtonPress) {
//Allow this mouse button to generate CLICK event on next ButtonRelease
- mouseButtonClickAllowed |= getButtonMask(lbutton);
+ mouseButtonClickAllowed |= XConstants.buttonsMask[lbutton];
XWindow lastWindow = (lastWindowRef != null) ? ((XWindow)lastWindowRef.get()):(null);
/*
multiclick checking
@@ -693,21 +695,22 @@
}
}
- if (lbutton == XConstants.Button1)
- button = MouseEvent.BUTTON1;
- else if (lbutton == XConstants.Button2 )
- button = MouseEvent.BUTTON2;
- else if (lbutton == XConstants.Button3)
- button = MouseEvent.BUTTON3;
- else if (lbutton == XConstants.Button4) {
- button = 4;
- wheel_mouse = true;
- } else if (lbutton == XConstants.Button5) {
- button = 5;
+ button = XConstants.buttons[lbutton - 1];
+ // 4 and 5 buttons are usually considered assigned to a first wheel
+ if (lbutton == XConstants.buttons[3] ||
+ lbutton == XConstants.buttons[4]) {
wheel_mouse = true;
}
- modifiers = getModifiers(xbe.get_state(),button,0);
+ // mapping extra buttons to numbers starting from 4.
+ if ((button > XConstants.buttons[4]) && (!Toolkit.getDefaultToolkit().areExtraMouseButtonsEnabled())){
+ return;
+ }
+
+ if (button > XConstants.buttons[4]){
+ button -= 2;
+ }
+ modifiers = getModifiers(xbe.get_state(),button,0, type, wheel_mouse);
if (!wheel_mouse) {
MouseEvent me = new MouseEvent((Component)getEventSource(),
@@ -720,7 +723,7 @@
postEventToEventQueue(me);
if ((type == XConstants.ButtonRelease) &&
- ((mouseButtonClickAllowed & getButtonMask(lbutton)) != 0) ) // No up-button in the drag-state
+ ((mouseButtonClickAllowed & XConstants.buttonsMask[lbutton]) != 0) ) // No up-button in the drag-state
{
postEventToEventQueue(me = new MouseEvent((Component)getEventSource(),
MouseEvent.MOUSE_CLICKED,
@@ -750,7 +753,7 @@
/* Update the state variable AFTER the CLICKED event post. */
if (type == XConstants.ButtonRelease) {
/* Exclude this mouse button from allowed list.*/
- mouseButtonClickAllowed &= ~getButtonMask(lbutton);
+ mouseButtonClickAllowed &= ~XConstants.buttonsMask[lbutton];
}
}
@@ -761,7 +764,19 @@
return;
}
- int mouseKeyState = (xme.get_state() & (XConstants.Button1Mask | XConstants.Button2Mask | XConstants.Button3Mask));
+ int mouseKeyState = 0; //(xme.get_state() & (XConstants.buttonsMask[0] | XConstants.buttonsMask[1] | XConstants.buttonsMask[2]));
+
+ //this doesn't work for extra buttons because Xsystem is sending state==0 for every extra button event.
+ // we can't correct it in MouseEvent class as we done it with modifiers, because exact type (DRAG|MOVE)
+ // should be passed from XWindow.
+ //TODO: eliminate it with some other value obtained w/o AWTLock.
+ for (int i = 0; i < XToolkit.getNumMouseButtons(); i++){
+ // TODO : here is the bug in WM: extra buttons doesn't have state!=0 as they should.
+ if ((i != 4) && (i != 5)) {
+ mouseKeyState = mouseKeyState | (xme.get_state() & XConstants.buttonsMask[i]);
+ }
+ }
+
boolean isDragging = (mouseKeyState != 0);
int mouseEventType = 0;
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java
--- a/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java Wed Jul 05 16:47:27 2017 +0200
@@ -1936,7 +1936,13 @@
new Object[] {xme, isGrabbed(), containsGlobal(xme.get_x_root(), xme.get_y_root())});
}
if (isGrabbed()) {
- boolean dragging = (xme.get_state() & (XConstants.Button1Mask | XConstants.Button2Mask | XConstants.Button3Mask)) != 0;
+ boolean dragging = false;
+ for (int i = 0; i javaKeycode2KeysymHash = new Hashtable();
tojava static long keysym_lowercase = unsafe.allocateMemory(Native.getLongSize());
tojava static long keysym_uppercase = unsafe.allocateMemory(Native.getLongSize());
tojava public static char convertKeysym( long ks, int state ) {
@@ -234,6 +236,10 @@
tojava Keysym2JavaKeycode jkc = getJavaKeycode( ev );
tojava return jkc == null ? java.awt.event.KeyEvent.VK_UNDEFINED : jkc.getJavaKeycode();
tojava }
+tojava static long javaKeycode2Keysym( int jkey ) {
+tojava Long ks = javaKeycode2KeysymHash.get( jkey );
+tojava return (ks == null ? 0 : ks.longValue());
+tojava }
tojava /**
tojava Return keysym derived from a keycode and modifiers.
tojava Usually an input method does this. However non-system input methods (e.g. Java IMs) do not.
@@ -2634,6 +2640,14 @@
tojava keysym2JavaKeycodeHash.put( Long.valueOf(XKeySymConstants.hpXK_mute_asciitilde), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_DEAD_TILDE, java.awt.event.KeyEvent.KEY_LOCATION_STANDARD));
tojava
tojava keysym2JavaKeycodeHash.put( Long.valueOf(XConstants.NoSymbol), new Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_UNDEFINED, java.awt.event.KeyEvent.KEY_LOCATION_UNKNOWN));
+tojava
+tojava /* Reverse search of keysym by keycode. */
+tojava
+tojava /* Add keyboard locking codes. */
+tojava javaKeycode2KeysymHash.put( java.awt.event.KeyEvent.VK_CAPS_LOCK, XKeySymConstants.XK_Caps_Lock);
+tojava javaKeycode2KeysymHash.put( java.awt.event.KeyEvent.VK_NUM_LOCK, XKeySymConstants.XK_Num_Lock);
+tojava javaKeycode2KeysymHash.put( java.awt.event.KeyEvent.VK_SCROLL_LOCK, XKeySymConstants.XK_Scroll_Lock);
+tojava javaKeycode2KeysymHash.put( java.awt.event.KeyEvent.VK_KANA_LOCK, XKeySymConstants.XK_Kana_Lock);
tojava };
tojava
tojava }
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/solaris/native/java/lang/UNIXProcess_md.c
--- a/jdk/src/solaris/native/java/lang/UNIXProcess_md.c Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/solaris/native/java/lang/UNIXProcess_md.c Wed Jul 05 16:47:27 2017 +0200
@@ -260,6 +260,12 @@
}
static int
+isAsciiDigit(char c)
+{
+ return c >= '0' && c <= '9';
+}
+
+static int
closeDescriptors(void)
{
DIR *dp;
@@ -284,7 +290,7 @@
*/
while ((dirp = readdir64(dp)) != NULL) {
int fd;
- if (isdigit(dirp->d_name[0]) &&
+ if (isAsciiDigit(dirp->d_name[0]) &&
(fd = strtol(dirp->d_name, NULL, 10)) >= from_fd + 2)
close(fd);
}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/solaris/native/sun/awt/awt_Robot.c
--- a/jdk/src/solaris/native/sun/awt/awt_Robot.c Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/solaris/native/sun/awt/awt_Robot.c Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 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
@@ -54,6 +54,7 @@
// 2 would be more correct, however that's how Robot originally worked
// and tests start to fail if this value is changed
static int32_t num_buttons = 3;
+static jint * masks;
static int32_t isXTestAvailable() {
int32_t major_opcode, first_event, first_error;
@@ -208,6 +209,26 @@
Java_sun_awt_X11_XRobotPeer_setup (JNIEnv * env, jclass cls) {
int32_t xtestAvailable;
+// this should be called from XRobotPeer constructor
+ jclass inputEventClazz = (*env)->FindClass(env, "java/awt/event/InputEvent");
+ jmethodID getButtonDownMasksID = (*env)->GetStaticMethodID(env, inputEventClazz, "getButtonDownMasks", "()[I");
+ jintArray obj = (jintArray)(*env)->CallStaticObjectMethod(env, inputEventClazz, getButtonDownMasksID);
+ jsize len = (*env)->GetArrayLength(env, obj);
+ jint * tmp = (*env)->GetIntArrayElements(env, obj, JNI_FALSE);
+
+ masks = (jint *)malloc(sizeof(jint)*len);
+ if (masks == (jint *) NULL) {
+ JNU_ThrowOutOfMemoryError((JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2), NULL);
+ goto finally;
+ }
+
+ int i;
+ for (i = 0; i < len; i++) {
+ masks[i] = tmp[i];
+ }
+ (*env)->ReleaseIntArrayElements(env, obj, tmp, 0);
+ (*env)->DeleteLocalRef(env, obj);
+
DTRACE_PRINTLN("RobotPeer: setup()");
AWT_LOCK();
@@ -221,8 +242,15 @@
}
getNumButtons();
+ finally:
+ AWT_UNLOCK();
+}
- AWT_UNLOCK();
+JNIEXPORT jint JNICALL
+Java_sun_awt_X11_XRobotPeer_getNumberOfButtonsImpl(JNIEnv *env,
+ jclass cls) {
+ // At the moment this routine being called we already should have an initialized num_buttons variable.
+ return num_buttons;
}
JNIEXPORT void JNICALL
@@ -348,52 +376,65 @@
AWT_UNLOCK();
}
+/*
+ * Function joining the code of mousePressImpl and mouseReleaseImpl
+ */
+void mouseAction(JNIEnv *env,
+ jclass cls,
+ jint buttonMask,
+ Bool isMousePress)
+{
+ AWT_LOCK();
+
+ DTRACE_PRINTLN1("RobotPeer: mouseAction(%i)", buttonMask);
+ DTRACE_PRINTLN1("RobotPeer: mouseAction, press = %d", isMousePress);
+
+ if (buttonMask & java_awt_event_InputEvent_BUTTON1_MASK ||
+ buttonMask & java_awt_event_InputEvent_BUTTON1_DOWN_MASK )
+ {
+ XTestFakeButtonEvent(awt_display, 1, isMousePress, CurrentTime);
+ }
+ if ((buttonMask & java_awt_event_InputEvent_BUTTON2_MASK ||
+ buttonMask & java_awt_event_InputEvent_BUTTON2_DOWN_MASK) &&
+ (num_buttons >= 2)) {
+ XTestFakeButtonEvent(awt_display, 2, isMousePress, CurrentTime);
+ }
+ if ((buttonMask & java_awt_event_InputEvent_BUTTON3_MASK ||
+ buttonMask & java_awt_event_InputEvent_BUTTON3_DOWN_MASK) &&
+ (num_buttons >= 3)) {
+ XTestFakeButtonEvent(awt_display, 3, isMousePress, CurrentTime);
+ }
+
+ if (num_buttons > 3){
+ int32_t i;
+ int32_t button = 0;
+ for (i = 3; i +1
+ // users wants to affect 4 or 5 button but they are assigned
+ // to the wheel so => we have to shift it to the right by 2.
+ button = i + 3;
+ XTestFakeButtonEvent(awt_display, button, isMousePress, CurrentTime);
+ }
+ }
+ }
+
+ XSync(awt_display, False);
+ AWT_UNLOCK();
+}
+
JNIEXPORT void JNICALL
Java_sun_awt_X11_XRobotPeer_mousePressImpl (JNIEnv *env,
jclass cls,
jint buttonMask) {
- AWT_LOCK();
-
- DTRACE_PRINTLN1("RobotPeer: mousePressImpl(%i)", buttonMask);
-
- if (buttonMask & java_awt_event_InputEvent_BUTTON1_MASK) {
- XTestFakeButtonEvent(awt_display, 1, True, CurrentTime);
- }
- if ((buttonMask & java_awt_event_InputEvent_BUTTON2_MASK) &&
- (num_buttons >= 2)) {
- XTestFakeButtonEvent(awt_display, 2, True, CurrentTime);
- }
- if ((buttonMask & java_awt_event_InputEvent_BUTTON3_MASK) &&
- (num_buttons >= 3)) {
- XTestFakeButtonEvent(awt_display, 3, True, CurrentTime);
- }
- XSync(awt_display, False);
-
- AWT_UNLOCK();
+ mouseAction(env, cls, buttonMask, True);
}
JNIEXPORT void JNICALL
Java_sun_awt_X11_XRobotPeer_mouseReleaseImpl (JNIEnv *env,
jclass cls,
jint buttonMask) {
- AWT_LOCK();
-
- DTRACE_PRINTLN1("RobotPeer: mouseReleaseImpl(%i)", buttonMask);
-
- if (buttonMask & java_awt_event_InputEvent_BUTTON1_MASK) {
- XTestFakeButtonEvent(awt_display, 1, False, CurrentTime);
- }
- if ((buttonMask & java_awt_event_InputEvent_BUTTON2_MASK) &&
- (num_buttons >= 2)) {
- XTestFakeButtonEvent(awt_display, 2, False, CurrentTime);
- }
- if ((buttonMask & java_awt_event_InputEvent_BUTTON3_MASK) &&
- (num_buttons >= 3)) {
- XTestFakeButtonEvent(awt_display, 3, False, CurrentTime);
- }
- XSync(awt_display, False);
-
- AWT_UNLOCK();
+ mouseAction(env, cls, buttonMask, False);
}
JNIEXPORT void JNICALL
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/solaris/native/sun/xawt/XlibWrapper.c
--- a/jdk/src/solaris/native/sun/xawt/XlibWrapper.c Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/solaris/native/sun/xawt/XlibWrapper.c Wed Jul 05 16:47:27 2017 +0200
@@ -1641,6 +1641,13 @@
AWT_CHECK_HAVE_LOCK();
return XdbeSwapBuffers((Display*) jlong_to_ptr(display), (XdbeSwapInfo *) jlong_to_ptr(swap_info), num_windows);
}
+JNIEXPORT void JNICALL Java_sun_awt_X11_XlibWrapper_XQueryKeymap
+(JNIEnv *env, jclass clazz, jlong display, jlong vector)
+{
+
+ AWT_CHECK_HAVE_LOCK();
+ XQueryKeymap( (Display *) jlong_to_ptr(display), (char *) jlong_to_ptr(vector));
+}
JNIEXPORT jlong JNICALL
Java_sun_awt_X11_XlibWrapper_XKeycodeToKeysym(JNIEnv *env, jclass clazz,
@@ -1911,19 +1918,30 @@
jint x1, jint y1, jint x2, jint y2,
jobject region)
{
- XRectangle rects[256];
- XRectangle *pRect = rects;
- int numrects;
-
AWT_CHECK_HAVE_LOCK();
- numrects = RegionToYXBandedRectangles(env, x1, y1, x2, y2, region,
- &pRect, 256);
+ // If all the params are zeros, the shape must be simply reset.
+ // Otherwise, the shape may be not rectangular.
+ if (region || x1 || x2 || y1 || y2) {
+ XRectangle rects[256];
+ XRectangle *pRect = rects;
- XShapeCombineRectangles((Display *)jlong_to_ptr(display), (Window)jlong_to_ptr(window),
+ int numrects = RegionToYXBandedRectangles(env, x1, y1, x2, y2, region,
+ &pRect, 256);
+
+ XShapeCombineRectangles((Display *)jlong_to_ptr(display), (Window)jlong_to_ptr(window),
+ ShapeClip, 0, 0, pRect, numrects, ShapeSet, YXBanded);
+ XShapeCombineRectangles((Display *)jlong_to_ptr(display), (Window)jlong_to_ptr(window),
ShapeBounding, 0, 0, pRect, numrects, ShapeSet, YXBanded);
- if (pRect != rects) {
- free(pRect);
+ if (pRect != rects) {
+ free(pRect);
+ }
+ } else {
+ // Reset the shape to a rectangular form.
+ XShapeCombineMask((Display *)jlong_to_ptr(display), (Window)jlong_to_ptr(window),
+ ShapeClip, 0, 0, None, ShapeSet);
+ XShapeCombineMask((Display *)jlong_to_ptr(display), (Window)jlong_to_ptr(window),
+ ShapeBounding, 0, 0, None, ShapeSet);
}
}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java
--- a/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java Wed Jul 05 16:47:27 2017 +0200
@@ -68,13 +68,6 @@
private static final Logger log = Logger.getLogger("sun.awt.windows.WComponentPeer");
private static final Logger shapeLog = Logger.getLogger("sun.awt.windows.shape.WComponentPeer");
- static {
- wheelInit();
- }
-
- // Only actually does stuff if running on 95
- native static void wheelInit();
-
// ComponentPeer implementation
SurfaceData surfaceData;
@@ -964,8 +957,12 @@
+ "; SHAPE: " + shape);
}
- setRectangularShape(shape.getLoX(), shape.getLoY(), shape.getHiX(), shape.getHiY(),
- (shape.isRectangular() ? null : shape));
+ if (shape != null) {
+ setRectangularShape(shape.getLoX(), shape.getLoY(), shape.getHiX(), shape.getHiY(),
+ (shape.isRectangular() ? null : shape));
+ } else {
+ setRectangularShape(0, 0, 0, 0, null);
+ }
}
}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/classes/sun/awt/windows/WInputMethod.java
--- a/jdk/src/windows/classes/sun/awt/windows/WInputMethod.java Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/classes/sun/awt/windows/WInputMethod.java Wed Jul 05 16:47:27 2017 +0200
@@ -548,11 +548,15 @@
public void inquireCandidatePosition()
{
+ Component source = getClientComponent();
+ if (source == null) {
+ return;
+ }
// This call should return immediately just to cause
// InputMethodRequests.getTextLocation be called within
// AWT Event thread. Otherwise, a potential deadlock
// could happen.
- java.awt.EventQueue.invokeLater(new Runnable() {
+ Runnable r = new Runnable() {
public void run() {
int x = 0;
int y = 0;
@@ -573,7 +577,9 @@
openCandidateWindow(awtFocussedComponentPeer, x, y);
}
- });
+ };
+ WToolkit.postEvent(WToolkit.targetToAppContext(source),
+ new InvocationEvent(source, r));
}
// java.awt.Toolkit#getNativeContainer() is not available
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/classes/sun/awt/windows/WRobotPeer.java
--- a/jdk/src/windows/classes/sun/awt/windows/WRobotPeer.java Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/classes/sun/awt/windows/WRobotPeer.java Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 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
@@ -60,6 +60,8 @@
}
public native int getRGBPixelImpl(int x, int y);
+ public native int getNumberOfButtons();
+
public int [] getRGBPixels(Rectangle bounds) {
int pixelArray[] = new int[bounds.width*bounds.height];
getRGBPixels(bounds.x, bounds.y, bounds.width, bounds.height, pixelArray);
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/classes/sun/awt/windows/WToolkit.java
--- a/jdk/src/windows/classes/sun/awt/windows/WToolkit.java Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/classes/sun/awt/windows/WToolkit.java Wed Jul 05 16:47:27 2017 +0200
@@ -80,6 +80,10 @@
// Dynamic Layout Resize client code setting
protected boolean dynamicLayoutSetting = false;
+ //Is it allowed to generate events assigned to extra mouse buttons.
+ //Set to true by default.
+ private static boolean areExtraMouseButtonsEnabled = true;
+
/**
* Initialize JNI field and method IDs
*/
@@ -249,6 +253,11 @@
// Enabled "live resizing" by default. It remains controlled
// by the native system though.
setDynamicLayout(true);
+
+ areExtraMouseButtonsEnabled = Boolean.parseBoolean(System.getProperty("sun.awt.enableExtraMouseButtons", "true"));
+ //set system property if not yet assigned
+ System.setProperty("sun.awt.enableExtraMouseButtons", ""+areExtraMouseButtonsEnabled);
+ setExtraMouseButtonsEnabledNative(areExtraMouseButtonsEnabled);
}
public void run() {
@@ -961,4 +970,9 @@
return new WDesktopPeer();
}
+ public static native void setExtraMouseButtonsEnabledNative(boolean enable);
+
+ public boolean areExtraMouseButtonsEnabled() throws HeadlessException {
+ return areExtraMouseButtonsEnabled;
+ }
}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/awt/splashscreen/splashscreen_sys.c
--- a/jdk/src/windows/native/sun/awt/splashscreen/splashscreen_sys.c Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/awt/splashscreen/splashscreen_sys.c Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2008 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
@@ -23,24 +23,21 @@
* have any questions.
*/
+// copy from awt.h
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0600
+#endif
+
+// copy from awt.h
+#ifndef _WIN32_IE
+#define _WIN32_IE 0x0600
+#endif
+
#include "splashscreen_impl.h"
#include
#include
#include
-/* layered windows api prototypes. wouldn't be needed if we could use an updated version of the MS PSDK. */
-
-typedef BOOL WINAPI UpdateLayeredWindowT(HWND hwnd, // handle to layered window
- HDC hdcDst, // handle to screen DC
- POINT * pptDst, // new screen position
- SIZE * psize, // new size of the layered window
- HDC hdcSrc, // handle to surface DC
- POINT * pptSrc, // layer position
- COLORREF crKey, // color key
- BLENDFUNCTION * pblend, // blend function
- DWORD dwFlags // options
- );
-
#ifndef WS_EX_LAYERED
#define WS_EX_LAYERED 0x80000
#endif
@@ -57,21 +54,6 @@
#define AC_SRC_ALPHA 0x01
#endif
-static UpdateLayeredWindowT *UpdateLayeredWindow = NULL;
-
-/* Get/SetWindowLongPtr prototypes, for the case we're compiling with old headers for a 32-bit platform
- copied from Component.cpp
- FIXME: remove this as soon as the build process is using up-to-date headers */
-#if !defined(__int3264)
-#define GetWindowLongPtr GetWindowLong
-#define SetWindowLongPtr SetWindowLong
-#define GWLP_USERDATA GWL_USERDATA
-#define GWLP_WNDPROC GWL_WNDPROC
-typedef __int32 LONG_PTR;
-typedef unsigned __int32 ULONG_PTR;
-#endif // __int3264
-
-
#define WM_SPLASHUPDATE WM_USER+1
#define WM_SPLASHRECONFIGURE WM_USER+2
@@ -436,16 +418,11 @@
void
SplashInitPlatform(Splash * splash)
{
- HMODULE user32 = LoadLibrary("user32.dll");
HDC hdc;
int paletteMode;
InitializeCriticalSection(&splash->lock);
splash->isLayered = FALSE;
- if (user32) {
- UpdateLayeredWindow = (UpdateLayeredWindowT *)
- GetProcAddress(user32, "UpdateLayeredWindow");
- }
hdc = GetDC(NULL);
paletteMode = (GetDeviceCaps(hdc, RASTERCAPS) & RC_PALETTE) != 0;
if (UpdateLayeredWindow && !paletteMode) {
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/java2d/d3d/D3DPipelineManager.cpp
--- a/jdk/src/windows/native/sun/java2d/d3d/D3DPipelineManager.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/java2d/d3d/D3DPipelineManager.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -184,7 +184,7 @@
pMgr = D3DPipelineManager::GetInstance();
RETURN_IF_NULL(pMgr);
hMon = pMgr->pd3d9->GetAdapterMonitor(adapter);
- gdiScreen = AwtWin32GraphicsDevice::GetScreenFromMHND((MHND)hMon);
+ gdiScreen = AwtWin32GraphicsDevice::GetScreenFromHMONITOR(hMon);
JNU_CallStaticMethodByName(env, NULL,
"sun/java2d/pipe/hw/AccelDeviceEventNotifier",
@@ -194,21 +194,21 @@
UINT D3DPipelineManager::GetAdapterOrdinalForScreen(jint gdiScreen)
{
- MHND mHnd = AwtWin32GraphicsDevice::GetMonitor(gdiScreen);
- if (mHnd == (MHND)0) {
+ HMONITOR mHnd = AwtWin32GraphicsDevice::GetMonitor(gdiScreen);
+ if (mHnd == (HMONITOR)0) {
return D3DADAPTER_DEFAULT;
}
return GetAdapterOrdinalByHmon((HMONITOR)mHnd);
}
// static
-HRESULT D3DPipelineManager::HandleAdaptersChange(HMONITOR *pMHNDs, UINT monNum)
+HRESULT D3DPipelineManager::HandleAdaptersChange(HMONITOR *pHMONITORs, UINT monNum)
{
HRESULT res = S_OK;
BOOL bResetD3D = FALSE, bFound;
D3DPipelineManager *pMgr = D3DPipelineManager::GetInstance();
- RETURN_STATUS_IF_NULL(pMHNDs, E_FAIL);
+ RETURN_STATUS_IF_NULL(pHMONITORs, E_FAIL);
if (pMgr == NULL) {
// NULL pMgr is valid when the pipeline is not enabled or if it hasn't
// been created yet
@@ -234,7 +234,7 @@
}
bFound = FALSE;
for (UINT mon = 0; mon < monNum; mon++) {
- if (pMHNDs[mon] == hMon) {
+ if (pHMONITORs[mon] == hMon) {
J2dTraceLn3(J2D_TRACE_VERBOSE,
" adapter %d: found hmnd[%d]=0x%x", i, mon, hMon);
bFound = TRUE;
@@ -364,8 +364,8 @@
HRESULT
D3DPipelineManager::GDICheckForBadHardware()
{
- _DISPLAY_DEVICE dd;
- dd.dwSize = sizeof(DISPLAY_DEVICE);
+ DISPLAY_DEVICE dd;
+ dd.cb = sizeof(DISPLAY_DEVICE);
int failedDevices = 0;
int attachedDevices = 0;
@@ -379,9 +379,9 @@
// i<20 is to guard against buggy drivers
while (EnumDisplayDevices(NULL, i, &dd, 0) && i < 20) {
- if (dd.dwFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) {
+ if (dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) {
attachedDevices++;
- id = dd.deviceID;
+ id = dd.DeviceID;
if (wcslen(id) > 21) {
// get vendor ID
wcsncpy(vendorId, id+8, 4);
@@ -796,7 +796,7 @@
ZeroMemory(&mi, sizeof(MONITORINFO));
mi.cbSize = sizeof(MONITORINFO);
HMONITOR hMon = pd3d9->GetAdapterMonitor(adapterOrdinal);
- if (hMon == 0 || !GetMonitorInfo(hMon, (PMONITOR_INFO)&mi)) {
+ if (hMon == 0 || !GetMonitorInfo(hMon, (LPMONITORINFO)&mi)) {
J2dRlsTraceLn1(J2D_TRACE_ERROR,
"D3DPPLM::CreateDefaultFocusWindow: "\
"error getting monitor info for adapter=%d", adapterOrdinal);
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/java2d/d3d/D3DRenderQueue.cpp
--- a/jdk/src/windows/native/sun/java2d/d3d/D3DRenderQueue.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/java2d/d3d/D3DRenderQueue.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -23,8 +23,8 @@
* have any questions.
*/
+#include "D3DPipeline.h"
#include
-#include
#include "sun_java2d_pipe_BufferedOpCodes.h"
#include "jlong.h"
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/java2d/d3d/D3DRenderer.cpp
--- a/jdk/src/windows/native/sun/java2d/d3d/D3DRenderer.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/java2d/d3d/D3DRenderer.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -23,6 +23,8 @@
* have any questions.
*/
+#include "D3DPipeline.h"
+
#include "sun_java2d_d3d_D3DRenderer.h"
#include "D3DContext.h"
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/java2d/d3d/D3DSurfaceData.cpp
--- a/jdk/src/windows/native/sun/java2d/d3d/D3DSurfaceData.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/java2d/d3d/D3DSurfaceData.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -23,8 +23,7 @@
* have any questions.
*/
-#include
-#include
+#include "D3DPipeline.h"
#include
#include "D3DSurfaceData.h"
#include "D3DPipelineManager.h"
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/java2d/windows/GDIBlitLoops.cpp
--- a/jdk/src/windows/native/sun/java2d/windows/GDIBlitLoops.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/java2d/windows/GDIBlitLoops.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -23,6 +23,7 @@
* have any questions.
*/
+#include "awt.h"
#include
#include "gdefs.h"
#include "Trace.h"
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/java2d/windows/GDIRenderer.cpp
--- a/jdk/src/windows/native/sun/java2d/windows/GDIRenderer.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/java2d/windows/GDIRenderer.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -23,6 +23,7 @@
* have any questions.
*/
+#include "awt.h"
#include "sun_java2d_windows_GDIRenderer.h"
#include "java_awt_geom_PathIterator.h"
@@ -31,11 +32,8 @@
#include "awt_Pen.h"
#include "awt_Brush.h"
-#include "jni.h"
-
#include "GraphicsPrimitiveMgr.h"
-#include
#include /* for cos(), sin(), etc */
#define MAX_CLAMP_BND (1<<26)
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp
--- a/jdk/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -246,7 +246,7 @@
}
if( numScreens > 1 ) {
- MONITOR_INFO *miInfo;
+ LPMONITORINFO miInfo;
RECT rSect ={0,0,0,0};
RECT rView ={bounds->x1, bounds->y1, bounds->x2, bounds->y2};
retCode = FALSE;
@@ -258,7 +258,7 @@
::OffsetRect(&rView,
(ptOrig.x), (ptOrig.y));
- ::IntersectRect(&rSect,&rView,&(miInfo->rMonitor));
+ ::IntersectRect(&rSect,&rView,&(miInfo->rcMonitor));
if( FALSE == ::IsRectEmpty(&rSect) ) {
if( TRUE == ::EqualRect(&rSect,&rView) ) {
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/java2d/windows/WindowsFlags.cpp
--- a/jdk/src/windows/native/sun/java2d/windows/WindowsFlags.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/java2d/windows/WindowsFlags.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -23,8 +23,6 @@
* have any questions.
*/
-
-#include
#include
#include "Trace.h"
#include "WindowsFlags.h"
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/ComCtl32Util.cpp
--- a/jdk/src/windows/native/sun/windows/ComCtl32Util.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/ComCtl32Util.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -23,54 +23,26 @@
* have any questions.
*/
+#include "awt.h"
#include "ComCtl32Util.h"
ComCtl32Util::ComCtl32Util() {
- hModComCtl32 = NULL;
- m_bNewSubclassing = FALSE;
-
- m_lpfnSetWindowSubclass = NULL;
- m_lpfnRemoveWindowSubclass = NULL;
- m_lpfnDefSubclassProc = NULL;
}
ComCtl32Util::~ComCtl32Util() {
- DASSERT(hModComCtl32 == NULL);
}
void ComCtl32Util::InitLibraries() {
- if (hModComCtl32 == NULL) {
- hModComCtl32 = ::LoadLibrary(TEXT("comctl32.dll"));
- if (hModComCtl32 != NULL) {
- m_lpfnSetWindowSubclass = (PFNSETWINDOWSUBCLASS)::GetProcAddress(hModComCtl32, "SetWindowSubclass");
- m_lpfnRemoveWindowSubclass = (PFNREMOVEWINDOWSUBCLASS)::GetProcAddress(hModComCtl32, "RemoveWindowSubclass");
- m_lpfnDefSubclassProc = (PFNDEFSUBCLASSPROC)::GetProcAddress(hModComCtl32, "DefSubclassProc");
-
- m_bNewSubclassing = (m_lpfnSetWindowSubclass != NULL) &&
- (m_lpfnRemoveWindowSubclass != NULL) &&
- (m_lpfnDefSubclassProc != NULL);
-
- fn_InitCommonControlsEx = (ComCtl32Util::InitCommonControlsExType)::GetProcAddress(hModComCtl32, "InitCommonControlsEx");
- InitCommonControls();
- }
- }
-}
-
-void ComCtl32Util::FreeLibraries() {
- if (hModComCtl32 != NULL) {
- m_lpfnSetWindowSubclass = NULL;
- m_lpfnRemoveWindowSubclass = NULL;
- m_lpfnDefSubclassProc = NULL;
- ::FreeLibrary(hModComCtl32);
- hModComCtl32 = NULL;
- }
+ INITCOMMONCONTROLSEX iccex;
+ memset(&iccex, 0, sizeof(INITCOMMONCONTROLSEX));
+ iccex.dwSize = sizeof(INITCOMMONCONTROLSEX);
+ ::InitCommonControlsEx(&iccex);
}
WNDPROC ComCtl32Util::SubclassHWND(HWND hwnd, WNDPROC _WindowProc) {
- if (m_bNewSubclassing) {
- DASSERT(hModComCtl32 != NULL);
+ if (IS_WINXP) {
const SUBCLASSPROC p = SharedWindowProc; // let compiler check type of SharedWindowProc
- m_lpfnSetWindowSubclass(hwnd, p, (UINT_PTR)_WindowProc, NULL); // _WindowProc is used as subclass ID
+ ::SetWindowSubclass(hwnd, p, (UINT_PTR)_WindowProc, NULL); // _WindowProc is used as subclass ID
return NULL;
} else {
return (WNDPROC)::SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)_WindowProc);
@@ -78,21 +50,17 @@
}
void ComCtl32Util::UnsubclassHWND(HWND hwnd, WNDPROC _WindowProc, WNDPROC _DefWindowProc) {
- if (m_bNewSubclassing) {
- DASSERT(hModComCtl32 != NULL);
- DASSERT(_DefWindowProc == NULL);
+ if (IS_WINXP) {
const SUBCLASSPROC p = SharedWindowProc; // let compiler check type of SharedWindowProc
- m_lpfnRemoveWindowSubclass(hwnd, p, (UINT_PTR)_WindowProc); // _WindowProc is used as subclass ID
+ ::RemoveWindowSubclass(hwnd, p, (UINT_PTR)_WindowProc); // _WindowProc is used as subclass ID
} else {
::SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)_DefWindowProc);
}
}
LRESULT ComCtl32Util::DefWindowProc(WNDPROC _DefWindowProc, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) {
- if (m_bNewSubclassing) {
- DASSERT(hModComCtl32 != NULL);
- DASSERT(_DefWindowProc == NULL);
- return m_lpfnDefSubclassProc(hwnd, msg, wParam, lParam);
+ if (IS_WINXP) {
+ return ::DefSubclassProc(hwnd, msg, wParam, lParam);
} else if (_DefWindowProc != NULL) {
return ::CallWindowProc(_DefWindowProc, hwnd, msg, wParam, lParam);
} else {
@@ -111,15 +79,3 @@
CATCH_BAD_ALLOC_RET(0);
}
-
-void ComCtl32Util::InitCommonControls()
-{
- if (fn_InitCommonControlsEx == NULL) {
- return;
- }
-
- INITCOMMONCONTROLSEX iccex;
- memset(&iccex, 0, sizeof(INITCOMMONCONTROLSEX));
- iccex.dwSize = sizeof(INITCOMMONCONTROLSEX);
- fn_InitCommonControlsEx(&iccex);
-}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/ComCtl32Util.h
--- a/jdk/src/windows/native/sun/windows/ComCtl32Util.h Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/ComCtl32Util.h Wed Jul 05 16:47:27 2017 +0200
@@ -30,20 +30,6 @@
#ifndef _COMCTL32UTIL_H
#define _COMCTL32UTIL_H
-
-/*
- * comctl32.dll version 6 subclassing - taken from PlatformSDK/Include/commctrl.h
- */
-typedef LRESULT (CALLBACK *SUBCLASSPROC)(HWND hWnd, UINT uMsg, WPARAM wParam, \
- LPARAM lParam, UINT_PTR uIdSubclass, DWORD_PTR dwRefData);
-
-typedef BOOL (WINAPI *PFNSETWINDOWSUBCLASS)(HWND hWnd, SUBCLASSPROC pfnSubclass, UINT_PTR uIdSubclass, \
- DWORD_PTR dwRefData);
-typedef BOOL (WINAPI *PFNREMOVEWINDOWSUBCLASS)(HWND hWnd, SUBCLASSPROC pfnSubclass, \
- UINT_PTR uIdSubclass);
-
-typedef LRESULT (WINAPI *PFNDEFSUBCLASSPROC)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-
class ComCtl32Util
{
public:
@@ -52,21 +38,8 @@
return theInstance;
}
- // loads comctl32.dll and checks if required routines are available
- // called from AwtToolkit::AwtToolkit()
void InitLibraries();
- // unloads comctl32.dll
- // called from AwtToolkit::Dispose()
- void FreeLibraries();
- //-- comctl32.dll version 6 subclassing API --//
-
- INLINE BOOL IsNewSubclassing() {
- return m_bNewSubclassing;
- }
-
- // if comctl32.dll version 6 is used returns NULL, otherwise
- // returns default window proc
WNDPROC SubclassHWND(HWND hwnd, WNDPROC _WindowProc);
// DefWindowProc is the same as returned from SubclassHWND
void UnsubclassHWND(HWND hwnd, WNDPROC _WindowProc, WNDPROC _DefWindowProc);
@@ -77,19 +50,6 @@
ComCtl32Util();
~ComCtl32Util();
- HMODULE hModComCtl32;
-
- PFNSETWINDOWSUBCLASS m_lpfnSetWindowSubclass;
- PFNREMOVEWINDOWSUBCLASS m_lpfnRemoveWindowSubclass;
- PFNDEFSUBCLASSPROC m_lpfnDefSubclassProc;
-
- typedef BOOL (WINAPI * InitCommonControlsExType)(const LPINITCOMMONCONTROLSEX lpInitCtrls);
- InitCommonControlsExType fn_InitCommonControlsEx;
-
- void InitCommonControls();
-
- BOOL m_bNewSubclassing;
-
// comctl32.dll version 6 window proc
static LRESULT CALLBACK SharedWindowProc(HWND hwnd, UINT message,
WPARAM wParam, LPARAM lParam,
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/Devices.cpp
--- a/jdk/src/windows/native/sun/windows/Devices.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/Devices.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -83,9 +83,83 @@
#include "Devices.h"
#include "Trace.h"
-#include "awt_Multimon.h"
#include "D3DPipelineManager.h"
+
+/* Some helper functions (from awt_MMStub.h/cpp) */
+
+int g_nMonitorCounter;
+int g_nMonitorLimit;
+HMONITOR* g_hmpMonitors;
+
+// Callback for CountMonitors below
+BOOL WINAPI clb_fCountMonitors(HMONITOR hMon, HDC hDC, LPRECT rRect, LPARAM lP)
+{
+ g_nMonitorCounter ++;
+ return TRUE;
+}
+
+int WINAPI CountMonitors(void)
+{
+ g_nMonitorCounter = 0;
+ ::EnumDisplayMonitors(NULL, NULL, clb_fCountMonitors, 0L);
+ return g_nMonitorCounter;
+
+}
+
+// Callback for CollectMonitors below
+BOOL WINAPI clb_fCollectMonitors(HMONITOR hMon, HDC hDC, LPRECT rRect, LPARAM lP)
+{
+
+ if ((g_nMonitorCounter < g_nMonitorLimit) && (NULL != g_hmpMonitors)) {
+ g_hmpMonitors[g_nMonitorCounter] = hMon;
+ g_nMonitorCounter ++;
+ }
+
+ return TRUE;
+}
+
+int WINAPI CollectMonitors(HMONITOR* hmpMonitors, int nNum)
+{
+ int retCode = 0;
+
+ if (NULL != hmpMonitors) {
+
+ g_nMonitorCounter = 0;
+ g_nMonitorLimit = nNum;
+ g_hmpMonitors = hmpMonitors;
+
+ ::EnumDisplayMonitors(NULL, NULL, clb_fCollectMonitors, 0L);
+
+ retCode = g_nMonitorCounter;
+
+ g_nMonitorCounter = 0;
+ g_nMonitorLimit = 0;
+ g_hmpMonitors = NULL;
+
+ }
+ return retCode;
+}
+
+BOOL WINAPI MonitorBounds(HMONITOR hmMonitor, RECT* rpBounds)
+{
+ BOOL retCode = FALSE;
+
+ if ((NULL != hmMonitor) && (NULL != rpBounds)) {
+ MONITORINFOEX miInfo;
+
+ memset((void*)(&miInfo), 0, sizeof(MONITORINFOEX));
+ miInfo.cbSize = sizeof(MONITORINFOEX);
+
+ if (TRUE == (retCode = ::GetMonitorInfo(hmMonitor, &miInfo))) {
+ (*rpBounds) = miInfo.rcMonitor;
+ }
+ }
+ return retCode;
+}
+
+/* End of helper functions */
+
Devices* Devices::theInstance = NULL;
CriticalSection Devices::arrayLock;
@@ -113,9 +187,9 @@
{
J2dTraceLn(J2D_TRACE_INFO, "Devices::UpdateInstance");
- int numScreens = ::CountMonitors();
- MHND *monHds = (MHND *)safe_Malloc(numScreens * sizeof(MHND));
- if (numScreens != ::CollectMonitors(monHds, numScreens)) {
+ int numScreens = CountMonitors();
+ HMONITOR *monHds = (HMONITOR *)safe_Malloc(numScreens * sizeof(HMONITOR));
+ if (numScreens != CollectMonitors(monHds, numScreens)) {
J2dRlsTraceLn(J2D_TRACE_ERROR,
"Devices::UpdateInstance: Failed to get all "\
"monitor handles.");
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/Devices.h
--- a/jdk/src/windows/native/sun/windows/Devices.h Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/Devices.h Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2008 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
@@ -70,4 +70,8 @@
};
+// Some helper functions (from awt_MMStub.h/cpp)
+
+BOOL WINAPI MonitorBounds (HMONITOR, RECT*);
+
#endif _DEVICES_H_
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/GDIHashtable.cpp
--- a/jdk/src/windows/native/sun/windows/GDIHashtable.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/GDIHashtable.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 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
@@ -25,7 +25,6 @@
#include "GDIHashtable.h"
#include "awt_GDIObject.h"
-#include "awt_dlls.h"
GDIHashtable::BatchDestructionManager GDIHashtable::manager;
@@ -46,7 +45,6 @@
DASSERT(value != NULL);
m_deleteProc(value);
}
- manager.update();
}
void GDIHashtable::flush() {
@@ -128,9 +126,6 @@
}
}
-#undef GFSR_GDIRESOURCES
-#define GFSR_GDIRESOURCES 0x0001
-
GDIHashtable::BatchDestructionManager::BatchDestructionManager(UINT nFirstThreshold,
UINT nSecondThreshold,
UINT nDestroyPeriod) :
@@ -138,48 +133,6 @@
m_nSecondThreshold(nSecondThreshold),
m_nDestroyPeriod(nDestroyPeriod),
m_nCounter(0),
- m_bBatchingEnabled(TRUE) {
- load_rsrc32_procs();
+ m_bBatchingEnabled(TRUE)
+{
}
-
-void GDIHashtable::BatchDestructionManager::update() {
-
- if (get_free_system_resources != NULL) {
-
- CriticalSection::Lock l(m_managerLock);
-
- if (m_nCounter < 0) {
- UINT nFreeResources = (*get_free_system_resources)(GFSR_GDIRESOURCES);
- /*
- * If m_bBatchingEnabled is FALSE there is no need
- * to flush since we have been destroying all
- * GDI resources as soon as they were released.
- */
- if (m_bBatchingEnabled) {
- if (nFreeResources < m_nFirstThreshold) {
- flushAll();
- nFreeResources = (*get_free_system_resources)(GFSR_GDIRESOURCES);
- }
- }
- if (nFreeResources < m_nSecondThreshold) {
- m_bBatchingEnabled = FALSE;
- m_nCounter = m_nDestroyPeriod;
- } else {
- m_bBatchingEnabled = TRUE;
- /*
- * The frequency of checks must depend on the currect amount
- * of free space in GDI heaps. Otherwise we can run into the
- * Resource Meter warning dialog when GDI resources are low.
- * This is a heuristic rule that provides this dependency.
- * These numbers have been chosen because:
- * Resource Meter posts a warning dialog when less than 10%
- * of GDI resources are free.
- * 5 pens/brushes take 1%. So 3 is the upper bound.
- * When changing this rule you should check that performance
- * isn't affected (with Caffeine Mark and JMark).
- */
- m_nCounter = (nFreeResources - 10) * 3;
- }
- }
- }
-}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/GDIHashtable.h
--- a/jdk/src/windows/native/sun/windows/GDIHashtable.h Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/GDIHashtable.h Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 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
@@ -151,12 +151,6 @@
*/
INLINE void decrementCounter() { m_nCounter--; }
- /**
- * Depending on the amount of free space in GDI heaps flushes
- * all GDIHashtables and sets the initial counter value.
- */
- void update();
-
INLINE CriticalSection& getLock() { return m_managerLock; }
};
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/ShellFolder2.cpp
--- a/jdk/src/windows/native/sun/windows/ShellFolder2.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/ShellFolder2.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2008 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
@@ -31,17 +31,27 @@
// This file should stand independent of AWT and should ultimately be
// put into its own DLL.
#include
-#endif
+#else
+// Include jni_util.h first, so JNU_* macros can be redefined
+#include "jni_util.h"
+// Borrow some macros from awt.h
+#define JNU_NewStringPlatform(env, x) env->NewString(reinterpret_cast(x), static_cast(_tcslen(x)))
+#define JNU_GetStringPlatformChars(env, x, y) reinterpret_cast(env->GetStringChars(x, y))
+#define JNU_ReleaseStringPlatformChars(env, x, y) env->ReleaseStringChars(x, reinterpret_cast(y))
+#endif // DEBUG
#include
#include
#include
-#include "jni_util.h"
#include "jlong.h"
#include "alloc.h"
#include "stdhdrs.h"
-#include "UnicowsLoader.h"
+
+// Copy from shlguid.h which is no longer in PlatformSDK
+#ifndef DEFINE_SHLGUID
+#define DEFINE_SHLGUID(name, l, w1, w2) DEFINE_GUID(name, l, w1, w2, 0xC0, 0, 0, 0, 0, 0, 0, 0x46)
+#endif
// {93F2F68C-1D1B-11d3-A30E-00C04F79ABD1}
DEFINE_GUID(IID_IShellFolder2, 0x93f2f68c, 0x1d1b, 0x11d3, 0xa3, 0xe, 0x0, 0xc0, 0x4f, 0x79, 0xab, 0xd1);
@@ -86,13 +96,15 @@
static IMalloc* pMalloc;
static IShellFolder* pDesktop;
-static BOOL isXP;
-
-// copied from awt.h, because it is not included in release
-#if defined (WIN32)
- #define IS_WINVISTA (!(::GetVersion() & 0x80000000) && LOBYTE(LOWORD(::GetVersion())) >= 6)
-#else
- #define IS_WINVISTA FALSE
+// Some macros from awt.h, because it is not included in release
+#ifndef IS_WIN2000
+#define IS_WIN2000 (LOBYTE(LOWORD(::GetVersion())) >= 5)
+#endif
+#ifndef IS_WINXP
+#define IS_WINXP ((IS_WIN2000 && HIBYTE(LOWORD(::GetVersion())) >= 1) || LOBYTE(LOWORD(::GetVersion())) > 5)
+#endif
+#ifndef IS_WINVISTA
+#define IS_WINVISTA (!(::GetVersion() & 0x80000000) && LOBYTE(LOWORD(::GetVersion())) >= 6)
#endif
@@ -103,7 +115,6 @@
static HMODULE libShell32 = NULL;
static HMODULE libUser32 = NULL;
static HMODULE libComCtl32 = NULL;
- static HMODULE libUnicows = UnicowsLoader::GetModuleHandle();
// If already initialized, return TRUE
if (libShell32 != NULL && libUser32 != NULL) {
return TRUE;
@@ -130,7 +141,7 @@
// Set up procs - libShell32
fn_FindExecutable = (FindExecutableType)GetProcAddress(
- (libUnicows ? libUnicows : libShell32), "FindExecutableW");
+ libShell32, "FindExecutableW");
if (fn_FindExecutable == NULL) {
return FALSE;
}
@@ -140,7 +151,7 @@
return FALSE;
}
fn_SHGetFileInfo = (SHGetFileInfoType)GetProcAddress(
- (libUnicows ? libUnicows : libShell32), "SHGetFileInfoW");
+ libShell32, "SHGetFileInfoW");
if (fn_SHGetFileInfo == NULL) {
return FALSE;
}
@@ -154,7 +165,7 @@
return FALSE;
}
fn_SHGetPathFromIDList = (SHGetPathFromIDListType)GetProcAddress(
- (libUnicows ? libUnicows : libShell32), "SHGetPathFromIDListW");
+ libShell32, "SHGetPathFromIDListW");
if (fn_SHGetPathFromIDList == NULL) {
return FALSE;
}
@@ -181,19 +192,19 @@
static jstring jstringFromSTRRET(JNIEnv* env, LPITEMIDLIST pidl, STRRET* pStrret) {
switch (pStrret->uType) {
case STRRET_CSTR :
- return JNU_NewStringPlatform(env, pStrret->cStr);
+ return JNU_NewStringPlatform(env, reinterpret_cast(pStrret->cStr));
case STRRET_OFFSET :
// Note : this may need to be WCHAR instead
return JNU_NewStringPlatform(env,
(CHAR*)pidl + pStrret->uOffset);
case STRRET_WSTR :
- return env->NewString(pStrret->pOleStr,
+ return env->NewString(reinterpret_cast(pStrret->pOleStr),
static_cast(wcslen(pStrret->pOleStr)));
}
return NULL;
}
// restoring the original definition
-#define JNU_NewStringPlatform(env, x) env->NewString(x, static_cast(_tcslen(x)))
+#define JNU_NewStringPlatform(env, x) env->NewString(reinterpret_cast(x), static_cast(_tcslen(x)))
/*
* Class: sun_awt_shell_Win32ShellFolder2
@@ -212,13 +223,6 @@
MID_relativePIDL = env->GetMethodID(cls, "setRelativePIDL", "(J)V");
FID_displayName = env->GetFieldID(cls, "displayName", "Ljava/lang/String;");
FID_folderType = env->GetFieldID(cls, "folderType", "Ljava/lang/String;");
-
- // Find out if we are on XP or later
- long version = GetVersion();
- isXP = (!(version & 0x80000000) &&
- (LOBYTE(LOWORD(version)) == 5 &&
- HIBYTE(LOWORD(version)) >= 1) ||
- LOBYTE(LOWORD(version)) > 5);
}
static IShellIcon* getIShellIcon(IShellFolder* pIShellFolder) {
@@ -669,46 +673,24 @@
if (!CoInit(doCoUninit)) {
return 0;
}
- if (IS_NT) {
- IShellLinkW* psl;
- hres = ::CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_IShellLinkW, (LPVOID *)&psl);
+ IShellLinkW* psl;
+ hres = ::CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_IShellLinkW, (LPVOID *)&psl);
+ if (SUCCEEDED(hres)) {
+ IPersistFile* ppf;
+ hres = psl->QueryInterface(IID_IPersistFile, (void**)&ppf);
if (SUCCEEDED(hres)) {
- IPersistFile* ppf;
- hres = psl->QueryInterface(IID_IPersistFile, (void**)&ppf);
+ hres = ppf->Load(wstr, STGM_READ);
if (SUCCEEDED(hres)) {
- hres = ppf->Load(wstr, STGM_READ);
- if (SUCCEEDED(hres)) {
- if (resolve) {
- hres = psl->Resolve(NULL, 0);
- // Ignore failure
- }
- pidl = (LPITEMIDLIST)NULL;
- hres = psl->GetIDList(&pidl);
+ if (resolve) {
+ hres = psl->Resolve(NULL, 0);
+ // Ignore failure
}
- ppf->Release();
+ pidl = (LPITEMIDLIST)NULL;
+ hres = psl->GetIDList(&pidl);
}
- psl->Release();
+ ppf->Release();
}
- } else {
- IShellLinkA* psl;
- hres = ::CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_IShellLinkA, (LPVOID *)&psl);
- if (SUCCEEDED(hres)) {
- IPersistFile* ppf;
- hres = psl->QueryInterface(IID_IPersistFile, (void**)&ppf);
- if (SUCCEEDED(hres)) {
- hres = ppf->Load(wstr, STGM_READ);
- if (SUCCEEDED(hres)) {
- if (resolve) {
- hres = psl->Resolve(NULL, 0);
- // Ignore failure
- }
- pidl = (LPITEMIDLIST)NULL;
- hres = psl->GetIDList(&pidl);
- }
- ppf->Release();
- }
- psl->Release();
- }
+ psl->Release();
}
if (doCoUninit) {
::CoUninitialize();
@@ -742,10 +724,10 @@
int nLength = env->GetStringLength(jname);
jchar* wszPath = new jchar[nLength + 1];
const jchar* strPath = env->GetStringChars(jname, NULL);
- wcsncpy(wszPath, strPath, nLength);
+ wcsncpy(reinterpret_cast(wszPath), reinterpret_cast(strPath), nLength);
wszPath[nLength] = 0;
HRESULT res = pIShellFolder->ParseDisplayName(NULL, NULL,
- const_cast(wszPath), NULL, &pIDL, NULL);
+ reinterpret_cast(wszPath), NULL, &pIDL, NULL);
if (res != S_OK) {
JNU_ThrowIOException(env, "Could not parse name");
pIDL = 0;
@@ -804,7 +786,7 @@
(JNIEnv* env, jobject folder, jstring path)
{
TCHAR szBuf[MAX_PATH];
- LPCTSTR szPath = (LPCTSTR)JNU_GetStringPlatformChars(env, path, NULL);
+ LPCTSTR szPath = JNU_GetStringPlatformChars(env, path, NULL);
if (szPath == NULL) {
return NULL;
}
@@ -827,7 +809,7 @@
{
HICON hIcon = NULL;
SHFILEINFO fileInfo;
- LPCTSTR pathStr = (LPCTSTR)JNU_GetStringPlatformChars(env, absolutePath, NULL);
+ LPCTSTR pathStr = JNU_GetStringPlatformChars(env, absolutePath, NULL);
if (fn_SHGetFileInfo(pathStr, 0L, &fileInfo, sizeof(fileInfo),
SHGFI_ICON | (getLargeIcon ? 0 : SHGFI_SMALLICON)) != 0) {
hIcon = fileInfo.hIcon;
@@ -890,52 +872,27 @@
}
HRESULT hres;
- if (IS_NT) {
- IExtractIconW* pIcon;
- hres = pIShellFolder->GetUIObjectOf(NULL, 1, const_cast(&pidl),
+ IExtractIconW* pIcon;
+ hres = pIShellFolder->GetUIObjectOf(NULL, 1, const_cast(&pidl),
IID_IExtractIconW, NULL, (void**)&pIcon);
+ if (SUCCEEDED(hres)) {
+ WCHAR szBuf[MAX_PATH];
+ INT index;
+ UINT flags;
+ hres = pIcon->GetIconLocation(GIL_FORSHELL, szBuf, MAX_PATH, &index, &flags);
if (SUCCEEDED(hres)) {
- WCHAR szBuf[MAX_PATH];
- INT index;
- UINT flags;
- hres = pIcon->GetIconLocation(GIL_FORSHELL, szBuf, MAX_PATH, &index, &flags);
+ HICON hIconLarge;
+ hres = pIcon->Extract(szBuf, index, &hIconLarge, &hIcon, (16 << 16) + 32);
if (SUCCEEDED(hres)) {
- HICON hIconLarge;
- hres = pIcon->Extract(szBuf, index, &hIconLarge, &hIcon, (16 << 16) + 32);
- if (SUCCEEDED(hres)) {
- if (getLargeIcon) {
- fn_DestroyIcon((HICON)hIcon);
- hIcon = hIconLarge;
- } else {
- fn_DestroyIcon((HICON)hIconLarge);
- }
+ if (getLargeIcon) {
+ fn_DestroyIcon((HICON)hIcon);
+ hIcon = hIconLarge;
+ } else {
+ fn_DestroyIcon((HICON)hIconLarge);
}
}
- pIcon->Release();
}
- } else {
- IExtractIconA* pIcon;
- hres = pIShellFolder->GetUIObjectOf(NULL, 1, const_cast(&pidl),
- IID_IExtractIconA, NULL, (void**)&pIcon);
- if (SUCCEEDED(hres)) {
- CHAR szBuf[MAX_PATH];
- INT index;
- UINT flags;
- hres = pIcon->GetIconLocation(GIL_FORSHELL, szBuf, MAX_PATH, &index, &flags);
- if (SUCCEEDED(hres)) {
- HICON hIconLarge;
- hres = pIcon->Extract(szBuf, index, &hIconLarge, &hIcon, (16 << 16) + 32);
- if (SUCCEEDED(hres)) {
- if (getLargeIcon) {
- fn_DestroyIcon((HICON)hIcon);
- hIcon = hIconLarge;
- } else {
- fn_DestroyIcon((HICON)hIconLarge);
- }
- }
- }
- pIcon->Release();
- }
+ pIcon->Release();
}
if (doCoUninit) {
::CoUninitialize();
@@ -987,7 +944,7 @@
// XP supports alpha in some icons, and depending on device.
// This should take precedence over the icon mask bits.
BOOL hasAlpha = FALSE;
- if (isXP) {
+ if (IS_WINXP) {
for (int i = 0; i < nBits; i++) {
if ((colorBits[i] & 0xff000000) != 0) {
hasAlpha = TRUE;
@@ -1127,9 +1084,9 @@
(JNIEnv* env, jclass cls, jstring libName, jint iconID,
jint cxDesired, jint cyDesired, jboolean useVGAColors)
{
- HINSTANCE libHandle = LoadLibrary(env->GetStringChars(libName, NULL));
+ HINSTANCE libHandle = LoadLibrary(JNU_GetStringPlatformChars(env, libName, NULL));
if (libHandle != NULL) {
- UINT fuLoad = (useVGAColors && !isXP) ? LR_VGACOLOR : 0;
+ UINT fuLoad = (useVGAColors && !IS_WINXP) ? LR_VGACOLOR : 0;
return ptr_to_jlong(LoadImage(libHandle, MAKEINTRESOURCE(iconID),
IMAGE_ICON, cxDesired, cyDesired,
fuLoad));
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/UnicowsLoader.cpp
--- a/jdk/src/windows/native/sun/windows/UnicowsLoader.cpp Wed Jul 05 16:46:57 2017 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,430 +0,0 @@
-/*
- * Copyright 2003-2005 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-#include
-#include "alloc.h"
-#include "UnicowsLoader.h"
-
-/*
- * Support functions for the Microsoft Layer for Unicode (MSLU).
- *
- * The MSLU maps the wide char version of Windows APIs with strings
- * to their ANSI version equivalent on Win98/ME platforms.
- *
- * For more details on the MSLU, please refer to the MSDN webpage at:
- * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/mslu/winprog/microsoft_layer_for_unicode_on_windows_95_98_me_systems.asp
- */
-
-// The MSLU module handle. Only initialized on Win9x/ME.
-HMODULE UnicowsLoader::hmodUnicows = NULL;
-
-// MSLU loader entry point, which is called when the module
-// is initialized.
-extern "C" HMODULE (__stdcall *_PfnLoadUnicows)(void) =
- &UnicowsLoader::LoadUnicows;
-
-// Overriede APIs that are not supported by MSLU.
-extern "C" FARPROC Unicows_GetPrinterW =
- (FARPROC)&UnicowsLoader::GetPrinterWImpl;
-extern "C" FARPROC Unicows_EnumPrintersW =
- (FARPROC)&UnicowsLoader::EnumPrintersWImpl;
-
-HMODULE __stdcall UnicowsLoader::LoadUnicows(void)
-{
- if (hmodUnicows != NULL) {
- return hmodUnicows;
- }
-
- // Unfortunately, some DLLs that are loaded in conjunction with
- // unicows.dll may blow the FPU's control word. So save it here.
- unsigned int fpu_cw = _CW_DEFAULT;
- fpu_cw = _control87(0, 0);
-
- // Loads the DLL, assuming that the DLL resides in the same directory
- // as the AWT(_G).DLL. We cannot use "sun.boot.library.path" system
- // property since there is no way to issue JNI calls at this point
- // (JNI_OnLoad is not yet called so it cannot obtain JavaVM structure)
- //
- // To obtain the AWT module handle, call GetModuleHandleA() directly,
- // instead of AwtToolkit.GetModuleHandle(). Otherwise it could cause
- // an infinite loop if some W call were made inside AwtToolkit class
- // initialization.
- HMODULE hmodAWT = GetModuleHandleA("awt");
- LPSTR abspath = (LPSTR)safe_Malloc(MAX_PATH);
- if (abspath != NULL) {
- GetModuleFileNameA(hmodAWT, abspath, MAX_PATH);
- *strrchr(abspath, '\\') = '\0';
- strcat(abspath, "\\unicows.dll");
- hmodUnicows = LoadLibraryA(abspath);
- free(abspath);
- }
-
- // Restore the FPU control word if needed.
- if ( _control87(0, 0) != fpu_cw) {
- _control87(fpu_cw, 0xfffff);
- }
-
- return hmodUnicows;
-}
-
-HMODULE UnicowsLoader::GetModuleHandle(void)
-{
- return hmodUnicows;
-}
-
-
-// Convenient functions to convert DEVMODEA -> DEVMODEW
-void UnicowsLoader::DevModeA2DevModeW(
- const DEVMODEA * dma,
- DEVMODEW * dmw)
-{
- // convert string portions
- ::MultiByteToWideChar(CP_ACP, 0, (CHAR *)dma->dmDeviceName, CCHDEVICENAME,
- dmw->dmDeviceName, CCHDEVICENAME);
- ::MultiByteToWideChar(CP_ACP, 0, (CHAR *)dma->dmFormName, CCHDEVICENAME,
- dmw->dmFormName, CCHDEVICENAME);
-
- // copy driver specific data if exists
- if (dma->dmDriverExtra != 0) {
- PBYTE pExtraA = (PBYTE)(dma + 1);
- PBYTE pExtraW = (PBYTE)(dmw + 1);
- memcpy(pExtraW, pExtraA, dma->dmDriverExtra);
- }
-
- // copy normal struct members
- dmw->dmSpecVersion = dma->dmSpecVersion;
- dmw->dmDriverVersion = dma->dmDriverVersion;
- dmw->dmSize = dma->dmSize;
- dmw->dmDriverExtra = dma->dmDriverExtra;
- dmw->dmFields = dma->dmFields;
- dmw->dmPosition = dma->dmPosition;
- dmw->dmScale = dma->dmScale;
- dmw->dmCopies = dma->dmCopies;
- dmw->dmDefaultSource = dma->dmDefaultSource;
- dmw->dmPrintQuality = dma->dmPrintQuality;
- dmw->dmColor = dma->dmColor;
- dmw->dmDuplex = dma->dmDuplex;
- dmw->dmYResolution = dma->dmYResolution;
- dmw->dmTTOption = dma->dmTTOption;
- dmw->dmCollate = dma->dmCollate;
- dmw->dmLogPixels = dma->dmLogPixels;
- dmw->dmBitsPerPel = dma->dmBitsPerPel;
- dmw->dmPelsWidth = dma->dmPelsWidth;
- dmw->dmPelsHeight = dma->dmPelsHeight;
- dmw->dmDisplayFlags = dma->dmDisplayFlags;
- dmw->dmDisplayFrequency = dma->dmDisplayFrequency;
-#if(WINVER >= 0x0400)
- dmw->dmICMMethod = dma->dmICMMethod;
- dmw->dmICMIntent = dma->dmICMIntent;
- dmw->dmMediaType = dma->dmMediaType;
- dmw->dmDitherType = dma->dmDitherType;
- dmw->dmReserved1 = dma->dmReserved1;
- dmw->dmReserved2 = dma->dmReserved2;
-#if (WINVER >= 0x0500) || (_WIN32_WINNT >= 0x0400)
- dmw->dmPanningWidth = dma->dmPanningWidth;
- dmw->dmPanningHeight = dma->dmPanningHeight;
-#endif
-#endif /* WINVER >= 0x0400 */
-}
-
-// PRINTER_INFO_1 struct converter
-void UnicowsLoader::PrinterInfo1A2W(
- const LPPRINTER_INFO_1A pi1A,
- LPPRINTER_INFO_1W pi1W,
- const DWORD num)
-{
- LPWSTR pwstrbuf = (LPWSTR)(pi1W + num);
- DWORD current;
-
- // loop through all structures
- for (current = 0; current < num; current ++) {
- LPPRINTER_INFO_1A curPi1A = pi1A + current;
- LPPRINTER_INFO_1W curPi1W = pi1W + current;
-
- // copy the structure itself
- memcpy(curPi1W, curPi1A, sizeof(_PRINTER_INFO_1W));
-
- // copy string members
- StringA2W(curPi1A->pDescription, &(curPi1W->pDescription), &pwstrbuf);
- StringA2W(curPi1A->pName, &(curPi1W->pName), &pwstrbuf);
- StringA2W(curPi1A->pComment, &(curPi1W->pComment), &pwstrbuf);
- }
-}
-
-// PRINTER_INFO_2 struct converter
-void UnicowsLoader::PrinterInfo2A2W(
- const LPPRINTER_INFO_2A pi2A,
- LPPRINTER_INFO_2W pi2W,
- const DWORD num)
-{
- PBYTE pbytebuf = (PBYTE)(pi2W + num);
- DWORD current;
-
- // loop through all structures
- for (current = 0; current < num; current ++) {
- LPPRINTER_INFO_2A curPi2A = pi2A + current;
- LPPRINTER_INFO_2W curPi2W = pi2W + current;
- // copy the structure itself
- memcpy(curPi2W, curPi2A, sizeof(_PRINTER_INFO_2W));
-
- // copy string members
- StringA2W(curPi2A->pServerName, &(curPi2W->pServerName), (LPWSTR *)&pbytebuf);
- StringA2W(curPi2A->pPrinterName, &(curPi2W->pPrinterName), (LPWSTR *)&pbytebuf);
- StringA2W(curPi2A->pShareName, &(curPi2W->pShareName), (LPWSTR *)&pbytebuf);
- StringA2W(curPi2A->pPortName, &(curPi2W->pPortName), (LPWSTR *)&pbytebuf);
- StringA2W(curPi2A->pDriverName, &(curPi2W->pDriverName), (LPWSTR *)&pbytebuf);
- StringA2W(curPi2A->pComment, &(curPi2W->pComment), (LPWSTR *)&pbytebuf);
- StringA2W(curPi2A->pLocation, &(curPi2W->pLocation), (LPWSTR *)&pbytebuf);
- StringA2W(curPi2A->pSepFile, &(curPi2W->pSepFile), (LPWSTR *)&pbytebuf);
- StringA2W(curPi2A->pPrintProcessor, &(curPi2W->pPrintProcessor), (LPWSTR *)&pbytebuf);
- StringA2W(curPi2A->pDatatype, &(curPi2W->pDatatype), (LPWSTR *)&pbytebuf);
- StringA2W(curPi2A->pParameters, &(curPi2W->pParameters), (LPWSTR *)&pbytebuf);
-
- // copy DEVMODE structure
- if (curPi2A->pDevMode != NULL) {
- curPi2W->pDevMode = (LPDEVMODEW)pbytebuf;
- DevModeA2DevModeW(curPi2A->pDevMode, curPi2W->pDevMode);
- pbytebuf += sizeof(DEVMODEW) + curPi2A->pDevMode->dmDriverExtra;
- }
- }
-}
-
-// PRINTER_INFO_5 struct converter
-void UnicowsLoader::PrinterInfo5A2W(
- const LPPRINTER_INFO_5A pi5A,
- LPPRINTER_INFO_5W pi5W,
- const DWORD num)
-{
- LPWSTR pbuf = (LPWSTR)(pi5W + num);
- DWORD current;
-
- // loop through all structures
- for (current = 0; current < num; current ++) {
- LPPRINTER_INFO_5A curPi5A = pi5A + current;
- LPPRINTER_INFO_5W curPi5W = pi5W + current;
-
- // copy the structure itself
- memcpy(curPi5W, curPi5A, sizeof(_PRINTER_INFO_5W));
-
- // copy string members
- StringA2W(curPi5A->pPrinterName, &(curPi5W->pPrinterName), &pbuf);
- StringA2W(curPi5A->pPortName, &(curPi5W->pPortName), &pbuf);
- }
-}
-
-// PRINTER_INFO_* struct converter. Supported levels are 1, 2, and 5.
-void UnicowsLoader::PrinterInfoA2W(
- const PVOID piA,
- PVOID piW,
- const DWORD Level,
- const DWORD num)
-{
- switch (Level) {
- case 1:
- PrinterInfo1A2W((LPPRINTER_INFO_1A)piA, (LPPRINTER_INFO_1W)piW, num);
- break;
-
- case 2:
- PrinterInfo2A2W((LPPRINTER_INFO_2A)piA, (LPPRINTER_INFO_2W)piW, num);
- break;
-
- case 5:
- PrinterInfo5A2W((LPPRINTER_INFO_5A)piA, (LPPRINTER_INFO_5W)piW, num);
- break;
- }
-}
-
-// converts string members in PRINTER_INFO_* struct.
-void UnicowsLoader::StringA2W(
- LPCSTR pSrcA,
- LPWSTR * ppwstrDest,
- LPWSTR * ppwstrbuf)
-{
- if (pSrcA != NULL) {
- DWORD cchWideChar = ::MultiByteToWideChar(CP_ACP, 0, pSrcA, -1, NULL, 0);
- *ppwstrDest = *ppwstrbuf;
- ::MultiByteToWideChar(CP_ACP, 0, pSrcA, -1, *ppwstrbuf, cchWideChar);
- *ppwstrbuf += cchWideChar;
- } else {
- *ppwstrDest = NULL;
- }
-}
-
-// GetPrinterW implementation. Level 1, 2, and 5 are the only supported levels.
-BOOL __stdcall UnicowsLoader::GetPrinterWImpl(
- HANDLE hPrinter,
- DWORD Level,
- LPBYTE pPrinter,
- DWORD cbBuf,
- LPDWORD pcbNeeded)
-{
- if ((Level != 1) && (Level != 2) && (Level != 5)) {
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return FALSE;
- }
-
- DWORD cbBufA = (cbBuf != 0 ? cbBuf / 2 : 0); // dirty estimation...
- LPBYTE pPrinterA = NULL;
- DWORD cbNeededA = 0;
- BOOL ret;
-
- if (cbBufA != 0) {
- pPrinterA = (LPBYTE)safe_Malloc(cbBufA);
- memset(pPrinterA, 0, cbBufA);
- }
-
- ret = ::GetPrinterA(hPrinter, Level, pPrinterA, cbBufA, &cbNeededA);
- *pcbNeeded = cbNeededA * 2; // dirty estimation...
-
- if (pPrinterA != NULL) {
- if (ret) {
- PrinterInfoA2W(pPrinterA, pPrinter, Level, 1);
- }
- free(pPrinterA);
- }
-
- return ret;
-}
-
-// EnumPrintersW implementation. Level 1, 2, and 5 are the only supported levels.
-BOOL __stdcall UnicowsLoader::EnumPrintersWImpl(
- DWORD Flags,
- LPWSTR Name,
- DWORD Level,
- LPBYTE pPrinterEnum,
- DWORD cbBuf,
- LPDWORD pcbNeeded,
- LPDWORD pcReturned)
-{
- if ((Level != 1) && (Level != 2) && (Level != 5)) {
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return FALSE;
- }
-
- LPSTR pNameA = NULL;
- DWORD cbBufA = (cbBuf != 0 ? cbBuf / 2 : 0); // dirty estimation...
- LPBYTE pPrinterEnumA = NULL;
- DWORD cbNeededA = 0;
- BOOL ret;
-
- if (Name != NULL) {
- DWORD len = static_cast(wcslen(Name)) + 1;
- pNameA = (LPSTR)safe_Malloc(len);
- ::WideCharToMultiByte(CP_ACP, 0, Name, -1, pNameA, len, NULL, NULL);
- }
-
- if (cbBufA != 0) {
- pPrinterEnumA = (LPBYTE)safe_Malloc(cbBufA);
- memset(pPrinterEnumA, 0, cbBufA);
- }
-
- ret = ::EnumPrintersA(Flags, pNameA, Level, pPrinterEnumA,
- cbBufA, &cbNeededA, pcReturned);
- *pcbNeeded = cbNeededA * 2; // dirty estimation...
-
- if (pPrinterEnumA != NULL) {
- if (ret) {
- PrinterInfoA2W(pPrinterEnumA, pPrinterEnum, Level, *pcReturned);
- }
- free(pPrinterEnumA);
- }
-
- if (pNameA != NULL) {
- free(pNameA);
- }
-
- return ret;
-}
-
-// wchar CRT implementations that VC6 does not support on Win9x.
-// These implementations are used on both Win9x/ME *and* WinNT/2K/XP.
-#undef _waccess
-#undef _wchmod
-#undef _wfullpath
-#undef _wremove
-#undef _wrename
-#undef _wstat
-#undef _wstati64
-#undef _wstat64
-#undef _wunlink
-#undef _wfopen
-#undef _wfreopen
-#undef _wfsopen
-#undef _wcreat
-#undef _wopen
-#undef _wsopen
-#undef _wfindfirst
-#undef _wfindfirst64
-#undef _wfindnext
-#undef _wfindnext64
-#undef _wsystem
-#undef _wexcel
-#undef _wexcele
-#undef _wexelp
-#undef _wexelpe
-#undef _wexecv
-#undef _wexecve
-#undef _wexecvp
-#undef _wexecvpe
-#undef _wpopen
-#undef _wputenv
-#undef _wspawnl
-#undef _wspawnle
-#undef _wspawnlp
-#undef _wspawnlpe
-#undef _wspawnv
-#undef _wspawnve
-#undef _wspawnvp
-#undef _wspawnvpe
-
-// _wfullpath implementation
-wchar_t * __cdecl UnicowsLoader::_wfullpathImpl(
- wchar_t * absPath,
- const wchar_t * relPath,
- size_t maxLength)
-{
- if (IS_NT) {
- return _wfullpath(absPath, relPath, maxLength);
- } else {
- wchar_t * ret = NULL;
- char * absPathA = (char *)safe_Malloc(maxLength);
- char * relPathA = (char *)safe_Malloc(maxLength);
- ::WideCharToMultiByte(CP_ACP, 0, relPath, -1, relPathA,
- static_cast(maxLength), NULL, NULL);
-
- char * retA = _fullpath(absPathA, relPathA, maxLength);
-
- if (retA != NULL) {
- ::MultiByteToWideChar(CP_ACP, 0, absPathA, -1,
- absPath, static_cast(maxLength));
- ret = absPath;
- }
-
- free(absPathA);
- free(relPathA);
-
- return ret;
- }
-}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/UnicowsLoader.h
--- a/jdk/src/windows/native/sun/windows/UnicowsLoader.h Wed Jul 05 16:46:57 2017 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,198 +0,0 @@
-/*
- * Copyright 2003-2004 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-#ifndef UNICOWSLOADER_H
-#define UNICOWSLOADER_H
-
-#if !defined(UNICODE) || !defined(_UNICODE)
-#error UnicowsLoader module needs UNICODE and _UNICODE flags to be set on compiling
-#endif
-
-#include
-
-// A class to load the Microsoft Layer for Unicode (unicows.dll)
-class UnicowsLoader {
-public:
- // this is called when the client DLL (this case, AWT) is loaded
- static HMODULE __stdcall LoadUnicows(void);
-
- // this is provided to pass the MSLU module handle
- static HMODULE GetModuleHandle(void);
-
- // member functions that implements functions that MSLU does not support
- static BOOL __stdcall GetPrinterWImpl(HANDLE, DWORD, LPBYTE, DWORD, LPDWORD);
- static BOOL __stdcall EnumPrintersWImpl(DWORD, LPWSTR, DWORD, LPBYTE,
- DWORD, LPDWORD, LPDWORD);
-
- // member functions that implements functions that VC6 CRT does not support
- // on Win9x
- static wchar_t * __cdecl _wfullpathImpl(wchar_t *, const wchar_t *, size_t);
-
-private:
- // The module handle
- static HMODULE hmodUnicows;
-
- // utility member functions
- static void DevModeA2DevModeW(const DEVMODEA *, DEVMODEW *);
- static void PrinterInfo1A2W(const LPPRINTER_INFO_1A, LPPRINTER_INFO_1W, const DWORD);
- static void PrinterInfo2A2W(const LPPRINTER_INFO_2A, LPPRINTER_INFO_2W, const DWORD);
- static void PrinterInfo5A2W(const LPPRINTER_INFO_5A, LPPRINTER_INFO_5W, const DWORD);
- static void PrinterInfoA2W(const PVOID, PVOID, DWORD, DWORD);
- static void StringA2W(LPCSTR, LPWSTR *, LPWSTR *);
-};
-
-#ifndef AWT_H
-// copied from awt.h
-#if defined (WIN32)
- #define IS_WIN32 TRUE
-#else
- #define IS_WIN32 FALSE
-#endif
-#define IS_NT (IS_WIN32 && !(::GetVersion() & 0x80000000))
-#endif // AWT_H
-
-// Now the platform encoding is Unicode (UTF-16), re-define JNU_ functions
-// to proper JNI functions.
-#define JNU_NewStringPlatform(env, x) env->NewString(x, static_cast(_tcslen(x)))
-#define JNU_GetStringPlatformChars(env, x, y) (LPWSTR)env->GetStringChars(x, y)
-#define JNU_ReleaseStringPlatformChars(env, x, y) env->ReleaseStringChars(x, y)
-
-// The following Windows W-APIs are not supported by the MSLU.
-// You need to implement a stub to use these APIs. Or, if it is
-// apparent that the API is used only on WindowsNT/2K/XP, wrap
-// the call site with #undef - #define, e.g:
-//
-// #undef SomeFunctionW
-// call SomeFunctionW
-// #define SomeFunctionW NotSupportedByMSLU
-
-#define AcquireCredentialsHandleW NotSupportedByMSLU
-#define CreateNamedPipeW NotSupportedByMSLU
-#define CryptAcquireContextW NotSupportedByMSLU
-#define CryptEnumProvidersW NotSupportedByMSLU
-#define CryptEnumProviderTypesW NotSupportedByMSLU
-#define CryptGetDefaultProviderW NotSupportedByMSLU
-#define CryptSetProviderW NotSupportedByMSLU
-#define CryptSetProviderExW NotSupportedByMSLU
-#define CryptSignHashW NotSupportedByMSLU
-#define CryptVerifySignatureW NotSupportedByMSLU
-#define EnumerateSecurityPackagesW NotSupportedByMSLU
-#define EnumMonitorsW NotSupportedByMSLU
-#define EnumPortsW NotSupportedByMSLU
-#define EnumPrinterDriversW NotSupportedByMSLU
-//#define EnumPrintersW NotSupportedByMSLU
-#define EnumPrintProcessorDatatypesW NotSupportedByMSLU
-#define EnumPrintProcessorsW NotSupportedByMSLU
-#define FreeContextBufferW NotSupportedByMSLU
-#define GetCharABCWidthsFloatW NotSupportedByMSLU
-#define GetJobW NotSupportedByMSLU
-#define GetOpenFileNamePreviewW NotSupportedByMSLU
-//#define GetPrinterW NotSupportedByMSLU
-#define GetPrinterDataW NotSupportedByMSLU
-#define GetPrinterDriverW NotSupportedByMSLU
-#define GetSaveFileNamePreviewW NotSupportedByMSLU
-#define InitializeSecurityContextW NotSupportedByMSLU
-#define mciSendCommandW NotSupportedByMSLU
-#define mixerGetControlDetailsW NotSupportedByMSLU
-#define mixerGetLineControlsW NotSupportedByMSLU
-#define mixerGetLineInfoW NotSupportedByMSLU
-#define mmioInstallIOProcW NotSupportedByMSLU
-#define OleUIChangeSourceW NotSupportedByMSLU
-#define OleUIConvertW NotSupportedByMSLU
-#define OleUIEditLinksW NotSupportedByMSLU
-#define OleUIInsertObjectW NotSupportedByMSLU
-#define OleUIObjectPropertiesW NotSupportedByMSLU
-#define OleUIPasteSpecialW NotSupportedByMSLU
-#define OleUIPromptUserW NotSupportedByMSLU
-#define OleUIUpdateLinksW NotSupportedByMSLU
-#define PolyTextOutW NotSupportedByMSLU
-#define QueryContextAttributesW NotSupportedByMSLU
-#define QueryCredentialsAttributesW NotSupportedByMSLU
-#define QuerySecurityPackageInfoW NotSupportedByMSLU
-#define RasDeleteSubEntryW NotSupportedByMSLU
-#define RasSetSubEntryPropertiesW NotSupportedByMSLU
-#define ResetPrinterW NotSupportedByMSLU
-
-// The following Shell COM interfaces are not supported by the MSLU.
-// See ShellFolder2.cpp
-#define IID_IFileViewerW NotSupportedByMSLU
-#define IID_IShellLinkW NotSupportedByMSLU
-#define IID_IExtractIconW NotSupportedByMSLU
-#define IID_IShellCopyHookW NotSupportedByMSLU
-#define IID_IShellExecuteHookW NotSupportedByMSLU
-#define IID_INewShortcutHookW NotSupportedByMSLU
-
-// The following CRT functions should fail on compiling, as it does not work on
-// Win9x/ME platform. If you need these CRTs, write a wrapper for ANSI version
-// equivalents, in which it converts to/from Unicode using WideCharToMultiByte.
-//
-// Or, if it is apparent that the function is used only on WindowsNT/2K/XP, wrap
-// the call site with #undef - #define, e.g:
-//
-// #undef _wsomefunc
-// call _wsomefunc
-// #define _wsomefunc NotSupportedOnWin9X
-
-#define _waccess NotSupportedOnWin9X
-#define _wchmod NotSupportedOnWin9X
-#define _wfullpath UnicowsLoader::_wfullpathImpl
-#define _wremove NotSupportedOnWin9X
-#define _wrename NotSupportedOnWin9X
-#define _wstat NotSupportedOnWin9X
-#define _wstati64 NotSupportedOnWin9X
-#define _wstat64 NotSupportedOnWin9X
-#define _wunlink NotSupportedOnWin9X
-#define _wfopen NotSupportedOnWin9X
-#define _wfreopen NotSupportedOnWin9X
-#define _wfsopen NotSupportedOnWin9X
-#define _wcreat NotSupportedOnWin9X
-#define _wopen NotSupportedOnWin9X
-#define _wsopen NotSupportedOnWin9X
-#define _wfindfirst NotSupportedOnWin9X
-#define _wfindfirst64 NotSupportedOnWin9X
-#define _wfindnext NotSupportedOnWin9X
-#define _wfindnext64 NotSupportedOnWin9X
-#define _wsystem NotSupportedOnWin9X
-#define _wexcel NotSupportedOnWin9X
-#define _wexcele NotSupportedOnWin9X
-#define _wexelp NotSupportedOnWin9X
-#define _wexelpe NotSupportedOnWin9X
-#define _wexecv NotSupportedOnWin9X
-#define _wexecve NotSupportedOnWin9X
-#define _wexecvp NotSupportedOnWin9X
-#define _wexecvpe NotSupportedOnWin9X
-#define _wpopen NotSupportedOnWin9X
-#define _wputenv NotSupportedOnWin9X
-#define _wspawnl NotSupportedOnWin9X
-#define _wspawnle NotSupportedOnWin9X
-#define _wspawnlp NotSupportedOnWin9X
-#define _wspawnlpe NotSupportedOnWin9X
-#define _wspawnv NotSupportedOnWin9X
-#define _wspawnve NotSupportedOnWin9X
-#define _wspawnvp NotSupportedOnWin9X
-#define _wspawnvpe NotSupportedOnWin9X
-
-
-#endif // UNICOWSLOADER_H
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/WPrinterJob.cpp
--- a/jdk/src/windows/native/sun/windows/WPrinterJob.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/WPrinterJob.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 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
@@ -23,14 +23,14 @@
* have any questions.
*/
+#include "awt.h"
+
#include "stdhdrs.h"
#include
#include
#include
#include
-#include "awt.h"
-#include "awt_dlls.h"
#include "awt_Toolkit.h"
#include "awt_PrintControl.h"
@@ -74,7 +74,6 @@
TRY;
TCHAR cBuffer[250];
- BOOL bFlag;
OSVERSIONINFO osv;
PRINTER_INFO_2 *ppi2 = NULL;
DWORD dwNeeded = 0;
@@ -86,39 +85,8 @@
osv.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
GetVersionEx(&osv);
- // If Windows 95 or 98, use EnumPrinters...
- if (osv.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
-
- // The first EnumPrinters() tells you how big our buffer should
- // be in order to hold ALL of PRINTER_INFO_2. Note that this will
- // usually return FALSE. This only means that the buffer (the 4th
- // parameter) was not filled in. You don't want it filled in here...
-
- EnumPrinters(PRINTER_ENUM_DEFAULT, NULL, 2,
- NULL, 0, &dwNeeded, &dwReturned);
- if (dwNeeded == 0) {
- return NULL;
- }
-
- // Allocate enough space for PRINTER_INFO_2...
- ppi2 = (PRINTER_INFO_2 *)GlobalAlloc(GPTR, dwNeeded);
- if (!ppi2) {
- return NULL;
- }
-
- // The second EnumPrinters() will fill in all the current information.
- bFlag = EnumPrinters(PRINTER_ENUM_DEFAULT, NULL, 2,
- (LPBYTE)ppi2, dwNeeded, &dwNeeded, &dwReturned);
- if (!bFlag) {
- GlobalFree(ppi2);
- return NULL;
- }
-
- jPrinterName = JNU_NewStringPlatform(env, ppi2->pPrinterName);
- GlobalFree(ppi2);
- return jPrinterName;
-
- } else if (osv.dwPlatformId == VER_PLATFORM_WIN32_NT) {
+ // If Windows 2000, XP, Vista
+ if (osv.dwPlatformId == VER_PLATFORM_WIN32_NT) {
// Retrieve the default string from Win.ini (the registry).
// String will be in form "printername,drivername,portname".
@@ -165,62 +133,32 @@
jobjectArray nameArray;
try {
- if (IS_NT) {
- ::EnumPrinters(PRINTER_ENUM_LOCAL | PRINTER_ENUM_CONNECTIONS,
- NULL, 4, NULL, 0, &cbNeeded, &cReturned);
- pPrinterEnum = new BYTE[cbNeeded];
- ::EnumPrinters(PRINTER_ENUM_LOCAL | PRINTER_ENUM_CONNECTIONS,
- NULL, 4, pPrinterEnum, cbNeeded, &cbNeeded,
- &cReturned);
+ ::EnumPrinters(PRINTER_ENUM_LOCAL | PRINTER_ENUM_CONNECTIONS,
+ NULL, 4, NULL, 0, &cbNeeded, &cReturned);
+ pPrinterEnum = new BYTE[cbNeeded];
+ ::EnumPrinters(PRINTER_ENUM_LOCAL | PRINTER_ENUM_CONNECTIONS,
+ NULL, 4, pPrinterEnum, cbNeeded, &cbNeeded,
+ &cReturned);
- if (cReturned > 0) {
- nameArray = env->NewObjectArray(cReturned, clazz, NULL);
- if (nameArray == NULL) {
- throw std::bad_alloc();
- }
- } else {
- nameArray = NULL;
+ if (cReturned > 0) {
+ nameArray = env->NewObjectArray(cReturned, clazz, NULL);
+ if (nameArray == NULL) {
+ throw std::bad_alloc();
}
+ } else {
+ nameArray = NULL;
+ }
- for (DWORD i = 0; i < cReturned; i++) {
- PRINTER_INFO_4 *info4 = (PRINTER_INFO_4 *)
- (pPrinterEnum + i * sizeof(PRINTER_INFO_4));
- utf_str = JNU_NewStringPlatform(env, info4->pPrinterName);
- if (utf_str == NULL) {
- throw std::bad_alloc();
- }
- env->SetObjectArrayElement(nameArray, i, utf_str);
- env->DeleteLocalRef(utf_str);
+ for (DWORD i = 0; i < cReturned; i++) {
+ PRINTER_INFO_4 *info4 = (PRINTER_INFO_4 *)
+ (pPrinterEnum + i * sizeof(PRINTER_INFO_4));
+ utf_str = JNU_NewStringPlatform(env, info4->pPrinterName);
+ if (utf_str == NULL) {
+ throw std::bad_alloc();
}
- } else {
- ::EnumPrinters(PRINTER_ENUM_LOCAL,
- NULL, 5, NULL, 0, &cbNeeded, &cReturned);
- pPrinterEnum = new BYTE[cbNeeded];
- ::EnumPrinters(PRINTER_ENUM_LOCAL,
- NULL, 5, pPrinterEnum, cbNeeded, &cbNeeded,
- &cReturned);
-
- if (cReturned > 0) {
- nameArray = env->NewObjectArray(cReturned, clazz, NULL);
- if (nameArray == NULL) {
- throw std::bad_alloc();
- }
- } else {
- nameArray = NULL;
- }
-
-
- for (DWORD i = 0; i < cReturned; i++) {
- PRINTER_INFO_5 *info5 = (PRINTER_INFO_5 *)
- (pPrinterEnum + i * sizeof(PRINTER_INFO_5));
- utf_str = JNU_NewStringPlatform(env, info5->pPrinterName);
- if (utf_str == NULL) {
- throw std::bad_alloc();
- }
- env->SetObjectArrayElement(nameArray, i, utf_str);
- env->DeleteLocalRef(utf_str);
- }
+ env->SetObjectArrayElement(nameArray, i, utf_str);
+ env->DeleteLocalRef(utf_str);
}
} catch (std::bad_alloc&) {
delete [] pPrinterEnum;
@@ -872,7 +810,7 @@
int numSizes = ::DeviceCapabilities(printerName, printerPort,
DC_PAPERS, NULL, NULL);
if (numSizes > 0) {
- LPWORD papers = (LPWORD)safe_Malloc(numSizes * sizeof(WORD));
+ LPTSTR papers = (LPTSTR)safe_Malloc(numSizes * sizeof(WORD));
if (papers != NULL &&
::DeviceCapabilities(printerName, printerPort,
DC_PAPERS, papers, NULL) != -1) {
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt.h
--- a/jdk/src/windows/native/sun/windows/awt.h Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt.h Wed Jul 05 16:47:27 2017 +0200
@@ -26,10 +26,21 @@
#ifndef _AWT_H_
#define _AWT_H_
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0600
+#endif
+
+#ifndef _WIN32_IE
+#define _WIN32_IE 0x0600
+#endif
+
+//#ifndef NTDDI_VERSION
+//#define NTDDI_VERSION NTDDI_LONGHORN
+//#endif
+
#include "stdhdrs.h"
#include "alloc.h"
#include "awt_Debug.h"
-#include "UnicowsLoader.h"
extern COLORREF DesktopColor2RGB(int colorIndex);
@@ -129,40 +140,23 @@
/* /NEW JNI */
/*
- * IS_NT returns TRUE on NT, 2000, XP
- * IS_WIN2000 returns TRUE on 2000, XP
- * IS_WINXP returns TRUE on XP
- * IS_WIN95 returns TRUE on 95, 98, ME
- * IS_WIN98 returns TRUE on 98, ME
- * IS_WINME returns TRUE on ME
- * IS_WIN32 returns TRUE on 32-bit Pentium and
- * 64-bit Itanium.
* IS_WIN64 returns TRUE on 64-bit Itanium
- *
- * uname -s returns Windows_95 on 95
- * uname -s returns Windows_98 on 98 and ME
- * uname -s returns Windows_NT on NT and 2000 and XP
*/
-#if defined (WIN32)
- #define IS_WIN32 TRUE
-#else
- #define IS_WIN32 FALSE
-#endif
#if defined (_WIN64)
#define IS_WIN64 TRUE
#else
#define IS_WIN64 FALSE
#endif
-#define IS_NT (IS_WIN32 && !(::GetVersion() & 0x80000000))
-#define IS_WIN2000 (IS_NT && LOBYTE(LOWORD(::GetVersion())) >= 5)
-#define IS_WIN2003 (IS_NT && LOBYTE(LOWORD(::GetVersion())) == 5 && HIBYTE(LOWORD(::GetVersion())) >= 2)
-#define IS_WINXP (IS_NT && (IS_WIN2000 && HIBYTE(LOWORD(::GetVersion())) >= 1) || LOBYTE(LOWORD(::GetVersion())) > 5)
-#define IS_WINVISTA (IS_NT && LOBYTE(LOWORD(::GetVersion())) >= 6)
-#define IS_WIN32S (IS_WIN32 && !IS_NT && LOBYTE(LOWORD(::GetVersion())) < 4)
-#define IS_WIN95 (IS_WIN32 && !IS_NT && LOBYTE(LOWORD(::GetVersion())) >= 4)
-#define IS_WIN98 (IS_WIN95 && HIBYTE(LOWORD(::GetVersion())) >= 10)
-#define IS_WINME (IS_WIN95 && HIBYTE(LOWORD(::GetVersion())) >= 90)
-#define IS_WIN4X (IS_WIN32 && LOBYTE(::GetVersion()) >= 4)
+
+/*
+ * IS_WIN2000 returns TRUE on 2000, XP and Vista
+ * IS_WINXP returns TRUE on XP and Vista
+ * IS_WINVISTA returns TRUE on Vista
+ */
+#define IS_WIN2000 (LOBYTE(LOWORD(::GetVersion())) >= 5)
+#define IS_WINXP ((IS_WIN2000 && HIBYTE(LOWORD(::GetVersion())) >= 1) || LOBYTE(LOWORD(::GetVersion())) > 5)
+#define IS_WINVISTA (LOBYTE(LOWORD(::GetVersion())) >= 6)
+
#define IS_WINVER_ATLEAST(maj, min) \
((maj) < LOBYTE(LOWORD(::GetVersion())) || \
(maj) == LOBYTE(LOWORD(::GetVersion())) && \
@@ -177,6 +171,12 @@
extern JavaVM *jvm;
+// Platform encoding is Unicode (UTF-16), re-define JNU_ functions
+// to proper JNI functions.
+#define JNU_NewStringPlatform(env, x) env->NewString(reinterpret_cast(x), static_cast(_tcslen(x)))
+#define JNU_GetStringPlatformChars(env, x, y) reinterpret_cast(env->GetStringChars(x, y))
+#define JNU_ReleaseStringPlatformChars(env, x, y) env->ReleaseStringChars(x, reinterpret_cast(y))
+
/*
* Itanium symbols needed for 64-bit compilation.
* These are defined in winuser.h in the August 2001 MSDN update.
@@ -211,17 +211,12 @@
* NOTE: float.h must be defined if using these macros
*/
#define SAVE_CONTROLWORD \
- unsigned int fpu_cw = _CW_DEFAULT; \
- if (IS_WIN95) { \
- fpu_cw = _control87(0, 0); \
- }
+ unsigned int fpu_cw = _control87(0, 0);
-#define RESTORE_CONTROLWORD \
- if (IS_WIN95) { \
- if ( _control87(0, 0) != fpu_cw) { \
- _control87(fpu_cw, 0xfffff); \
- } \
- }
+#define RESTORE_CONTROLWORD \
+ if (_control87(0, 0) != fpu_cw) { \
+ _control87(fpu_cw, 0xffffffff); \
+ }
/*
* checks if the current thread is/isn't the toolkit thread
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_Button.cpp
--- a/jdk/src/windows/native/sun/windows/awt_Button.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_Button.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 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
@@ -23,7 +23,7 @@
* have any questions.
*/
-#include
+#include "awt.h"
#include "awt_Object.h" /* wop_pDataID */
#include "awt_Toolkit.h"
@@ -106,7 +106,7 @@
if (label == NULL) {
labelStr = L"";
} else {
- labelStr = env->GetStringChars(label, JNI_FALSE);
+ labelStr = JNU_GetStringPlatformChars(env, label, JNI_FALSE);
}
style = 0;
@@ -128,7 +128,7 @@
c->m_backgroundColorSet = TRUE; // suppress inheriting parent's color
c->UpdateBackground(env, target);
if (label != NULL)
- env->ReleaseStringChars(label, labelStr);
+ JNU_ReleaseStringPlatformChars(env, label, labelStr);
} catch (...) {
env->DeleteLocalRef(target);
if (label != NULL)
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_Checkbox.cpp
--- a/jdk/src/windows/native/sun/windows/awt_Checkbox.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_Checkbox.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -23,6 +23,7 @@
* have any questions.
*/
+#include "awt.h"
#include "awt_Toolkit.h"
#include "awt_Checkbox.h"
#include "awt_KeyboardFocusManager.h"
@@ -106,7 +107,7 @@
label = (jstring)env->GetObjectField(target, AwtCheckbox::labelID);
if (label != NULL) {
- labelStr = env->GetStringChars(label, 0);
+ labelStr = JNU_GetStringPlatformChars(env, label, 0);
}
if (labelStr != 0) {
jint x = env->GetIntField(target, AwtComponent::xID);
@@ -123,7 +124,7 @@
peer);
if (labelStr != defaultLabelStr) {
- env->ReleaseStringChars(label, labelStr);
+ JNU_ReleaseStringPlatformChars(env, label, labelStr);
}
} else {
throw std::bad_alloc();
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_Choice.cpp
--- a/jdk/src/windows/native/sun/windows/awt_Choice.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_Choice.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 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
@@ -206,7 +206,7 @@
fieldHeight =(int)::SendMessage(GetHWnd(), CB_GETITEMHEIGHT, (UINT)-1, 0);
// add top and bottom border lines; border size is different for
// Win 4.x (3d edge) vs 3.x (1 pixel line)
- borderHeight = ::GetSystemMetrics(IS_WIN4X ? SM_CYEDGE : SM_CYBORDER);
+ borderHeight = ::GetSystemMetrics(SM_CYEDGE);
fieldHeight += borderHeight*2;
return fieldHeight;
}
@@ -424,6 +424,9 @@
case mrPassAlong:
return AwtComponent::WmKillFocus(hWndGotFocus);
}
+
+ DASSERT(false); // must never reach here
+ return mrDoDefault;
}
MsgRouting
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_Color.cpp
--- a/jdk/src/windows/native/sun/windows/awt_Color.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_Color.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 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
@@ -97,7 +97,7 @@
iColor = COLOR_MENUTEXT;
break;
case sun_awt_windows_WColor_BUTTON_BKGND:
- iColor = (IS_NT) ? COLOR_BTNFACE : COLOR_3DFACE;
+ iColor = COLOR_BTNFACE;
break;
case sun_awt_windows_WColor_BUTTON_TEXT:
iColor = COLOR_BTNTEXT;
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_Component.cpp
--- a/jdk/src/windows/native/sun/windows/awt_Component.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_Component.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -23,7 +23,8 @@
* have any questions.
*/
-#include "windows.h"
+#include "awt.h"
+
#include
#include
@@ -42,7 +43,6 @@
#include "awt_MouseEvent.h"
#include "awt_Palette.h"
#include "awt_Toolkit.h"
-#include "awt_Unicode.h"
#include "awt_Window.h"
#include "awt_Win32GraphicsDevice.h"
#include "Hashtable.h"
@@ -67,30 +67,10 @@
#include
// Begin -- Win32 SDK include files
-#include
#include
#include
// End -- Win32 SDK include files
-#ifndef GET_KEYSTATE_WPARAM // defined for (_WIN32_WINNT >= 0x0400)
-#define GET_KEYSTATE_WPARAM(wParam) (LOWORD(wParam))
-#endif
-
-#ifndef GET_WHEEL_DELTA_WPARAM // defined for (_WIN32_WINNT >= 0x0500)
-#define GET_WHEEL_DELTA_WPARAM(wParam) ((short)HIWORD(wParam))
-#endif
-
-//
-#if !defined(__int3264)
-#define GetWindowLongPtr GetWindowLong
-#define SetWindowLongPtr SetWindowLong
-#define GWLP_USERDATA GWL_USERDATA
-#define GWLP_WNDPROC GWL_WNDPROC
-typedef __int32 LONG_PTR;
-typedef unsigned __int32 ULONG_PTR;
-#endif // __int3264
-//
-
#include
LPCTSTR szAwtComponentClassName = TEXT("SunAwtComponent");
@@ -207,9 +187,7 @@
UINT AwtComponent::m_CodePage
= AwtComponent::LangToCodePage(m_idLang);
-BOOL AwtComponent::m_isWin95 = IS_WIN95;
-BOOL AwtComponent::m_isWin2000 = IS_WIN2000;
-BOOL AwtComponent::m_isWinNT = IS_NT;
+jint *AwtComponent::masks;
static BOOL bLeftShiftIsDown = false;
static BOOL bRightShiftIsDown = false;
@@ -544,7 +522,7 @@
jobject createError = NULL;
if (dw == ERROR_OUTOFMEMORY)
{
- jstring errorMsg = env->NewStringUTF("too many window handles");
+ jstring errorMsg = JNU_NewStringPlatform(env, L"too many window handles");
createError = JNU_NewObjectByName(env, "java/lang/OutOfMemoryError",
"(Ljava/lang/String;)V",
errorMsg);
@@ -1201,6 +1179,9 @@
WIN_MSG(WM_MBUTTONDOWN)
WIN_MSG(WM_MBUTTONUP)
WIN_MSG(WM_MBUTTONDBLCLK)
+ WIN_MSG(WM_XBUTTONDBLCLK)
+ WIN_MSG(WM_XBUTTONDOWN)
+ WIN_MSG(WM_XBUTTONUP)
WIN_MSG(WM_MOUSEWHEEL)
WIN_MSG(WM_PARENTNOTIFY)
WIN_MSG(WM_ENTERMENULOOP)
@@ -1347,17 +1328,9 @@
return (LRESULT)TRUE;
}
- UINT switchMessage;
- if (IS_WIN95 && !IS_WIN98 && message == Wheel95GetMsg()) {
- // Wheel message is generated dynamically on 95. A quick swap and
- // we're good to go.
- DTRACE_PRINTLN1("got wheel event on 95. msg is %i\n", message);
- switchMessage = WM_MOUSEWHEEL;
- }
- else {
- switchMessage = message;
- }
-
+ DWORD curPos = 0;
+
+ UINT switchMessage = message;
switch (switchMessage) {
case WM_AWT_GETDC:
{
@@ -1644,67 +1617,87 @@
case WM_MBUTTONDOWN:
case WM_MBUTTONDBLCLK:
case WM_MBUTTONUP:
+ case WM_XBUTTONDBLCLK:
+ case WM_XBUTTONDOWN:
+ case WM_XBUTTONUP:
case WM_MOUSEMOVE:
case WM_MOUSEWHEEL:
case WM_AWT_MOUSEENTER:
case WM_AWT_MOUSEEXIT:
- {
- DWORD curPos = ::GetMessagePos();
+ curPos = ::GetMessagePos();
POINT myPos;
myPos.x = GET_X_LPARAM(curPos);
myPos.y = GET_Y_LPARAM(curPos);
::ScreenToClient(GetHWnd(), &myPos);
switch(switchMessage) {
case WM_AWT_MOUSEENTER:
- mr = WmMouseEnter(static_cast(wParam), myPos.x, myPos.y); break;
+ mr = WmMouseEnter(static_cast(wParam), myPos.x, myPos.y);
+ break;
case WM_LBUTTONDOWN:
case WM_LBUTTONDBLCLK:
- mr = WmMouseDown(static_cast(wParam), myPos.x, myPos.y,
- LEFT_BUTTON); break;
- case WM_LBUTTONUP:
- mr = WmMouseUp(static_cast(wParam), myPos.x, myPos.y,
- LEFT_BUTTON); break;
- case WM_MOUSEMOVE:
- mr = WmMouseMove(static_cast(wParam), myPos.x, myPos.y); break;
- case WM_MBUTTONDOWN:
- case WM_MBUTTONDBLCLK:
- mr = WmMouseDown(static_cast(wParam), myPos.x, myPos.y,
- MIDDLE_BUTTON); break;
- case WM_RBUTTONDOWN:
- case WM_RBUTTONDBLCLK:
- mr = WmMouseDown(static_cast(wParam), myPos.x, myPos.y,
- RIGHT_BUTTON); break;
- case WM_RBUTTONUP:
- mr = WmMouseUp(static_cast(wParam), myPos.x, myPos.y,
- RIGHT_BUTTON);
- break;
- case WM_MBUTTONUP:
- mr = WmMouseUp(static_cast(wParam), myPos.x, myPos.y,
- MIDDLE_BUTTON);
- break;
- case WM_AWT_MOUSEEXIT:
- mr = WmMouseExit(static_cast(wParam), myPos.x, myPos.y);
- break;
- case WM_MOUSEWHEEL:
- if (IS_WIN95 && !IS_WIN98) {
- // On 95, the wParam doesn't contain the keystate flags, just
- // the wheel rotation. The keystates are fetched in WmMouseWheel
- // using GetJavaModifiers().
- mr = WmMouseWheel(0,
- GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam),
- (int)wParam);
- return FALSE;
- }
- else {
+ mr = WmMouseDown(static_cast(wParam), myPos.x, myPos.y,
+ LEFT_BUTTON);
+ break;
+ case WM_LBUTTONUP:
+ mr = WmMouseUp(static_cast(wParam), myPos.x, myPos.y,
+ LEFT_BUTTON);
+ break;
+ case WM_MOUSEMOVE:
+ mr = WmMouseMove(static_cast(wParam), myPos.x, myPos.y);
+ break;
+ case WM_MBUTTONDOWN:
+ case WM_MBUTTONDBLCLK:
+ mr = WmMouseDown(static_cast(wParam), myPos.x, myPos.y,
+ MIDDLE_BUTTON);
+ break;
+ case WM_XBUTTONDOWN:
+ case WM_XBUTTONDBLCLK:
+ if (AwtToolkit::GetInstance().areExtraMouseButtonsEnabled()) {
+ if (HIWORD(wParam) == 1) {
+ mr = WmMouseDown(static_cast(wParam), myPos.x, myPos.y,
+ X1_BUTTON);
+ }
+ if (HIWORD(wParam) == 2) {
+ mr = WmMouseDown(static_cast(wParam), myPos.x, myPos.y,
+ X2_BUTTON);
+ }
+ }
+ break;
+ case WM_XBUTTONUP:
+ if (AwtToolkit::GetInstance().areExtraMouseButtonsEnabled()) {
+ if (HIWORD(wParam) == 1) {
+ mr = WmMouseUp(static_cast(wParam), myPos.x, myPos.y,
+ X1_BUTTON);
+ }
+ if (HIWORD(wParam) == 2) {
+ mr = WmMouseUp(static_cast(wParam), myPos.x, myPos.y,
+ X2_BUTTON);
+ }
+ }
+ break;
+ case WM_RBUTTONDOWN:
+ case WM_RBUTTONDBLCLK:
+ mr = WmMouseDown(static_cast(wParam), myPos.x, myPos.y,
+ RIGHT_BUTTON);
+ break;
+ case WM_RBUTTONUP:
+ mr = WmMouseUp(static_cast(wParam), myPos.x, myPos.y,
+ RIGHT_BUTTON);
+ break;
+ case WM_MBUTTONUP:
+ mr = WmMouseUp(static_cast(wParam), myPos.x, myPos.y,
+ MIDDLE_BUTTON);
+ break;
+ case WM_AWT_MOUSEEXIT:
+ mr = WmMouseExit(static_cast(wParam), myPos.x, myPos.y);
+ break;
+ case WM_MOUSEWHEEL:
mr = WmMouseWheel(GET_KEYSTATE_WPARAM(wParam),
GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam),
GET_WHEEL_DELTA_WPARAM(wParam));
+ break;
}
break;
- }
- }
- break;
-
case WM_SETCURSOR:
mr = mrDoDefault;
if (LOWORD(lParam) == HTCLIENT) {
@@ -2589,8 +2582,12 @@
lastComp = this;
lastX = x;
lastY = y;
-
- if ( (flags & ALL_MK_BUTTONS) != 0 ) {
+ BOOL extraButtonsEnabled = AwtToolkit::GetInstance().areExtraMouseButtonsEnabled();
+ if (((flags & (ALL_MK_BUTTONS)) != 0) ||
+ (extraButtonsEnabled && (flags & (X_BUTTONS)) != 0))
+// if (( extraButtonsEnabled && ( (flags & (ALL_MK_BUTTONS | X_BUTTONS)) != 0 )) ||
+// ( !extraButtonsEnabled && (((flags & (ALL_MK_BUTTONS)) != 0 )) && ((flags & (X_BUTTONS)) == 0) ))
+ {
// 6404008 : if Dragged event fired we shouldn't fire
// Clicked event: m_firstDragSent set to TRUE.
// This is a partial backout of 5039416 fix.
@@ -2649,21 +2646,10 @@
jdouble preciseWheelRotation = (jdouble) wheelRotation / (-1 * WHEEL_DELTA);
MSG msg;
-
- if (IS_WIN95 && !IS_WIN98) {
- // 95 doesn't understand the SPI_GETWHEELSCROLLLINES - get the user
- // preference by other means
- DTRACE_PRINTLN("WmMouseWheel: using 95 branch");
- platformLines = Wheel95GetScrLines();
- result = true;
- InitMessage(&msg, lastMessage, wheelRotation, MAKELPARAM(x, y));
- }
- else {
- result = ::SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0,
- &platformLines, 0);
- InitMessage(&msg, lastMessage, MAKEWPARAM(flags, wheelRotation),
- MAKELPARAM(x, y));
- }
+ result = ::SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0,
+ &platformLines, 0);
+ InitMessage(&msg, lastMessage, MAKEWPARAM(flags, wheelRotation),
+ MAKELPARAM(x, y));
if (result) {
if (platformLines == WHEEL_PAGESCROLL) {
@@ -2743,156 +2729,21 @@
"AwtComponent::GetShiftKeyLocation vkey = %d = 0x%x scan = %d",
vkey, vkey, keyScanCode);
- if (m_isWinNT) {
- leftShiftScancode = ::MapVirtualKey(VK_LSHIFT, 0);
- rightShiftScancode = ::MapVirtualKey(VK_RSHIFT, 0);
-
- if (keyScanCode == leftShiftScancode) {
- return java_awt_event_KeyEvent_KEY_LOCATION_LEFT;
- }
- if (keyScanCode == rightShiftScancode) {
- return java_awt_event_KeyEvent_KEY_LOCATION_RIGHT;
- }
-
- DASSERT(false);
- // Note: the above should not fail on NT (or 2000),
- // but just in case it does, try the more complicated method
- // we use for Win9x below.
- }
-
- // "Transition" bit = 0 if keyPressed, 1 if keyReleased
- BOOL released = ((1<<15) & flags);
-
- DTRACE_PRINTLN2(
- "AwtComponent::GetShiftKeyLocation bLeftShiftIsDown = %d bRightShiftIsDown == %d",
- bLeftShiftIsDown, bRightShiftIsDown);
- DTRACE_PRINTLN2(
- "AwtComponent::GetShiftKeyLocation lastShiftKeyPressed = %d released = %d",
- lastShiftKeyPressed, released);
-
- jint keyLocation = java_awt_event_KeyEvent_KEY_LOCATION_UNKNOWN;
-
- // It is possible for somebody to hold down one or both
- // Shift keys, causing repeat key events. We need to
- // handle all the cases.
- //
- // Just a side-note: if two or more keys are being held down,
- // and then one key is released, whether more key presses are
- // generated for the keys that are still held down depends on
- // which keys they are, and whether you released the right or
- // the left shift/ctrl/etc. key first. This also differs
- // between Win9x and NT. Just plain screwy.
- //
- // Note: on my PC, the repeat count is always 1. Yup, we need
- // 16 bits to handle that, all right.
-
- // Handle the case where only one of the Shift keys
- // was down before this event took place
- if (bLeftShiftIsDown && !bRightShiftIsDown) {
- if (released) {
- // This is a left Shift release
- keyLocation = java_awt_event_KeyEvent_KEY_LOCATION_LEFT;
- } else {
- // This is a right Shift press
- keyLocation = java_awt_event_KeyEvent_KEY_LOCATION_RIGHT;
- }
- } else if (!bLeftShiftIsDown && bRightShiftIsDown) {
- if (released) {
- // This is a right Shift release
- keyLocation = java_awt_event_KeyEvent_KEY_LOCATION_RIGHT;
- } else {
- // This is a left Shift press
- keyLocation = java_awt_event_KeyEvent_KEY_LOCATION_LEFT;
- }
- }
-
- // Handle the case where neither of the Shift keys
- // were down before this event took place
- if (!bLeftShiftIsDown && !bRightShiftIsDown) {
- DASSERT(!released);
- if (HIBYTE(::GetKeyState(VK_LSHIFT)) != 0) {
- // This is a left Shift press
- keyLocation = java_awt_event_KeyEvent_KEY_LOCATION_LEFT;
- } else if (HIBYTE(::GetKeyState(VK_RSHIFT)) != 0) {
- // This is a right Shift press
- keyLocation = java_awt_event_KeyEvent_KEY_LOCATION_RIGHT;
- } else {
- DASSERT(false);
- }
- }
-
- // Handle the case where both Shift keys were down before
- // this event took place
- if (bLeftShiftIsDown && bRightShiftIsDown) {
- // If this is a key release event, we can just check to see
- // what the keyboard state is after the event
- if (released) {
- if (HIBYTE(::GetKeyState(VK_RSHIFT)) == 0) {
- // This is a right Shift release
- keyLocation = java_awt_event_KeyEvent_KEY_LOCATION_RIGHT;
- } else if (HIBYTE(::GetKeyState(VK_LSHIFT)) == 0) {
- // This is a left Shift release
- keyLocation = java_awt_event_KeyEvent_KEY_LOCATION_LEFT;
- } else {
- DASSERT(false);
- }
- } else {
- // If this is a key press event, and both Shift keys were
- // already down, this is going to be a repeat of the last
- // Shift press
- if (lastShiftKeyPressed == VK_LSHIFT) {
- keyLocation = java_awt_event_KeyEvent_KEY_LOCATION_LEFT;
- } else if (lastShiftKeyPressed == VK_RSHIFT) {
- keyLocation = java_awt_event_KeyEvent_KEY_LOCATION_RIGHT;
- } else {
- DASSERT(false);
- }
- }
- }
-
- if (keyLocation == java_awt_event_KeyEvent_KEY_LOCATION_UNKNOWN) {
- // Nothing we tried above worked for some reason. Sigh.
- // Make a last-ditch effort to guess what happened:
- // guess that the Shift scancodes are usually the same
- // from system to system, even though this isn't guaranteed.
- DTRACE_PRINTLN("Last-ditch effort at guessing Shift keyLocation");
-
- // Tested on a couple of Windows keyboards: these are standard values
- leftShiftScancode = 42;
- rightShiftScancode = 54;
-
- if (keyScanCode == leftShiftScancode) {
- keyLocation = java_awt_event_KeyEvent_KEY_LOCATION_LEFT;
- } else if (keyScanCode == rightShiftScancode) {
- keyLocation = java_awt_event_KeyEvent_KEY_LOCATION_RIGHT;
- }
- }
-
- // Set the Shift flags with the new key state.
- bLeftShiftIsDown = (HIBYTE(::GetKeyState(VK_LSHIFT)) != 0);
- bRightShiftIsDown = (HIBYTE(::GetKeyState(VK_RSHIFT)) != 0);
-
- // Update lastShiftKeyPressed
- if (released) {
- // At most one shift key is down now, so just check which one
- if (bLeftShiftIsDown) {
- lastShiftKeyPressed = VK_LSHIFT;
- DASSERT(!bRightShiftIsDown);
- } else if (bRightShiftIsDown) {
- lastShiftKeyPressed = VK_RSHIFT;
- } else {
- lastShiftKeyPressed = 0;
- }
- } else {
- // It was a press, so at least one shift key is down now
- if (keyLocation == java_awt_event_KeyEvent_KEY_LOCATION_LEFT) {
- lastShiftKeyPressed = VK_LSHIFT;
- } else if (keyLocation == java_awt_event_KeyEvent_KEY_LOCATION_RIGHT) {
- lastShiftKeyPressed = VK_RSHIFT;
- }
- }
-
- return keyLocation;
+ leftShiftScancode = ::MapVirtualKey(VK_LSHIFT, 0);
+ rightShiftScancode = ::MapVirtualKey(VK_RSHIFT, 0);
+
+ if (keyScanCode == leftShiftScancode) {
+ return java_awt_event_KeyEvent_KEY_LOCATION_LEFT;
+ }
+ if (keyScanCode == rightShiftScancode) {
+ return java_awt_event_KeyEvent_KEY_LOCATION_RIGHT;
+ }
+
+ DASSERT(false);
+ // Note: the above should not fail on NT (or 2000)
+
+ // default value
+ return java_awt_event_KeyEvent_KEY_LOCATION_LEFT;
}
/* Returns Java extended InputEvent modifieres.
@@ -2914,7 +2765,7 @@
modifiers |= java_awt_event_InputEvent_ALT_DOWN_MASK;
}
if (HIBYTE(::GetKeyState(VK_MBUTTON)) != 0) {
- modifiers |= java_awt_event_InputEvent_BUTTON2_DOWN_MASK;
+ modifiers |= java_awt_event_InputEvent_BUTTON2_DOWN_MASK;
}
if (HIBYTE(::GetKeyState(VK_RBUTTON)) != 0) {
modifiers |= java_awt_event_InputEvent_BUTTON3_DOWN_MASK;
@@ -2922,6 +2773,13 @@
if (HIBYTE(::GetKeyState(VK_LBUTTON)) != 0) {
modifiers |= java_awt_event_InputEvent_BUTTON1_DOWN_MASK;
}
+
+ if (HIBYTE(::GetKeyState(VK_XBUTTON1)) != 0) {
+ modifiers |= masks[3];
+ }
+ if (HIBYTE(::GetKeyState(VK_XBUTTON2)) != 0) {
+ modifiers |= masks[4];
+ }
return modifiers;
}
@@ -2936,6 +2794,11 @@
return java_awt_event_MouseEvent_BUTTON2;
case RIGHT_BUTTON:
return java_awt_event_MouseEvent_BUTTON3;
+ case X1_BUTTON: //16 :
+ //just assign 4 and 5 numbers because MouseEvent class doesn't contain const identifier for them now
+ return 4;
+ case X2_BUTTON: //32
+ return 5;
}
return java_awt_event_MouseEvent_NOBUTTON;
}
@@ -2950,6 +2813,10 @@
return MK_MBUTTON;
case RIGHT_BUTTON:
return MK_RBUTTON;
+ case X1_BUTTON:
+ return MK_XBUTTON1;
+ case X2_BUTTON:
+ return MK_XBUTTON2;
}
return 0;
}
@@ -2967,6 +2834,14 @@
#define VK_NONCONVERT 0x1D
#endif
+#ifndef VK_XBUTTON1
+#define VK_XBUTTON1 0x05
+#endif
+
+#ifndef VK_XBUTTON2
+#define VK_XBUTTON2 0x06
+#endif
+
typedef struct {
UINT javaKey;
UINT windowsKey;
@@ -3786,22 +3661,6 @@
// via WM_AWT_FORWARD_BYTE, but the Edit classes don't seem to
// like that.
- // Begin pollution
- if (!m_isWinNT && IsDBCSLeadByteEx(GetCodePage(), BYTE(character))) {
- if (GetDBCSEditHandle() != NULL) {
- return mrDoDefault;
- } else {
- // Kludge: Some Chinese IMEs, e.g. QuanPin, sends two WM_CHAR
- // messages for some punctuations (e.g. full stop) without sending
- // WM_IME_CHAR message beforehand.
- if (m_PendingLeadByte == 0) {
- m_PendingLeadByte = character;
- return mrConsume;
- }
- }
- }
- // End pollution
-
// We will simply create Java events here.
UINT message = system ? WM_SYSCHAR : WM_CHAR;
@@ -3861,43 +3720,8 @@
MsgRouting AwtComponent::WmForwardChar(WCHAR character, LPARAM lParam,
BOOL synthetic)
{
- if (m_isWinNT) {
- // just post WM_CHAR with unicode key value
- DefWindowProc(WM_CHAR, (WPARAM)character, lParam);
- return mrConsume;
- }
-
- // This message is sent from the Java key event handler.
- CHAR mbChar[2] = {'\0', '\0'};
-
- int cBytes = ::WideCharToMultiByte(GetCodePage(), 0, &character, 1, mbChar, 2, NULL, NULL);
- if (cBytes!=1 && cBytes!=2) return mrConsume;
-
- HWND hDBCSEditHandle = GetDBCSEditHandle();
-
- if (hDBCSEditHandle != NULL && cBytes==2)
- {
- // The first WM_CHAR message will get handled by the WmChar, but
- // the second WM_CHAR message will get picked off by the Edit class.
- // WmChar will never see it.
- // If an Edit class gets a lead byte, it immediately calls PeekMessage
- // and pulls the trail byte out of the message queue.
- ::PostMessage(hDBCSEditHandle, WM_CHAR, mbChar[0] & 0x00ff, lParam);
- ::PostMessage(hDBCSEditHandle, WM_CHAR, mbChar[1] & 0x00ff, lParam);
- }
- else
- {
- MSG* pMsg;
- pMsg = CreateMessage(WM_CHAR, mbChar[0] & 0x00ff, lParam);
- ::PostMessage(GetHWnd(), WM_AWT_FORWARD_BYTE, (WPARAM)synthetic,
- (LPARAM)pMsg);
- if (mbChar[1])
- {
- pMsg = CreateMessage(WM_CHAR, mbChar[1] & 0x00ff, lParam);
- ::PostMessage(GetHWnd(), WM_AWT_FORWARD_BYTE, (WPARAM)synthetic,
- (LPARAM)pMsg);
- }
- }
+ // just post WM_CHAR with unicode key value
+ DefWindowProc(WM_CHAR, (WPARAM)character, lParam);
return mrConsume;
}
@@ -3929,7 +3753,7 @@
SetCandidateWindow(iCandType, x-rc.left, y-rc.top);
}
if (m_bitsCandType != 0) {
- DefWindowProc(WM_IME_NOTIFY, IMN_OPENCANDIDATE, m_bitsCandType);
+ ::DefWindowProc(GetHWnd(), WM_IME_NOTIFY, IMN_OPENCANDIDATE, m_bitsCandType);
}
}
@@ -4543,7 +4367,7 @@
// Special case for components with a sunken border. Windows does not
// print the border correctly on PCL printers, so we have to do it ourselves.
- if (IS_WIN4X && (GetStyleEx() & WS_EX_CLIENTEDGE)) {
+ if (GetStyleEx() & WS_EX_CLIENTEDGE) {
RECT r;
VERIFY(::GetWindowRect(GetHWnd(), &r));
VERIFY(::OffsetRect(&r, -r.left, -r.top));
@@ -4559,7 +4383,7 @@
* We will first print the non-client area with the original offset,
* then the client area with a corrected offset.
*/
- if (IS_WIN4X && (GetStyleEx() & WS_EX_CLIENTEDGE)) {
+ if (GetStyleEx() & WS_EX_CLIENTEDGE) {
int nEdgeWidth = ::GetSystemMetrics(SM_CXEDGE);
int nEdgeHeight = ::GetSystemMetrics(SM_CYEDGE);
@@ -5305,7 +5129,12 @@
if (modifiers & java_awt_event_InputEvent_BUTTON3_DOWN_MASK) {
wLow |= MK_MBUTTON;
}
-
+ if (modifiers & X1_BUTTON) {
+ wLow |= GetButtonMK(X1_BUTTON);
+ }
+ if (modifiers & X2_BUTTON) {
+ wLow |= GetButtonMK(X2_BUTTON);
+ }
wheelAmt = (jint)JNU_CallMethodByName(env,
NULL,
@@ -5319,18 +5148,8 @@
// convert Java wheel amount value to Win32
wheelAmt *= -1 * WHEEL_DELTA;
- if (IS_WIN95 && !IS_WIN98) {
- // 95 doesn't understand WM_MOUSEWHEEL, so plug in value of
- // mouse wheel event on 95
- DTRACE_PRINTLN("awt_C::synthmm - 95 case");
- DASSERT(Wheel95GetMsg() != NULL);
- message = Wheel95GetMsg();
- wParam = wheelAmt;
- }
- else {
- message = WM_MOUSEWHEEL;
- wParam = MAKEWPARAM(wLow, wheelAmt);
- }
+ message = WM_MOUSEWHEEL;
+ wParam = MAKEWPARAM(wLow, wheelAmt);
break;
default:
@@ -5445,45 +5264,6 @@
VerifyState();
}
-/* Initialization of MouseWheel support on Windows 95 */
-void AwtComponent::Wheel95Init() {
- DASSERT(IS_WIN95 && !IS_WIN98);
-
- HWND mwHWND = NULL;
- UINT wheelMSG = WM_NULL;
- UINT suppMSG = WM_NULL;
- UINT linesMSG = WM_NULL;
- BOOL wheelActive;
- INT lines;
-
- mwHWND = HwndMSWheel(&wheelMSG, &suppMSG, &linesMSG, &wheelActive, &lines);
- if (mwHWND != WM_NULL) {
- sm_95WheelMessage = wheelMSG;
- sm_95WheelSupport = suppMSG;
- }
-}
-
-/* Win95 only
- * Return the user's preferred number of lines of test to scroll when the
- * mouse wheel is rotated.
- */
-UINT AwtComponent::Wheel95GetScrLines() {
- DASSERT(IS_WIN95 && !IS_WIN98);
- DASSERT(sm_95WheelSupport != NULL);
-
- HWND mwHWND = NULL;
- UINT linesMSG = WM_NULL;
- INT numLines = 3;
-
- linesMSG = RegisterWindowMessage(MSH_SCROLL_LINES);
- mwHWND = FindWindow(MSH_WHEELMODULE_CLASS, MSH_WHEELMODULE_TITLE);
-
- if (mwHWND && linesMSG) {
- numLines = (INT)::SendMessage(mwHWND, linesMSG, 0, 0);
- }
- return numLines;
-}
-
/*
* associate an AwtDropTarget with this AwtComponent
*/
@@ -5983,7 +5763,7 @@
{
AwtFont *awtFont = (AwtFont *)env->GetLongField(font, AwtFont::pDataID);
if (awtFont == NULL) {
- /*arguments of AwtFont::Create are changed for multifont component */
+ /*arguments of AwtFont::Create are changed for multifont component */
awtFont = AwtFont::Create(env, font);
}
env->SetLongField(font, AwtFont::pDataID, (jlong)awtFont);
@@ -6334,30 +6114,36 @@
c = (AwtComponent *)pData;
if (::IsWindow(c->GetHWnd()))
{
- RGNDATA *pRgnData = NULL;
- RGNDATAHEADER *pRgnHdr;
-
- /* reserving memory for the worst case */
- size_t worstBufferSize = size_t(((x2 - x1) / 2 + 1) * (y2 - y1));
- pRgnData = (RGNDATA *) safe_Malloc(sizeof(RGNDATAHEADER) +
- sizeof(RECT_T) * worstBufferSize);
- pRgnHdr = (RGNDATAHEADER *) pRgnData;
-
- pRgnHdr->dwSize = sizeof(RGNDATAHEADER);
- pRgnHdr->iType = RDH_RECTANGLES;
- pRgnHdr->nRgnSize = 0;
- pRgnHdr->rcBound.top = 0;
- pRgnHdr->rcBound.left = 0;
- pRgnHdr->rcBound.bottom = LONG(y2 - y1);
- pRgnHdr->rcBound.right = LONG(x2 - x1);
-
- RECT_T * pRect = (RECT_T *) (((BYTE *) pRgnData) + sizeof(RGNDATAHEADER));
- pRgnHdr->nCount = RegionToYXBandedRectangles(env, x1, y1, x2, y2, region, &pRect, worstBufferSize);
-
- HRGN hRgn = ::ExtCreateRegion(NULL,
- sizeof(RGNDATAHEADER) + sizeof(RECT_T) * pRgnHdr->nCount, pRgnData);
-
- free(pRgnData);
+ HRGN hRgn = NULL;
+
+ if (region || x1 || x2 || y1 || y2) {
+ // If all the params are zeros, the shape must be simply reset.
+ // Otherwise, convert it into a region.
+ RGNDATA *pRgnData = NULL;
+ RGNDATAHEADER *pRgnHdr;
+
+ /* reserving memory for the worst case */
+ size_t worstBufferSize = size_t(((x2 - x1) / 2 + 1) * (y2 - y1));
+ pRgnData = (RGNDATA *) safe_Malloc(sizeof(RGNDATAHEADER) +
+ sizeof(RECT_T) * worstBufferSize);
+ pRgnHdr = (RGNDATAHEADER *) pRgnData;
+
+ pRgnHdr->dwSize = sizeof(RGNDATAHEADER);
+ pRgnHdr->iType = RDH_RECTANGLES;
+ pRgnHdr->nRgnSize = 0;
+ pRgnHdr->rcBound.top = 0;
+ pRgnHdr->rcBound.left = 0;
+ pRgnHdr->rcBound.bottom = LONG(y2 - y1);
+ pRgnHdr->rcBound.right = LONG(x2 - x1);
+
+ RECT_T * pRect = (RECT_T *) (((BYTE *) pRgnData) + sizeof(RGNDATAHEADER));
+ pRgnHdr->nCount = RegionToYXBandedRectangles(env, x1, y1, x2, y2, region, &pRect, worstBufferSize);
+
+ hRgn = ::ExtCreateRegion(NULL,
+ sizeof(RGNDATAHEADER) + sizeof(RECT_T) * pRgnHdr->nCount, pRgnData);
+
+ free(pRgnData);
+ }
::SetWindowRgn(c->GetHWnd(), hRgn, TRUE);
}
@@ -6451,6 +6237,18 @@
Java_java_awt_Component_initIDs(JNIEnv *env, jclass cls)
{
TRY;
+ jclass inputEventClazz = env->FindClass("java/awt/event/InputEvent");
+ jmethodID getButtonDownMasksID = env->GetStaticMethodID(inputEventClazz, "getButtonDownMasks", "()[I");
+ jintArray obj = (jintArray)env->CallStaticObjectMethod(inputEventClazz, getButtonDownMasksID);
+ jint * tmp = env->GetIntArrayElements(obj, JNI_FALSE);
+
+ jsize len = env->GetArrayLength(obj);
+ AwtComponent::masks = new jint[len];
+ for (int i = 0; i < len; i++) {
+ AwtComponent::masks[i] = tmp[i];
+ }
+ env->ReleaseIntArrayElements(obj, tmp, 0);
+ env->DeleteLocalRef(obj);
/* class ids */
jclass peerCls = env->FindClass("sun/awt/windows/WComponentPeer");
@@ -7025,20 +6823,6 @@
CATCH_BAD_ALLOC_RET(NULL);
}
-/*
- * Class: sun_awt_windows_WComponentPeer
- * Method: wheelInit
- * Signature: ()V
- */
-JNIEXPORT void JNICALL
-Java_sun_awt_windows_WComponentPeer_wheelInit(JNIEnv *env, jclass cls)
-{
- // Only necessary on Win95
- if (IS_WIN95 && !IS_WIN98) {
- AwtComponent::Wheel95Init();
- }
-}
-
JNIEXPORT jboolean JNICALL
Java_sun_awt_windows_WComponentPeer_processSynchronousLightweightTransfer(JNIEnv *env, jclass cls,
jobject heavyweight,
@@ -7217,7 +7001,9 @@
"getName",
"()Ljava/lang/String;").l;
DASSERT(!safe_ExceptionOccurred(env));
- printf("\t%S\n", TO_WSTRING(targetStr));
+ LPCWSTR targetStrW = JNU_GetStringPlatformChars(env, targetStr, NULL);
+ printf("\t%S\n", targetStrW);
+ JNU_ReleaseStringPlatformChars(env, targetStr, targetStrW);
}
printf("\twas: [%d,%d,%dx%d]\n", x, y, width, height);
if (!fSizeValid) {
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_Component.h
--- a/jdk/src/windows/native/sun/windows/awt_Component.h Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_Component.h Wed Jul 05 16:47:27 2017 +0200
@@ -53,6 +53,22 @@
#define MIDDLE_BUTTON 2
#define RIGHT_BUTTON 4
#define DBL_CLICK 8
+#define X1_BUTTON 16
+#define X2_BUTTON 32
+
+#ifndef MK_XBUTTON1
+#define MK_XBUTTON1 0x0020
+#endif
+
+#ifndef MK_XBUTTON2
+#define MK_XBUTTON2 0x0040
+#endif
+
+// combination of standard mouse button flags
+const int ALL_MK_BUTTONS = MK_LBUTTON|MK_MBUTTON|MK_RBUTTON;
+const int X_BUTTONS = MK_XBUTTON1|MK_XBUTTON2;
+
+
// Whether to check for embedded frame and adjust location
#define CHECK_EMBEDDED 0
@@ -81,11 +97,6 @@
class AwtComponent : public AwtObject {
public:
- enum {
- // combination of all mouse button flags
- ALL_MK_BUTTONS = MK_LBUTTON|MK_MBUTTON|MK_RBUTTON
- };
-
/* java.awt.Component fields and method IDs */
static jfieldID peerID;
static jfieldID xID;
@@ -112,6 +123,7 @@
static jmethodID replaceSurfaceDataLaterMID;
static const UINT WmAwtIsComponent;
+ static jint * masks; //InputEvent mask array
AwtComponent();
virtual ~AwtComponent();
@@ -675,10 +687,6 @@
static HWND sm_focusOwner;
static HWND sm_focusedWindow;
- static BOOL m_isWin95;
- static BOOL m_isWin2000;
- static BOOL m_isWinNT;
-
static BOOL sm_bMenuLoop;
static INLINE BOOL isMenuLoopActive() {
return sm_bMenuLoop;
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_Cursor.cpp
--- a/jdk/src/windows/native/sun/windows/awt_Cursor.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_Cursor.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 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
@@ -79,10 +79,6 @@
custom = TRUE;
dirty = FALSE;
-
- if (IsWin95Cursor()) {
- customCursors.Add(this);
- }
}
AwtCursor::~AwtCursor()
@@ -96,9 +92,6 @@
if (custom) {
::DestroyIcon(hCursor);
- if (IsWin95Cursor()) {
- customCursors.Remove(this);
- }
}
JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
@@ -256,16 +249,6 @@
env->DeleteLocalRef(jcomp);
}
-void AwtCursor::DirtyAllCustomCursors() {
- if (IsWin95Cursor()) {
- AwtObjectListItem *cur = customCursors.m_head;
- while (cur != NULL) {
- ((AwtCursor *)(cur->obj))->dirty = TRUE;
- cur = cur->next;
- }
- }
-}
-
void AwtCursor::Rebuild() {
if (!dirty) {
return;
@@ -294,23 +277,6 @@
dirty = FALSE;
}
-/* Bug fix for 4205805:
- Custom cursor on WIN95 needs more effort, the same API works fine on NT
- and WIN98. On Win95, DDB has to be passed in when calling createIconIndirect
- Since DDB depends on the DISPLAY, we have to rebuild all the custom cursors
- when user changes the display settings.
-*/
-BOOL AwtCursor::IsWin95Cursor() {
- static BOOL val;
- static BOOL known = FALSE;
- if (!known) {
- val = (IS_WIN32 && !IS_NT && LOBYTE(LOWORD(::GetVersion())) == 4 &&
- HIBYTE(LOWORD(::GetVersion())) == 0);
- known = TRUE;
- }
- return val;
-}
-
extern "C" {
/************************************************************************
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_Cursor.h
--- a/jdk/src/windows/native/sun/windows/awt_Cursor.h Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_Cursor.h Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 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
@@ -66,7 +66,6 @@
}
static AwtCursor * CreateSystemCursor(jobject jCursor);
static void UpdateCursor(AwtComponent *comp);
- static void DirtyAllCustomCursors();
static HCURSOR GetCursor(JNIEnv *env, AwtComponent *comp);
static void setPData(jobject cursor, jlong pdata) {
@@ -76,7 +75,6 @@
private:
void Rebuild();
- static BOOL IsWin95Cursor();
HCURSOR hCursor;
jweak jCursor;
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_DataTransferer.cpp
--- a/jdk/src/windows/native/sun/windows/awt_DataTransferer.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_DataTransferer.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 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
@@ -24,12 +24,11 @@
*/
#include "awt.h"
-#include "awt_dlls.h"
#include "awt_DataTransferer.h"
#include "awt_DnDDT.h"
#include "awt_TextComponent.h"
-#include "awt_Unicode.h"
#include
+#include
#include
#include
@@ -271,9 +270,7 @@
hdrop = (HDROP)bBytes;
- load_shell_procs();
-
- UINT nFilenames = (*do_drag_query_file)(hdrop, 0xFFFFFFFF, NULL, 0);
+ UINT nFilenames = ::DragQueryFile(hdrop, 0xFFFFFFFF, NULL, 0);
jclass str_clazz = env->FindClass("java/lang/String");
DASSERT(str_clazz != NULL);
@@ -287,12 +284,12 @@
buffer = (LPTSTR)safe_Malloc(bufsize*sizeof(TCHAR));
for (UINT i = 0; i < nFilenames; i++) {
- UINT size = (*do_drag_query_file)(hdrop, i, NULL, 0);
+ UINT size = ::DragQueryFile(hdrop, i, NULL, 0);
if (size > bufsize) {
bufsize = size;
buffer = (LPTSTR)safe_Realloc(buffer, bufsize*sizeof(TCHAR));
}
- (*do_drag_query_file)(hdrop, i, buffer, bufsize);
+ ::DragQueryFile(hdrop, i, buffer, bufsize);
jstring name = JNU_NewStringPlatform(env, buffer);
if (name == NULL) {
@@ -401,7 +398,7 @@
case 4:
case 8:
nColorEntries = (pSrcBmih->biClrUsed != 0) ?
- pSrcBmih->biClrUsed : 1 << (pSrcBmih->biBitCount - 1);
+ pSrcBmih->biClrUsed : (1 << pSrcBmih->biBitCount);
break;
case 16:
case 24:
@@ -454,11 +451,6 @@
width = p.x;
height = -p.y;
- // Win9X supports only 16-bit signed coordinates.
- if (IS_WIN95) {
- if (width > 0x7FFF) { width = 0x7FFF; }
- if (height > 0x7FFF) { height = 0x7FFF; }
- }
free(lpemh);
}
break;
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_Desktop.cpp
--- a/jdk/src/windows/native/sun/windows/awt_Desktop.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_Desktop.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -23,8 +23,8 @@
* have any questions.
*/
+#include "awt.h"
#include
-#include
#include
#include
@@ -40,32 +40,32 @@
JNIEXPORT jstring JNICALL Java_sun_awt_windows_WDesktopPeer_ShellExecute
(JNIEnv *env, jclass cls, jstring uri_j, jstring verb_j)
{
- const WCHAR* uri_c = env->GetStringChars(uri_j, JNI_FALSE);
- const WCHAR* verb_c = env->GetStringChars(verb_j, JNI_FALSE);
+ LPCWSTR uri_c = JNU_GetStringPlatformChars(env, uri_j, JNI_FALSE);
+ LPCWSTR verb_c = JNU_GetStringPlatformChars(env, verb_j, JNI_FALSE);
// 6457572: ShellExecute possibly changes FPU control word - saving it here
unsigned oldcontrol87 = _control87(0, 0);
- HINSTANCE retval = ShellExecuteW(NULL, verb_c, uri_c, NULL, NULL, SW_SHOWNORMAL);
+ HINSTANCE retval = ::ShellExecute(NULL, verb_c, uri_c, NULL, NULL, SW_SHOWNORMAL);
_control87(oldcontrol87, 0xffffffff);
- env->ReleaseStringChars(uri_j, uri_c);
- env->ReleaseStringChars(verb_j, verb_c);
+ JNU_ReleaseStringPlatformChars(env, uri_j, uri_c);
+ JNU_ReleaseStringPlatformChars(env, verb_j, verb_c);
if ((int)retval <= 32) {
// ShellExecute failed.
- LPVOID buffer;
- int len = FormatMessageW(
+ LPTSTR buffer = NULL;
+ int len = ::FormatMessage(
FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS,
NULL,
GetLastError(),
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
- (LPWSTR) &buffer,
+ (LPTSTR)&buffer,
0,
NULL );
- jstring errmsg = env->NewString((LPCWSTR)buffer, len);
+ jstring errmsg = JNU_NewStringPlatform(env, buffer, len);
LocalFree(buffer);
return errmsg;
}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_DesktopProperties.cpp
--- a/jdk/src/windows/native/sun/windows/awt_DesktopProperties.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_DesktopProperties.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 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
@@ -23,17 +23,17 @@
* have any questions.
*/
-#include "stdhdrs.h"
+#include "awt.h"
#include "mmsystem.h"
#include "jlong.h"
-#include "awt.h"
#include "awt_DesktopProperties.h"
-#include "awt_dlls.h"
+#include "awt_Toolkit.h"
#include "sun_awt_windows_WDesktopProperties.h"
#include "java_awt_Font.h"
#include "awtmsg.h"
-#include "Zmouse.h"
-#include "shellapi.h"
+#include "zmouse.h"
+#include
+#include
// WDesktopProperties fields
jfieldID AwtDesktopProperties::pDataID = 0;
@@ -44,10 +44,6 @@
jmethodID AwtDesktopProperties::setFontPropertyID = 0;
jmethodID AwtDesktopProperties::setSoundPropertyID = 0;
-typedef VOID (WINAPI *SHGetSettingsType)(LPSHELLFLAGSTATE, DWORD);
-static HMODULE libShell32 = NULL;
-static SHGetSettingsType fn_SHGetSettings;
-
AwtDesktopProperties::AwtDesktopProperties(jobject self) {
this->self = GetEnv()->NewGlobalRef(self);
GetEnv()->SetLongField( self, AwtDesktopProperties::pDataID,
@@ -431,14 +427,12 @@
void AwtDesktopProperties::GetColorParameters() {
- if (IS_WIN98 || IS_WIN2000) {
- SetColorProperty(TEXT("win.frame.activeCaptionGradientColor"),
- GetSysColor(COLOR_GRADIENTACTIVECAPTION));
- SetColorProperty(TEXT("win.frame.inactiveCaptionGradientColor"),
- GetSysColor(COLOR_GRADIENTINACTIVECAPTION));
- SetColorProperty(TEXT("win.item.hotTrackedColor"),
- GetSysColor(COLOR_HOTLIGHT));
- }
+ SetColorProperty(TEXT("win.frame.activeCaptionGradientColor"),
+ GetSysColor(COLOR_GRADIENTACTIVECAPTION));
+ SetColorProperty(TEXT("win.frame.inactiveCaptionGradientColor"),
+ GetSysColor(COLOR_GRADIENTINACTIVECAPTION));
+ SetColorProperty(TEXT("win.item.hotTrackedColor"),
+ GetSysColor(COLOR_HOTLIGHT));
SetColorProperty(TEXT("win.3d.darkShadowColor"), GetSysColor(COLOR_3DDKSHADOW));
SetColorProperty(TEXT("win.3d.backgroundColor"), GetSysColor(COLOR_3DFACE));
SetColorProperty(TEXT("win.3d.highlightColor"), GetSysColor(COLOR_3DHIGHLIGHT));
@@ -510,40 +504,18 @@
// This property is called "win.frame.fullWindowDragsOn" above
// This is one of the properties that don't trigger WM_SETTINGCHANGE
SetBooleanProperty(TEXT("awt.dynamicLayoutSupported"), GetBooleanParameter(SPI_GETDRAGFULLWINDOWS));
-
- // 95 MouseWheel support
- // More or less copied from the MSH_MOUSEWHEEL MSDN entry
- if (IS_WIN95 && !IS_WIN98) {
- HWND hdlMSHWHEEL = NULL;
- UINT msgMSHWheelSupported = NULL;
- BOOL wheelSupported = FALSE;
-
- msgMSHWheelSupported = RegisterWindowMessage(MSH_WHEELSUPPORT);
- hdlMSHWHEEL = FindWindow(MSH_WHEELMODULE_CLASS, MSH_WHEELMODULE_TITLE);
- if (hdlMSHWHEEL && msgMSHWheelSupported) {
- wheelSupported = (BOOL)::SendMessage(hdlMSHWHEEL,
- msgMSHWheelSupported, 0, 0);
- }
- SetBooleanProperty(TEXT("awt.wheelMousePresent"), wheelSupported);
- }
- else {
- SetBooleanProperty(TEXT("awt.wheelMousePresent"),
- ::GetSystemMetrics(SM_MOUSEWHEELPRESENT));
- }
+ SetBooleanProperty(TEXT("awt.wheelMousePresent"),
+ ::GetSystemMetrics(SM_MOUSEWHEELPRESENT));
// END cross-platform properties
- if (IS_WIN98 || IS_WIN2000) {
- //DWORD menuShowDelay;
- //SystemParametersInfo(SPI_GETMENUSHOWDELAY, 0, &menuShowDelay, 0);
- // SetIntegerProperty(TEXT("win.menu.showDelay"), menuShowDelay);
- SetBooleanProperty(TEXT("win.frame.captionGradientsOn"), GetBooleanParameter(SPI_GETGRADIENTCAPTIONS));
- SetBooleanProperty(TEXT("win.item.hotTrackingOn"), GetBooleanParameter(SPI_GETHOTTRACKING));
- }
+ //DWORD menuShowDelay;
+ //SystemParametersInfo(SPI_GETMENUSHOWDELAY, 0, &menuShowDelay, 0);
+ // SetIntegerProperty(TEXT("win.menu.showDelay"), menuShowDelay);
+ SetBooleanProperty(TEXT("win.frame.captionGradientsOn"), GetBooleanParameter(SPI_GETGRADIENTCAPTIONS));
+ SetBooleanProperty(TEXT("win.item.hotTrackingOn"), GetBooleanParameter(SPI_GETHOTTRACKING));
- if (IS_WIN2000) {
- SetBooleanProperty(TEXT("win.menu.keyboardCuesOn"), GetBooleanParameter(SPI_GETKEYBOARDCUES));
- }
+ SetBooleanProperty(TEXT("win.menu.keyboardCuesOn"), GetBooleanParameter(SPI_GETKEYBOARDCUES));
// High contrast accessibility property
HIGHCONTRAST contrast;
@@ -557,21 +529,19 @@
SetBooleanProperty(TEXT("win.highContrast.on"), FALSE);
}
- if (fn_SHGetSettings != NULL) {
- SHELLFLAGSTATE sfs;
- fn_SHGetSettings(&sfs, SSF_SHOWALLOBJECTS | SSF_SHOWATTRIBCOL);
- if (sfs.fShowAllObjects) {
- SetBooleanProperty(TEXT("awt.file.showHiddenFiles"), TRUE);
- }
- else {
- SetBooleanProperty(TEXT("awt.file.showHiddenFiles"), FALSE);
- }
- if (sfs.fShowAttribCol) {
- SetBooleanProperty(TEXT("awt.file.showAttribCol"), TRUE);
- }
- else {
- SetBooleanProperty(TEXT("awt.file.showAttribCol"), FALSE);
- }
+ SHELLFLAGSTATE sfs;
+ ::SHGetSettings(&sfs, SSF_SHOWALLOBJECTS | SSF_SHOWATTRIBCOL);
+ if (sfs.fShowAllObjects) {
+ SetBooleanProperty(TEXT("awt.file.showHiddenFiles"), TRUE);
+ }
+ else {
+ SetBooleanProperty(TEXT("awt.file.showHiddenFiles"), FALSE);
+ }
+ if (sfs.fShowAttribCol) {
+ SetBooleanProperty(TEXT("awt.file.showAttribCol"), TRUE);
+ }
+ else {
+ SetBooleanProperty(TEXT("awt.file.showAttribCol"), FALSE);
}
LPTSTR value;
@@ -667,7 +637,7 @@
}
void AwtDesktopProperties::SetStringProperty(LPCTSTR propName, LPTSTR value) {
- jstring key = JNU_NewStringPlatform(GetEnv(), propName);
+ jstring key = JNU_NewStringPlatform(GetEnv(), const_cast(propName));
GetEnv()->CallVoidMethod(self,
AwtDesktopProperties::setStringPropertyID,
key, JNU_NewStringPlatform(GetEnv(), value));
@@ -675,7 +645,7 @@
}
void AwtDesktopProperties::SetIntegerProperty(LPCTSTR propName, int value) {
- jstring key = JNU_NewStringPlatform(GetEnv(), propName);
+ jstring key = JNU_NewStringPlatform(GetEnv(), const_cast(propName));
GetEnv()->CallVoidMethod(self,
AwtDesktopProperties::setIntegerPropertyID,
key, (jint)value);
@@ -683,7 +653,7 @@
}
void AwtDesktopProperties::SetBooleanProperty(LPCTSTR propName, BOOL value) {
- jstring key = JNU_NewStringPlatform(GetEnv(), propName);
+ jstring key = JNU_NewStringPlatform(GetEnv(), const_cast(propName));
GetEnv()->CallVoidMethod(self,
AwtDesktopProperties::setBooleanPropertyID,
key, value ? JNI_TRUE : JNI_FALSE);
@@ -691,7 +661,7 @@
}
void AwtDesktopProperties::SetColorProperty(LPCTSTR propName, DWORD value) {
- jstring key = JNU_NewStringPlatform(GetEnv(), propName);
+ jstring key = JNU_NewStringPlatform(GetEnv(), const_cast(propName));
GetEnv()->CallVoidMethod(self,
AwtDesktopProperties::setColorPropertyID,
key, GetRValue(value), GetGValue(value),
@@ -743,7 +713,7 @@
style |= java_awt_Font_ITALIC;
}
- jstring key = JNU_NewStringPlatform(GetEnv(), propName);
+ jstring key = JNU_NewStringPlatform(GetEnv(), const_cast(propName));
GetEnv()->CallVoidMethod(self,
AwtDesktopProperties::setFontPropertyID,
key, fontName, style, pointSize);
@@ -761,7 +731,7 @@
jint pointSize;
jint style;
- fontName = JNU_NewStringPlatform(GetEnv(), font.lfFaceName);
+ fontName = JNU_NewStringPlatform(GetEnv(), const_cast(font.lfFaceName));
#if 0
HDC hdc;
@@ -784,7 +754,7 @@
style |= java_awt_Font_ITALIC;
}
- jstring key = JNU_NewStringPlatform(GetEnv(), propName);
+ jstring key = JNU_NewStringPlatform(GetEnv(), const_cast(propName));
GetEnv()->CallVoidMethod(self, AwtDesktopProperties::setFontPropertyID,
key, fontName, style, pointSize);
@@ -793,8 +763,8 @@
}
void AwtDesktopProperties::SetSoundProperty(LPCTSTR propName, LPCTSTR winEventName) {
- jstring key = JNU_NewStringPlatform(GetEnv(), propName);
- jstring event = JNU_NewStringPlatform(GetEnv(), winEventName);
+ jstring key = JNU_NewStringPlatform(GetEnv(), const_cast(propName));
+ jstring event = JNU_NewStringPlatform(GetEnv(), const_cast(winEventName));
GetEnv()->CallVoidMethod(self,
AwtDesktopProperties::setSoundPropertyID,
key, event);
@@ -805,9 +775,9 @@
void AwtDesktopProperties::PlayWindowsSound(LPCTSTR event) {
// stop any currently playing sounds
- AwtWinMM::PlaySoundWrapper(NULL, NULL, SND_PURGE);
+ ::PlaySound(NULL, NULL, SND_PURGE);
// play the sound for the given event name
- AwtWinMM::PlaySoundWrapper(event, NULL, SND_ASYNC|SND_ALIAS|SND_NODEFAULT);
+ ::PlaySound(event, NULL, SND_ASYNC|SND_ALIAS|SND_NODEFAULT);
}
///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -852,16 +822,6 @@
Java_sun_awt_windows_WDesktopProperties_init(JNIEnv *env, jobject self) {
TRY;
- // Open shell32.dll, get the symbol for SHGetSettings
- libShell32 = LoadLibrary(TEXT("shell32.dll"));
- if (libShell32 == NULL) {
- fn_SHGetSettings = NULL;
- }
- else {
- fn_SHGetSettings = (SHGetSettingsType)GetProcAddress(
- libShell32, "SHGetSettings");
- }
-
new AwtDesktopProperties(self);
CATCH_BAD_ALLOC;
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_Dialog.cpp
--- a/jdk/src/windows/native/sun/windows/awt_Dialog.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_Dialog.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -132,14 +132,13 @@
dialog = new AwtDialog();
{
- int colorId = IS_WIN4X ? COLOR_3DFACE : COLOR_WINDOW;
+ int colorId = COLOR_3DFACE;
DWORD style = WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN;
if (hwndParent != NULL) {
style |= WS_POPUP;
}
style &= ~(WS_MINIMIZEBOX|WS_MAXIMIZEBOX);
- DWORD exStyle = IS_WIN4X ? WS_EX_WINDOWEDGE | WS_EX_DLGMODALFRAME
- : 0;
+ DWORD exStyle = WS_EX_WINDOWEDGE | WS_EX_DLGMODALFRAME;
if (GetRTL()) {
exStyle |= WS_EX_RIGHT | WS_EX_LEFTSCROLLBAR;
@@ -663,7 +662,7 @@
int badAlloc = 0;
LPCTSTR coption;
- LPTSTR empty = TEXT("InputMethod");
+ LPCTSTR empty = TEXT("InputMethod");
AwtDialog *d = NULL;
PDATA pData;
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_DnDDS.cpp
--- a/jdk/src/windows/native/sun/windows/awt_DnDDS.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_DnDDS.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 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
@@ -23,6 +23,7 @@
* have any questions.
*/
+#include "awt.h"
#include "jlong.h"
#include "awt_DataTransferer.h"
#include "awt_DnDDS.h"
@@ -36,8 +37,6 @@
#include "sun_awt_dnd_SunDragSourceContextPeer.h"
#include "sun_awt_windows_WDragSourceContextPeer.h"
-#include
-#include
#include
#include
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_DnDDT.cpp
--- a/jdk/src/windows/native/sun/windows/awt_DnDDT.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_DnDDT.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 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
@@ -30,11 +30,8 @@
#include "awt_Toolkit.h"
#include "java_awt_dnd_DnDConstants.h"
#include "sun_awt_windows_WDropTargetContextPeer.h"
-#include "awt_dlls.h"
#include "awt_Container.h"
-#include
-#include
#include
#include
@@ -555,8 +552,7 @@
break;
}
case TYMED_FILE: {
- jobject local = JNU_NewStringPlatform(env, (LPCTSTR)
- stgmedium.lpszFileName);
+ jobject local = JNU_NewStringPlatform(env, stgmedium.lpszFileName);
jstring fileName = (jstring)env->NewGlobalRef(local);
env->DeleteLocalRef(local);
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_DrawingSurface.cpp
--- a/jdk/src/windows/native/sun/windows/awt_DrawingSurface.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_DrawingSurface.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -24,6 +24,8 @@
*/
#define _JNI_IMPLEMENTATION_
+
+#include "awt.h"
#include "awt_DrawingSurface.h"
#include "awt_Component.h"
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_FileDialog.cpp
--- a/jdk/src/windows/native/sun/windows/awt_FileDialog.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_FileDialog.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 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
@@ -27,7 +27,6 @@
#include "awt_FileDialog.h"
#include "awt_Dialog.h"
#include "awt_Toolkit.h"
-#include "awt_dlls.h"
#include "ComCtl32Util.h"
#include
#include
@@ -65,7 +64,7 @@
{
int length = env->GetStringLength(filterDescription);
DASSERT(length + 1 < MAX_FILTER_STRING);
- LPCTSTR tmp = (LPTSTR)JNU_GetStringPlatformChars(env, filterDescription, NULL);
+ LPCTSTR tmp = JNU_GetStringPlatformChars(env, filterDescription, NULL);
_tcscpy(s_fileFilterString, tmp);
JNU_ReleaseStringPlatformChars(env, filterDescription, tmp);
@@ -156,7 +155,7 @@
LPITEMIDLIST pidl = (LPITEMIDLIST)notifyEx->pidl;
// Get the filename and directory
TCHAR szPath[MAX_PATH];
- if (!get_path_from_idlist(pidl,szPath)) {
+ if (!::SHGetPathFromIDList(pidl, szPath)) {
return TRUE;
}
jstring strPath = JNU_NewStringPlatform(env, szPath);
@@ -190,7 +189,7 @@
WCHAR unicodeChar = L' ';
LPTSTR fileBuffer = NULL;
LPTSTR currentDirectory = NULL;
- AWTOPENFILENAME ofn;
+ OPENFILENAME ofn;
jint mode = 0;
BOOL result = FALSE;
DWORD dlgerr;
@@ -222,7 +221,7 @@
HWND hwndOwner = awtParent ? awtParent->GetHWnd() : NULL;
if (title == NULL || env->GetStringLength(title)==0) {
- title = env->NewString(&unicodeChar, 1);
+ title = JNU_NewStringPlatform(env, &unicodeChar);
}
JavaStringBuffer titleBuffer(env, title);
@@ -243,14 +242,7 @@
memset(&ofn, 0, sizeof(ofn));
- // According to the MSDN docs, lStructSize must be set to
- // OPENFILENAME_SIZE_VERSION_400 on NT4.0.
- if (IS_NT && !(IS_WIN2000)) {
- ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400;
- }
- else {
ofn.lStructSize = sizeof(ofn);
- }
ofn.lpstrFilter = s_fileFilterString;
ofn.nFilterIndex = 1;
/*
@@ -289,9 +281,6 @@
mode = env->GetIntField(target, AwtFileDialog::modeID);
- // Fix for 4364256 : call load_shell_procs()
- load_shell_procs();
-
AwtDialog::CheckInstallModalHook();
// show the Win32 file dialog
@@ -304,7 +293,7 @@
// If the dialog is not shown because of invalid file name
// replace the file name by empty string.
if (!result) {
- dlgerr = AwtCommDialog::CommDlgExtendedError();
+ dlgerr = ::CommDlgExtendedError();
if (dlgerr == FNERR_INVALIDFILENAME) {
_tcscpy(fileBuffer, TEXT(""));
if (mode == java_awt_FileDialog_LOAD) {
@@ -326,7 +315,7 @@
// Report result to peer.
if (result) {
jstring tmpJString = (_tcslen(ofn.lpstrFile) == 0 ?
- env->NewStringUTF("") :
+ JNU_NewStringPlatform(env, L"") :
JNU_NewStringPlatform(env, ofn.lpstrFile));
env->CallVoidMethod(peer, AwtFileDialog::handleSelectedMID, tmpJString);
env->DeleteLocalRef(tmpJString);
@@ -362,20 +351,18 @@
}
BOOL
-AwtFileDialog::GetOpenFileName(LPAWTOPENFILENAME data) {
- AwtCommDialog::load_comdlg_procs();
+AwtFileDialog::GetOpenFileName(LPOPENFILENAME data) {
return static_cast(reinterpret_cast(
AwtToolkit::GetInstance().InvokeFunction((void*(*)(void*))
- AwtCommDialog::GetOpenFileNameWrapper, data)));
+ ::GetOpenFileName, data)));
}
BOOL
-AwtFileDialog::GetSaveFileName(LPAWTOPENFILENAME data) {
- AwtCommDialog::load_comdlg_procs();
+AwtFileDialog::GetSaveFileName(LPOPENFILENAME data) {
return static_cast(reinterpret_cast(
AwtToolkit::GetInstance().InvokeFunction((void *(*)(void *))
- AwtCommDialog::GetSaveFileNameWrapper, data)));
+ ::GetSaveFileName, data)));
}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_FileDialog.h
--- a/jdk/src/windows/native/sun/windows/awt_FileDialog.h Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_FileDialog.h Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 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
@@ -36,43 +36,6 @@
#include "java_awt_FileDialog.h"
#include "sun_awt_windows_WFileDialogPeer.h"
-// The VC6 headers don't include this, but it's necessary for
-// backward-compatibility with NT4.0, so we fake it.
-#ifndef OPENFILENAME_SIZE_VERSION_400
- // Determined via sizeof(OPENFILENAME)
- #define OPENFILENAME_SIZE_VERSION_400 76
-#endif
-
-// 4859390
-// For the Places Bar to show up, we need the "full" OPENFILENAME struct
-typedef struct tagAWTOFN {
- DWORD lStructSize;
- HWND hwndOwner;
- HINSTANCE hInstance;
- LPCTSTR lpstrFilter;
- LPTSTR lpstrCustomFilter;
- DWORD nMaxCustFilter;
- DWORD nFilterIndex;
- LPTSTR lpstrFile;
- DWORD nMaxFile;
- LPTSTR lpstrFileTitle;
- DWORD nMaxFileTitle;
- LPCTSTR lpstrInitialDir;
- LPCTSTR lpstrTitle;
- DWORD Flags;
- WORD nFileOffset;
- WORD nFileExtension;
- LPCTSTR lpstrDefExt;
- LPARAM lCustData;
- LPOFNHOOKPROC lpfnHook;
- LPCTSTR lpTemplateName;
-//#if (_WIN32_WINNT >= 0x0500)
- void * pvReserved;
- DWORD dwReserved;
- DWORD FlagsEx;
-//#endif // (_WIN32_WINNT >= 0x0500)
-} AWTOPENFILENAME, *LPAWTOPENFILENAME;
-
/************************************************************************
* AwtFileDialog class
*/
@@ -96,8 +59,8 @@
static void Initialize(JNIEnv *env, jstring filterDescription);
static void Show(void *peer);
- static BOOL GetOpenFileName(LPAWTOPENFILENAME);
- static BOOL GetSaveFileName(LPAWTOPENFILENAME);
+ static BOOL GetOpenFileName(LPOPENFILENAME);
+ static BOOL GetSaveFileName(LPOPENFILENAME);
virtual BOOL InheritsNativeMouseWheelBehavior();
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_Font.cpp
--- a/jdk/src/windows/native/sun/windows/awt_Font.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_Font.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 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
@@ -23,6 +23,7 @@
* have any questions.
*/
+#include "awt.h"
#include
#include "jlong.h"
#include "awt_Font.h"
@@ -195,7 +196,7 @@
}
// Get suitable CHARSET from charset string provided by font configuration.
-static int GetNativeCharset(WCHAR* name)
+static int GetNativeCharset(LPCWSTR name)
{
if (wcsstr(name, L"ANSI_CHARSET"))
return ANSI_CHARSET;
@@ -259,7 +260,7 @@
cfnum = 0;
}
- WCHAR* wName;
+ LPCWSTR wName;
awtFont = new AwtFont(cfnum, env, font);
@@ -269,9 +270,7 @@
if (cfnum > 0) {
// Ask peer class for the text component font name
jstring jTextComponentFontName = GetTextComponentFontName(env, font);
- WCHAR* textComponentFontName = TO_WSTRING(jTextComponentFontName);
-
- env->DeleteLocalRef(jTextComponentFontName);
+ LPCWSTR textComponentFontName = JNU_GetStringPlatformChars(env, jTextComponentFontName, NULL);
awtFont->m_textInput = -1;
for (int i = 0; i < cfnum; i++) {
@@ -282,13 +281,13 @@
jstring nativeName =
(jstring)env->GetObjectField(fontDescriptor,
AwtFont::nativeNameID);
- wName = TO_WSTRING(nativeName);
+ wName = JNU_GetStringPlatformChars(env, nativeName, NULL);
DASSERT(wName);
//On NT platforms, if the font is not Symbol or Dingbats
//use "W" version of Win32 APIs directly, info the FontDescription
//no need to convert characters from Unicode to locale encodings.
- if (IS_NT && GetNativeCharset(wName) != SYMBOL_CHARSET) {
+ if (GetNativeCharset(wName) != SYMBOL_CHARSET) {
env->SetBooleanField(fontDescriptor, AwtFont::useUnicodeID, TRUE);
}
@@ -299,10 +298,12 @@
(wcscmp(wName, textComponentFontName) == 0)) {
awtFont->m_textInput = i;
}
- HFONT hfonttmp = CreateHFont(wName, fontStyle, fontSize,
+ HFONT hfonttmp = CreateHFont(const_cast(wName), fontStyle, fontSize,
angle, awScale);
awtFont->m_hFont[i] = hfonttmp;
+ JNU_ReleaseStringPlatformChars(env, nativeName, wName);
+
env->DeleteLocalRef(fontDescriptor);
env->DeleteLocalRef(nativeName);
}
@@ -311,11 +312,14 @@
// to first component
awtFont->m_textInput = 0;
}
+
+ JNU_ReleaseStringPlatformChars(env, jTextComponentFontName, textComponentFontName);
+ env->DeleteLocalRef(jTextComponentFontName);
} else {
// Instantiation for English version.
jstring fontName = (jstring)env->GetObjectField(font,
AwtFont::nameID);
- wName = TO_WSTRING(fontName);
+ wName = JNU_GetStringPlatformChars(env, fontName, NULL);
WCHAR* wEName;
if (!wcscmp(wName, L"Helvetica") || !wcscmp(wName, L"SansSerif")) {
@@ -338,6 +342,9 @@
awtFont->m_textInput = 0;
awtFont->m_hFont[0] = CreateHFont(wEName, fontStyle, fontSize,
angle, awScale);
+
+ JNU_ReleaseStringPlatformChars(env, fontName, wName);
+
env->DeleteLocalRef(fontName);
}
/* The several callers of this method also set the pData field.
@@ -381,7 +388,7 @@
}
-static HFONT CreateHFont_sub(WCHAR* name, int style, int height,
+static HFONT CreateHFont_sub(LPCWSTR name, int style, int height,
int angle=0, float awScale=1.0f)
{
LOGFONTW logFont;
@@ -420,18 +427,7 @@
strip_tail(tmpname,L"Italic");
strip_tail(tmpname,L"Bold");
wcscpy(&(logFont.lfFaceName[0]), tmpname);
- HFONT hFont;
- if (IS_WIN95) {
-#ifdef WIN32
- DASSERT(IS_WIN95);
-#endif
- HDC hdc = ::GetDC(NULL);
- ::EnumFontFamiliesEx(hdc, &logFont, (FONTENUMPROC)FindFamilyName,
- (LPARAM)tmpname, 0L);
- ::ReleaseDC(NULL, hdc);
- wcscpy(&logFont.lfFaceName[0], tmpname);
- }
- hFont = ::CreateFontIndirectW(&logFont);
+ HFONT hFont = ::CreateFontIndirect(&logFont);
DASSERT(hFont != NULL);
// get a expanded or condensed version if its specified.
if (awScale != 1.0f) {
@@ -446,7 +442,7 @@
}
avgWidth = tm.tmAveCharWidth;
logFont.lfWidth = (LONG)((fabs)(avgWidth*awScale));
- hFont = CreateFontIndirectW(&logFont);
+ hFont = ::CreateFontIndirect(&logFont);
DASSERT(hFont != NULL);
VERIFY(::ReleaseDC(0, hDC));
}
@@ -460,15 +456,8 @@
WCHAR longName[80];
// 80 > (max face name(=30) + strlen("CHINESEBIG5_CHARSET"))
// longName doesn't have to be printable. So, it is OK not to convert.
- if (IS_NT) {
- //wsprintfW only works on NT. See bugid 4123362
- wsprintfW(longName, L"%ls-%d-%d", name, style, height);
- } else {
-#ifdef WIN32
- DASSERT(IS_WIN95);
-#endif
- swprintf(longName, L"%ls-%d-%d", name, style, height);
- }
+
+ wsprintf(longName, L"%ls-%d-%d", name, style, height);
HFONT hFont = NULL;
@@ -682,28 +671,16 @@
if (arrayLength == 0) {
int length = env->GetStringLength(str);
- WCHAR* string = TO_WSTRING(str);
+ LPCWSTR strW = JNU_GetStringPlatformChars(env, str, NULL);
VERIFY(::SelectObject(hDC, awtFont->GetHFont()));
if (AwtComponent::GetRTLReadingOrder()){
- if (IS_WIN95) {
- // Start of conversion Code to fix arabic shaping problems
- // with unicode support in win 95
- LPSTR buffer = (LPSTR) alloca((wcslen(string) + 1) * 2);
- int count = ::WideCharToMultiByte(codePage, 0, string, length,
- buffer,
- static_cast((wcslen(string) + 1) * 2),
- NULL, NULL);
- VERIFY(!draw || ::ExtTextOutA(hDC, x, y, ETO_RTLREADING, NULL,
- buffer, count, NULL));
- // End Of Conversion Code
- } else {
- VERIFY(!draw || ::ExtTextOutW(hDC, x, y, ETO_RTLREADING, NULL,
- string, length, NULL));
- }
+ VERIFY(!draw || ::ExtTextOut(hDC, x, y, ETO_RTLREADING, NULL,
+ strW, length, NULL));
} else {
- VERIFY(!draw || ::TextOutW(hDC, x, y, string, length));
+ VERIFY(!draw || ::TextOut(hDC, x, y, strW, length));
}
- VERIFY(::GetTextExtentPoint32W(hDC, string, length, &size));
+ VERIFY(::GetTextExtentPoint32(hDC, strW, length, &size));
+ JNU_ReleaseStringPlatformChars(env, str, strW);
} else {
for (int i = 0; i < arrayLength; i = i + 2) {
jobject fontDescriptor = env->GetObjectArrayElement(array, i);
@@ -732,7 +709,7 @@
* extend buflen and bad things will happen.
*/
unsigned char* buffer = NULL;
- jboolean unicodeUsed = env->GetBooleanField(fontDescriptor,AwtFont::useUnicodeID);
+ jboolean unicodeUsed = env->GetBooleanField(fontDescriptor, AwtFont::useUnicodeID);
try {
buffer = (unsigned char *)
env->GetPrimitiveArrayCritical(convertedBytes, 0);
@@ -1231,7 +1208,7 @@
public:
CSegTableComponent();
virtual ~CSegTableComponent();
- virtual void Create(LPWSTR name);
+ virtual void Create(LPCWSTR name);
virtual BOOL In(USHORT iChar) { DASSERT(FALSE); return FALSE; };
LPWSTR GetFontName(){
DASSERT(m_lpszFontName != NULL); return m_lpszFontName;
@@ -1254,7 +1231,7 @@
}
}
-void CSegTableComponent::Create(LPWSTR name)
+void CSegTableComponent::Create(LPCWSTR name)
{
if (m_lpszFontName != NULL) {
free(m_lpszFontName);
@@ -1453,7 +1430,7 @@
CStdSegTable();
virtual ~CStdSegTable();
BOOL IsEUDC() { return FALSE; };
- virtual void Create(LPWSTR name);
+ virtual void Create(LPCWSTR name);
protected:
void GetData(DWORD dwOffset, LPVOID lpData, DWORD cbData);
@@ -1481,7 +1458,7 @@
DASSERT(nBytes != GDI_ERROR);
}
-void CStdSegTable::Create(LPWSTR name)
+void CStdSegTable::Create(LPCWSTR name)
{
CSegTableComponent::Create(name);
@@ -1509,7 +1486,7 @@
CEUDCSegTable();
virtual ~CEUDCSegTable();
BOOL IsEUDC() { return TRUE; };
- virtual void Create(LPWSTR name);
+ virtual void Create(LPCWSTR name);
protected:
void GetData(DWORD dwOffset, LPVOID lpData, DWORD cbData);
@@ -1543,7 +1520,7 @@
DASSERT(dwRead == cbData);
}
-void CEUDCSegTable::Create(LPWSTR name)
+void CEUDCSegTable::Create(LPCWSTR name)
{
typedef struct tagHEAD{
FIXED sfnt_version;
@@ -1564,19 +1541,8 @@
// create EUDC font file and make EUDCSegTable
// after wrapper function for CreateFileW, we use only CreateFileW
- if (IS_NT) {
- m_hTmpFile = ::CreateFileW(name, GENERIC_READ,
- FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
- } else {
-#ifdef WIN32
- DASSERT(IS_WIN95);
-#endif
- char szFileName[_MAX_PATH];
- ::WideCharToMultiByte(CP_ACP, 0, name, -1,
- szFileName, sizeof(szFileName), NULL, NULL);
- m_hTmpFile = ::CreateFileA(szFileName, GENERIC_READ,
- FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
- }
+ m_hTmpFile = ::CreateFile(name, GENERIC_READ,
+ FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
if (m_hTmpFile == INVALID_HANDLE_VALUE){
m_hTmpFile = NULL;
return;
@@ -1654,10 +1620,10 @@
class CSegTableManager : public CSegTableManagerComponent
{
public:
- CSegTable* GetTable(LPWSTR lpszFontName, BOOL fEUDC);
+ CSegTable* GetTable(LPCWSTR lpszFontName, BOOL fEUDC);
};
-CSegTable* CSegTableManager::GetTable(LPWSTR lpszFontName, BOOL fEUDC)
+CSegTable* CSegTableManager::GetTable(LPCWSTR lpszFontName, BOOL fEUDC)
{
for (int i = 0; i < m_nTable; i++) {
if ((((CSegTable*)m_tables[i])->IsEUDC() == fEUDC) &&
@@ -1685,7 +1651,7 @@
{
public:
CCombinedSegTable();
- void Create(LPWSTR name);
+ void Create(LPCWSTR name);
BOOL In(USHORT iChar);
private:
@@ -1807,7 +1773,7 @@
wcscpy(m_szDefaultEUDCFile, lpszFileName);
}
-void CCombinedSegTable::Create(LPWSTR name)
+void CCombinedSegTable::Create(LPCWSTR name)
{
CSegTableComponent::Create(name);
@@ -1840,10 +1806,10 @@
class CCombinedSegTableManager : public CSegTableManagerComponent
{
public:
- CCombinedSegTable* GetTable(LPWSTR lpszFontName);
+ CCombinedSegTable* GetTable(LPCWSTR lpszFontName);
};
-CCombinedSegTable* CCombinedSegTableManager::GetTable(LPWSTR lpszFontName)
+CCombinedSegTable* CCombinedSegTableManager::GetTable(LPCWSTR lpszFontName)
{
for (int i = 0; i < m_nTable; i++) {
if (wcscmp(m_tables[i]->GetFontName(),lpszFontName) == 0)
@@ -1901,8 +1867,9 @@
jstring fontName = (jstring)env->GetObjectField(self, AwtFont::fontNameID);
DASSERT(fontName != NULL);
- LPWSTR fontNameWStr = TO_WSTRING(fontName);
- CCombinedSegTable* pTable = tableManager.GetTable(fontNameWStr);
+ LPCWSTR fontNameW = JNU_GetStringPlatformChars(env, fontName, NULL);
+ CCombinedSegTable* pTable = tableManager.GetTable(fontNameW);
+ JNU_ReleaseStringPlatformChars(env, fontName, fontNameW);
return (pTable->In((USHORT) ch) ? JNI_TRUE : JNI_FALSE);
CATCH_BAD_ALLOC_RET(FALSE);
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_Font.h
--- a/jdk/src/windows/native/sun/windows/awt_Font.h Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_Font.h Wed Jul 05 16:47:27 2017 +0200
@@ -28,7 +28,6 @@
#include "awt.h"
#include "awt_Object.h"
-#include "awt_Unicode.h"
#include "java_awt_Font.h"
#include "sun_awt_windows_WFontMetrics.h"
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_Frame.cpp
--- a/jdk/src/windows/native/sun/windows/awt_Frame.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_Frame.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -1472,7 +1472,7 @@
int badAlloc = 0;
LPCTSTR coption;
- LPTSTR empty = TEXT("InputMethod");
+ LPCTSTR empty = TEXT("InputMethod");
AwtFrame *f = NULL;
PDATA pData;
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_InputMethod.cpp
--- a/jdk/src/windows/native/sun/windows/awt_InputMethod.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_InputMethod.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 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
@@ -580,18 +580,10 @@
DWORD cbHKL = 16;
LPTSTR end;
- if (IS_NT) {
- ret = ::RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Keyboard Layout\\Preload"), NULL, KEY_READ, &hKey);
- } else {
- ret = ::RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("keyboard layout\\preload\\1"), NULL, KEY_READ, &hKey);
- }
+ ret = ::RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Keyboard Layout\\Preload"), NULL, KEY_READ, &hKey);
if (ret == ERROR_SUCCESS) {
- if (IS_NT) {
- ret = ::RegQueryValueEx(hKey, TEXT("1"), 0, 0, szHKL, &cbHKL);
- } else {
- ret = ::RegQueryValueEx(hKey, NULL, 0, 0, szHKL, &cbHKL);
- }
+ ret = ::RegQueryValueEx(hKey, TEXT("1"), 0, 0, szHKL, &cbHKL);
if (ret == ERROR_SUCCESS) {
hkl = reinterpret_cast(static_cast(
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_InputTextInfor.cpp
--- a/jdk/src/windows/native/sun/windows/awt_InputTextInfor.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_InputTextInfor.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2008 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
@@ -22,10 +22,9 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
-#include
-#include
+
+#include "awt.h"
#include
-#include "awt.h"
#include "awt_Component.h"
#include "awt_InputTextInfor.h"
@@ -91,12 +90,12 @@
LONG cbData[5] = {0};
LPVOID lpData[5] = {NULL};
for (int i = startIndex, j = 0; i <= endIndex; i++, j++) {
- cbData[j] = ImmGetCompositionStringW(hIMC, GCS_INDEX[i], NULL, 0);
+ cbData[j] = ::ImmGetCompositionString(hIMC, GCS_INDEX[i], NULL, 0);
if (cbData[j] == 0) {
lpData[j] = NULL;
} else {
LPBYTE lpTemp = new BYTE[cbData[j]];
- cbData[j] = ImmGetCompositionStringW(hIMC, GCS_INDEX[i], lpTemp, cbData[j]);
+ cbData[j] = ::ImmGetCompositionString(hIMC, GCS_INDEX[i], lpTemp, cbData[j]);
if (IMM_ERROR_GENERAL != cbData[j]) {
lpData[j] = (LPVOID)lpTemp;
} else {
@@ -126,7 +125,7 @@
// Get the cursor position
if (flags & GCS_COMPSTR) {
- m_cursorPosW = ImmGetCompositionStringW(hIMC, GCS_CURSORPOS,
+ m_cursorPosW = ::ImmGetCompositionString(hIMC, GCS_CURSORPOS,
NULL, 0);
}
@@ -185,9 +184,11 @@
jstring AwtInputTextInfor::MakeJavaString(JNIEnv* env, LPWSTR lpStrW, int cStrW) {
- if (env == NULL || lpStrW == NULL || cStrW == 0) return NULL;
-
- return env->NewString(lpStrW, cStrW);
+ if (env == NULL || lpStrW == NULL || cStrW == 0) {
+ return NULL;
+ } else {
+ return env->NewString(reinterpret_cast(lpStrW), cStrW);
+ }
}
//
@@ -232,7 +233,7 @@
LCID lcJPN = MAKELCID(MAKELANGID(LANG_JAPANESE,SUBLANG_DEFAULT),SORT_DEFAULT);
// Reading string is given in half width katakana in Japanese Windows
// Convert it to full width katakana.
- int cFWStrW = LCMapStringW( lcJPN, LCMAP_FULLWIDTH, lpHWStrW, cHWStrW, NULL, 0 );
+ int cFWStrW = ::LCMapString(lcJPN, LCMAP_FULLWIDTH, lpHWStrW, cHWStrW, NULL, 0);
LPWSTR lpFWStrW;
try {
lpFWStrW = new WCHAR[cFWStrW];
@@ -244,7 +245,7 @@
throw;
}
- LCMapStringW( lcJPN, LCMAP_FULLWIDTH, lpHWStrW, cHWStrW, lpFWStrW, cFWStrW );
+ ::LCMapString(lcJPN, LCMAP_FULLWIDTH, lpHWStrW, cHWStrW, lpFWStrW, cFWStrW);
readingClauseW[cls] = MakeJavaString(env, lpFWStrW, cFWStrW);
delete [] lpFWStrW;
} else {
@@ -252,7 +253,7 @@
}
}
else {
- readingClauseW[cls] = MakeJavaString(env, (LPWSTR)NULL, 0);
+ readingClauseW[cls] = NULL;
}
}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_InputTextInfor.h
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_List.cpp
--- a/jdk/src/windows/native/sun/windows/awt_List.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_List.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 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
@@ -27,7 +27,6 @@
#include "awt_KeyboardFocusManager.h"
#include "awt_Canvas.h"
#include "awt_Dimension.h"
-#include "awt_Unicode.h"
#include "awt_Toolkit.h"
#include "awt_Window.h"
@@ -112,9 +111,8 @@
DWORD wrapExStyle = 0;
DWORD style = WS_CHILD | WS_CLIPSIBLINGS | WS_VSCROLL | WS_HSCROLL |
- LBS_NOINTEGRALHEIGHT | LBS_NOTIFY | LBS_OWNERDRAWFIXED |
- (IS_WIN4X ? 0 : WS_BORDER);
- DWORD exStyle = IS_WIN4X ? WS_EX_CLIENTEDGE : 0;
+ LBS_NOINTEGRALHEIGHT | LBS_NOTIFY | LBS_OWNERDRAWFIXED;
+ DWORD exStyle = WS_EX_CLIENTEDGE;
/*
* NOTE: WS_VISIBLE is always set for the listbox. Listbox
@@ -571,10 +569,10 @@
// operate WM_PRINT to be compatible with the "smooth scrolling" feature.
MsgRouting AwtList::WmPrint(HDC hDC, LPARAM flags)
{
- if (!isWrapperPrint && IS_WIN4X
- && (flags & PRF_CLIENT)
- && (GetStyleEx() & WS_EX_CLIENTEDGE)) {
-
+ if (!isWrapperPrint &&
+ (flags & PRF_CLIENT) &&
+ (GetStyleEx() & WS_EX_CLIENTEDGE))
+ {
int nOriginalDC = ::SaveDC(hDC);
DASSERT(nOriginalDC != 0);
// Save a copy of the DC for WmPrintClient
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_MMStub.cpp
--- a/jdk/src/windows/native/sun/windows/awt_MMStub.cpp Wed Jul 05 16:46:57 2017 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,573 +0,0 @@
-/*
- * Copyright 1999-2003 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-#include "awt_MMStub.h"
-
-//---------------------------------------------------------------------------
-// Basic API
-//---------------------------------------------------------------------------
-
-int (WINAPI* g_pfnGetSystemMetrics) (int);
-MHND (WINAPI* g_pfnMonitorFromWindow) (HWND,BOOL);
-MHND (WINAPI* g_pfnMonitorFromRect) (LPCRECT,BOOL);
-MHND (WINAPI* g_pfnMonitorFromPoint) (POINT,BOOL);
-BOOL (WINAPI* g_pfnGetMonitorInfo) (MHND,PMONITOR_INFO);
-BOOL (WINAPI* g_pfnEnumDisplayMonitors) (HDC,LPCRECT,MON_ENUM_CALLBACK_PROC,LPARAM);
-BOOL (WINAPI* g_pfnEnumDisplayDevices) (LPVOID,int,P_DISPLAY_DEVICE,DWORD);
-
-BOOL __initMultipleMonitorStubs(void);
-BOOL __initMultipleMonitorStubs(void)
-{
- static BOOL fInitDone;
- HMODULE hUser32;
- HMODULE hUnicows = UnicowsLoader::GetModuleHandle();
- BOOL retCode = FALSE;
-
- if (fInitDone)
- {
- retCode = g_pfnGetMonitorInfo != NULL;
- goto _RET_;
- }
-
- if ((hUser32 = GetModuleHandle(TEXT("USER32"))) &&
- (*(FARPROC*)&g_pfnGetSystemMetrics = GetProcAddress(hUser32,"GetSystemMetrics")) &&
- (*(FARPROC*)&g_pfnMonitorFromWindow = GetProcAddress(hUser32,"MonitorFromWindow")) &&
- (*(FARPROC*)&g_pfnMonitorFromRect = GetProcAddress(hUser32,"MonitorFromRect")) &&
- (*(FARPROC*)&g_pfnMonitorFromPoint = GetProcAddress(hUser32,"MonitorFromPoint")) &&
- (*(FARPROC*)&g_pfnEnumDisplayMonitors = GetProcAddress(hUser32,"EnumDisplayMonitors")) &&
- (*(FARPROC*)&g_pfnGetMonitorInfo = GetProcAddress(IS_WIN95 ? hUnicows : hUser32,"GetMonitorInfoW")) &&
- (*(FARPROC*)&g_pfnEnumDisplayDevices = GetProcAddress(IS_WIN95 ? hUnicows : hUser32,"EnumDisplayDevicesW")) &&
- (GetSystemMetrics(SM_CXVSCREEN) >= GetSystemMetrics(SM_CXSCREEN)) &&
- (GetSystemMetrics(SM_CYVSCREEN) >= GetSystemMetrics(SM_CYSCREEN)) )
- {
- fInitDone = TRUE;
- retCode = TRUE;
- goto _RET_;
- }
- g_pfnGetSystemMetrics = NULL;
- g_pfnMonitorFromWindow = NULL;
- g_pfnMonitorFromRect = NULL;
- g_pfnMonitorFromPoint = NULL;
- g_pfnGetMonitorInfo = NULL;
- g_pfnEnumDisplayMonitors = NULL;
- g_pfnEnumDisplayDevices = NULL;
-
- fInitDone = TRUE;
- retCode = FALSE;
-
-_RET_:
- return retCode;
-}
-
-int WINAPI _getSystemMetrics(int nCode)
-{
- int retCode;
- if( __initMultipleMonitorStubs() )
- {
- retCode = g_pfnGetSystemMetrics(nCode);
- goto _RET_;
- }
-
- switch( nCode )
- {
- case SM_CMONITORS:
- case SM_SAMEDSPLFORMAT:
- return 1;
-
- case SM_XVSCREEN:
- case SM_YVSCREEN:
- return 0;
-
- case SM_CXVSCREEN:
- nCode = SM_CXSCREEN;
- break;
-
- case SM_CYVSCREEN:
- nCode = SM_CYSCREEN;
- break;
- }
-
- retCode = GetSystemMetrics(nCode);
-_RET_:
- return retCode;
-}
-
-
-MHND WINAPI _monitorFromRect(LPCRECT prScreen, UINT nFlags)
-{
- MHND retCode = NULL;
- if( __initMultipleMonitorStubs() )
- {
- retCode = g_pfnMonitorFromRect(prScreen, nFlags);
- goto _RET_;
- }
-
- if( (prScreen->right < 0) || (prScreen->bottom < 0) )
- {
- goto _RET_;
- }
- {
- POINT pP = {0,0};
-
- pP.x = prScreen->left;
- pP.y = prScreen->top;
-
- retCode = _monitorFromPoint(pP,nFlags);
- }
-
-_RET_:
- return retCode;
-}
-
-MHND WINAPI _monitorFromWindow(HWND hwProbe, UINT nFlags)
-{
- RECT rR;
- MHND retCode = NULL;
-
- if( __initMultipleMonitorStubs() )
- {
- retCode = g_pfnMonitorFromWindow(hwProbe, nFlags);
- goto _RET_;
- }
-
- if( nFlags & (MONITOR_DEFAULT_TO_PRIMARY | MONITOR_DEFAULT_TO_NEAR) )
- {
- retCode = PRIMARY_MONITOR;
- goto _RET_;
- }
-
- if( GetWindowRect(hwProbe, &rR) )
- {
- retCode = _monitorFromRect(&rR, nFlags);
- goto _RET_;
- }
-
-_RET_:
- return retCode;
-}
-
-MHND WINAPI _monitorFromPoint(POINT ptProbe, UINT nFlags)
-{
- MHND retCode = NULL;
- if( __initMultipleMonitorStubs() )
- {
- retCode = g_pfnMonitorFromPoint(ptProbe,nFlags);
- goto _RET_;
- }
-
- if( nFlags & (MONITOR_DEFAULT_TO_PRIMARY | MONITOR_DEFAULT_TO_NEAR) )
- {
- goto _ASSIGN_;
- }
-
- if( (ptProbe.x <= 0) || (ptProbe.x > GetSystemMetrics(SM_CXSCREEN)) )
- {
- goto _RET_;
- }
-
- if( (ptProbe.y <= 0) || (ptProbe.y < GetSystemMetrics(SM_CYSCREEN)) )
- {
- goto _RET_;
- }
-_ASSIGN_:
- retCode = PRIMARY_MONITOR;
-
-_RET_:
- return retCode;
-}
-
-BOOL WINAPI _getMonitorInfo(MHND mhMon, PMONITOR_INFO pmMonInfo)
-{
- RECT rArea;
- BOOL retCode = FALSE;
-
- if( __initMultipleMonitorStubs() )
- {
- retCode = g_pfnGetMonitorInfo(mhMon, pmMonInfo);
- goto _RET_;
- }
-
- if( mhMon != PRIMARY_MONITOR )
- {
- goto _RET_;
- }
-
- if( NULL == pmMonInfo )
- {
- goto _RET_;
- }
-
- if( FALSE == SystemParametersInfo(SPI_GETWORKAREA,0,&rArea,0) )
- {
- goto _RET_;
- }
-
- if( pmMonInfo->dwSize >= sizeof(MONITOR_INFO) )
- {
- pmMonInfo->rMonitor.left = 0;
- pmMonInfo->rMonitor.top = 0;
- pmMonInfo->rMonitor.right = GetSystemMetrics(SM_CXSCREEN);
- pmMonInfo->rMonitor.bottom = GetSystemMetrics(SM_CYSCREEN);
- pmMonInfo->rWork = rArea;
- pmMonInfo->dwFlags = MONITOR_INFO_FLAG_PRIMARY;
-
- if( pmMonInfo->dwSize >= sizeof(MONITOR_INFO_EXTENDED))
- {
- lstrcpy(((PMONITOR_INFO_EXTENDED)pmMonInfo)->strDevice,
- TEXT("DISPLAY") );
- }
-
- retCode = TRUE;
- }
-
-_RET_:
- return retCode;
-}
-
-BOOL WINAPI _enumDisplayMonitors(
- HDC hDC,LPCRECT lrcSect,
- MON_ENUM_CALLBACK_PROC lpfnEnumProc,
- LPARAM lData
- )
-{
- BOOL retCode = FALSE;
- RECT rToPass = {0,0,0,0};
- RECT rBorder = {0,0,0,0};
-
- if( __initMultipleMonitorStubs() )
- {
- retCode = g_pfnEnumDisplayMonitors (
- hDC, lrcSect,
- lpfnEnumProc,lData
- );
- goto _RET_;
- }
-
- if( !lpfnEnumProc )
- {
- goto _RET_;
- }
-
- rBorder.left = 0;
- rBorder.top = 0;
- rBorder.right = GetSystemMetrics(SM_CXSCREEN);
- rBorder.bottom = GetSystemMetrics(SM_CYSCREEN);
-
- if( hDC )
- {
- RECT rSect = {0,0,0,0};
- HWND hWnd = NULL;
-
- if( NULL == (hWnd = WindowFromDC(hDC)) )
- {
- goto _RET_;
- }
-
- switch( GetClipBox(hDC,&rSect) )
- {
- case NULLREGION:
- goto _ASSIGN_;
- case ERROR:
- goto _RET_;
- default:
- MapWindowPoints(NULL, hWnd, (LPPOINT)&rBorder, 2);
- if( TRUE == IntersectRect(&rToPass,&rSect,&rBorder) )
- {
- break;
- }
- }
-
- rBorder = rToPass;
- }
-
- if( (NULL == lrcSect) || (TRUE == IntersectRect(&rToPass,lrcSect,&rBorder)) )
- {
- lpfnEnumProc(PRIMARY_MONITOR,hDC,&rToPass,lData);
- }
-_ASSIGN_:
- retCode = TRUE;
-_RET_:
- return retCode;
-}
-
-BOOL WINAPI _enumDisplayDevices (
- LPVOID lpReserved, int iDeviceNum,
- _DISPLAY_DEVICE * pDisplayDevice, DWORD dwFlags
- )
-{
- BOOL retCode = FALSE;
- if( __initMultipleMonitorStubs() )
- {
- retCode = g_pfnEnumDisplayDevices(lpReserved,iDeviceNum,pDisplayDevice,dwFlags);
- }
-
- return retCode;
-}
-
-
-//---------------------------------------------------------------------------
-// Extended API.
-//---------------------------------------------------------------------------
-// Globais
-int g_nMonitorCounter;
-int g_nMonitorLimit;
-MHND* g_hmpMonitors;
-// Callbacks
-BOOL WINAPI clb_fCountMonitors(MHND,HDC,LPRECT,LPARAM);
-BOOL WINAPI clb_fCountMonitors(MHND hMon,HDC hDC,LPRECT rRect,LPARAM lP)
-{
- g_nMonitorCounter ++;
- return TRUE;
-}
-BOOL WINAPI clb_fCollectMonitors(MHND,HDC,LPRECT,LPARAM);
-BOOL WINAPI clb_fCollectMonitors(MHND hMon,HDC hDC,LPRECT rRect,LPARAM lP)
-{
-
- if( (g_nMonitorCounter < g_nMonitorLimit) && (NULL != g_hmpMonitors) )
- {
- g_hmpMonitors[g_nMonitorCounter] = hMon;
- g_nMonitorCounter ++;
- }
-
- return TRUE;
-}
-// Tools
-void __normaRectPos(RECT*,RECT,RECT);
-HWND __createWindow0(MHND,LPCTSTR,LPCTSTR,DWORD,int,int,int,int,HWND,HMENU,HANDLE,LPVOID);
-HWND __createWindow1(MHND,LPCTSTR,LPCTSTR,DWORD,int,int,int,int,HWND,HMENU,HANDLE,LPVOID);
-void __normaRectPos(RECT* rDest,RECT rSrc,RECT rNorma)
-{
- int nDX = rSrc.right - rSrc.left;
- int nDY = rSrc.bottom - rSrc.top;
-
- rDest->left = rSrc.left + rNorma.left;
- rDest->top = rSrc.top + rNorma.top;
-
- rDest->right = rDest->left + nDX;
- rDest->bottom = rDest->top + nDY;
-}
-HWND __createWindow0( MHND hmMonitor,LPCTSTR lpClassName,LPCTSTR lpWindowName,
- DWORD dwStyle,int x,int y,int nWidth,
- int nHeight,HWND hWndParent,HMENU hMenu,
- HANDLE hInstance,LPVOID lpParam )
-{
- HWND retCode = NULL;
-
- if( (NULL != hmMonitor) && (NULL != lpClassName) &&
- (NULL != lpWindowName) && (NULL != hInstance) )
- {
- RECT rRW = {0,0,0,0};
- RECT rRM = {0,0,0,0};
- RECT rSect = {0,0,0,0};
-
- SetRect(&rRW,x,y,x+nWidth,y+nHeight);
-
- if( TRUE == _monitorBounds(hmMonitor,&rRM) )
- {
- __normaRectPos(&rRW,rRW,rRM);
-
- IntersectRect(&rSect,&rRM,&rRW);
-
- if( TRUE == EqualRect(&rSect,&rRW) )
- {
- x = rSect.left;
- y = rSect.top;
- nWidth = rSect.right - rSect.left;
- nHeight = rSect.bottom - rSect.top;
- retCode = CreateWindow(
- lpClassName,lpWindowName,
- dwStyle,x,y,nWidth,
- nHeight,hWndParent,hMenu,
- (HINSTANCE)hInstance,lpParam
- );
- } else {
- // A coisa indefinida. Nao tenho sabdoria o que
- // fazer aqui mesmo
- // E necessario perguntar Jeannette
- }
- }
- }
-
- return retCode;
-}
-HWND __createWindow1( MHND hmMonitor,LPCTSTR lpClassName,LPCTSTR lpWindowName,
- DWORD dwStyle,int x,int y,int nWidth,
- int nHeight,HWND hWndParent,HMENU hMenu,
- HANDLE hInstance,LPVOID lpParam )
-{
- HWND retCode = NULL;
-
- if( (NULL != hmMonitor) && (NULL != lpClassName) &&
- (NULL != lpWindowName) && (NULL != hInstance) )
- {
- RECT rRM = {0,0,0,0};
-
- if( TRUE == _monitorBounds(hmMonitor,&rRM) )
- {
- HWND wW = NULL;
- BOOL wasVisible = (0 != (dwStyle & WS_VISIBLE));
-
- if( TRUE == wasVisible )
- {
- dwStyle &= ~WS_VISIBLE;
- }
-
- if( NULL != (wW = CreateWindow(
- lpClassName,lpWindowName,
- dwStyle,x,y,nWidth,
- nHeight,hWndParent,hMenu,
- (HINSTANCE)hInstance,lpParam
- )) )
- {
- RECT rRW = {0,0,0,0};
- RECT rSect = {0,0,0,0};
-
- GetWindowRect(wW,&rRW);
-
- __normaRectPos(&rRW,rRW,rRM);
-
- IntersectRect(&rSect,&rRM,&rRW);
-
- if( TRUE == EqualRect(&rSect,&rRW) )
- {
- x = rSect.left;
- y = rSect.top;
- nWidth = rSect.right - rSect.left;
- nHeight = rSect.bottom - rSect.top;
-
- MoveWindow(wW,x,y,nWidth,nHeight,FALSE);
-
- if( TRUE == wasVisible )
- {
- UpdateWindow(wW);
- ShowWindow(wW,SW_SHOW);
- }
-
- retCode = wW;
- } else {
- // A coisa indefinida. Nao sei o que
- // fazer aqui. E necessario perguntar Jeannette
- DestroyWindow(wW);
- }
- }
- }
- }
-
- return retCode;
-}
-
-// Implementations
-int WINAPI _countMonitors(void)
-{
- g_nMonitorCounter = 0;
-
- _enumDisplayMonitors(NULL,NULL,clb_fCountMonitors,0L);
-
- return g_nMonitorCounter;
-
-}
-int WINAPI _collectMonitors(MHND* hmpMonitors,int nNum)
-{
- int retCode = 0;
-
- if( NULL != hmpMonitors )
- {
- g_nMonitorCounter = 0;
- g_nMonitorLimit = nNum;
- g_hmpMonitors = hmpMonitors;
-
- _enumDisplayMonitors(NULL,NULL,clb_fCollectMonitors,0L);
-
- retCode = g_nMonitorCounter;
-
- g_nMonitorCounter = 0;
- g_nMonitorLimit = 0;
- g_hmpMonitors = NULL;
-
- }
- return retCode;
-}
-BOOL WINAPI _monitorBounds(MHND hmMonitor,RECT* rpBounds)
-{
- BOOL retCode = FALSE;
-
- if( (NULL != hmMonitor) && (NULL != rpBounds) )
- {
- MONITOR_INFO miInfo;
-
- memset((void*)(&miInfo),0,sizeof(MONITOR_INFO));
- miInfo.dwSize = sizeof(MONITOR_INFO);
-
- if( TRUE == (retCode = _getMonitorInfo(hmMonitor,&(miInfo))) )
- {
- (*rpBounds) = miInfo.rMonitor;
- }
- }
- return retCode;
-}
-
-HDC WINAPI _makeDCFromMonitor(MHND hmMonitor) {
- HDC retCode = NULL;
-
- if( NULL != hmMonitor ) {
-
- MONITOR_INFO_EXTENDED mieInfo;
-
- memset((void*)(&mieInfo),0,sizeof(MONITOR_INFO_EXTENDED));
- mieInfo.dwSize = sizeof(MONITOR_INFO_EXTENDED);
-
- if( TRUE == _getMonitorInfo(hmMonitor,(PMONITOR_INFO)(&mieInfo)) ) {
- HDC hDC = CreateDC(mieInfo.strDevice,NULL,NULL,NULL);
-
- if( NULL != hDC ) {
- retCode = hDC;
- }
- }
- }
- return retCode;
-}
-
-HWND WINAPI _createWindowOM( MHND hmMonitor,LPCTSTR lpClassName,LPCTSTR lpWindowName,
- DWORD dwStyle,int x,int y,int nWidth,
- int nHeight,HWND hWndParent,HMENU hMenu,
- HANDLE hInstance,LPVOID lpParam )
-{
- if( (CW_USEDEFAULT == x) || (CW_USEDEFAULT == y) ||
- (CW_USEDEFAULT == nWidth) || (CW_USEDEFAULT == nHeight) )
- {
- return __createWindow1 (
- hmMonitor,lpClassName,lpWindowName,
- dwStyle,x,y,nWidth,
- nHeight,hWndParent,hMenu,
- hInstance,lpParam
- );
- }
- return __createWindow0 (
- hmMonitor,lpClassName,lpWindowName,
- dwStyle,x,y,nWidth,
- nHeight,hWndParent,hMenu,
- hInstance,lpParam
- );
-}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_MMStub.h
--- a/jdk/src/windows/native/sun/windows/awt_MMStub.h Wed Jul 05 16:46:57 2017 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,131 +0,0 @@
-/*
- * Copyright 1999-2003 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-#ifndef _INC_MMSTUB
-#define _INC_MMSTUB
-
-#ifndef _WINDOWS_
-#include "windows.h"
-#endif
-
-#ifndef _AWT_H_
-#include "awt.h"
-#endif
-
-#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0500)
-
-/* Cdecl for C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Constants */
-#define SM_XVSCREEN 76
-#define SM_YVSCREEN 77
-#define SM_CXVSCREEN 78
-#define SM_CYVSCREEN 79
-#define SM_CMONITORS 80
-#define SM_SAMEDSPLFORMAT 81
-
-#define MONITOR_DEFAULT_TO_NULL 0x00000000
-#define MONITOR_DEFAULT_TO_PRIMARY 0x00000001
-#define MONITOR_DEFAULT_TO_NEAR 0x00000002
-
-
-
-#define MONITOR_INFO_FLAG_PRIMARY 0x00000001
-
-#define DISPLAY_DEVICE_ATTACHED_TO_DESKTOP 0x00000001
-#define DISPLAY_DEVICE_MULTY_DRIVER 0x00000002
-#define DISPLAY_DEVICE_PRIMARY_DEVICE 0x00000004
-#define DISPLAY_DEVICE_MIRRORING_DRIVER 0x00000008
-
-
-#define DISPLAY_DEVICE_VGA 0x00000010
-
-#define ENUM_CURRENT_SETTINGS ((DWORD)-1)
-#define ENUM_REGISTRY_SETTINGS ((DWORD)-2)
-
-#define PRIMARY_MONITOR ((MHND)0x42)
-
-
-#define DEV_NAME_LEN 32
-#define DEV_STR_LEN 128
-
-
-// Datatypes
-typedef HANDLE MHND;
-typedef BOOL (CALLBACK* MON_ENUM_CALLBACK_PROC)(MHND,HDC,LPRECT,LPARAM);
-
-typedef struct tagMONITOR_INFO
-{
- DWORD dwSize;
- RECT rMonitor;
- RECT rWork;
- DWORD dwFlags;
-} MONITOR_INFO, *PMONITOR_INFO;
-
-typedef struct tagMONITOR_INFO_EXTENDED
-{
- DWORD dwSize;
- RECT rMonitor;
- RECT rWork;
- DWORD dwFlags;
- TCHAR strDevice[DEV_NAME_LEN];
-} MONITOR_INFO_EXTENDED, *PMONITOR_INFO_EXTENDED;
-
-typedef struct tagDISPLAY_DEVICE
-{
- DWORD dwSize;
- WCHAR strDevName[DEV_NAME_LEN];
- WCHAR strDevString[DEV_STR_LEN];
- DWORD dwFlags;
- WCHAR deviceID[128];
- WCHAR deviceKey[128];
-} _DISPLAY_DEVICE, *P_DISPLAY_DEVICE;
-
-/* Basic API's */
-BOOL WINAPI _enumDisplayMonitors(HDC,LPCRECT,MON_ENUM_CALLBACK_PROC,LPARAM);
-BOOL WINAPI _enumDisplayDevices (LPVOID,int,P_DISPLAY_DEVICE,DWORD);
-BOOL WINAPI _getMonitorInfo (MHND,PMONITOR_INFO);
-MHND WINAPI _monitorFromPoint (POINT,UINT);
-MHND WINAPI _monitorFromWindow (HWND,UINT);
-MHND WINAPI _monitorFromRect (LPCRECT,UINT);
-int WINAPI _getSystemMetrics (int);
-
-/* Additional API's */
-int WINAPI _countMonitors (void);
-int WINAPI _collectMonitors (MHND*,int);
-BOOL WINAPI _monitorBounds (MHND,RECT*);
-HDC WINAPI _makeDCFromMonitor (MHND);
-HWND WINAPI _createWindowOM (MHND,LPCTSTR,LPCTSTR,DWORD,int,int,int,
- int,HWND,HMENU,HANDLE,LPVOID);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0500) */
-
-#endif /* _INC_MMSTUB */
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_MenuItem.cpp
--- a/jdk/src/windows/native/sun/windows/awt_MenuItem.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_MenuItem.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 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
@@ -23,6 +23,7 @@
* have any questions.
*/
+#include "awt.h"
#include "awt_MenuItem.h"
#include "awt_Menu.h"
#include "awt_MenuBar.h"
@@ -70,7 +71,6 @@
LANGID AwtMenuItem::m_idLang = LOWORD(GetKeyboardLayout(0));
UINT AwtMenuItem::m_CodePage =
AwtMenuItem::LangToCodePage(AwtMenuItem::m_idLang);
-BOOL AwtMenuItem::m_isWin95 = IS_WIN95;
BOOL AwtMenuItem::sm_rtl = PRIMARYLANGID(GetInputLanguage()) == LANG_ARABIC ||
PRIMARYLANGID(GetInputLanguage()) == LANG_HEBREW;
BOOL AwtMenuItem::sm_rtlReadingOrder =
@@ -150,7 +150,7 @@
jobject createError = NULL;
if (dw == ERROR_OUTOFMEMORY)
{
- jstring errorMsg = env->NewStringUTF("too many menu handles");
+ jstring errorMsg = JNU_NewStringPlatform(env, L"too many menu handles");
createError = JNU_NewObjectByName(env, "java/lang/OutOfMemoryError",
"(Ljava/lang/String;)V",
errorMsg);
@@ -435,16 +435,7 @@
if (drawInfo.itemID != m_Id)
return;
- /* Fixed bug 4349969. Since the problem occurs on Windows 98 and not on
- Windows NT, the fix is to check for Windows 95/98 and to check if the
- handle to the menu of the item to be drawn is the same as the handle to the
- menu of the menu object. If they're not the same, just return and don't do
- the drawing.
- */
- if ( IS_WIN95 && drawInfo.hwndItem != (HWND)this->m_menuContainer->GetHMenu()) {
- return;
- } else
- DrawSelf(drawInfo);
+ DrawSelf(drawInfo);
}
void AwtMenuItem::MeasureSelf(HDC hDC, MEASUREITEMSTRUCT& measureInfo)
@@ -802,8 +793,9 @@
jobject jitem = GetTarget(env);
jstring label =
(jstring)(env)->GetObjectField(jitem, AwtMenuItem::labelID);
- LPWSTR labelW = TO_WSTRING(label);
+ LPCWSTR labelW = JNU_GetStringPlatformChars(env, label, NULL);
BOOL isSeparator = (labelW && (wcscmp(labelW, L"-") == 0));
+ JNU_ReleaseStringPlatformChars(env, label, labelW);
env->DeleteLocalRef(label);
env->DeleteLocalRef(jitem);
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_Multimon.h
--- a/jdk/src/windows/native/sun/windows/awt_Multimon.h Wed Jul 05 16:46:57 2017 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright 1999-2001 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-#ifndef _INC_MULTIMON_
-#define _INC_MULTIMON_
-#endif
-//
-// build defines that replace the regular APIs with our versions
-//
-#undef GetMonitorInfo
-#undef GetSystemMetrics
-#undef MonitorFromWindow
-#undef MonitorFromRect
-#undef MonitorFromPoint
-#undef EnumDisplayMonitors
-#undef EnumDisplayDevices
-
-#include "awt_MMStub.h"
-
-#define GetSystemMetricsMM _getSystemMetrics
-#define MonitorFromWindow _monitorFromWindow
-#define MonitorFromRect _monitorFromRect
-#define MonitorFromPoint _monitorFromPoint
-#define GetMonitorInfo _getMonitorInfo
-#define EnumDisplayMonitors _enumDisplayMonitors
-#define EnumDisplayDevices _enumDisplayDevices
-
-
-#define CountMonitors _countMonitors
-#define CollectMonitors _collectMonitors
-#define MonitorBounds _monitorBounds
-#define MakeDCFromMonitor _makeDCFromMonitor
-#define CreateWindowOnMonitor _createWindowOM
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_Object.cpp
--- a/jdk/src/windows/native/sun/windows/awt_Object.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_Object.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -25,9 +25,6 @@
#include "awt_Object.h"
#include "ObjectList.h"
-#ifdef DEBUG
-#include "awt_Unicode.h"
-#endif
#ifdef DEBUG
static BOOL reportEvents = FALSE;
@@ -116,8 +113,9 @@
"getName",
"()Ljava/lang/String;").l;
DASSERT(!safe_ExceptionOccurred(env));
- printf("Posting %s%s method to %S\n", methodName, methodSig,
- TO_WSTRING(targetStr));
+ LPCWSTR targetStrW = JNU_GetStringPlatformChars(env, targetStr, NULL);
+ printf("Posting %s%s method to %S\n", methodName, methodSig, targetStrW);
+ JNU_ReleaseStringPlatformChars(env, targetStr, targetStrW);
}
#endif
/* caching would do much good here */
@@ -148,8 +146,11 @@
(jstring)JNU_CallMethodByName(env, NULL, GetTarget(env),"getName",
"()Ljava/lang/String;").l;
DASSERT(!safe_ExceptionOccurred(env));
- printf("Posting %S to %S\n", TO_WSTRING(eventStr),
- TO_WSTRING(targetStr));
+ LPCWSTR eventStrW = JNU_GetStringPlatformChars(env, eventStr, NULL);
+ LPCWSTR targetStrW = JNU_GetStringPlatformChars(env, targetStr, NULL);
+ printf("Posting %S to %S\n", eventStrW, targetStrW);
+ JNU_ReleaseStringPlatformChars(env, eventStr, eventStrW);
+ JNU_ReleaseStringPlatformChars(env, targetStr, targetStrW);
}
#endif
/* Post event to the system EventQueue. */
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_Palette.cpp
--- a/jdk/src/windows/native/sun/windows/awt_Palette.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_Palette.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2008 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
@@ -23,7 +23,7 @@
* have any questions.
*/
-#include
+#include "awt.h"
#include "awt_Palette.h"
#include "awt_Component.h"
#include "img_util_md.h"
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_PopupMenu.cpp
--- a/jdk/src/windows/native/sun/windows/awt_PopupMenu.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_PopupMenu.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -234,11 +234,13 @@
jobject jitem = item->GetTarget(env);
BOOL bItemEnabled = isEnabled && (jboolean)env->GetBooleanField(jitem,
AwtMenuItem::enabledID);
- LPWSTR labelW = TO_WSTRING((jstring)env->GetObjectField(jitem,
- AwtMenuItem::labelID));
- if (labelW != NULL && wcscmp(labelW,L"-") != 0) {
+ jstring labelStr = static_cast(env->GetObjectField(jitem, AwtMenuItem::labelID));
+ LPCWSTR labelStrW = JNU_GetStringPlatformChars(env, labelStr, NULL);
+ if (labelStrW && wcscmp(labelStrW, L"-") != 0) {
item->Enable(bItemEnabled);
}
+ JNU_ReleaseStringPlatformChars(env, labelStr, labelStrW);
+ env->DeleteLocalRef(labelStr);
env->DeleteLocalRef(jitem);
}
env->DeleteLocalRef(target);
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_PrintControl.cpp
--- a/jdk/src/windows/native/sun/windows/awt_PrintControl.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_PrintControl.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 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
@@ -108,16 +108,13 @@
{
JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
- BOOL nt = IS_NT;
DWORD cReturned = 0;
if (pPrinterEnum == NULL) {
// Compute size of buffer
DWORD cbNeeded = 0;
- if (nt) {
- ::EnumPrinters(PRINTER_ENUM_LOCAL | PRINTER_ENUM_CONNECTIONS,
+ ::EnumPrinters(PRINTER_ENUM_LOCAL | PRINTER_ENUM_CONNECTIONS,
NULL, 2, NULL, 0, &cbNeeded, &cReturned);
- }
::EnumPrinters(PRINTER_ENUM_LOCAL,
NULL, 5, NULL, 0, pcbBuf, &cReturned);
if (cbNeeded > (*pcbBuf)) {
@@ -139,65 +136,63 @@
// doesn't support port searches. So, if the user has specified the
// printer name as "LPT1:" (even though this is actually a port
// name), we won't find the printer here.
- if (nt) {
- if (!::EnumPrinters(PRINTER_ENUM_LOCAL | PRINTER_ENUM_CONNECTIONS,
- NULL, 4, pPrinterEnum, cbBuf, &dummyWord, &cReturned)) {
- return FALSE;
- }
+ if (!::EnumPrinters(PRINTER_ENUM_LOCAL | PRINTER_ENUM_CONNECTIONS,
+ NULL, 4, pPrinterEnum, cbBuf, &dummyWord, &cReturned)) {
+ return FALSE;
+ }
- for (DWORD i = 0; i < cReturned; i++) {
- PRINTER_INFO_4 *info4 = (PRINTER_INFO_4 *)
- (pPrinterEnum + i * sizeof(PRINTER_INFO_4));
- if (info4->pPrinterName != NULL &&
- _tcsicmp(lpcPrinterName, info4->pPrinterName) == 0) {
+ for (DWORD i = 0; i < cReturned; i++) {
+ PRINTER_INFO_4 *info4 = (PRINTER_INFO_4 *)
+ (pPrinterEnum + i * sizeof(PRINTER_INFO_4));
+ if (info4->pPrinterName != NULL &&
+ _tcsicmp(lpcPrinterName, info4->pPrinterName) == 0) {
- // Fix for BugTraq Id 4281380.
- // Get the port name since some drivers may require
- // this name to be passed to ::DeviceCapabilities().
- HANDLE hPrinter = NULL;
- if (::OpenPrinter(info4->pPrinterName, &hPrinter, NULL)) {
- // Fix for BugTraq Id 4286812.
- // Some drivers don't support PRINTER_INFO_5.
- // In this case we try PRINTER_INFO_2, and if that
- // isn't supported as well return NULL port name.
- try {
- if (AwtPrintControl::IsSupportedLevel(hPrinter, 5)) {
- VERIFY(::GetPrinter(hPrinter, 5, pPrinterEnum, cbBuf,
- &dummyWord));
- PRINTER_INFO_5 *info5 = (PRINTER_INFO_5 *)pPrinterEnum;
- *foundPrinter = info5->pPrinterName;
- // pPortName may specify multiple ports. We only want one.
- *foundPort = (info5->pPortName != NULL)
- ? _tcstok(info5->pPortName, TEXT(",")) : NULL;
- } else if (AwtPrintControl::IsSupportedLevel(hPrinter, 2)) {
- VERIFY(::GetPrinter(hPrinter, 2, pPrinterEnum, cbBuf,
- &dummyWord));
- PRINTER_INFO_2 *info2 = (PRINTER_INFO_2 *)pPrinterEnum;
- *foundPrinter = info2->pPrinterName;
- // pPortName may specify multiple ports. We only want one.
- *foundPort = (info2->pPortName != NULL)
- ? _tcstok(info2->pPortName, TEXT(",")) : NULL;
- } else {
- *foundPrinter = info4->pPrinterName;
- // We failed to determine port name for the found printer.
- *foundPort = NULL;
- }
- } catch (std::bad_alloc&) {
- VERIFY(::ClosePrinter(hPrinter));
- throw;
+ // Fix for BugTraq Id 4281380.
+ // Get the port name since some drivers may require
+ // this name to be passed to ::DeviceCapabilities().
+ HANDLE hPrinter = NULL;
+ if (::OpenPrinter(info4->pPrinterName, &hPrinter, NULL)) {
+ // Fix for BugTraq Id 4286812.
+ // Some drivers don't support PRINTER_INFO_5.
+ // In this case we try PRINTER_INFO_2, and if that
+ // isn't supported as well return NULL port name.
+ try {
+ if (AwtPrintControl::IsSupportedLevel(hPrinter, 5)) {
+ VERIFY(::GetPrinter(hPrinter, 5, pPrinterEnum, cbBuf,
+ &dummyWord));
+ PRINTER_INFO_5 *info5 = (PRINTER_INFO_5 *)pPrinterEnum;
+ *foundPrinter = info5->pPrinterName;
+ // pPortName may specify multiple ports. We only want one.
+ *foundPort = (info5->pPortName != NULL)
+ ? _tcstok(info5->pPortName, TEXT(",")) : NULL;
+ } else if (AwtPrintControl::IsSupportedLevel(hPrinter, 2)) {
+ VERIFY(::GetPrinter(hPrinter, 2, pPrinterEnum, cbBuf,
+ &dummyWord));
+ PRINTER_INFO_2 *info2 = (PRINTER_INFO_2 *)pPrinterEnum;
+ *foundPrinter = info2->pPrinterName;
+ // pPortName may specify multiple ports. We only want one.
+ *foundPort = (info2->pPortName != NULL)
+ ? _tcstok(info2->pPortName, TEXT(",")) : NULL;
+ } else {
+ *foundPrinter = info4->pPrinterName;
+ // We failed to determine port name for the found printer.
+ *foundPort = NULL;
}
-
+ } catch (std::bad_alloc&) {
VERIFY(::ClosePrinter(hPrinter));
-
- return TRUE;
+ throw;
}
- return FALSE;
+ VERIFY(::ClosePrinter(hPrinter));
+
+ return TRUE;
}
+
+ return FALSE;
}
}
- // We still haven't found the printer, or we're using 95/98.
+ // We still haven't found the printer, /* or we're using 95/98. */
// PRINTER_INFO_5 supports both printer name and port name, so
// we'll test both. On NT, PRINTER_ENUM_LOCAL means just local
// printers. This is what we want, because we already tested all
@@ -213,28 +208,17 @@
for (DWORD i = 0; i < cReturned; i++) {
PRINTER_INFO_5 *info5 = (PRINTER_INFO_5 *)
(pPrinterEnum + i * sizeof(PRINTER_INFO_5));
- if (nt) {
- // pPortName can specify multiple ports. Test them one at
- // a time.
- if (info5->pPortName != NULL) {
- LPTSTR port = _tcstok(info5->pPortName, TEXT(","));
- while (port != NULL) {
- if (_tcsicmp(lpcPrinterName, port) == 0) {
- *foundPrinter = info5->pPrinterName;
- *foundPort = port;
- return TRUE;
- }
- port = _tcstok(NULL, TEXT(","));
+ // pPortName can specify multiple ports. Test them one at
+ // a time.
+ if (info5->pPortName != NULL) {
+ LPTSTR port = _tcstok(info5->pPortName, TEXT(","));
+ while (port != NULL) {
+ if (_tcsicmp(lpcPrinterName, port) == 0) {
+ *foundPrinter = info5->pPrinterName;
+ *foundPort = port;
+ return TRUE;
}
- }
- } else {
- if ((info5->pPrinterName != NULL &&
- _tcsicmp(lpcPrinterName, info5->pPrinterName) == 0) ||
- (info5->pPortName != NULL &&
- _tcsicmp(lpcPrinterName, info5->pPortName) == 0)) {
- *foundPrinter = info5->pPrinterName;
- *foundPort = info5->pPortName;
- return TRUE;
+ port = _tcstok(NULL, TEXT(","));
}
}
}
@@ -400,13 +384,11 @@
}
// Create DEVNAMES.
- if (IS_NT) {
- if (pPortName != NULL) {
- info2->pPortName = pPortName;
- } else if (info2->pPortName != NULL) {
- // pPortName may specify multiple ports. We only want one.
- info2->pPortName = _tcstok(info2->pPortName, TEXT(","));
- }
+ if (pPortName != NULL) {
+ info2->pPortName = pPortName;
+ } else if (info2->pPortName != NULL) {
+ // pPortName may specify multiple ports. We only want one.
+ info2->pPortName = _tcstok(info2->pPortName, TEXT(","));
}
size_t lenDriverName = ((info2->pDriverName != NULL)
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_PrintDialog.cpp
--- a/jdk/src/windows/native/sun/windows/awt_PrintDialog.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_PrintDialog.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 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
@@ -23,10 +23,10 @@
* have any questions.
*/
+#include "awt.h"
#include "awt_PrintDialog.h"
#include "awt_Dialog.h"
#include "awt_PrintControl.h"
-#include "awt_dlls.h"
#include "awt_Window.h"
#include "ComCtl32Util.h"
#include
@@ -39,11 +39,9 @@
BOOL
AwtPrintDialog::PrintDlg(LPPRINTDLG data) {
- AwtCommDialog::load_comdlg_procs();
return static_cast(reinterpret_cast(
AwtToolkit::GetInstance().InvokeFunction(
- reinterpret_cast(AwtCommDialog::PrintDlgWrapper),
- data)));
+ reinterpret_cast(::PrintDlg), data)));
}
LRESULT CALLBACK PrintDialogWndProc(HWND hWnd, UINT message,
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_PrintJob.cpp
--- a/jdk/src/windows/native/sun/windows/awt_PrintJob.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_PrintJob.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 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
@@ -23,6 +23,7 @@
* have any questions.
*/
+#include "awt.h"
#include
#include
#include
@@ -30,10 +31,9 @@
#include
#include
-#include "awt.h"
-#include "awt_dlls.h"
#include "awt_Toolkit.h"
#include "awt_Component.h"
+#include "awt_Dialog.h"
#include "awt_Font.h"
#include "awt_PrintDialog.h"
#include "awt_PrintControl.h"
@@ -422,7 +422,7 @@
*/
if (AwtPrintControl::getPrintHDMode(env, self) == NULL ||
AwtPrintControl::getPrintHDName(env,self) == NULL) {
- (void)AwtCommDialog::PageSetupDlg(&setup);
+ (void)::PageSetupDlg(&setup);
/* check if hDevMode and hDevNames are set.
* If both are null, then there is no default printer.
*/
@@ -460,7 +460,7 @@
AwtDialog::CheckInstallModalHook();
- BOOL ret = AwtCommDialog::PageSetupDlg(&setup);
+ BOOL ret = ::PageSetupDlg(&setup);
if (ret) {
jobject paper = getPaper(env, page);
@@ -733,7 +733,7 @@
pd.lStructSize = sizeof(PRINTDLG);
pd.Flags = PD_RETURNDEFAULT | PD_RETURNDC;
- if (AwtCommDialog::PrintDlg(&pd)) {
+ if (::PrintDlg(&pd)) {
printDC = pd.hDC;
hDevMode = pd.hDevMode;
hDevNames = pd.hDevNames;
@@ -1838,10 +1838,6 @@
(JNIEnv *env, jobject self, jlong printDC, jlong cap, jlong join, jfloat width,
jint red, jint green, jint blue) {
- /* End cap and line join styles are not supported in Win 9x. */
- if (IS_WIN95)
- return JNI_FALSE;
-
TRY;
LOGBRUSH logBrush;
@@ -1879,23 +1875,13 @@
{
jboolean didSetFont = JNI_FALSE;
- if (IS_NT) {
- didSetFont = jFontToWFontW(env, (HDC)printDC,
+ didSetFont = jFontToWFontW(env, (HDC)printDC,
fontName,
fontSize,
isBold,
isItalic,
rotation,
awScale);
- } else {
- didSetFont = jFontToWFontA(env, (HDC)printDC,
- fontName,
- fontSize,
- isBold,
- isItalic,
- rotation,
- awScale);
- }
return didSetFont;
}
@@ -1919,7 +1905,7 @@
memset(&matchedLogFont, 0, sizeof(matchedLogFont));
- WCHAR* name = TO_WSTRING(fontName);
+ LPCWSTR fontNameW = JNU_GetStringPlatformChars(env, fontName, NULL);
/* Some fontnames of Non-ASCII fonts like 'MS Minchou' are themselves
@@ -1928,14 +1914,14 @@
*/
int maxlen = static_cast(sizeof(lf.lfFaceName)) - 1;
// maxlen is int due to cbMultiByte parameter is int
- int destLen = WideCharToMultiByte(CP_ACP, // convert to ASCII code page
- 0, // flags
- name, // Unicode string
- -1, // Unicode length is calculated automatically
+ int destLen = WideCharToMultiByte(CP_ACP, // convert to ASCII code page
+ 0, // flags
+ fontNameW, // Unicode string
+ -1, // Unicode length is calculated automatically
lf.lfFaceName, // Put ASCII string here
- maxlen, // max len
- NULL, // default handling of unmappables
- NULL);// do not care if def char is used
+ maxlen, // max len
+ NULL, // default handling of unmappables
+ NULL); // do not care if def char is used
/* If WideCharToMultiByte succeeded then the number
* of bytes it copied into the face name buffer will
@@ -2018,9 +2004,10 @@
} else {
foundFont = false;
}
-
}
+ JNU_ReleaseStringPlatformChars(env, fontName, fontNameW);
+
return foundFont ? JNI_TRUE : JNI_FALSE;
}
@@ -2043,27 +2030,29 @@
memset(&matchedLogFont, 0, sizeof(matchedLogFont));
+ LPCWSTR fontNameW = JNU_GetStringPlatformChars(env, fontName, NULL);
+
/* Describe the GDI fonts we want enumerated. We
* simply supply the java font name and let GDI
* do the matching. If the java font name is
* longer than the GDI maximum font lenght then
* we can't convert the font.
*/
- WCHAR* name = TO_WSTRING(fontName);
- size_t nameLen = wcslen(name);
-
+ size_t nameLen = wcslen(fontNameW);
if (nameLen < (sizeof(lf.lfFaceName) / sizeof(lf.lfFaceName[0]))) {
- wcscpy(lf.lfFaceName, name);
+ wcscpy(lf.lfFaceName, fontNameW);
lf.lfCharSet = DEFAULT_CHARSET;
lf.lfPitchAndFamily = 0;
- foundFont = !EnumFontFamiliesExW((HDC)printDC, &lf,
+ foundFont = !::EnumFontFamiliesEx((HDC)printDC, &lf,
(FONTENUMPROCW) fontEnumProcW,
(LPARAM) &matchedLogFont, 0);
}
+ JNU_ReleaseStringPlatformChars(env, fontName, fontNameW);
+
if (!foundFont) {
return JNI_FALSE;
}
@@ -2100,7 +2089,7 @@
//Debug: dumpLogFont(&matchedLogFont);
- HFONT font = CreateFontIndirectW(&matchedLogFont);
+ HFONT font = ::CreateFontIndirect(&matchedLogFont);
if (font == NULL) {
return JNI_FALSE;
}
@@ -2123,7 +2112,7 @@
GetTextMetrics(printDC, &tm);
avgWidth = tm.tmAveCharWidth;
matchedLogFont.lfWidth = (LONG)((fabs)(avgWidth*awScale));
- font = CreateFontIndirectW(&matchedLogFont);
+ font = ::CreateFontIndirect(&matchedLogFont);
if (font == NULL) {
return JNI_FALSE;
}
@@ -2230,14 +2219,11 @@
(JNIEnv *env, jobject self, jlong printDC, jstring text)
{
SIZE size;
- LPWSTR wText = TO_WSTRING(text);
+ LPCWSTR wText = JNU_GetStringPlatformChars(env, text, NULL);
size_t strLen = wcslen(wText);
BOOL ok = GetTextExtentPoint32((HDC)printDC, wText, (int)strLen, &size);
- if (ok) {
- return size.cx;
- } else {
- return 0;
- }
+ JNU_ReleaseStringPlatformChars(env, text, wText);
+ return ok ? size.cx : 0;
}
@@ -2288,7 +2274,7 @@
long posX = ROUND_TO_LONG(x);
long posY = ROUND_TO_LONG(y);
int flags = (glyphCodes !=0) ? ETO_GLYPH_INDEX : 0;
- LPWSTR wText = TO_WSTRING(text);
+ LPCWSTR wText = JNU_GetStringPlatformChars(env, text, NULL);
int *advances = NULL, *xadvances = NULL, *xyadvances = NULL;
BOOL useYAdvances = FALSE;
@@ -2359,7 +2345,7 @@
*inxyAdvances = 0;
}
- if (useYAdvances && IS_WIN2000) {
+ if (useYAdvances) {
advances = xyadvances;
flags |= J2D_ETO_PDY;
} else {
@@ -2371,7 +2357,7 @@
env->ReleaseFloatArrayElements(positions, glyphPos, JNI_ABORT);
}
- BOOL drawn = ::ExtTextOutW( (HDC)printDC,
+ BOOL drawn = ::ExtTextOut((HDC)printDC,
posX, posY, // starting position for the text
flags, // glyphCodes?, y advances?
NULL, // optional clipping-opaquing rectangle
@@ -2385,6 +2371,8 @@
if (xyadvances != NULL) {
free(xyadvances);
}
+
+ JNU_ReleaseStringPlatformChars(env, text, wText);
}
/**
@@ -2968,7 +2956,7 @@
pd.lStructSize = sizeof(PRINTDLG);
pd.Flags = PD_RETURNDEFAULT | PD_RETURNDC;
- if (AwtCommDialog::PrintDlg(&pd)) {
+ if (::PrintDlg(&pd)) {
printDC = pd.hDC;
/* Find out how many copies the driver can do, and use driver's
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_Robot.cpp
--- a/jdk/src/windows/native/sun/windows/awt_Robot.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_Robot.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 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
@@ -23,6 +23,7 @@
* have any questions.
*/
+#include "awt.h"
#include "awt_Toolkit.h"
#include "awt_Component.h"
#include "awt_Robot.h"
@@ -30,8 +31,6 @@
#include "java_awt_event_InputEvent.h"
#include
-static const int MOUSE_MAX = 65535;
-
AwtRobot::AwtRobot( jobject peer )
{
JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
@@ -44,11 +43,11 @@
}
#ifndef SPI_GETMOUSESPEED
-#define SPI_GETMOUSESPEED 112
+#define SPI_GETMOUSESPEED 112
#endif
#ifndef SPI_SETMOUSESPEED
-#define SPI_SETMOUSESPEED 113
+#define SPI_SETMOUSESPEED 113
#endif
void AwtRobot::MouseMove( jint x, jint y)
@@ -102,19 +101,38 @@
// left handed mouse setup
BOOL bSwap = ::GetSystemMetrics(SM_SWAPBUTTON);
- if ( buttonMask & java_awt_event_InputEvent_BUTTON1_MASK ) {
+ if ( buttonMask & java_awt_event_InputEvent_BUTTON1_MASK ||
+ buttonMask & java_awt_event_InputEvent_BUTTON1_DOWN_MASK)
+ {
dwFlags |= !bSwap ? MOUSEEVENTF_LEFTDOWN : MOUSEEVENTF_RIGHTDOWN;
}
- if ( buttonMask & java_awt_event_InputEvent_BUTTON3_MASK ) {
+ if ( buttonMask & java_awt_event_InputEvent_BUTTON3_MASK ||
+ buttonMask & java_awt_event_InputEvent_BUTTON3_DOWN_MASK)
+ {
dwFlags |= !bSwap ? MOUSEEVENTF_RIGHTDOWN : MOUSEEVENTF_LEFTDOWN;
}
- if ( buttonMask & java_awt_event_InputEvent_BUTTON2_MASK ) {
+ if ( buttonMask & java_awt_event_InputEvent_BUTTON2_MASK ||
+ buttonMask & java_awt_event_InputEvent_BUTTON2_DOWN_MASK)
+ {
dwFlags |= MOUSEEVENTF_MIDDLEDOWN;
}
- mouse_event(dwFlags, 0, 0, 0, 0 );
+ INPUT mouseInput = {0};
+ mouseInput.type = INPUT_MOUSE;
+ mouseInput.mi.time = 0;
+ mouseInput.mi.dwFlags = dwFlags;
+ if ( buttonMask & AwtComponent::masks[3] ) {
+ mouseInput.mi.dwFlags = mouseInput.mi.dwFlags | MOUSEEVENTF_XDOWN;
+ mouseInput.mi.mouseData = XBUTTON1;
+ }
+
+ if ( buttonMask & AwtComponent::masks[4] ) {
+ mouseInput.mi.dwFlags = mouseInput.mi.dwFlags | MOUSEEVENTF_XDOWN;
+ mouseInput.mi.mouseData = XBUTTON2;
+ }
+ ::SendInput(1, &mouseInput, sizeof(mouseInput));
}
void AwtRobot::MouseRelease( jint buttonMask )
@@ -125,61 +143,43 @@
// left handed mouse setup
BOOL bSwap = ::GetSystemMetrics(SM_SWAPBUTTON);
- if ( buttonMask & java_awt_event_InputEvent_BUTTON1_MASK ) {
+ if ( buttonMask & java_awt_event_InputEvent_BUTTON1_MASK ||
+ buttonMask & java_awt_event_InputEvent_BUTTON1_DOWN_MASK)
+ {
dwFlags |= !bSwap ? MOUSEEVENTF_LEFTUP : MOUSEEVENTF_RIGHTUP;
}
- if ( buttonMask & java_awt_event_InputEvent_BUTTON3_MASK ) {
+ if ( buttonMask & java_awt_event_InputEvent_BUTTON3_MASK ||
+ buttonMask & java_awt_event_InputEvent_BUTTON3_DOWN_MASK)
+ {
dwFlags |= !bSwap ? MOUSEEVENTF_RIGHTUP : MOUSEEVENTF_LEFTUP;
}
- if ( buttonMask & java_awt_event_InputEvent_BUTTON2_MASK ) {
+ if ( buttonMask & java_awt_event_InputEvent_BUTTON2_MASK ||
+ buttonMask & java_awt_event_InputEvent_BUTTON2_DOWN_MASK)
+ {
dwFlags |= MOUSEEVENTF_MIDDLEUP;
}
- mouse_event(dwFlags, 0, 0, 0, 0 );
+ INPUT mouseInput = {0};
+ mouseInput.type = INPUT_MOUSE;
+ mouseInput.mi.time = 0;
+ mouseInput.mi.dwFlags = dwFlags;
+
+ if ( buttonMask & AwtComponent::masks[3] ) {
+ mouseInput.mi.dwFlags = mouseInput.mi.dwFlags | MOUSEEVENTF_XUP;
+ mouseInput.mi.mouseData = XBUTTON1;
+ }
+
+ if ( buttonMask & AwtComponent::masks[4] ) {
+ mouseInput.mi.dwFlags = mouseInput.mi.dwFlags | MOUSEEVENTF_XUP;
+ mouseInput.mi.mouseData = XBUTTON2;
+ }
+ ::SendInput(1, &mouseInput, sizeof(mouseInput));
}
void AwtRobot::MouseWheel (jint wheelAmt) {
- if (IS_WIN95 && !IS_WIN98) {
- // Other win32 platforms do nothing for mouse_event(0), so
- // do nothing on 95, too.
- if (wheelAmt == 0) {
- return;
- }
-
- // Win95 doesn't understand MOUSEEVENTF_WHEEL, so use PostEvent
- POINT curPos;
- HWND mouseOver = NULL;
- HWND topLevel = NULL;
- UINT wheelMsg = NULL;
-
- if (::GetCursorPos((LPPOINT)&curPos) == 0) {
- return;
- }
- // get hwnd of top-level container
- mouseOver = ::WindowFromPoint(curPos);
- DASSERT(mouseOver);
- topLevel = AwtComponent::GetTopLevelParentForWindow(mouseOver);
- DASSERT(topLevel);
-
- if (::ScreenToClient(topLevel, (LPPOINT)&curPos) == 0) {
- return;
- }
- wheelMsg = AwtComponent::Wheel95GetMsg();
-
- if (wheelMsg == NULL) {
- return;
- }
-
- ::PostMessage(topLevel,
- wheelMsg,
- wheelAmt * -1 * WHEEL_DELTA,
- MAKELPARAM((WORD)curPos.x, (WORD)curPos.y));
- }
- else {
- mouse_event(MOUSEEVENTF_WHEEL, 0, 0, wheelAmt * -1 * WHEEL_DELTA, 0);
- }
+ mouse_event(MOUSEEVENTF_WHEEL, 0, 0, wheelAmt * -1 * WHEEL_DELTA, 0);
}
inline jint AwtRobot::WinToJavaPixel(USHORT r, USHORT g, USHORT b)
@@ -437,3 +437,9 @@
CATCH_BAD_ALLOC;
}
+
+JNIEXPORT jint JNICALL Java_sun_awt_windows_WRobotPeer_getNumberOfButtons(
+ JNIEnv *, jobject self)
+{
+ return GetSystemMetrics(SM_CMOUSEBUTTONS);
+}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_Robot.h
--- a/jdk/src/windows/native/sun/windows/awt_Robot.h Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_Robot.h Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 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
@@ -42,13 +42,13 @@
void MouseRelease( jint buttonMask );
void MouseWheel(jint wheelAmt);
+ jint getNumberOfButtons();
jint GetRGBPixel( jint x, jint y);
void GetRGBPixels(jint x, jint y, jint width, jint height, jintArray pixelArray);
void KeyPress( jint key );
void KeyRelease( jint key );
-
static AwtRobot * GetRobot( jobject self );
private:
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_ScrollPane.cpp
--- a/jdk/src/windows/native/sun/windows/awt_ScrollPane.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_ScrollPane.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 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
@@ -108,13 +108,6 @@
{
DWORD style = WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
- if (!IS_WIN4X) {
- /*
- * It's been decided by the UI folks that 3.X ScrollPanes
- * should have borders...
- */
- style |= WS_BORDER;
- }
jint scrollbarDisplayPolicy =
env->GetIntField(target, scrollbarDisplayPolicyID);
@@ -122,7 +115,7 @@
== java_awt_ScrollPane_SCROLLBARS_ALWAYS) {
style |= WS_HSCROLL | WS_VSCROLL;
}
- DWORD exStyle = IS_WIN4X ? WS_EX_CLIENTEDGE : 0;
+ DWORD exStyle = WS_EX_CLIENTEDGE;
if (GetRTL()) {
exStyle |= WS_EX_RIGHT | WS_EX_LEFTSCROLLBAR;
@@ -225,15 +218,8 @@
}
/* Determine border width without scrollbars. */
- int horzBorder;
- int vertBorder;
- if (IS_WIN4X) {
- horzBorder = ::GetSystemMetrics(SM_CXEDGE);
- vertBorder = ::GetSystemMetrics(SM_CYEDGE);
- } else {
- horzBorder = ::GetSystemMetrics(SM_CXBORDER);
- vertBorder = ::GetSystemMetrics(SM_CYBORDER);
- }
+ int horzBorder = ::GetSystemMetrics(SM_CXEDGE);;
+ int vertBorder = ::GetSystemMetrics(SM_CYEDGE);;
parentWidth -= (horzBorder * 2);
parentHeight -= (vertBorder * 2);
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_TextArea.cpp
--- a/jdk/src/windows/native/sun/windows/awt_TextArea.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_TextArea.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -26,10 +26,8 @@
#include "awt_Toolkit.h"
#include "awt_TextArea.h"
#include "awt_TextComponent.h"
-#include "awt_dlls.h"
#include "awt_KeyboardFocusManager.h"
#include "awt_Canvas.h"
-#include "awt_Unicode.h"
#include "awt_Window.h"
/* IMPORTANT! Read the README.JNI file for notes on JNI converted AWT code.
@@ -50,7 +48,6 @@
jfieldID AwtTextArea::scrollbarVisibilityID;
WNDPROC AwtTextArea::sm_pDefWindowProc = NULL;
-BOOL AwtTextArea::sm_RichEdit20 = (IS_WIN98 || IS_NT);
/************************************************************************
* AwtTextArea methods
@@ -78,8 +75,12 @@
}
LPCTSTR AwtTextArea::GetClassName() {
- load_rich_edit_library();
- return sm_RichEdit20 ? RICHEDIT_CLASS : TEXT("RICHEDIT");
+ static BOOL richedLibraryLoaded = FALSE;
+ if (!richedLibraryLoaded) {
+ ::LoadLibrary(TEXT("RICHED20.DLL"));
+ richedLibraryLoaded = TRUE;
+ }
+ return RICHEDIT_CLASS;
}
/* Create a new AwtTextArea object and window. */
@@ -134,9 +135,8 @@
* scrollbars instead of hiding them when not needed.
*/
DWORD style = WS_CHILD | WS_CLIPSIBLINGS | ES_LEFT | ES_MULTILINE |
- ES_WANTRETURN | scroll_style |
- (IS_WIN4X ? 0 : WS_BORDER) | ES_DISABLENOSCROLL;
- DWORD exStyle = IS_WIN4X ? WS_EX_CLIENTEDGE : 0;
+ ES_WANTRETURN | scroll_style | ES_DISABLENOSCROLL;
+ DWORD exStyle = WS_EX_CLIENTEDGE;
if (GetRTL()) {
exStyle |= WS_EX_RIGHT | WS_EX_LEFTSCROLLBAR;
if (GetRTLReadingOrder())
@@ -169,9 +169,7 @@
// end-of-document marker or carriage return,
// to format paragraphs.
// kdm@sparc.spb.su
- if (sm_RichEdit20) {
- c->SendMessage(EM_SETTEXTMODE, TM_PLAINTEXT, 0);
- }
+ c->SendMessage(EM_SETTEXTMODE, TM_PLAINTEXT, 0);
c->m_backgroundColorSet = TRUE;
/* suppress inheriting parent's color. */
@@ -242,7 +240,7 @@
*/
size_t length = env->GetStringLength(jStr) + 1;
WCHAR *string = new WCHAR[length];
- env->GetStringRegion(jStr, 0, static_cast(length - 1), string);
+ env->GetStringRegion(jStr, 0, static_cast(length - 1), reinterpret_cast(string));
string[length-1] = '\0';
for (size_t i = 0; i < maxlen && i < length - 1; i++) {
if (string[i] == L'\n') {
@@ -461,12 +459,7 @@
/* Check if all the text is selected. */
if (cr.cpMin == 0) {
- int len = 0;
- if (m_isWin95) {
- len = ::GetWindowTextLengthA(GetHWnd());
- } else {
- len = ::GetWindowTextLengthW(GetHWnd());
- }
+ int len = ::GetWindowTextLength(GetHWnd());
if (cr.cpMin == 0 && cr.cpMax >= len) {
/*
* All the text is selected in RichEdit - select all the
@@ -738,14 +731,8 @@
// kdm@sparc.spb.su
UINT platfScrollLines = 3;
// Retrieve a number of scroll lines.
- if (!sm_RichEdit20) {
- // 95 doesn't understand the SPI_GETWHEELSCROLLLINES - get the user
- // preference by other means
- platfScrollLines = Wheel95GetScrLines();
- } else {
- ::SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0,
- &platfScrollLines, 0);
- }
+ ::SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0,
+ &platfScrollLines, 0);
if (platfScrollLines > 0) {
HWND hWnd = GetHWnd();
@@ -838,23 +825,6 @@
return returnVal;
}
-int AwtTextArea::GetText(LPTSTR buffer, int size)
-{
- // Due to a known limitation of the MSLU, GetWindowText cannot be
- // issued for the Unicode RichEdit control on Win9x. Use EM_GETTEXTEX instead.
- if (sm_RichEdit20 && !IS_NT) {
- GETTEXTEX gte;
- gte.cb = size * sizeof(TCHAR);
- gte.flags = GT_USECRLF;
- gte.codepage = 1200; // implies Unicode
- gte.lpDefaultChar = NULL;
- gte.lpUsedDefChar = NULL;
- return (int)SendMessage(EM_GETTEXTEX, (WPARAM)>e, (LPARAM)buffer);
- } else {
- return ::GetWindowText(GetHWnd(), buffer, size);
- }
-}
-
/*
* WM_CTLCOLOR is not sent by rich edit controls.
* Use EM_SETCHARFORMAT and EM_SETBKGNDCOLOR to set
@@ -984,16 +954,16 @@
jsize length = env->GetStringLength(text) + 1;
// Bugid 4141477 - Can't use TO_WSTRING here because it uses alloca
// WCHAR* buffer = TO_WSTRING(text);
- WCHAR *buffer = new WCHAR[length];
- env->GetStringRegion(text, 0, length-1, buffer);
+ TCHAR *buffer = new TCHAR[length];
+ env->GetStringRegion(text, 0, length-1, reinterpret_cast(buffer));
buffer[length-1] = '\0';
c->CheckLineSeparator(buffer);
c->RemoveCR(buffer);
// Fix for 5003402: added restoring/hiding selection to enable automatic scrolling
c->SendMessage(EM_HIDESELECTION, FALSE, TRUE);
- c->SendMessageW(EM_SETSEL, start, end);
- c->SendMessageW(EM_REPLACESEL, FALSE, (LPARAM)buffer);
+ c->SendMessage(EM_SETSEL, start, end);
+ c->SendMessage(EM_REPLACESEL, FALSE, (LPARAM)buffer);
c->SendMessage(EM_HIDESELECTION, TRUE, TRUE);
delete[] buffer;
@@ -1187,12 +1157,11 @@
HGLOBAL hMetaPict) {
if (reco == RECO_PASTE) {
// If CF_TEXT format is available edit controls will select it,
- // otherwise if it is WinNT or Win2000 and CF_UNICODETEXT is
- // available it will be selected, otherwise if CF_OEMTEXT is
- // available it will be selected.
+ // otherwise if it is CF_UNICODETEXT is available it will be
+ // selected, otherwise if CF_OEMTEXT is available it will be selected.
if (::IsClipboardFormatAvailable(CF_TEXT)) {
*pcfFormat = CF_TEXT;
- } else if (!m_isWin95 && ::IsClipboardFormatAvailable(CF_UNICODETEXT)) {
+ } else if (::IsClipboardFormatAvailable(CF_UNICODETEXT)) {
*pcfFormat = CF_UNICODETEXT;
} else if (::IsClipboardFormatAvailable(CF_OEMTEXT)) {
*pcfFormat = CF_OEMTEXT;
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_TextArea.h
--- a/jdk/src/windows/native/sun/windows/awt_TextArea.h Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_TextArea.h Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 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
@@ -73,8 +73,6 @@
MsgRouting WmNcHitTest(UINT x, UINT y, LRESULT &retVal);
MsgRouting HandleEvent(MSG *msg, BOOL synthetic);
- INLINE virtual int GetText(LPTSTR buffer, int size);
-
INLINE void SetIgnoreEnChange(BOOL b) { m_bIgnoreEnChange = b; }
virtual void SetColor(COLORREF c);
@@ -96,10 +94,6 @@
void EditGetSel(CHARRANGE &cr);
LONG EditGetCharFromPos(POINT& pt);
private:
-
- // TRUE if the rich edit version is 2.0
- static BOOL sm_RichEdit20;
-
// RichEdit 1.0 control generates EN_CHANGE notifications not only
// on text changes, but also on any character formatting change.
// This flag is true when the latter case is detected.
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_TextComponent.cpp
--- a/jdk/src/windows/native/sun/windows/awt_TextComponent.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_TextComponent.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 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
@@ -326,7 +326,7 @@
WCHAR* buf = new WCHAR[len + 1];
c->GetText(buf, len + 1);
c->RemoveCR(buf);
- result = env->NewString(buf, static_cast(wcslen(buf)));
+ result = JNU_NewStringPlatform(env, buf);
delete [] buf;
}
}
@@ -362,7 +362,7 @@
{
int length = env->GetStringLength(text);
WCHAR* buffer = new WCHAR[length + 1];
- env->GetStringRegion(text, 0, length, buffer);
+ env->GetStringRegion(text, 0, length, reinterpret_cast(buffer));
buffer[length] = 0;
c->CheckLineSeparator(buffer);
c->RemoveCR(buffer);
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_TextComponent.h
--- a/jdk/src/windows/native/sun/windows/awt_TextComponent.h Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_TextComponent.h Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 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
@@ -70,15 +70,6 @@
static jstring _GetText(void *param);
BOOL ActMouseMessage(MSG* pMsg);
- /*
- * For TextComponents that contains WCHAR strings or messages with
- * WCHAR parameters.
- */
- INLINE LRESULT SendMessageW(UINT msg, WPARAM wParam = 0, LPARAM lParam = 0)
- {
- DASSERT(GetHWnd());
- return ::SendMessageW(GetHWnd(), msg, wParam, lParam);
- }
void SetFont(AwtFont* font);
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_TextField.cpp
--- a/jdk/src/windows/native/sun/windows/awt_TextField.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_TextField.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 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
@@ -26,7 +26,6 @@
#include "awt_Toolkit.h"
#include "awt_TextField.h"
#include "awt_TextComponent.h"
-#include "awt_dlls.h"
#include "awt_KeyboardFocusManager.h"
#include "awt_Canvas.h"
@@ -69,9 +68,8 @@
{
DWORD style = WS_CHILD | WS_CLIPSIBLINGS |
- ES_LEFT | ES_AUTOHSCROLL |
- (IS_WIN4X ? 0 : WS_BORDER);
- DWORD exStyle = IS_WIN4X ? WS_EX_CLIENTEDGE : 0;
+ ES_LEFT | ES_AUTOHSCROLL;
+ DWORD exStyle = WS_EX_CLIENTEDGE;
if (GetRTL()) {
exStyle |= WS_EX_RIGHT | WS_EX_LEFTSCROLLBAR;
if (GetRTLReadingOrder())
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_Toolkit.cpp
--- a/jdk/src/windows/native/sun/windows/awt_Toolkit.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_Toolkit.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -23,15 +23,16 @@
* have any questions.
*/
+#include "awt.h"
#include
#include
-#if defined(_DEBUG) && defined(_MSC_VER) && _MSC_VER >= 1000
-#include
-#endif
+//#if defined(_DEBUG) && defined(_MSC_VER) && _MSC_VER >= 1000
+//#include
+//#endif
#define _JNI_IMPLEMENTATION_
-#include "stdhdrs.h"
+
#include "awt_DrawingSurface.h"
#include "awt_AWTEvent.h"
#include "awt_Component.h"
@@ -51,7 +52,6 @@
#include "awt_FileDialog.h"
#include "CmdIDList.h"
#include "awt_new.h"
-#include "awt_Unicode.h"
#include "debug_trace.h"
#include "debug_mem.h"
@@ -225,8 +225,7 @@
HKL prev = ::ActivateKeyboardLayout(hkl, 0);
// If the above call fails, try loading the layout in case of NT
- if ((prev == 0) && IS_NT) {
-
+ if (!prev) {
// create input locale string, e.g., "00000409", from hkl.
TCHAR inputLocale[9];
TCHAR buf[9];
@@ -297,7 +296,7 @@
if (jstr != NULL) {
int length = env->GetStringLength(jstr);
buffer = new TCHAR[length + 1];
- LPCTSTR tmp = (LPCTSTR)JNU_GetStringPlatformChars(env, jstr, NULL);
+ LPCTSTR tmp = JNU_GetStringPlatformChars(env, jstr, NULL);
_tcscpy(buffer, tmp);
JNU_ReleaseStringPlatformChars(env, jstr, tmp);
} else {
@@ -323,6 +322,7 @@
m_vmSignalled = FALSE;
m_isDynamicLayoutSet = FALSE;
+ m_areExtraMouseButtonsEnabled = TRUE;
m_verifyComponents = FALSE;
m_breakOnError = FALSE;
@@ -490,8 +490,6 @@
::CloseHandle(m_waitEvent);
- ComCtl32Util::GetInstance().FreeLibraries();
-
tk.m_isDisposed = TRUE;
return TRUE;
@@ -886,8 +884,6 @@
return (DWORD)ImmGetOpenStatus((HIMC)wParam);
}
case WM_DISPLAYCHANGE: {
- AwtCursor::DirtyAllCustomCursors();
-
// Reinitialize screens
initScreens(env);
@@ -1161,9 +1157,7 @@
if (p && p->PreProcessMsg(msg) == mrConsume)
return TRUE;
- if ((msg.message >= WM_MOUSEFIRST && msg.message <= WM_AWT_MOUSELAST) ||
- (IS_WIN95 && !IS_WIN98 &&
- msg.message == AwtComponent::Wheel95GetMsg()) ||
+ if ((msg.message >= WM_MOUSEFIRST && msg.message <= WM_MOUSELAST) ||
(msg.message >= WM_NCMOUSEMOVE && msg.message <= WM_NCMBUTTONDBLCLK)) {
if (PreProcessMouseMsg(p, msg)) {
return TRUE;
@@ -1190,9 +1184,7 @@
return FALSE;
}
- if (msg.message >= WM_MOUSEFIRST && msg.message <= WM_AWT_MOUSELAST ||
- (IS_WIN95 && !IS_WIN98 && msg.message == AwtComponent::Wheel95GetMsg()))
- {
+ if (msg.message >= WM_MOUSEFIRST && msg.message <= WM_MOUSELAST) {
mouseWParam = msg.wParam;
mouseLParam = msg.lParam;
} else {
@@ -1287,21 +1279,6 @@
//window
msg.hwnd = hWndForWheel;
}
- else if (IS_WIN95 && !IS_WIN98 &&
- msg.message == AwtComponent::Wheel95GetMsg() &&
- mouseWheelComp != NULL) {
-
- // On Win95, mouse wheels are _always_ delivered to the top level
- // Frame. Default behavior only takes place if the message's hwnd
- // remains that of the Frame. We only want to change the hwnd if
- // we're changing it to a Component that DOESN'T handle the
- // mousewheel natively.
-
- if (!mouseWheelComp->InheritsNativeMouseWheelBehavior()) {
- DTRACE_PRINTLN("AwtT::PPMM: changing hwnd on 95");
- msg.hwnd = hWndForWheel;
- }
- }
/*
* Make sure we get at least one last chance to check for transitions
@@ -1792,7 +1769,7 @@
{
jobject insets = NULL;
RECT rRW;
- MONITOR_INFO *miInfo;
+ LPMONITORINFO miInfo;
TRY;
@@ -1814,10 +1791,10 @@
if (miInfo) {
insets = env->NewObject(env->FindClass("java/awt/Insets"),
AwtToolkit::insetsMID,
- miInfo->rWork.top - miInfo->rMonitor.top,
- miInfo->rWork.left - miInfo->rMonitor.left,
- miInfo->rMonitor.bottom - miInfo->rWork.bottom,
- miInfo->rMonitor.right - miInfo->rWork.right);
+ miInfo->rcWork.top - miInfo->rcMonitor.top,
+ miInfo->rcWork.left - miInfo->rcMonitor.left,
+ miInfo->rcMonitor.bottom - miInfo->rcWork.bottom,
+ miInfo->rcMonitor.right - miInfo->rcWork.right);
}
}
@@ -2057,29 +2034,15 @@
swprintf(szVer, L"0x%x = %ld", version, version);
int l = lstrlen(szVer);
- if (IS_WIN95) {
- if (IS_WIN98) {
- if (IS_WINME) {
- swprintf(szVer + l, L" (Windows ME)");
+ if (IS_WIN2000) {
+ if (IS_WINXP) {
+ if (IS_WINVISTA) {
+ swprintf(szVer + l, L" (Windows Vista)");
} else {
- swprintf(szVer + l, L" (Windows 98)");
+ swprintf(szVer + l, L" (Windows XP)");
}
} else {
- swprintf(szVer + l, L" (Windows 95)");
- }
- } else if (IS_NT) {
- if (IS_WIN2000) {
- if (IS_WINXP) {
- if (IS_WINVISTA) {
- swprintf(szVer + l, L" (Windows Vista)");
- } else {
- swprintf(szVer + l, L" (Windows XP)");
- }
- } else {
- swprintf(szVer + l, L" (Windows 2000)");
- }
- } else {
- swprintf(szVer + l, L" (Windows NT)");
+ swprintf(szVer + l, L" (Windows 2000)");
}
} else {
swprintf(szVer + l, L" (Unknown)");
@@ -2130,3 +2093,26 @@
splashClose();
}
}
+
+/*
+ * accessible from awt_Component
+ */
+BOOL AwtToolkit::areExtraMouseButtonsEnabled() {
+ return m_areExtraMouseButtonsEnabled;
+}
+
+/*
+ * Class: sun_awt_windows_WToolkit
+ * Method: setExtraMouseButtonsEnabledNative
+ * Signature: (Z)V
+ */
+extern "C" JNIEXPORT void JNICALL Java_sun_awt_windows_WToolkit_setExtraMouseButtonsEnabledNative
+(JNIEnv *env, jclass self, jboolean enable){
+ TRY;
+ AwtToolkit::GetInstance().setExtraMouseButtonsEnabled(enable);
+ CATCH_BAD_ALLOC;
+}
+
+void AwtToolkit::setExtraMouseButtonsEnabled(BOOL enable) {
+ m_areExtraMouseButtonsEnabled = enable;
+}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_Toolkit.h
--- a/jdk/src/windows/native/sun/windows/awt_Toolkit.h Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_Toolkit.h Wed Jul 05 16:47:27 2017 +0200
@@ -50,7 +50,6 @@
#include "awt.h"
#include "awtmsg.h"
-#include "awt_Multimon.h"
#include "Trace.h"
#include "sun_awt_windows_WToolkit.h"
@@ -89,11 +88,8 @@
*/
class CriticalSection {
public:
- INLINE CriticalSection() { ::InitializeCriticalSection(&rep);
- ::InitializeCriticalSection(&tryrep);
- tryEntered = 0; }
- INLINE ~CriticalSection() { ::DeleteCriticalSection(&rep);
- ::DeleteCriticalSection(&tryrep); }
+ INLINE CriticalSection() { ::InitializeCriticalSection(&rep); }
+ INLINE ~CriticalSection() { ::DeleteCriticalSection(&rep); }
class Lock {
public:
@@ -111,50 +107,18 @@
private:
CRITICAL_SECTION rep;
- CRITICAL_SECTION tryrep;
- long tryEntered;
-
CriticalSection(const CriticalSection&);
const CriticalSection& operator =(const CriticalSection&);
public:
- virtual void Enter (void)
- {
- ::EnterCriticalSection(&tryrep);
- tryEntered++;
- if (tryEntered == 1) {
- ::EnterCriticalSection(&rep);
- ::LeaveCriticalSection(&tryrep);
- } else {
- ::LeaveCriticalSection(&tryrep);
- ::EnterCriticalSection(&rep);
- }
+ virtual void Enter() {
+ ::EnterCriticalSection(&rep);
}
- // we cannot use ::TryEnterCriticalSection as it is not supported on Win9x/Me
- virtual BOOL TryEnter (void)
- {
- BOOL result = FALSE;
- ::EnterCriticalSection(&tryrep);
- if (tryEntered == 0) {
- ::EnterCriticalSection(&rep);
- tryEntered++;
- result = TRUE;
- }
- ::LeaveCriticalSection(&tryrep);
- return result;
+ virtual BOOL TryEnter() {
+ return ::TryEnterCriticalSection(&rep);
}
- virtual void Leave (void)
- {
- ::EnterCriticalSection(&tryrep);
- if (tryEntered > 0) {
- tryEntered--;
- } else {
- // this may happen only if we call to Leave() before
- // Enter() so this is definitely a bug
- DASSERT(FALSE);
- }
+ virtual void Leave() {
::LeaveCriticalSection(&rep);
- ::LeaveCriticalSection(&tryrep);
}
};
@@ -211,6 +175,8 @@
BOOL IsDynamicLayoutSet();
BOOL IsDynamicLayoutSupported();
BOOL IsDynamicLayoutActive();
+ BOOL areExtraMouseButtonsEnabled();
+ void setExtraMouseButtonsEnabled(BOOL enable);
INLINE BOOL localPump() { return m_localPump; }
INLINE BOOL VerifyComponents() { return FALSE; } // TODO: Use new DebugHelper class to set this flag
@@ -387,6 +353,7 @@
BOOL m_verbose;
BOOL m_isActive; // set to FALSE at beginning of Dispose
BOOL m_isDisposed; // set to TRUE at end of Dispose
+ BOOL m_areExtraMouseButtonsEnabled;
BOOL m_vmSignalled; // set to TRUE if QUERYENDSESSION has successfully
// raised SIGTERM
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_TrayIcon.cpp
--- a/jdk/src/windows/native/sun/windows/awt_TrayIcon.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_TrayIcon.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -23,9 +23,10 @@
* have any questions.
*/
-#include
+#include "awt.h"
#include
#include
+#include
#include "awt_Toolkit.h"
#include "awt_TrayIcon.h"
@@ -173,27 +174,20 @@
env->DeleteLocalRef(target);
return awtTrayIcon;
}
-typedef struct _SDLLVERSIONINFO
-{
- DWORD cbSize;
- DWORD dwMajorVersion; // Major version
- DWORD dwMinorVersion; // Minor version
- DWORD dwBuildNumber; // Build number
- DWORD dwPlatformID; // DLLVER_PLATFORM_*
-} SDLLVERSIONINFO;
-typedef HRESULT (CALLBACK* SDLLGETVERSIONPROC)(SDLLVERSIONINFO *);
void AwtTrayIcon::InitNID(UINT uID)
{
// fix for 6271589: we MUST set the size of the structure to match
// the shell version, otherwise some errors may occur (like missing
// balloon messages on win2k)
- SDLLVERSIONINFO dllVersionInfo;
- dllVersionInfo.cbSize = sizeof(SDLLVERSIONINFO);
- int shellVersion = 4; // WIN_98
+ DLLVERSIONINFO dllVersionInfo;
+ dllVersionInfo.cbSize = sizeof(DLLVERSIONINFO);
+ int shellVersion = 5; // WIN_2000
+ // MSDN: DllGetVersion should not be implicitly called, but rather
+ // loaded using GetProcAddress
HMODULE hShell = LoadLibrary(TEXT("Shell32.dll"));
if (hShell != NULL) {
- SDLLGETVERSIONPROC proc = (SDLLGETVERSIONPROC)GetProcAddress(hShell, "DllGetVersion");
+ DLLGETVERSIONPROC proc = (DLLGETVERSIONPROC)GetProcAddress(hShell, "DllGetVersion");
if (proc != NULL) {
if (proc(&dllVersionInfo) == NOERROR) {
shellVersion = dllVersionInfo.dwMajorVersion;
@@ -202,14 +196,16 @@
}
FreeLibrary(hShell);
switch (shellVersion) {
- case 5: // WIN_2000, WIN_ME
+ case 5: // WIN_2000
m_nid.cbSize = (BYTE *)(&m_nid.guidItem) - (BYTE *)(&m_nid.cbSize);
break;
case 6: // WIN_XP
+ // Uncomment these two lines when moving to VS2008
+// m_nid.cbSize = (BYTE *)(&m_nid.hBalloonIcon) - (BYTE *)(&m_nid.cbSize);
+// break;
+ default: // WIN_VISTA?
m_nid.cbSize = sizeof(m_nid);
break;
- default: // WIN_98, WIN_NT
- m_nid.cbSize = (BYTE *)(&m_nid.szTip) - (BYTE *)(&m_nid.cbSize) + sizeof(m_nid.szTip) / 2;
}
m_nid.hWnd = AwtTrayIcon::sm_msgWindow;
m_nid.uID = uID;
@@ -217,7 +213,7 @@
m_nid.uCallbackMessage = WM_AWT_TRAY_NOTIFY;
m_nid.hIcon = AwtToolkit::GetInstance().GetAwtIcon();
m_nid.szTip[0] = '\0';
- m_nid.uVersion = IS_WIN2000 ? AWT_NOTIFYICON_VERSION : 0;
+ m_nid.uVersion = NOTIFYICON_VERSION;
}
BOOL AwtTrayIcon::SendTrayMessage(DWORD dwMessage)
@@ -304,13 +300,13 @@
case WM_CONTEXTMENU:
mr = WmContextMenu(0, pos.x, pos.y);
break;
- case AWT_NIN_KEYSELECT:
+ case NIN_KEYSELECT:
mr = WmKeySelect(0, pos.x, pos.y);
break;
- case AWT_NIN_SELECT:
+ case NIN_SELECT:
mr = WmSelect(0, pos.x, pos.y);
break;
- case AWT_NIN_BALLOONUSERCLICK:
+ case NIN_BALLOONUSERCLICK:
mr = WmBalloonUserClick(0, pos.x, pos.y);
break;
}
@@ -371,7 +367,7 @@
(AwtComponent::GetButton(button) == java_awt_event_MouseEvent_BUTTON3 ?
TRUE : FALSE), AwtComponent::GetButton(button), &msg);
- if ((m_mouseButtonClickAllowed & AwtComponent::GetButtonMK(button)) != 1) { // No up-button in the drag-state
+ if ((m_mouseButtonClickAllowed & AwtComponent::GetButtonMK(button)) != 0) { // No up-button in the drag-state
SendMouseEvent(java_awt_event_MouseEvent_MOUSE_CLICKED,
TimeHelper::windowsToUTC(::GetTickCount()), x, y, AwtComponent::GetJavaModifiers(),
clickCount, JNI_FALSE, AwtComponent::GetButton(button));
@@ -397,7 +393,7 @@
lastX = x;
lastY = y;
AwtComponent::InitMessage(&msg, lastMessage, flags, MAKELPARAM(x, y), x, y);
- if ((flags & AwtComponent::ALL_MK_BUTTONS) != 0) {
+ if ((flags & ALL_MK_BUTTONS) != 0) {
m_mouseButtonClickAllowed = 0;
} else {
SendMouseEvent(java_awt_event_MouseEvent_MOUSE_MOVED, TimeHelper::windowsToUTC(::GetTickCount()), x, y,
@@ -473,7 +469,7 @@
BOOL result = item->m_trayIcon->SendTrayMessage(NIM_ADD);
// 6270114: Instructs the taskbar to behave according to the Shell version 5.0
if (result) {
- item->m_trayIcon->SendTrayMessage(AWT_NIM_SETVERSION);
+ item->m_trayIcon->SendTrayMessage(NIM_SETVERSION);
}
}
return mrDoDefault;
@@ -733,9 +729,9 @@
goto ret;
}
- tooltipStr = env->GetStringChars(jtooltip, (jboolean *)NULL);
+ tooltipStr = JNU_GetStringPlatformChars(env, jtooltip, (jboolean *)NULL);
trayIcon->SetToolTip(tooltipStr);
- env->ReleaseStringChars(jtooltip, tooltipStr);
+ JNU_ReleaseStringPlatformChars(env, jtooltip, tooltipStr);
ret:
env->DeleteGlobalRef(self);
env->DeleteGlobalRef(jtooltip);
@@ -782,7 +778,7 @@
BOOL result = trayIcon->SendTrayMessage(jupdate == JNI_TRUE ? NIM_MODIFY : NIM_ADD);
// 6270114: Instructs the taskbar to behave according to the Shell version 5.0
if (result && jupdate == JNI_FALSE) {
- trayIcon->SendTrayMessage(AWT_NIM_SETVERSION);
+ trayIcon->SendTrayMessage(NIM_SETVERSION);
}
ret:
env->DeleteGlobalRef(self);
@@ -791,22 +787,19 @@
void AwtTrayIcon::DisplayMessage(LPCTSTR caption, LPCTSTR text, LPCTSTR msgType)
{
- if (!IS_WIN2000)
- return;
-
- m_nid.uFlags |= AWT_NIF_INFO;
+ m_nid.uFlags |= NIF_INFO;
m_nid.uTimeout = 10000;
if (lstrcmp(msgType, TEXT("ERROR")) == 0) {
- m_nid.dwInfoFlags = AWT_NIIF_ERROR;
+ m_nid.dwInfoFlags = NIIF_ERROR;
} else if (lstrcmp(msgType, TEXT("WARNING")) == 0) {
- m_nid.dwInfoFlags = AWT_NIIF_WARNING;
+ m_nid.dwInfoFlags = NIIF_WARNING;
} else if (lstrcmp(msgType, TEXT("INFO")) == 0) {
- m_nid.dwInfoFlags = AWT_NIIF_INFO;
+ m_nid.dwInfoFlags = NIIF_INFO;
} else if (lstrcmp(msgType, TEXT("NONE")) == 0) {
- m_nid.dwInfoFlags = AWT_NIIF_NONE;
+ m_nid.dwInfoFlags = NIIF_NONE;
} else {
- m_nid.dwInfoFlags = AWT_NIIF_NONE;
+ m_nid.dwInfoFlags = NIIF_NONE;
}
if (caption[0] == '\0') {
@@ -835,7 +828,7 @@
}
SendTrayMessage(NIM_MODIFY);
- m_nid.uFlags &= ~AWT_NIF_INFO;
+ m_nid.uFlags &= ~NIF_INFO;
}
void AwtTrayIcon::_DisplayMessage(void *param)
@@ -855,15 +848,15 @@
JNI_CHECK_PEER_GOTO(self, ret);
trayIcon = (AwtTrayIcon *)pData;
- captionStr = env->GetStringChars(jcaption, (jboolean *)NULL);
- textStr = env->GetStringChars(jtext, (jboolean *)NULL);
- msgTypeStr = env->GetStringChars(jmsgType, (jboolean *)NULL);
+ captionStr = JNU_GetStringPlatformChars(env, jcaption, (jboolean *)NULL);
+ textStr = JNU_GetStringPlatformChars(env, jtext, (jboolean *)NULL);
+ msgTypeStr = JNU_GetStringPlatformChars(env, jmsgType, (jboolean *)NULL);
trayIcon->DisplayMessage(captionStr, textStr, msgTypeStr);
- env->ReleaseStringChars(jcaption, captionStr);
- env->ReleaseStringChars(jtext, textStr);
- env->ReleaseStringChars(jmsgType, msgTypeStr);
+ JNU_ReleaseStringPlatformChars(env, jcaption, captionStr);
+ JNU_ReleaseStringPlatformChars(env, jtext, textStr);
+ JNU_ReleaseStringPlatformChars(env, jmsgType, msgTypeStr);
ret:
env->DeleteGlobalRef(self);
env->DeleteGlobalRef(jcaption);
@@ -1057,16 +1050,14 @@
{
TRY;
- if (IS_WIN2000) {
- DisplayMessageStruct *dms = new DisplayMessageStruct;
- dms->trayIcon = env->NewGlobalRef(self);
- dms->caption = (jstring)env->NewGlobalRef(caption);
- dms->text = (jstring)env->NewGlobalRef(text);
- dms->msgType = (jstring)env->NewGlobalRef(msgType);
+ DisplayMessageStruct *dms = new DisplayMessageStruct;
+ dms->trayIcon = env->NewGlobalRef(self);
+ dms->caption = (jstring)env->NewGlobalRef(caption);
+ dms->text = (jstring)env->NewGlobalRef(text);
+ dms->msgType = (jstring)env->NewGlobalRef(msgType);
- AwtToolkit::GetInstance().SyncCall(AwtTrayIcon::_DisplayMessage, dms);
- // global ref is deleted in _DisplayMessage
- }
+ AwtToolkit::GetInstance().SyncCall(AwtTrayIcon::_DisplayMessage, dms);
+ // global ref is deleted in _DisplayMessage
CATCH_BAD_ALLOC(NULL);
}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_TrayIcon.h
--- a/jdk/src/windows/native/sun/windows/awt_TrayIcon.h Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_TrayIcon.h Wed Jul 05 16:47:27 2017 +0200
@@ -36,57 +36,11 @@
#define TRAY_ICON_X_HOTSPOT 0
#define TRAY_ICON_Y_HOTSPOT 0
-#define TRAY_ICON_TOOLTIP_MAX_SIZE (IS_WIN2000 ? 128 : 64)
+#define TRAY_ICON_TOOLTIP_MAX_SIZE 128
#define TRAY_ICON_BALLOON_TITLE_MAX_SIZE 64
#define TRAY_ICON_BALLOON_INFO_MAX_SIZE 256
-// **********************************************************************
-// The following definitions are duplicates for those from the shellapi.h
-// **********************************************************************
-
-#define AWT_NOTIFYICON_VERSION 3
-
-#define AWT_NIM_SETVERSION 0x00000004
-
-#define AWT_NIN_SELECT (WM_USER + 0)
-#define AWT_NINF_KEY 0x1
-#define AWT_NIN_KEYSELECT (AWT_NIN_SELECT | AWT_NINF_KEY)
-#define AWT_NIN_BALLOONSHOW (WM_USER + 2)
-#define AWT_NIN_BALLOONHIDE (WM_USER + 3)
-#define AWT_NIN_BALLOONTIMEOUT (WM_USER + 4)
-#define AWT_NIN_BALLOONUSERCLICK (WM_USER + 5)
-
-#define AWT_NIIF_NONE 0x00000000
-#define AWT_NIIF_INFO 0x00000001
-#define AWT_NIIF_WARNING 0x00000002
-#define AWT_NIIF_ERROR 0x00000003
-
-#define AWT_NIF_INFO 0x00000010
-
-typedef struct _AWT_NOTIFYICONDATA {
- DWORD cbSize;
- HWND hWnd;
- UINT uID;
- UINT uFlags;
- UINT uCallbackMessage;
- HICON hIcon;
- TCHAR szTip[128];
-
- DWORD dwState; // _WIN32_IE >= 0x0500
- DWORD dwStateMask;
- TCHAR szInfo[256];
- union {
- UINT uTimeout;
- UINT uVersion;
- } DUMMYUNIONNAME;
- TCHAR szInfoTitle[64];
- DWORD dwInfoFlags;
-
- GUID guidItem; // _WIN32_IE >= 0x600
-} AWT_NOTIFYICONDATA, *PAWT_NOTIFYICONDATA;
-
-
/************************************************************************
* AwtTrayIcon class
*/
@@ -174,7 +128,7 @@
static int sm_instCount;
private:
- AWT_NOTIFYICONDATA m_nid;
+ NOTIFYICONDATA m_nid;
/* A bitmask keeps the button's numbers as MK_LBUTTON, MK_MBUTTON, MK_RBUTTON
* which are allowed to
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_Unicode.cpp
--- a/jdk/src/windows/native/sun/windows/awt_Unicode.cpp Wed Jul 05 16:46:57 2017 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright 1996-2003 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-#include "awt.h"
-
-LPWSTR J2WHelper1(LPWSTR lpw, LPWSTR lpj, int offset, int nChars) {
- memcpy(lpw, lpj + offset, nChars*2);
- lpw[nChars] = '\0';
- return lpw;
-}
-
-LPWSTR JNI_J2WHelper1(JNIEnv *env, LPWSTR lpwstr, jstring jstr) {
-
- int len = env->GetStringLength(jstr);
-
- env->GetStringRegion(jstr, 0, len, lpwstr);
- lpwstr[len] = '\0';
-
- return lpwstr;
-}
-
-LPWSTR J2WHelper(LPWSTR lpw, LPWSTR lpj, int nChars) {
- return J2WHelper1(lpw, lpj, 0, nChars);
-}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_Unicode.h
--- a/jdk/src/windows/native/sun/windows/awt_Unicode.h Wed Jul 05 16:46:57 2017 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
- * Copyright 1996-2003 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-/*
- * Unicode to ANSI string conversion macros, based on a slide from a
- * presentation by Asmus Freytag. These must be macros, since the
- * alloca() has to be in the caller's stack space.
- */
-
-#ifndef AWT_UNICODE_H
-#define AWT_UNICODE_H
-
-#include
-
-// Get a Unicode string copy of a Java String object (Java String aren't
-// null-terminated).
-extern LPWSTR J2WHelper(LPWSTR lpw, LPWSTR lpj, int nChars);
-extern LPWSTR J2WHelper1(LPWSTR lpw, LPWSTR lpj, int offset, int nChars);
-
-extern LPWSTR JNI_J2WHelper1(JNIEnv *env, LPWSTR lpw, jstring jstr);
-
-#define TO_WSTRING(jstr) \
- ((jstr == NULL) ? NULL : \
- (JNI_J2WHelper1(env, (LPWSTR) alloca((env->GetStringLength(jstr)+1)*2), \
- jstr) \
- ))
-
-#endif // AWT_UNICODE_H
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_Win32GraphicsConfig.cpp
--- a/jdk/src/windows/native/sun/windows/awt_Win32GraphicsConfig.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_Win32GraphicsConfig.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 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
@@ -23,12 +23,12 @@
* have any questions.
*/
-#include
#include "awt.h"
#include
#include "awt_Win32GraphicsConfig.h"
#include "awt_Canvas.h"
#include "awt_Win32GraphicsDevice.h"
+#include "Devices.h"
//Info for building a ColorModel
#include "java_awt_image_DataBuffer.h"
@@ -93,8 +93,8 @@
clazz = env->FindClass("java/awt/Rectangle");
mid = env->GetMethodID(clazz, "", "(IIII)V");
if (mid != 0) {
- RECT rRW = {0,0,0,0};
- if( TRUE == ::MonitorBounds(AwtWin32GraphicsDevice::GetMonitor(screen), &rRW) ) {
+ RECT rRW = {0, 0, 0, 0};
+ if (TRUE == MonitorBounds(AwtWin32GraphicsDevice::GetMonitor(screen), &rRW)) {
bounds = env->NewObject(clazz, mid,
rRW.left, rRW.top,
rRW.right - rRW.left,
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp
--- a/jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -37,19 +37,17 @@
* array index.
*/
-#include
-#include
#include
#include
#include "awt_Canvas.h"
#include "awt_Win32GraphicsDevice.h"
+#include "awt_Window.h"
#include "java_awt_Transparency.h"
#include "java_awt_color_ColorSpace.h"
#include "sun_awt_Win32GraphicsDevice.h"
#include "java_awt_image_DataBuffer.h"
#include "dither.h"
#include "img_util_md.h"
-#include "awt_dlls.h"
#include "Devices.h"
uns_ordered_dither_array img_oda_alpha;
@@ -72,7 +70,7 @@
* device, and information on whether the primary device is palettized.
*/
AwtWin32GraphicsDevice::AwtWin32GraphicsDevice(int screen,
- MHND mhnd, Devices *arr)
+ HMONITOR mhnd, Devices *arr)
{
this->screen = screen;
this->devicesArray = arr;
@@ -83,8 +81,8 @@
cData = NULL;
gpBitmapInfo = NULL;
monitor = mhnd;
- pMonitorInfo = (PMONITOR_INFO)new MONITOR_INFO_EXTENDED;
- pMonitorInfo->dwSize = sizeof(MONITOR_INFO_EXTENDED);
+ pMonitorInfo = new MONITORINFOEX;
+ pMonitorInfo->cbSize = sizeof(MONITORINFOEX);
::GetMonitorInfo(monitor, pMonitorInfo);
// Set primary device info: other devices will need to know
@@ -93,7 +91,7 @@
HDC hDC = this->GetDC();
colorData->bitsperpixel = ::GetDeviceCaps(hDC, BITSPIXEL);
this->ReleaseDC(hDC);
- if (MONITOR_INFO_FLAG_PRIMARY & pMonitorInfo->dwFlags) {
+ if (MONITORINFOF_PRIMARY & pMonitorInfo->dwFlags) {
primaryIndex = screen;
if (colorData->bitsperpixel > 8) {
primaryPalettized = FALSE;
@@ -124,6 +122,24 @@
}
}
+HDC AwtWin32GraphicsDevice::MakeDCFromMonitor(HMONITOR hmMonitor) {
+ HDC retCode = NULL;
+ if (NULL != hmMonitor) {
+ MONITORINFOEX mieInfo;
+
+ memset((void*)(&mieInfo), 0, sizeof(MONITORINFOEX));
+ mieInfo.cbSize = sizeof(MONITORINFOEX);
+
+ if (TRUE == ::GetMonitorInfo(hmMonitor, (LPMONITORINFOEX)(&mieInfo))) {
+ HDC hDC = CreateDC(mieInfo.szDevice, NULL, NULL, NULL);
+ if (NULL != hDC) {
+ retCode = hDC;
+ }
+ }
+ }
+ return retCode;
+}
+
HDC AwtWin32GraphicsDevice::GetDC()
{
return MakeDCFromMonitor(monitor);
@@ -164,7 +180,7 @@
VERIFY(::GetDIBits(hBMDC, hBM, 0, 1, NULL, gpBitmapInfo, DIB_RGB_COLORS));
if (colorData->bitsperpixel > 8) {
- if (MONITOR_INFO_FLAG_PRIMARY & pMonitorInfo->dwFlags) {
+ if (MONITORINFOF_PRIMARY & pMonitorInfo->dwFlags) {
primaryPalettized = FALSE;
}
if (colorData->bitsperpixel != 24) { // 15, 16, or 32 bpp
@@ -250,7 +266,7 @@
((int *)gpBitmapInfo->bmiColors)[2] = 0xff0000;
}
} else {
- if (MONITOR_INFO_FLAG_PRIMARY & pMonitorInfo->dwFlags) {
+ if (MONITORINFOF_PRIMARY & pMonitorInfo->dwFlags) {
primaryPalettized = TRUE;
}
gpBitmapInfo->bmiHeader.biBitCount = 8;
@@ -565,8 +581,8 @@
*/
int AwtWin32GraphicsDevice::DeviceIndexForWindow(HWND hWnd)
{
- MHND mon = MonitorFromWindow(hWnd, MONITOR_DEFAULT_TO_NEAR);
- int screen = AwtWin32GraphicsDevice::GetScreenFromMHND(mon);
+ HMONITOR mon = MonitorFromWindow(hWnd, MONITOR_DEFAULTTONEAREST);
+ int screen = AwtWin32GraphicsDevice::GetScreenFromHMONITOR(mon);
return screen;
}
@@ -645,14 +661,14 @@
return devices->GetDevice(deviceIndex)->GetColorModel(env, dynamic);
}
-MONITOR_INFO *AwtWin32GraphicsDevice::GetMonitorInfo(int deviceIndex)
+LPMONITORINFO AwtWin32GraphicsDevice::GetMonitorInfo(int deviceIndex)
{
Devices::InstanceAccess devices;
return devices->GetDevice(deviceIndex)->GetMonitorInfo();
}
/**
- * This function updates the data in the MONITOR_INFO structure pointed to by
+ * This function updates the data in the MONITORINFOEX structure pointed to by
* pMonitorInfo for all monitors on the system. Added for 4654713.
*/
void AwtWin32GraphicsDevice::ResetAllMonitorInfo()
@@ -660,14 +676,14 @@
Devices::InstanceAccess devices;
int devicesNum = devices->GetNumDevices();
for (int deviceIndex = 0; deviceIndex < devicesNum; deviceIndex++) {
- MHND monitor = devices->GetDevice(deviceIndex)->GetMonitor();
+ HMONITOR monitor = devices->GetDevice(deviceIndex)->GetMonitor();
::GetMonitorInfo(monitor,
devices->GetDevice(deviceIndex)->pMonitorInfo);
}
}
void AwtWin32GraphicsDevice::DisableOffscreenAccelerationForDevice(
- MHND hMonitor)
+ HMONITOR hMonitor)
{
Devices::InstanceAccess devices;
if (hMonitor == NULL) {
@@ -682,7 +698,7 @@
}
}
-MHND AwtWin32GraphicsDevice::GetMonitor(int deviceIndex)
+HMONITOR AwtWin32GraphicsDevice::GetMonitor(int deviceIndex)
{
Devices::InstanceAccess devices;
return devices->GetDevice(deviceIndex)->GetMonitor();
@@ -741,30 +757,31 @@
return MakeDCFromMonitor(dev->GetMonitor());
}
-/** Compare elements of MONITOR_INFO structures for the given MHNDs.
+/** Compare elements of MONITORINFOEX structures for the given HMONITORs.
* If equal, return TRUE
*/
-BOOL AwtWin32GraphicsDevice::AreSameMonitors(MHND mon1, MHND mon2) {
+BOOL AwtWin32GraphicsDevice::AreSameMonitors(HMONITOR mon1, HMONITOR mon2) {
J2dTraceLn2(J2D_TRACE_INFO,
"AwtWin32GraphicsDevice::AreSameMonitors mhnd1=%x mhnd2=%x",
mon1, mon2);
DASSERT(mon1 != NULL);
DASSERT(mon2 != NULL);
- MONITOR_INFO mi1;
- MONITOR_INFO mi2;
+ MONITORINFOEX mi1;
+ MONITORINFOEX mi2;
+
+ memset((void*)(&mi1), 0, sizeof(MONITORINFOEX));
+ mi1.cbSize = sizeof(MONITORINFOEX);
+ memset((void*)(&mi2), 0, sizeof(MONITORINFOEX));
+ mi2.cbSize = sizeof(MONITORINFOEX);
- memset((void*)(&mi1),0,sizeof(MONITOR_INFO));
- mi1.dwSize = sizeof(MONITOR_INFO);
- memset((void*)(&mi2),0,sizeof(MONITOR_INFO));
- mi2.dwSize = sizeof(MONITOR_INFO);
-
- if (::GetMonitorInfo(mon1,&mi1) != 0 &&
- ::GetMonitorInfo(mon2,&mi2) != 0 ) {
-
- if (::EqualRect(&mi1.rMonitor,&mi2.rMonitor) &&
- ::EqualRect(&mi1.rWork,&mi2.rWork) &&
- mi1.dwFlags == mi1.dwFlags) {
+ if (::GetMonitorInfo(mon1, &mi1) != 0 &&
+ ::GetMonitorInfo(mon2, &mi2) != 0 )
+ {
+ if (::EqualRect(&mi1.rcMonitor, &mi2.rcMonitor) &&
+ ::EqualRect(&mi1.rcWork, &mi2.rcWork) &&
+ (mi1.dwFlags == mi1.dwFlags))
+ {
J2dTraceLn(J2D_TRACE_VERBOSE, " the monitors are the same");
return TRUE;
@@ -774,15 +791,15 @@
return FALSE;
}
-int AwtWin32GraphicsDevice::GetScreenFromMHND(MHND mon) {
+int AwtWin32GraphicsDevice::GetScreenFromHMONITOR(HMONITOR mon) {
J2dTraceLn1(J2D_TRACE_INFO,
- "AwtWin32GraphicsDevice::GetScreenFromMHND mhnd=%x", mon);
+ "AwtWin32GraphicsDevice::GetScreenFromHMONITOR mhnd=%x", mon);
DASSERT(mon != NULL);
Devices::InstanceAccess devices;
for (int i = 0; i < devices->GetNumDevices(); i++) {
- MHND mhnd = devices->GetDevice(i)->GetMonitor();
+ HMONITOR mhnd = devices->GetDevice(i)->GetMonitor();
if (AreSameMonitors(mon, mhnd)) {
J2dTraceLn1(J2D_TRACE_VERBOSE, " Found device: %d", i);
return i;
@@ -790,8 +807,8 @@
}
J2dTraceLn1(J2D_TRACE_WARNING,
- "AwtWin32GraphicsDevice::GetScreenFromMHND(): "\
- "couldn't find screen for MHND %x, returning default", mon);
+ "AwtWin32GraphicsDevice::GetScreenFromHMONITOR(): "\
+ "couldn't find screen for HMONITOR %x, returning default", mon);
return AwtWin32GraphicsDevice::GetDefaultDeviceIndex();
}
@@ -1076,19 +1093,19 @@
* of the structure pointed to by lpDisplayDevice is undefined.
*/
static BOOL
-GetAttachedDisplayDevice(int screen, _DISPLAY_DEVICE *lpDisplayDevice)
+GetAttachedDisplayDevice(int screen, DISPLAY_DEVICE *lpDisplayDevice)
{
DWORD dwDeviceNum = 0;
- lpDisplayDevice->dwSize = sizeof(_DISPLAY_DEVICE);
+ lpDisplayDevice->cb = sizeof(DISPLAY_DEVICE);
while (EnumDisplayDevices(NULL, dwDeviceNum, lpDisplayDevice, 0) &&
dwDeviceNum < 20) // avoid infinite loop with buggy drivers
{
- if (lpDisplayDevice->dwFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) {
+ if (lpDisplayDevice->StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) {
Devices::InstanceAccess devices;
- MONITOR_INFO_EXTENDED *pMonInfo =
- (PMONITOR_INFO_EXTENDED) devices->GetDevice(screen)->GetMonitorInfo();
+ MONITORINFOEX *pMonInfo =
+ (LPMONITORINFOEX)devices->GetDevice(screen)->GetMonitorInfo();
// make sure the device names match
- if (wcscmp(pMonInfo->strDevice, lpDisplayDevice->strDevName) == 0) {
+ if (wcscmp(pMonInfo->szDevice, lpDisplayDevice->DeviceName) == 0) {
return TRUE;
}
}
@@ -1114,9 +1131,9 @@
dm.dmSize = sizeof(dm);
dm.dmDriverExtra = 0;
- _DISPLAY_DEVICE displayDevice;
+ DISPLAY_DEVICE displayDevice;
if (GetAttachedDisplayDevice(screen, &displayDevice)) {
- pName = displayDevice.strDevName;
+ pName = displayDevice.DeviceName;
}
if (!EnumDisplaySettings(pName, ENUM_CURRENT_SETTINGS, &dm))
{
@@ -1156,7 +1173,7 @@
// ChangeDisplaySettingsEx is not available on NT,
// so it'd be nice not to break it if we can help it.
if (screen == AwtWin32GraphicsDevice::GetDefaultDeviceIndex()) {
- if (ChangeDisplaySettings(&dm, CDS_FULLSCREEN) !=
+ if (::ChangeDisplaySettings(&dm, CDS_FULLSCREEN) !=
DISP_CHANGE_SUCCESSFUL)
{
JNU_ThrowInternalError(env,
@@ -1165,15 +1182,9 @@
return;
}
- // make sure the function pointer for fn_change_display_settings_ex
- // is initialized
- load_user_procs();
-
- _DISPLAY_DEVICE displayDevice;
- if (fn_change_display_settings_ex == NULL ||
- !GetAttachedDisplayDevice(screen, &displayDevice) ||
- ((*fn_change_display_settings_ex)
- (displayDevice.strDevName, &dm, NULL, CDS_FULLSCREEN, NULL) !=
+ DISPLAY_DEVICE displayDevice;
+ if (!GetAttachedDisplayDevice(screen, &displayDevice) ||
+ (::ChangeDisplaySettingsEx(displayDevice.DeviceName, &dm, NULL, CDS_FULLSCREEN, NULL) !=
DISP_CHANGE_SUCCESSFUL))
{
JNU_ThrowInternalError(env,
@@ -1231,11 +1242,11 @@
DEVMODE dm;
LPTSTR pName = NULL;
- _DISPLAY_DEVICE displayDevice;
+ DISPLAY_DEVICE displayDevice;
if (GetAttachedDisplayDevice(screen, &displayDevice)) {
- pName = displayDevice.strDevName;
+ pName = displayDevice.DeviceName;
}
dm.dmSize = sizeof(dm);
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.h
--- a/jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.h Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.h Wed Jul 05 16:47:27 2017 +0200
@@ -32,7 +32,6 @@
} // extern "C"
#include "colordata.h"
#include "awt_Palette.h"
-#include "awt_MMStub.h"
#include "Devices.h"
class AwtPalette;
@@ -40,7 +39,7 @@
class AwtWin32GraphicsDevice {
public:
- AwtWin32GraphicsDevice(int screen, MHND mhnd, Devices *arr);
+ AwtWin32GraphicsDevice(int screen, HMONITOR mhnd, Devices *arr);
~AwtWin32GraphicsDevice();
void UpdateDeviceColorState();
void SetGrayness(int grayValue);
@@ -60,8 +59,8 @@
HPALETTE GetPalette();
ColorData *GetColorData() { return cData; }
int GetBitDepth() { return colorData->bitsperpixel; }
- MHND GetMonitor() { return monitor; }
- MONITOR_INFO *GetMonitorInfo() { return pMonitorInfo; }
+ HMONITOR GetMonitor() { return monitor; }
+ LPMONITORINFO GetMonitorInfo() { return pMonitorInfo; }
jobject GetJavaDevice() { return javaDevice; }
int GetDeviceIndex() { return screen; }
void Release();
@@ -78,14 +77,14 @@
static void UpdateDynamicColorModel(int deviceIndex);
static BOOL UpdateSystemPalette(int deviceIndex);
static HPALETTE GetPalette(int deviceIndex);
- static MHND GetMonitor(int deviceIndex);
- static MONITOR_INFO *GetMonitorInfo(int deviceIndex);
+ static HMONITOR GetMonitor(int deviceIndex);
+ static LPMONITORINFO GetMonitorInfo(int deviceIndex);
static void ResetAllMonitorInfo();
static BOOL IsPrimaryPalettized() { return primaryPalettized; }
static int GetDefaultDeviceIndex() { return primaryIndex; }
- static void DisableOffscreenAccelerationForDevice(MHND hMonitor);
+ static void DisableOffscreenAccelerationForDevice(HMONITOR hMonitor);
static HDC GetDCFromScreen(int screen);
- static int GetScreenFromMHND(MHND mon);
+ static int GetScreenFromHMONITOR(HMONITOR mon);
static int primaryIndex;
static BOOL primaryPalettized;
@@ -97,17 +96,19 @@
static jmethodID paletteChangedMID;
private:
- static BOOL AreSameMonitors(MHND mon1, MHND mon2);
+ static BOOL AreSameMonitors(HMONITOR mon1, HMONITOR mon2);
ImgColorData *colorData;
AwtPalette *palette;
ColorData *cData; // Could be static, but may sometime
// have per-device info in this structure
BITMAPINFO *gpBitmapInfo;
int screen;
- MHND monitor;
- MONITOR_INFO *pMonitorInfo;
+ HMONITOR monitor;
+ LPMONITORINFO pMonitorInfo;
jobject javaDevice;
Devices *devicesArray;
+
+ static HDC MakeDCFromMonitor(HMONITOR);
};
#endif AWT_WIN32GRAPHICSDEVICE_H
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_Win32GraphicsEnv.cpp
--- a/jdk/src/windows/native/sun/windows/awt_Win32GraphicsEnv.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_Win32GraphicsEnv.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -23,8 +23,6 @@
* have any questions.
*/
-#include
-#include
#include
#include
#include "awt_Canvas.h"
@@ -188,44 +186,6 @@
return AwtWin32GraphicsDevice::GetDefaultDeviceIndex();
}
-#define FR_PRIVATE 0x10 /* from wingdi.h */
-typedef int (WINAPI *AddFontResourceExType)(LPCTSTR,DWORD,VOID*);
-typedef int (WINAPI *RemoveFontResourceExType)(LPCTSTR,DWORD,VOID*);
-
-static AddFontResourceExType procAddFontResourceEx = NULL;
-static RemoveFontResourceExType procRemoveFontResourceEx = NULL;
-
-static int winVer = -1;
-
-static int getWinVer() {
- if (winVer == -1) {
- OSVERSIONINFO osvi;
- osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
- GetVersionEx(&osvi);
- winVer = osvi.dwMajorVersion;
- if (winVer >= 5) {
- // REMIND verify on 64 bit windows
- HMODULE hGDI = LoadLibrary(TEXT("gdi32.dll"));
- if (hGDI != NULL) {
- procAddFontResourceEx =
- (AddFontResourceExType)GetProcAddress(hGDI,"AddFontResourceExW");
- if (procAddFontResourceEx == NULL) {
- winVer = 0;
- }
- procRemoveFontResourceEx =
- (RemoveFontResourceExType)GetProcAddress(hGDI,
- "RemoveFontResourceExW");
- if (procRemoveFontResourceEx == NULL) {
- winVer = 0;
- }
- FreeLibrary(hGDI);
- }
- }
- }
-
- return winVer;
-}
-
/*
* Class: sun_awt_Win32GraphicsEnvironment
* Method: registerFontWithPlatform
@@ -236,9 +196,10 @@
jclass cl,
jstring fontName)
{
- if (getWinVer() >= 5 && procAddFontResourceEx != NULL) {
- LPTSTR file = (LPTSTR)JNU_GetStringPlatformChars(env, fontName, NULL);
- (*procAddFontResourceEx)(file, FR_PRIVATE, NULL);
+ LPTSTR file = (LPTSTR)JNU_GetStringPlatformChars(env, fontName, JNI_FALSE);
+ if (file) {
+ ::AddFontResourceEx(file, FR_PRIVATE, NULL);
+ JNU_ReleaseStringPlatformChars(env, fontName, file);
}
}
@@ -255,9 +216,10 @@
jclass cl,
jstring fontName)
{
- if (getWinVer() >= 5 && procRemoveFontResourceEx != NULL) {
- LPTSTR file = (LPTSTR)JNU_GetStringPlatformChars(env, fontName, NULL);
- (*procRemoveFontResourceEx)(file, FR_PRIVATE, NULL);
+ LPTSTR file = (LPTSTR)JNU_GetStringPlatformChars(env, fontName, JNI_FALSE);
+ if (file) {
+ ::RemoveFontResourceEx(file, FR_PRIVATE, NULL);
+ JNU_ReleaseStringPlatformChars(env, fontName, file);
}
}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_Window.cpp
--- a/jdk/src/windows/native/sun/windows/awt_Window.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awt_Window.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -23,7 +23,7 @@
* have any questions.
*/
-#include
+#include "awt.h"
#include "awt_Component.h"
#include "awt_Container.h"
@@ -32,7 +32,6 @@
#include "awt_Panel.h"
#include "awt_Toolkit.h"
#include "awt_Window.h"
-#include "awt_dlls.h"
#include "awt_Win32GraphicsDevice.h"
#include "awt_BitmapUtil.h"
#include "awt_IconCursor.h"
@@ -42,6 +41,8 @@
#include
#include "sun_awt_windows_WCanvasPeer.h"
+#include
+
#if !defined(__int3264)
typedef __int32 LONG_PTR;
#endif // __int3264
@@ -501,8 +502,7 @@
// which might involve tagging java.awt.Window instances with a semantic
// property so platforms can animate/decorate/etc accordingly.
//
- if ((IS_WIN98 || IS_WIN2000) &&
- JNU_IsInstanceOfByName(env, target, "com/sun/java/swing/plaf/windows/WindowsPopupWindow") > 0)
+ if (JNU_IsInstanceOfByName(env, target, "com/sun/java/swing/plaf/windows/WindowsPopupWindow") > 0)
{
// need this global ref to make the class unloadable (see 6500204)
static jclass windowsPopupWindowCls;
@@ -535,13 +535,8 @@
windowType = env->GetIntField(target, windowTypeFID);
if (windowType == windowTYPES[TOOLTIP]) {
- if (IS_WIN2000) {
- SystemParametersInfo(SPI_GETTOOLTIPANIMATION, 0, &animateflag, 0);
- SystemParametersInfo(SPI_GETTOOLTIPFADE, 0, &fadeflag, 0);
- } else {
- // use same setting as menus
- SystemParametersInfo(SPI_GETMENUANIMATION, 0, &animateflag, 0);
- }
+ SystemParametersInfo(SPI_GETTOOLTIPANIMATION, 0, &animateflag, 0);
+ SystemParametersInfo(SPI_GETTOOLTIPFADE, 0, &fadeflag, 0);
if (animateflag) {
// AW_BLEND currently produces runtime parameter error
// animateStyle = fadeflag? AW_BLEND : AW_SLIDE | AW_VER_POSITIVE;
@@ -551,13 +546,10 @@
windowType == windowTYPES[POPUPMENU]) {
SystemParametersInfo(SPI_GETMENUANIMATION, 0, &animateflag, 0);
if (animateflag) {
-
- if (IS_WIN2000) {
- SystemParametersInfo(SPI_GETMENUFADE, 0, &fadeflag, 0);
- if (fadeflag) {
- // AW_BLEND currently produces runtime parameter error
- //animateStyle = AW_BLEND;
- }
+ SystemParametersInfo(SPI_GETMENUFADE, 0, &fadeflag, 0);
+ if (fadeflag) {
+ // AW_BLEND currently produces runtime parameter error
+ //animateStyle = AW_BLEND;
}
if (animateStyle == 0 && !fadeflag) {
animateStyle = AW_SLIDE;
@@ -578,38 +570,18 @@
}
if (animateStyle != 0) {
- load_user_procs();
-
- if (fn_animate_window != NULL) {
- BOOL result = (*fn_animate_window)(hWnd, (DWORD)200, animateStyle);
- if (result == 0) {
- LPTSTR msgBuffer = NULL;
- FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
- FORMAT_MESSAGE_FROM_SYSTEM |
- FORMAT_MESSAGE_IGNORE_INSERTS,
- NULL,
- GetLastError(),
- MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
- (LPTSTR)&msgBuffer, // it's an output parameter when allocate buffer is used
- 0,
- NULL);
-
- if (msgBuffer == NULL) {
- msgBuffer = TEXT("");
- }
- _ftprintf(stderr,TEXT("AwtWindow::Show: AnimateWindow: "));
- _ftprintf(stderr,msgBuffer);
- LocalFree(msgBuffer);
- } else {
- // WM_PAINT is not automatically sent when invoking AnimateWindow,
- // so force an expose event
- RECT rect;
- ::GetWindowRect(hWnd,&rect);
- ::ScreenToClient(hWnd, (LPPOINT)&rect);
- ::InvalidateRect(hWnd,&rect,TRUE);
- ::UpdateWindow(hWnd);
- done = TRUE;
- }
+ BOOL result = ::AnimateWindow(hWnd, (DWORD)200, animateStyle);
+ if (!result) {
+ // TODO: log message
+ } else {
+ // WM_PAINT is not automatically sent when invoking AnimateWindow,
+ // so force an expose event
+ RECT rect;
+ ::GetWindowRect(hWnd,&rect);
+ ::ScreenToClient(hWnd, (LPPOINT)&rect);
+ ::InvalidateRect(hWnd, &rect, TRUE);
+ ::UpdateWindow(hWnd);
+ done = TRUE;
}
}
}
@@ -1205,16 +1177,17 @@
}
/* draw warning text */
- LPWSTR text = TO_WSTRING(warningString);
+ LPCWSTR text = JNU_GetStringPlatformChars(env, warningString, NULL);
VERIFY(::SetBkColor(hDC, ::GetSysColor(COLOR_BTNFACE)) != CLR_INVALID);
VERIFY(::SetTextColor(hDC, ::GetSysColor(COLOR_BTNTEXT)) != CLR_INVALID);
VERIFY(::SelectObject(hDC, ::GetStockObject(DEFAULT_GUI_FONT)) != NULL);
VERIFY(::SetTextAlign(hDC, TA_LEFT | TA_BOTTOM) != GDI_ERROR);
- VERIFY(::ExtTextOutW(hDC, r.left+2, r.bottom-1,
+ VERIFY(::ExtTextOut(hDC, r.left+2, r.bottom-1,
ETO_CLIPPED | ETO_OPAQUE,
&r, text, static_cast(wcslen(text)), NULL));
VERIFY(::RestoreDC(hDC, iSaveDC));
::ReleaseDC(GetHWnd(), hDC);
+ JNU_ReleaseStringPlatformChars(env, warningString, text);
}
env->DeleteLocalRef(target);
@@ -1360,13 +1333,13 @@
}
int AwtWindow::GetScreenImOn() {
- MHND hmon;
+ HMONITOR hmon;
int scrnNum;
- hmon = ::MonitorFromWindow(GetHWnd(), MONITOR_DEFAULT_TO_PRIMARY);
+ hmon = ::MonitorFromWindow(GetHWnd(), MONITOR_DEFAULTTOPRIMARY);
DASSERT(hmon != NULL);
- scrnNum = AwtWin32GraphicsDevice::GetScreenFromMHND(hmon);
+ scrnNum = AwtWin32GraphicsDevice::GetScreenFromHMONITOR(hmon);
DASSERT(scrnNum > -1);
return scrnNum;
@@ -1619,10 +1592,10 @@
if (::IsWindow(w->GetHWnd()))
{
int length = env->GetStringLength(title);
- WCHAR *buffer = new WCHAR[length + 1];
- env->GetStringRegion(title, 0, length, buffer);
+ TCHAR *buffer = new TCHAR[length + 1];
+ env->GetStringRegion(title, 0, length, reinterpret_cast(buffer));
buffer[length] = L'\0';
- VERIFY(::SetWindowTextW(w->GetHWnd(), buffer));
+ VERIFY(::SetWindowText(w->GetHWnd(), buffer));
delete[] buffer;
}
ret:
@@ -1967,13 +1940,11 @@
window->m_isFocusableWindow = isFocusableWindow;
- if (IS_WIN2000) {
- if (!window->m_isFocusableWindow) {
- LONG isPopup = window->GetStyle() & WS_POPUP;
- window->SetStyleEx(window->GetStyleEx() | (isPopup ? 0 : WS_EX_APPWINDOW) | AWT_WS_EX_NOACTIVATE);
- } else {
- window->SetStyleEx(window->GetStyleEx() & ~WS_EX_APPWINDOW & ~AWT_WS_EX_NOACTIVATE);
- }
+ if (!window->m_isFocusableWindow) {
+ LONG isPopup = window->GetStyle() & WS_POPUP;
+ window->SetStyleEx(window->GetStyleEx() | (isPopup ? 0 : WS_EX_APPWINDOW) | AWT_WS_EX_NOACTIVATE);
+ } else {
+ window->SetStyleEx(window->GetStyleEx() & ~WS_EX_APPWINDOW & ~AWT_WS_EX_NOACTIVATE);
}
ret:
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_dlls.cpp
--- a/jdk/src/windows/native/sun/windows/awt_dlls.cpp Wed Jul 05 16:46:57 2017 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,422 +0,0 @@
-/*
- * Copyright 1999-2003 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-#include "awt.h"
-#include "awt_dlls.h"
-
-/*
- * To reduce memory footprint we don't statically link to COMDLG32.DLL
- * and SHELL32. Instead we programatically load them only when they are
- * needed.
- */
-
-PrintDlgType AwtCommDialog::do_print_dlg;
-PageSetupDlgType AwtCommDialog::do_page_setup_dlg;
-GetOpenFileNameType AwtCommDialog::get_open_file_name;
-GetSaveFileNameType AwtCommDialog::get_save_file_name;
-GetExtendedErrorType AwtCommDialog::get_dlg_extended_error;
-
-/***********************************************************************/
-
-DWORD
-AwtCommDialog::CommDlgExtendedError(VOID) {
- AwtCommDialog::load_comdlg_procs();
- return static_cast(reinterpret_cast(
- AwtToolkit::GetInstance().
- InvokeFunction(reinterpret_cast
- (AwtCommDialog::GetExtendedErrorWrapper))));
-}
-
-BOOL
-AwtCommDialog::PrintDlg(LPPRINTDLG data) {
- AwtCommDialog::load_comdlg_procs();
- return static_cast(reinterpret_cast(
- AwtToolkit::GetInstance().
- InvokeFunction(reinterpret_cast
- (AwtCommDialog::PrintDlgWrapper), data)));
-}
-
-BOOL
-AwtCommDialog::PageSetupDlg(LPPAGESETUPDLG data) {
- AwtCommDialog::load_comdlg_procs();
- return static_cast(reinterpret_cast(
- AwtToolkit::GetInstance().
- InvokeFunction(reinterpret_cast
- (AwtCommDialog::PageSetupDlgWrapper), data)));
-}
-
-/*
- * Load the COMDLG32.dll and get pointers to various procedures.
- */
-
-void
-AwtCommDialog::load_comdlg_procs()
-{
- static int initialized = 0;
- HMODULE lib = NULL;
- if (initialized) {
- return;
- }
- lib = LoadLibrary(TEXT("COMDLG32.DLL"));
- HMODULE libUnicows = UnicowsLoader::GetModuleHandle();
- do_print_dlg = (PrintDlgType)GetProcAddress(IS_WIN95 ? libUnicows : lib, "PrintDlgW");
- do_page_setup_dlg = (PageSetupDlgType)GetProcAddress(IS_WIN95 ? libUnicows : lib, "PageSetupDlgW");
- get_open_file_name = (GetOpenFileNameType)GetProcAddress(IS_WIN95 ? libUnicows : lib, "GetOpenFileNameW");
- get_save_file_name = (GetSaveFileNameType)GetProcAddress(IS_WIN95 ? libUnicows : lib, "GetSaveFileNameW");
- get_dlg_extended_error = (GetExtendedErrorType)GetProcAddress(lib, "CommDlgExtendedError");
- initialized = 1;
-}
-
-/***********************************************************************/
-
-DragQueryFileType do_drag_query_file;
-GetPathFromIDListType get_path_from_idlist;
-
-/*
- * Load the SHELL32.dll and get pointers to various procedures.
- */
-
-void
-load_shell_procs()
-{
- static int initialized = 0;
- HMODULE lib = NULL;
- if (initialized) {
- return;
- }
-
- if (IS_WIN95) {
- lib = UnicowsLoader::GetModuleHandle();
- } else {
- lib = LoadLibrary(TEXT("SHELL32.DLL"));
- }
-
- do_drag_query_file = (DragQueryFileType)GetProcAddress(lib, "DragQueryFileW");
- get_path_from_idlist = (GetPathFromIDListType)GetProcAddress(lib,
- "SHGetPathFromIDListW");
- initialized = 1;
-}
-
-/***********************************************************************/
-
-AnimateWindowType fn_animate_window;
-ChangeDisplaySettingsExType fn_change_display_settings_ex;
-
-/*
- * Load the USER32.dll and get pointers to various procedures.
- */
-
-void
-load_user_procs()
-{
- static int initialized = 0;
- HMODULE lib = NULL;
- if (initialized) {
- return;
- }
- lib = LoadLibrary(TEXT("USER32.DLL"));
- HMODULE libUnicows = UnicowsLoader::GetModuleHandle();
- fn_animate_window = (AnimateWindowType)GetProcAddress(lib, "AnimateWindow");
- fn_change_display_settings_ex = (ChangeDisplaySettingsExType)
- GetProcAddress(IS_WIN95 ? libUnicows : lib, "ChangeDisplaySettingsExW");
- initialized = 1;
-}
-
-/***********************************************************************/
-
-GetFileVersionInfoSizeType get_file_version_info_size;
-GetFileVersionInfoType get_file_version_info;
-VerQueryValueType do_ver_query_value;
-
-/*
- * Load the VERSION.dll and get pointers to various procedures.
- */
-
-void
-load_version_procs()
-{
- static int initialized = 0;
- HMODULE lib = NULL;
- if (initialized) {
- return;
- }
-
- if (IS_WIN95) {
- lib = UnicowsLoader::GetModuleHandle();
- } else {
- lib = LoadLibrary(TEXT("VERSION.DLL"));
- }
-
- get_file_version_info_size =
- (GetFileVersionInfoSizeType)GetProcAddress(lib, "GetFileVersionInfoSizeW");
- get_file_version_info =
- (GetFileVersionInfoType)GetProcAddress(lib, "GetFileVersionInfoW");
- do_ver_query_value =
- (VerQueryValueType)GetProcAddress(lib, "VerQueryValueW");
- initialized = 1;
-}
-
-/***********************************************************************/
-
-#define MAX_KNOWN_VERSION 4
-
-/*
- * We are going to use an undocumented procedure RSRC32.DLL.
- * The safest will be to use it only for a finite set of known versions.
- */
-
-DWORD known_versions[MAX_KNOWN_VERSION][2] = {
- { 0x00040000, 0x000003B6 }, // WIN95\RETAIL
- // WIN95\RETAIL\UPGRADE
- // WIN95\OSR2
- // WIN95\OSR25
- // WIN95\international\RETAIL
- // WIN95\international\OSR2
-
- { 0x0004000A, 0x00000672 }, // WIN98\international\win98beta3
-
- { 0x0004000A, 0x000007CE }, // WIN98\RETAIL
- // WIN98\international\RETAIL
- // WIN98\SE
-
- { 0x0004005A, 0x00000BB8 } // WIN98ME
-};
-
-GetFreeSystemResourcesType get_free_system_resources = NULL;
-
-/*
- * Load the RSRC32.dll, check that it is a known version
- * and get the pointer to the undocumented procedure.
- */
-
-void
-load_rsrc32_procs()
-{
- static int initialized = 0;
- if (initialized) {
- return;
- }
- if (IS_NT) {
- // 4310028: Only load library on non-NT systems. The load
- // will always fail anyways. However, if a Win 9x OS is
- // also installed on the system, and the user's path
- // includes C:\WINDOWS\SYSTEM, or the equivalent, a really
- // ugly and annoying warning dialog will appear.
- initialized = 1;
- return;
- }
- HMODULE lib = LoadLibrary(TEXT("RSRC32.DLL"));
- if (lib != NULL) {
- TCHAR szFullPath[_MAX_PATH];
- DWORD dwVerHnd = 0;
- DWORD dwVersionInfoSize;
- LPBYTE lpVersionInfo;
- LPVOID lpBuffer;
- UINT uLength = 0;
-
- /*
- * We use undocumented procedure exported by RSRC32.DLL, so the
- * safest will be to check the library's version and only attempt
- * to get the procedure address if it's a known version.
- */
- if (::GetModuleFileName(lib, szFullPath, sizeof(szFullPath))) {
- load_version_procs();
- dwVersionInfoSize = (*get_file_version_info_size)(szFullPath, &dwVerHnd);
- if (dwVersionInfoSize) {
- lpVersionInfo = new BYTE[dwVersionInfoSize];
- (*get_file_version_info)(szFullPath, dwVerHnd,
- dwVersionInfoSize, lpVersionInfo);
- if ((*do_ver_query_value)(lpVersionInfo, TEXT("\\"), &lpBuffer, &uLength)) {
- VS_FIXEDFILEINFO *lpvsFixedFileInfo = (VS_FIXEDFILEINFO *)lpBuffer;
- DWORD dwFileVersionMS = lpvsFixedFileInfo->dwFileVersionMS;
- DWORD dwFileVersionLS = lpvsFixedFileInfo->dwFileVersionLS;
- for (int i = 0; i < MAX_KNOWN_VERSION; i++) {
- if ((known_versions[i][0] == dwFileVersionMS) &&
- (known_versions[i][1] == dwFileVersionLS)) {
- get_free_system_resources =
- (GetFreeSystemResourcesType)
- ::GetProcAddress(lib, "_MyGetFreeSystemResources32@4");
- break;
- }
- }
- }
- delete[] lpVersionInfo;
- }
- }
- }
- initialized = 1;
-}
-
-void
-load_rich_edit_library() {
- static int initialized = 0;
- BOOL isRichEdit32Needed = IS_WIN95 && !IS_WIN98;
-
- if (initialized) {
- return;
- }
-
- HMODULE lib = NULL;
- if (isRichEdit32Needed) {
- lib = ::LoadLibrary(TEXT("RICHED32.DLL"));
- } else {
- lib = ::LoadLibrary(TEXT("RICHED20.DLL"));
- }
- if (lib == NULL) {
- JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
- JNU_ThrowInternalError(env, "Can't load a rich edit DLL");
- } else if (isRichEdit32Needed) {
- // Richedit language checking logic is needed for RICHED32.DLL only.
- LPTSTR szFullPath = new TCHAR[_MAX_PATH];
- DWORD dwVerHnd = 0;
- DWORD dwVersionInfoSize;
- LPVOID lpVersionInfo;
- UINT uLength = 0;
- struct LANGANDCODEPAGE {
- WORD wLanguage;
- WORD wCodePage;
- } *lpTranslate;
-
- try {
- if (!IS_WIN2000 && ::GetModuleFileName(lib, szFullPath, _MAX_PATH)) {
- load_version_procs();
- dwVersionInfoSize = (*get_file_version_info_size)(szFullPath, &dwVerHnd);
- if (dwVersionInfoSize) {
- lpVersionInfo = new BYTE[dwVersionInfoSize];
- try {
- if ((*get_file_version_info)(szFullPath,
- dwVerHnd,
- dwVersionInfoSize,
- lpVersionInfo)
- && (*do_ver_query_value)(lpVersionInfo,
- TEXT("\\VarFileInfo\\Translation"),
- (LPVOID*)&lpTranslate,
- &uLength)) {
-
- if (::GetSystemMetrics(SM_DBCSENABLED)
- && LANGIDFROMLCID(::GetThreadLocale()) != lpTranslate[0].wLanguage) {
-
- JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
- if (env->PushLocalFrame(6) >= 0) {
- jstring keystr = env->NewStringUTF("AWT.InconsistentDLLsWarning");
- jstring defstr = env->NewStringUTF(
-"Text based operations may not work correctly due to \
-an inconsistent set of dynamic linking libraries (DLLs) installed on your \
-system. For more information on this problem and a suggested workaround \
-please see the Java(TM) 2 SDK, Standard Edition Release Notes \
-on java.sun.com.");
-
- jstring retstr =
- (jstring) JNU_CallStaticMethodByName(
- env,
- NULL,
- "java/awt/Toolkit",
- "getProperty",
- "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;",
- keystr,
- defstr).l;
-
- jboolean exception;
- jstring pkgstr = env->NewStringUTF("java.awt");
- jobject logger =
- (jobject) JNU_CallStaticMethodByName(
- env,
- &exception,
- "java/util/logging/Logger",
- "getLogger",
- "(Ljava/lang/String;)Ljava/util/logging/Logger;",
- pkgstr).l;
-
- jstring msgstr = (retstr) ? retstr : defstr;
- if (!exception) {
- JNU_CallMethodByName(
- env,
- NULL,
- logger,
- "warning",
- "(Ljava/lang/String;)V",
- msgstr);
- } else {
- LPCTSTR outstr = JNU_GetStringPlatformChars(env, msgstr, NULL);
- _ftprintf(stdout, TEXT("\nWARNING: %s\n"), outstr);
- fflush(stdout);
- JNU_ReleaseStringPlatformChars(env, msgstr, outstr);
- }
-
- env->PopLocalFrame(NULL);
- }
- }
- }
- } catch (...) {
- delete[] lpVersionInfo;
- throw;
- }
- delete[] lpVersionInfo;
- }
- }
- } catch (...) {
- delete[] szFullPath;
- throw;
- }
- delete[] szFullPath;
- }
- initialized = 1;
-}
-
-/***********************************************************************/
-
-bool AwtWinMM::initialized = false;
-AwtWinMM::PlaySoundWFunc* AwtWinMM::playSoundFunc = NULL;
-
-BOOL AwtWinMM::PlaySoundWrapper(LPCTSTR pszSound, HMODULE hmod, DWORD fdwSound) {
- load_winmm_procs();
- if (playSoundFunc == NULL) {
- return FALSE;
- }
- return (*playSoundFunc)(pszSound, hmod, fdwSound);
-}
-
-void AwtWinMM::load_winmm_procs() {
- if (initialized) {
- return;
- }
- HMODULE dll = NULL;
-
- if (IS_WIN95) {
- dll = UnicowsLoader::GetModuleHandle();
- } else {
- dll = ::LoadLibrary(TEXT("winmm.dll"));
- }
-
- if (dll == NULL) {
- return;
- }
- playSoundFunc =
- (PlaySoundWFunc*) GetProcAddress(dll, "PlaySoundW");
- if (playSoundFunc == NULL) {
- return;
- }
- initialized = true;
-}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awt_dlls.h
--- a/jdk/src/windows/native/sun/windows/awt_dlls.h Wed Jul 05 16:46:57 2017 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,173 +0,0 @@
-/*
- * Copyright 1999-2003 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-#ifndef AWT_DLLS_H
-#define AWT_DLLS_H
-
-#include
-#include
-#include
-#include "awt_FileDialog.h"
-#include "awt_PrintDialog.h"
-
-/*
- * To reduce memory footprint we don't statically link to COMDLG32.DLL
- * and SHELL32. Instead we programatically load them only when they are
- * needed.
- */
-
-//---------------------------------------------------------------------------
-
-typedef BOOL (APIENTRY *PrintDlgType)(LPPRINTDLGW);
-typedef BOOL (APIENTRY *PageSetupDlgType)(LPPAGESETUPDLGW);
-typedef BOOL (APIENTRY *GetOpenFileNameType)(LPOPENFILENAMEW);
-typedef BOOL (APIENTRY *GetSaveFileNameType)(LPOPENFILENAMEW);
-typedef DWORD (APIENTRY *GetExtendedErrorType)(VOID);
-
-class AwtCommDialog {
-public:
- static DWORD CommDlgExtendedError(VOID);
-
- static BOOL PrintDlg(LPPRINTDLG data);
-
- static BOOL PageSetupDlg(LPPAGESETUPDLG data);
-
-private:
- static void load_comdlg_procs();
-
- // Use wrapper functions with default calling convention. If the
- // default isn't __stdcall, accessing the Win32 functions directly
- // will cause stack corruption if we cast away __stdcall.
- static BOOL PrintDlgWrapper(LPPRINTDLG data) {
- return (*do_print_dlg)(data);
- }
- static BOOL PageSetupDlgWrapper(LPPAGESETUPDLG data) {
- return (*do_page_setup_dlg)(data);
- }
- static BOOL GetOpenFileNameWrapper(LPOPENFILENAME data) {
- return (*get_open_file_name)(data);
- }
- static BOOL GetSaveFileNameWrapper(LPOPENFILENAME data) {
- return (*get_save_file_name)(data);
- }
- static DWORD GetExtendedErrorWrapper(VOID) {
- return (*get_dlg_extended_error)();
- }
-
- friend BOOL AwtFileDialog::GetOpenFileName(LPAWTOPENFILENAME);
- friend BOOL AwtFileDialog::GetSaveFileName(LPAWTOPENFILENAME);
- friend BOOL AwtPrintDialog::PrintDlg(LPPRINTDLG);
-
- static PrintDlgType do_print_dlg;
- static PageSetupDlgType do_page_setup_dlg;
- static GetOpenFileNameType get_open_file_name;
- static GetSaveFileNameType get_save_file_name;
- static GetExtendedErrorType get_dlg_extended_error;
-};
-
-//---------------------------------------------------------------------------
-
-// Dynamically load in SHELL32.DLL and define the procedure pointers listed below.
-extern void load_shell_procs();
-
-// Procedure pointers obtained from SHELL32.DLL
-// You must call load_shell_procs() before using any of these.
-typedef UINT (APIENTRY *DragQueryFileType)(HDROP,UINT,LPTSTR,UINT);
-typedef BOOL (APIENTRY *GetPathFromIDListType)(LPCITEMIDLIST,LPTSTR);
-extern DragQueryFileType do_drag_query_file;
-extern GetPathFromIDListType get_path_from_idlist;
-
-//---------------------------------------------------------------------------
-
-// Dynamically load in USER32.DLL and define the procedure pointers listed below.
-extern void load_user_procs();
-
-// Procedure pointers obtained from USER32.DLL
-// You must call load_user_procs() before using any of these.
-typedef BOOL (WINAPI *AnimateWindowType)(HWND,DWORD,DWORD);
-typedef LONG (WINAPI *ChangeDisplaySettingsExType)(LPCTSTR,LPDEVMODE,HWND,DWORD,LPVOID lParam);
-extern AnimateWindowType fn_animate_window;
-extern ChangeDisplaySettingsExType fn_change_display_settings_ex;
-
-//---------------------------------------------------------------------------
-
-// Dynamically load in VERSION.DLL and define the procedure pointers listed below.
-extern void load_version_procs();
-
-// Procedure pointers obtained from VERSION.DLL
-// You must call load_version_procs() before using any of these.
-typedef DWORD (APIENTRY *GetFileVersionInfoSizeType)(LPTSTR,LPDWORD);
-typedef BOOL (APIENTRY *GetFileVersionInfoType)(LPTSTR,DWORD,DWORD,LPVOID);
-typedef BOOL (APIENTRY *VerQueryValueType)(const LPVOID,LPTSTR,LPVOID*,PUINT);
-extern GetFileVersionInfoSizeType get_file_version_info_size;
-extern GetFileVersionInfoType get_file_version_info;
-extern VerQueryValueType do_ver_query_value;
-
-//---------------------------------------------------------------------------
-
-// Dynamically load in RSRC32.DLL and define the procedure pointers listed below.
-extern void load_rsrc32_procs();
-
-// Procedure pointers obtained from RSRC32.DLL
-// You must call load_rsrc32_procs() before using this procedure.
-
-/*
- * NOTE: even after load_rsrc32_procs() you must check that
- * the function pointer is valid before use.
- * It will be NULL in three cases:
- * 1.RSRC32.DLL not found. This means that Resource Meter
- * isn't installed.
- * 2.RSRC32.DLL can't be loaded. This happens on WinNT.
- * 3.Unknown version of RSRC32.DLL. This is undocumented
- * procedure, so the safest will be to use it only for
- * a finite set of known versions.
- */
-typedef UINT (APIENTRY *GetFreeSystemResourcesType)(UINT);
-
-extern GetFreeSystemResourcesType get_free_system_resources;
-
-extern void load_rich_edit_library();
-
-//---------------------------------------------------------------------------
-
-/*
- * Loading WINMM.DLL (the Windows MultiMedia library) is extremely
- * expensive. The AWT only uses it to play certain Windows sounds
- * (which are off by default) so we dynamically load it upon demand
- * instead of statically linking to it.
- */
-
-class AwtWinMM {
-public:
- static BOOL PlaySoundWrapper(LPCTSTR pszSound, HMODULE hmod, DWORD fdwSound);
-
-private:
- static void load_winmm_procs();
- static bool initialized;
- typedef BOOL WINAPI PlaySoundWFunc(LPCTSTR pszSound, HMODULE hmod, DWORD fdwSound);
- static PlaySoundWFunc* playSoundFunc;
-};
-
-#endif /* AWT_DLLS_H */
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/awtmsg.h
--- a/jdk/src/windows/native/sun/windows/awtmsg.h Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/awtmsg.h Wed Jul 05 16:47:27 2017 +0200
@@ -182,18 +182,6 @@
#endif //AW_BLEND
-
-
-// WM_MOUSEWHEEL should be WM_MOUSELAST, but
-// is not being defined. See winuser.h
-#ifdef WM_MOUSELAST
-#if WM_MOUSELAST <= 0x020A
-#define WM_AWT_MOUSELAST 0x020A
-#else
-#error Unexpected value of WM_MOUSELAST
-#endif //WM_MOUSELAST <= 0x0209
-#endif //WM_MOUSELAST
-
// AwtComponent messages
enum {
// 6427323: unfortunately WM_APP+nnn conflicts with edit control messages
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/src/windows/native/sun/windows/jawt.cpp
--- a/jdk/src/windows/native/sun/windows/jawt.cpp Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/src/windows/native/sun/windows/jawt.cpp Wed Jul 05 16:47:27 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2001 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 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
@@ -26,6 +26,7 @@
#define _JNI_IMPLEMENTATION_
#include
+#include "awt.h"
#include "awt_DrawingSurface.h"
/*
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/test/java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java Wed Jul 05 16:47:27 2017 +0200
@@ -0,0 +1,136 @@
+/*
+ @test
+ @bug 6304473 6727884
+ @summary Tests that an exception on EDT is handled with ThreadGroup.uncaughtException()
+ @author artem.ananiev: area=awt.eventdispatching
+ @library ../../regtesthelpers
+ @build Util
+ @run main HandleExceptionOnEDT
+*/
+
+import java.awt.*;
+import java.awt.event.*;
+
+import test.java.awt.regtesthelpers.Util;
+
+public class HandleExceptionOnEDT
+{
+ private final static String EXCEPTION_MESSAGE = "A1234567890";
+
+ private static volatile boolean exceptionHandled = false;
+ private static volatile boolean mousePressed = false;
+
+ public static void main(String[] args)
+ {
+ final Thread.UncaughtExceptionHandler eh = new Thread.UncaughtExceptionHandler()
+ {
+ @Override
+ public void uncaughtException(Thread t, Throwable e)
+ {
+ if (e.getMessage().equals(EXCEPTION_MESSAGE))
+ {
+ exceptionHandled = true;
+ }
+ }
+ };
+
+ Frame f = new Frame("F");
+ f.setBounds(100, 100, 400, 300);
+ // set exception handler for EDT
+ f.addWindowListener(new WindowAdapter()
+ {
+ @Override
+ public void windowOpened(WindowEvent we)
+ {
+ Thread edt = Thread.currentThread();
+ edt.setUncaughtExceptionHandler(eh);
+ }
+ });
+ f.setVisible(true);
+
+ Robot r = Util.createRobot();
+ Util.waitForIdle(r);
+
+ // check exception without modal dialog
+ MouseListener exceptionListener = new MouseAdapter()
+ {
+ @Override
+ public void mousePressed(MouseEvent me)
+ {
+ throw new RuntimeException(EXCEPTION_MESSAGE);
+ }
+ };
+ f.addMouseListener(exceptionListener);
+
+ exceptionHandled = false;
+ Point fp = f.getLocationOnScreen();
+ r.mouseMove(fp.x + f.getWidth() / 2, fp.y + f.getHeight() / 2);
+ Util.waitForIdle(r);
+ r.mousePress(InputEvent.BUTTON1_MASK);
+ Util.waitForIdle(r);
+ r.mouseRelease(InputEvent.BUTTON2_MASK);
+ f.removeMouseListener(exceptionListener);
+
+ if (!exceptionHandled)
+ {
+ throw new RuntimeException("Test FAILED: exception is not handled for frame");
+ }
+
+ // check exception with modal dialog
+ final Dialog d = new Dialog(f, "D", true);
+ d.setBounds(fp.x + 100, fp.y + 100, 400, 300);
+ d.addMouseListener(exceptionListener);
+ EventQueue.invokeLater(new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ d.setVisible(true);
+ }
+ });
+ Util.waitForIdle(r);
+
+ exceptionHandled = false;
+ Point dp = d.getLocationOnScreen();
+ r.mouseMove(dp.x + d.getWidth() / 2, dp.y + d.getHeight() / 2);
+ Util.waitForIdle(r);
+ r.mousePress(InputEvent.BUTTON1_MASK);
+ Util.waitForIdle(r);
+ r.mouseRelease(InputEvent.BUTTON2_MASK);
+ d.removeMouseListener(exceptionListener);
+
+ if (!exceptionHandled)
+ {
+ throw new RuntimeException("Test FAILED: exception is not handled for modal dialog");
+ }
+
+ // check the dialog is still modal
+ MouseListener pressedListener = new MouseAdapter()
+ {
+ @Override
+ public void mousePressed(MouseEvent me)
+ {
+ mousePressed = true;
+ }
+ };
+ f.addMouseListener(pressedListener);
+
+ mousePressed = false;
+ r.mouseMove(fp.x + 50, fp.y + 50);
+ Util.waitForIdle(r);
+ r.mousePress(InputEvent.BUTTON1_MASK);
+ Util.waitForIdle(r);
+ r.mouseRelease(InputEvent.BUTTON1_MASK);
+ Util.waitForIdle(r);
+ f.removeMouseListener(pressedListener);
+
+ if (mousePressed)
+ {
+ throw new RuntimeException("Test FAILED: modal dialog is not modal or visible after exception");
+ }
+
+ // test is passed
+ d.dispose();
+ f.dispose();
+ }
+}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/test/java/awt/Frame/FrameSize/TestFrameSize.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/Frame/FrameSize/TestFrameSize.java Wed Jul 05 16:47:27 2017 +0200
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2009 Red Hat, 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.
+ */
+
+/*
+ @test
+ @bug 6721088
+ @summary X11 Window sizes should be what we set them to
+ @author Omair Majid : area=awt.toplevel
+ @run main TestFrameSize
+ */
+
+/**
+ * TestFrameSize.java
+ *
+ * Summary: test that X11 Awt windows are drawn with correct sizes
+ *
+ * Test fails if size of window is wrong
+ */
+
+import java.awt.Dimension;
+import java.awt.Frame;
+
+public class TestFrameSize {
+
+ static Dimension desiredDimensions = new Dimension(200, 200);
+ static int ERROR_MARGIN = 15;
+ static Frame mainWindow;
+
+ public static void drawGui() {
+ mainWindow = new Frame("");
+ mainWindow.setPreferredSize(desiredDimensions);
+ mainWindow.pack();
+
+ Dimension actualDimensions = mainWindow.getSize();
+ System.out.println("Desired dimensions: " + desiredDimensions.toString());
+ System.out.println("Actual dimensions: " + actualDimensions.toString());
+ if (Math.abs(actualDimensions.height - desiredDimensions.height) > ERROR_MARGIN) {
+ throw new RuntimeException("Incorrect widow size");
+ }
+ }
+
+ public static void main(String[] args) {
+ try {
+ drawGui();
+ } finally {
+ if (mainWindow != null) {
+ mainWindow.dispose();
+ }
+ }
+ }
+}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/test/java/awt/Mixing/HWDisappear.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/Mixing/HWDisappear.java Wed Jul 05 16:47:27 2017 +0200
@@ -0,0 +1,426 @@
+/*
+ * Copyright 2009 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 %W% %E%
+ @bug 6769511
+ @summary AWT components are invisible for a while after frame is moved & menu items are visible
+ @author anthony.petrov@...: area=awt.mixing
+ @library ../regtesthelpers
+ @build Util
+ @run main HWDisappear
+*/
+
+/**
+ * HWDisappear.java
+ *
+ * summary: AWT components are invisible for a while after frame is moved & menu items are visible
+ */
+
+import java.awt.*;
+import java.awt.event.*;
+import javax.swing.*;
+import test.java.awt.regtesthelpers.Util;
+
+public class HWDisappear
+{
+
+ static volatile boolean clickPassed = false;
+
+ private static void init()
+ {
+ //*** Create instructions for the user here ***
+
+ String[] instructions =
+ {
+ "This is an AUTOMATIC test, simply wait until it is done.",
+ "The result (passed or failed) will be shown in the",
+ "message window below."
+ };
+ Sysout.createDialog( );
+ Sysout.printInstructions( instructions );
+
+
+ // Create the frame and the button
+ JFrame f = new JFrame();
+ f.setBounds(100, 100, 400, 300);
+
+ JMenuBar menubar = new JMenuBar();
+ f.setJMenuBar(menubar);
+
+ // Create lightweight-enabled menu
+ JMenu lmenu = new JMenu("Lite Menu");
+ lmenu.add("Salad");
+ lmenu.add("Fruit Plate");
+ lmenu.add("Water");
+ menubar.add(lmenu);
+
+ Button b = new Button("OK");
+
+ f.setLayout(null);
+ f.add(b);
+ b.setBounds(50, 50, 200, 50);
+
+ b.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent e) {
+ clickPassed = true;
+ }
+ });
+
+ f.setVisible(true);
+
+ Robot robot = Util.createRobot();
+ robot.setAutoDelay(20);
+
+ Util.waitForIdle(robot);
+
+ // Move quite far to ensure the button is hidden completely
+ f.setLocation(500, 200);
+
+ Util.waitForIdle(robot);
+
+ // Activate the menu
+ Point lLoc = lmenu.getLocationOnScreen();
+ robot.mouseMove(lLoc.x + 5, lLoc.y + 5);
+
+ robot.mousePress(InputEvent.BUTTON1_MASK);
+ robot.mouseRelease(InputEvent.BUTTON1_MASK);
+ Util.waitForIdle(robot);
+
+ // Click on the button.
+ Point bLoc = b.getLocationOnScreen();
+ robot.mouseMove(bLoc.x + b.getWidth() / 2, bLoc.y + 5);
+
+ robot.mousePress(InputEvent.BUTTON1_MASK);
+ robot.mouseRelease(InputEvent.BUTTON1_MASK);
+ Util.waitForIdle(robot);
+
+ if (clickPassed) {
+ pass();
+ } else {
+ fail("The button cannot be clicked.");
+ }
+ }//End init()
+
+
+
+ /*****************************************************
+ * 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-
+ * 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;
+
+ // Not sure about what happens if multiple of this test are
+ // instantiated in the same VM. Being static (and using
+ // static vars), it aint gonna work. Not worrying about
+ // it for now.
+ 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 pass nor test fail 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)
+ {
+ //The test harness may have interrupted the test. If so, rethrow the exception
+ // so that the harness gets it and deals with it.
+ 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();
+ }
+ 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 HWDisappear
+
+//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 ****************
+
+// if want to make listeners, here is the recommended place for them, then 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
+
+ HWDisappear.pass();
+ }
+ else if( tries == 20 )
+ {
+ //tried too many times without getting enough events so fail
+
+ HWDisappear.fail();
+ }
+
+ }// eventDispatched()
+
+ }// NewClass class
+
+*/
+
+
+//************** End classes defined for the test *******************
+
+
+
+
+/****************************************************
+ Standard Test Machinery
+ DO NOT modify anything below -- it's a standard
+ chunk of code whose purpose is to make user
+ interaction uniform, and thereby make it simpler
+ to read and understand someone else's test.
+ ****************************************************/
+
+/**
+ This is part of the standard test machinery.
+ It creates a dialog (with the instructions), and is the interface
+ for sending text messages to the user.
+ To print the instructions, send an array of strings to Sysout.createDialog
+ WithInstructions method. Put one line of instructions per array entry.
+ To display a message for the tester to see, simply call Sysout.println
+ with the string to be displayed.
+ This mimics System.out.println but works within the test harness as well
+ as standalone.
+ */
+
+class Sysout
+{
+ private static TestDialog dialog;
+
+ public static void createDialogWithInstructions( String[] instructions )
+ {
+ dialog = new TestDialog( new Frame(), "Instructions" );
+ dialog.printInstructions( instructions );
+ dialog.setVisible(true);
+ println( "Any messages for the tester will display here." );
+ }
+
+ public static void createDialog( )
+ {
+ dialog = new TestDialog( new Frame(), "Instructions" );
+ String[] defInstr = { "Instructions will appear here. ", "" } ;
+ dialog.printInstructions( defInstr );
+ dialog.setVisible(true);
+ println( "Any messages for the tester will display here." );
+ }
+
+
+ public static void printInstructions( String[] instructions )
+ {
+ dialog.printInstructions( instructions );
+ }
+
+
+ public static void println( String messageIn )
+ {
+ dialog.displayMessage( messageIn );
+ System.out.println(messageIn);
+ }
+
+}// Sysout class
+
+/**
+ This is part of the standard test machinery. It provides a place for the
+ test instructions to be displayed, and a place for interactive messages
+ to the user to be displayed.
+ To have the test instructions displayed, see Sysout.
+ To have a message to the user be displayed, see Sysout.
+ Do not call anything in this dialog directly.
+ */
+class TestDialog extends Dialog
+{
+
+ TextArea instructionsText;
+ TextArea messageText;
+ int maxStringLength = 80;
+
+ //DO NOT call this directly, go through Sysout
+ public TestDialog( Frame frame, String name )
+ {
+ super( frame, name );
+ int scrollBoth = TextArea.SCROLLBARS_BOTH;
+ instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth );
+ add( "North", instructionsText );
+
+ messageText = new TextArea( "", 5, maxStringLength, scrollBoth );
+ add("Center", messageText);
+
+ pack();
+
+ setVisible(true);
+ }// TestDialog()
+
+ //DO NOT call this directly, go through Sysout
+ public void printInstructions( String[] instructions )
+ {
+ //Clear out any current instructions
+ instructionsText.setText( "" );
+
+ //Go down array of instruction strings
+
+ String printStr, remainingStr;
+ for( int i=0; i < instructions.length; i++ )
+ {
+ //chop up each into pieces maxSringLength long
+ remainingStr = instructions[ i ];
+ while( remainingStr.length() > 0 )
+ {
+ //if longer than max then chop off first max chars to print
+ if( remainingStr.length() >= maxStringLength )
+ {
+ //Try to chop on a word boundary
+ int posOfSpace = remainingStr.
+ lastIndexOf( ' ', maxStringLength - 1 );
+
+ if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1;
+
+ printStr = remainingStr.substring( 0, posOfSpace + 1 );
+ remainingStr = remainingStr.substring( posOfSpace + 1 );
+ }
+ //else just print
+ else
+ {
+ printStr = remainingStr;
+ remainingStr = "";
+ }
+
+ instructionsText.append( printStr + "\n" );
+
+ }// while
+
+ }// for
+
+ }//printInstructions()
+
+ //DO NOT call this directly, go through Sysout
+ public void displayMessage( String messageIn )
+ {
+ messageText.append( messageIn + "\n" );
+ System.out.println(messageIn);
+ }
+
+}// TestDialog class
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/test/java/awt/Mixing/JButtonInGlassPane.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/Mixing/JButtonInGlassPane.java Wed Jul 05 16:47:27 2017 +0200
@@ -0,0 +1,430 @@
+/*
+ * Copyright 2009 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 %W% %E%
+ @bug 6779670
+ @summary Tests if a LW components in the glass pane affects HW in the content pane
+ @author anthony.petrov@...: area=awt.mixing
+ @library ../regtesthelpers
+ @build Util
+ @run main JButtonInGlassPane
+*/
+
+
+/**
+ * JButtonInGlassPane.java
+ *
+ * summary: Tests whether a LW menu correctly overlaps a HW button
+ */
+
+import java.awt.*;
+import java.awt.event.*;
+import javax.swing.*;
+import test.java.awt.regtesthelpers.Util;
+
+
+
+public class JButtonInGlassPane
+{
+ static volatile boolean failed = false;
+
+ private static void init()
+ {
+ //*** Create instructions for the user here ***
+
+ String[] instructions =
+ {
+ "This is an AUTOMATIC test, simply wait until it is done.",
+ "The result (passed or failed) will be shown in the",
+ "message window below."
+ };
+ Sysout.createDialog( );
+ Sysout.printInstructions( instructions );
+
+ JFrame frame = new JFrame("Glass Pane children test");
+ frame.setLayout(null);
+
+ final Button button = new Button("AWT Button");
+ button.setBounds(100,100,100,100);
+ frame.add(button);
+
+ button.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ failed = true;
+ }
+ });
+
+ frame.getGlassPane().setVisible(true);
+ Container glassPane = (Container) frame.getGlassPane();
+ glassPane.setLayout(null);
+
+ final JButton jbutton = new JButton("JButton");
+ jbutton.setBounds(50,50,100,100);
+ glassPane.add(jbutton);
+
+ jbutton.setVisible(false);
+
+ frame.setSize(400, 400);
+ frame.setLocationRelativeTo(null);
+ frame.setVisible(true);
+
+ Robot robot = Util.createRobot();
+ robot.setAutoDelay(20);
+
+ Util.waitForIdle(robot);
+
+ jbutton.setVisible(true);
+ Util.waitForIdle(robot);
+
+ // Click the LW button - in the area that intersects with
+ // the HW button.
+ Point lLoc = jbutton.getLocationOnScreen();
+ robot.mouseMove(lLoc.x + jbutton.getWidth() - 5, lLoc.y + jbutton.getHeight() - 5);
+
+ robot.mousePress(InputEvent.BUTTON1_MASK);
+ robot.mouseRelease(InputEvent.BUTTON1_MASK);
+ Util.waitForIdle(robot);
+
+ jbutton.setBounds(50,50,120,120);
+ Util.waitForIdle(robot);
+
+ // Now click on the 'added' area of the LW button that again
+ // intersects with the HW.
+ robot.mouseMove(lLoc.x + jbutton.getWidth() - 5, lLoc.y + jbutton.getHeight() - 5);
+
+ robot.mousePress(InputEvent.BUTTON1_MASK);
+ robot.mouseRelease(InputEvent.BUTTON1_MASK);
+ Util.waitForIdle(robot);
+
+ if (failed) {
+ JButtonInGlassPane.fail("The LW button did not receive the click.");
+ } else {
+ JButtonInGlassPane.pass();
+ }
+ }//End init()
+
+
+
+ /*****************************************************
+ * 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-
+ * 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;
+
+ // Not sure about what happens if multiple of this test are
+ // instantiated in the same VM. Being static (and using
+ // static vars), it aint gonna work. Not worrying about
+ // it for now.
+ 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 pass nor test fail 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)
+ {
+ //The test harness may have interrupted the test. If so, rethrow the exception
+ // so that the harness gets it and deals with it.
+ 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();
+ }
+ 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 JButtonInGlassPane
+
+//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 ****************
+
+// if want to make listeners, here is the recommended place for them, then 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
+
+ JButtonInGlassPane.pass();
+ }
+ else if( tries == 20 )
+ {
+ //tried too many times without getting enough events so fail
+
+ JButtonInGlassPane.fail();
+ }
+
+ }// eventDispatched()
+
+ }// NewClass class
+
+*/
+
+
+//************** End classes defined for the test *******************
+
+
+
+
+/****************************************************
+ Standard Test Machinery
+ DO NOT modify anything below -- it's a standard
+ chunk of code whose purpose is to make user
+ interaction uniform, and thereby make it simpler
+ to read and understand someone else's test.
+ ****************************************************/
+
+/**
+ This is part of the standard test machinery.
+ It creates a dialog (with the instructions), and is the interface
+ for sending text messages to the user.
+ To print the instructions, send an array of strings to Sysout.createDialog
+ WithInstructions method. Put one line of instructions per array entry.
+ To display a message for the tester to see, simply call Sysout.println
+ with the string to be displayed.
+ This mimics System.out.println but works within the test harness as well
+ as standalone.
+ */
+
+class Sysout
+{
+ private static TestDialog dialog;
+
+ public static void createDialogWithInstructions( String[] instructions )
+ {
+ dialog = new TestDialog( new Frame(), "Instructions" );
+ dialog.printInstructions( instructions );
+ dialog.setVisible(true);
+ println( "Any messages for the tester will display here." );
+ }
+
+ public static void createDialog( )
+ {
+ dialog = new TestDialog( new Frame(), "Instructions" );
+ String[] defInstr = { "Instructions will appear here. ", "" } ;
+ dialog.printInstructions( defInstr );
+ dialog.setVisible(true);
+ println( "Any messages for the tester will display here." );
+ }
+
+
+ public static void printInstructions( String[] instructions )
+ {
+ dialog.printInstructions( instructions );
+ }
+
+
+ public static void println( String messageIn )
+ {
+ dialog.displayMessage( messageIn );
+ System.out.println(messageIn);
+ }
+
+}// Sysout class
+
+/**
+ This is part of the standard test machinery. It provides a place for the
+ test instructions to be displayed, and a place for interactive messages
+ to the user to be displayed.
+ To have the test instructions displayed, see Sysout.
+ To have a message to the user be displayed, see Sysout.
+ Do not call anything in this dialog directly.
+ */
+class TestDialog extends Dialog
+{
+
+ TextArea instructionsText;
+ TextArea messageText;
+ int maxStringLength = 80;
+
+ //DO NOT call this directly, go through Sysout
+ public TestDialog( Frame frame, String name )
+ {
+ super( frame, name );
+ int scrollBoth = TextArea.SCROLLBARS_BOTH;
+ instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth );
+ add( "North", instructionsText );
+
+ messageText = new TextArea( "", 5, maxStringLength, scrollBoth );
+ add("Center", messageText);
+
+ pack();
+
+ setVisible(true);
+ }// TestDialog()
+
+ //DO NOT call this directly, go through Sysout
+ public void printInstructions( String[] instructions )
+ {
+ //Clear out any current instructions
+ instructionsText.setText( "" );
+
+ //Go down array of instruction strings
+
+ String printStr, remainingStr;
+ for( int i=0; i < instructions.length; i++ )
+ {
+ //chop up each into pieces maxSringLength long
+ remainingStr = instructions[ i ];
+ while( remainingStr.length() > 0 )
+ {
+ //if longer than max then chop off first max chars to print
+ if( remainingStr.length() >= maxStringLength )
+ {
+ //Try to chop on a word boundary
+ int posOfSpace = remainingStr.
+ lastIndexOf( ' ', maxStringLength - 1 );
+
+ if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1;
+
+ printStr = remainingStr.substring( 0, posOfSpace + 1 );
+ remainingStr = remainingStr.substring( posOfSpace + 1 );
+ }
+ //else just print
+ else
+ {
+ printStr = remainingStr;
+ remainingStr = "";
+ }
+
+ instructionsText.append( printStr + "\n" );
+
+ }// while
+
+ }// for
+
+ }//printInstructions()
+
+ //DO NOT call this directly, go through Sysout
+ public void displayMessage( String messageIn )
+ {
+ messageText.append( messageIn + "\n" );
+ System.out.println(messageIn);
+ }
+
+}// TestDialog class
+
+
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/test/java/awt/Mixing/LWComboBox.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/Mixing/LWComboBox.java Wed Jul 05 16:47:27 2017 +0200
@@ -0,0 +1,425 @@
+/*
+ * Copyright 2009 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 %W% %E%
+ @bug 6637655
+ @summary Tests whether a LW combobox correctly overlaps a HW button
+ @author anthony.petrov@...: area=awt.mixing
+ @library ../regtesthelpers
+ @build Util
+ @run main LWComboBox
+*/
+
+
+/**
+ * LWComboBox.java
+ *
+ * summary: Tests whether a LW combobox correctly overlaps a HW button
+ */
+
+import java.awt.*;
+import java.awt.event.*;
+import javax.swing.*;
+import java.util.Vector;
+import test.java.awt.regtesthelpers.Util;
+
+
+
+public class LWComboBox
+{
+ static volatile boolean failed = false;
+
+ private static void init()
+ {
+ //*** Create instructions for the user here ***
+
+ String[] instructions =
+ {
+ "This is an AUTOMATIC test, simply wait until it is done.",
+ "The result (passed or failed) will be shown in the",
+ "message window below."
+ };
+ Sysout.createDialog( );
+ Sysout.printInstructions( instructions );
+
+ JFrame f = new JFrame("LW menu test");
+
+ JComboBox ch;
+ Button b;
+
+ Vector v = new Vector();
+ for(int i = 1 ; i <=20;i++){
+ v.add("Item # "+i);
+ }
+ ch = new JComboBox(v);
+
+
+ b = new Button("AWT Button");
+ b.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ failed = true;
+ }
+ });
+
+ f.add(ch,BorderLayout.NORTH);
+ f.add(b,BorderLayout.CENTER);
+ f.setSize(300,300);
+ f.setVisible(true);
+
+ Robot robot = Util.createRobot();
+ robot.setAutoDelay(20);
+
+ Util.waitForIdle(robot);
+
+ // Pop up the combobox
+ Point lLoc = ch.getLocationOnScreen();
+ System.err.println("lLoc: " + lLoc);
+ robot.mouseMove(lLoc.x + 5, lLoc.y + 5);
+
+ robot.mousePress(InputEvent.BUTTON1_MASK);
+ robot.mouseRelease(InputEvent.BUTTON1_MASK);
+ Util.waitForIdle(robot);
+
+ // Click on the combo popup.
+ // It's assumed that the popup item is located
+ // above the heavyweight button.
+ Point bLoc = b.getLocationOnScreen();
+ System.err.println("bLoc: " + bLoc);
+ robot.mouseMove(bLoc.x + 10, bLoc.y + 10);
+
+ robot.mousePress(InputEvent.BUTTON1_MASK);
+ robot.mouseRelease(InputEvent.BUTTON1_MASK);
+ Util.waitForIdle(robot);
+
+ if (failed) {
+ fail("The LW popup did not received the click.");
+ } else {
+ pass();
+ }
+ }//End init()
+
+
+
+ /*****************************************************
+ * 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-
+ * 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;
+
+ // Not sure about what happens if multiple of this test are
+ // instantiated in the same VM. Being static (and using
+ // static vars), it aint gonna work. Not worrying about
+ // it for now.
+ 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 pass nor test fail 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)
+ {
+ //The test harness may have interrupted the test. If so, rethrow the exception
+ // so that the harness gets it and deals with it.
+ 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();
+ }
+ 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 LWComboBox
+
+//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 ****************
+
+// if want to make listeners, here is the recommended place for them, then 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
+
+ LWComboBox.pass();
+ }
+ else if( tries == 20 )
+ {
+ //tried too many times without getting enough events so fail
+
+ LWComboBox.fail();
+ }
+
+ }// eventDispatched()
+
+ }// NewClass class
+
+*/
+
+
+//************** End classes defined for the test *******************
+
+
+
+
+/****************************************************
+ Standard Test Machinery
+ DO NOT modify anything below -- it's a standard
+ chunk of code whose purpose is to make user
+ interaction uniform, and thereby make it simpler
+ to read and understand someone else's test.
+ ****************************************************/
+
+/**
+ This is part of the standard test machinery.
+ It creates a dialog (with the instructions), and is the interface
+ for sending text messages to the user.
+ To print the instructions, send an array of strings to Sysout.createDialog
+ WithInstructions method. Put one line of instructions per array entry.
+ To display a message for the tester to see, simply call Sysout.println
+ with the string to be displayed.
+ This mimics System.out.println but works within the test harness as well
+ as standalone.
+ */
+
+class Sysout
+{
+ private static TestDialog dialog;
+
+ public static void createDialogWithInstructions( String[] instructions )
+ {
+ dialog = new TestDialog( new Frame(), "Instructions" );
+ dialog.printInstructions( instructions );
+ dialog.setVisible(true);
+ println( "Any messages for the tester will display here." );
+ }
+
+ public static void createDialog( )
+ {
+ dialog = new TestDialog( new Frame(), "Instructions" );
+ String[] defInstr = { "Instructions will appear here. ", "" } ;
+ dialog.printInstructions( defInstr );
+ dialog.setVisible(true);
+ println( "Any messages for the tester will display here." );
+ }
+
+
+ public static void printInstructions( String[] instructions )
+ {
+ dialog.printInstructions( instructions );
+ }
+
+
+ public static void println( String messageIn )
+ {
+ dialog.displayMessage( messageIn );
+ System.out.println(messageIn);
+ }
+
+}// Sysout class
+
+/**
+ This is part of the standard test machinery. It provides a place for the
+ test instructions to be displayed, and a place for interactive messages
+ to the user to be displayed.
+ To have the test instructions displayed, see Sysout.
+ To have a message to the user be displayed, see Sysout.
+ Do not call anything in this dialog directly.
+ */
+class TestDialog extends Dialog
+{
+
+ TextArea instructionsText;
+ TextArea messageText;
+ int maxStringLength = 80;
+
+ //DO NOT call this directly, go through Sysout
+ public TestDialog( Frame frame, String name )
+ {
+ super( frame, name );
+ int scrollBoth = TextArea.SCROLLBARS_BOTH;
+ instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth );
+ add( "North", instructionsText );
+
+ messageText = new TextArea( "", 5, maxStringLength, scrollBoth );
+ add("Center", messageText);
+
+ pack();
+
+ setVisible(true);
+ }// TestDialog()
+
+ //DO NOT call this directly, go through Sysout
+ public void printInstructions( String[] instructions )
+ {
+ //Clear out any current instructions
+ instructionsText.setText( "" );
+
+ //Go down array of instruction strings
+
+ String printStr, remainingStr;
+ for( int i=0; i < instructions.length; i++ )
+ {
+ //chop up each into pieces maxSringLength long
+ remainingStr = instructions[ i ];
+ while( remainingStr.length() > 0 )
+ {
+ //if longer than max then chop off first max chars to print
+ if( remainingStr.length() >= maxStringLength )
+ {
+ //Try to chop on a word boundary
+ int posOfSpace = remainingStr.
+ lastIndexOf( ' ', maxStringLength - 1 );
+
+ if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1;
+
+ printStr = remainingStr.substring( 0, posOfSpace + 1 );
+ remainingStr = remainingStr.substring( posOfSpace + 1 );
+ }
+ //else just print
+ else
+ {
+ printStr = remainingStr;
+ remainingStr = "";
+ }
+
+ instructionsText.append( printStr + "\n" );
+
+ }// while
+
+ }// for
+
+ }//printInstructions()
+
+ //DO NOT call this directly, go through Sysout
+ public void displayMessage( String messageIn )
+ {
+ messageText.append( messageIn + "\n" );
+ System.out.println(messageIn);
+ }
+
+}// TestDialog class
+
+
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/test/java/awt/Mixing/MixingOnShrinkingHWButton.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/Mixing/MixingOnShrinkingHWButton.java Wed Jul 05 16:47:27 2017 +0200
@@ -0,0 +1,429 @@
+/*
+ * Copyright 2009 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 %W% %E%
+ @bug 6777320
+ @summary PIT : Canvas is not fully painted on the internal frame & internal frame goes behind the canvas
+ @author dmitry.cherepanov@...: area=awt.mixing
+ @library ../regtesthelpers
+ @build Util
+ @run main MixingOnShrinkingHWButton
+*/
+
+
+/**
+ * MixingOnDialog.java
+ *
+ * summary: Tests whether awt.Button and swing.JButton mix correctly
+ * when awt.Button's width got shrinked
+ */
+
+import java.awt.*;
+import java.awt.event.*;
+import javax.swing.*;
+import test.java.awt.regtesthelpers.Util;
+
+
+
+public class MixingOnShrinkingHWButton
+{
+ static volatile boolean heavyClicked = false;
+ static volatile boolean lightClicked = false;
+
+ private static void init()
+ {
+ //*** Create instructions for the user here ***
+
+ String[] instructions =
+ {
+ "This is an AUTOMATIC test, simply wait until it is done.",
+ "The result (passed or failed) will be shown in the",
+ "message window below."
+ };
+ Sysout.createDialog( );
+ Sysout.printInstructions( instructions );
+
+
+ // Create components
+ final Dialog d = new Dialog((Frame)null, "Button-JButton mix test");
+ final Button heavy = new Button(" Heavyweight Button ");
+ final JButton light = new JButton(" LW Button ");
+
+ // Actions for the buttons add appropriate number to the test sequence
+ heavy.addActionListener(new java.awt.event.ActionListener()
+ {
+ public void actionPerformed(java.awt.event.ActionEvent e) {
+ heavyClicked = true;
+ }
+ }
+ );
+
+ light.addActionListener(new java.awt.event.ActionListener()
+ {
+ public void actionPerformed(java.awt.event.ActionEvent e) {
+ lightClicked = true;
+ }
+ }
+ );
+
+ // Shrink the HW button under LW button
+ heavy.setBounds(30, 30, 100, 100);
+ light.setBounds(40, 30, 100, 100);
+
+ // Put the components into the frame
+ d.setLayout(null);
+ d.add(light);
+ d.add(heavy);
+ d.setBounds(50, 50, 400, 400);
+ d.setVisible(true);
+
+
+ Robot robot = Util.createRobot();
+ robot.setAutoDelay(20);
+
+ Util.waitForIdle(robot);
+
+ // Move the mouse pointer to the position where both
+ // buttons overlap
+ Point heavyLoc = heavy.getLocationOnScreen();
+ robot.mouseMove(heavyLoc.x + 20, heavyLoc.y + 20);
+
+ // Now perform the click at this point
+ robot.mousePress(InputEvent.BUTTON1_MASK);
+ robot.mouseRelease(InputEvent.BUTTON1_MASK);
+ Util.waitForIdle(robot);
+
+ // If the buttons are correctly mixed, the test sequence
+ // is equal to the check sequence.
+ if (lightClicked == true) {
+ MixingOnShrinkingHWButton.pass();
+ } else {
+ MixingOnShrinkingHWButton.fail("The lightweight component left behind the heavyweight one.");
+ }
+ }//End init()
+
+
+
+ /*****************************************************
+ * 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-
+ * 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;
+
+ // Not sure about what happens if multiple of this test are
+ // instantiated in the same VM. Being static (and using
+ // static vars), it aint gonna work. Not worrying about
+ // it for now.
+ 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 pass nor test fail 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)
+ {
+ //The test harness may have interrupted the test. If so, rethrow the exception
+ // so that the harness gets it and deals with it.
+ 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();
+ }
+ 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 MixingOnDialog
+
+//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 ****************
+
+// if want to make listeners, here is the recommended place for them, then 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
+
+ MixingOnDialog.pass();
+ }
+ else if( tries == 20 )
+ {
+ //tried too many times without getting enough events so fail
+
+ MixingOnDialog.fail();
+ }
+
+ }// eventDispatched()
+
+ }// NewClass class
+
+*/
+
+
+//************** End classes defined for the test *******************
+
+
+
+
+/****************************************************
+ Standard Test Machinery
+ DO NOT modify anything below -- it's a standard
+ chunk of code whose purpose is to make user
+ interaction uniform, and thereby make it simpler
+ to read and understand someone else's test.
+ ****************************************************/
+
+/**
+ This is part of the standard test machinery.
+ It creates a dialog (with the instructions), and is the interface
+ for sending text messages to the user.
+ To print the instructions, send an array of strings to Sysout.createDialog
+ WithInstructions method. Put one line of instructions per array entry.
+ To display a message for the tester to see, simply call Sysout.println
+ with the string to be displayed.
+ This mimics System.out.println but works within the test harness as well
+ as standalone.
+ */
+
+class Sysout
+{
+ private static TestDialog dialog;
+
+ public static void createDialogWithInstructions( String[] instructions )
+ {
+ dialog = new TestDialog( new Frame(), "Instructions" );
+ dialog.printInstructions( instructions );
+ dialog.setVisible(true);
+ println( "Any messages for the tester will display here." );
+ }
+
+ public static void createDialog( )
+ {
+ dialog = new TestDialog( new Frame(), "Instructions" );
+ String[] defInstr = { "Instructions will appear here. ", "" } ;
+ dialog.printInstructions( defInstr );
+ dialog.setVisible(true);
+ println( "Any messages for the tester will display here." );
+ }
+
+
+ public static void printInstructions( String[] instructions )
+ {
+ dialog.printInstructions( instructions );
+ }
+
+
+ public static void println( String messageIn )
+ {
+ dialog.displayMessage( messageIn );
+ System.out.println(messageIn);
+ }
+
+}// Sysout class
+
+/**
+ This is part of the standard test machinery. It provides a place for the
+ test instructions to be displayed, and a place for interactive messages
+ to the user to be displayed.
+ To have the test instructions displayed, see Sysout.
+ To have a message to the user be displayed, see Sysout.
+ Do not call anything in this dialog directly.
+ */
+class TestDialog extends Dialog
+{
+
+ TextArea instructionsText;
+ TextArea messageText;
+ int maxStringLength = 80;
+
+ //DO NOT call this directly, go through Sysout
+ public TestDialog( Frame frame, String name )
+ {
+ super( frame, name );
+ int scrollBoth = TextArea.SCROLLBARS_BOTH;
+ instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth );
+ add( "North", instructionsText );
+
+ messageText = new TextArea( "", 5, maxStringLength, scrollBoth );
+ add("Center", messageText);
+
+ pack();
+
+ setVisible(true);
+ }// TestDialog()
+
+ //DO NOT call this directly, go through Sysout
+ public void printInstructions( String[] instructions )
+ {
+ //Clear out any current instructions
+ instructionsText.setText( "" );
+
+ //Go down array of instruction strings
+
+ String printStr, remainingStr;
+ for( int i=0; i < instructions.length; i++ )
+ {
+ //chop up each into pieces maxSringLength long
+ remainingStr = instructions[ i ];
+ while( remainingStr.length() > 0 )
+ {
+ //if longer than max then chop off first max chars to print
+ if( remainingStr.length() >= maxStringLength )
+ {
+ //Try to chop on a word boundary
+ int posOfSpace = remainingStr.
+ lastIndexOf( ' ', maxStringLength - 1 );
+
+ if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1;
+
+ printStr = remainingStr.substring( 0, posOfSpace + 1 );
+ remainingStr = remainingStr.substring( posOfSpace + 1 );
+ }
+ //else just print
+ else
+ {
+ printStr = remainingStr;
+ remainingStr = "";
+ }
+
+ instructionsText.append( printStr + "\n" );
+
+ }// while
+
+ }// for
+
+ }//printInstructions()
+
+ //DO NOT call this directly, go through Sysout
+ public void displayMessage( String messageIn )
+ {
+ messageText.append( messageIn + "\n" );
+ System.out.println(messageIn);
+ }
+
+}// TestDialog class
+
+
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/test/java/awt/Mixing/NonOpaqueInternalFrame.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/Mixing/NonOpaqueInternalFrame.java Wed Jul 05 16:47:27 2017 +0200
@@ -0,0 +1,434 @@
+/*
+ * Copyright 2009 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 %W% %E%
+ @bug 6768332
+ @summary Tests whether internal frames are always considered opaque
+ @author anthony.petrov@...: area=awt.mixing
+ @library ../regtesthelpers
+ @build Util
+ @run main NonOpaqueInternalFrame
+*/
+
+
+/**
+ * NonOpaqueInternalFrame.java
+ *
+ * summary: Tests whether internal frames are always considered opaque
+ */
+
+import java.awt.*;
+import java.awt.event.*;
+import java.beans.PropertyVetoException;
+import javax.swing.*;
+import java.util.Vector;
+import test.java.awt.regtesthelpers.Util;
+
+
+
+public class NonOpaqueInternalFrame
+{
+ static volatile boolean failed = false;
+
+ private static final class MyButton extends Button
+ implements ActionListener
+ {
+ public MyButton() {
+ setPreferredSize(new Dimension(100, 100));
+ addActionListener(this);
+ }
+
+ public void actionPerformed(ActionEvent e) {
+ failed = true;
+ }
+ }
+
+ private static void init()
+ {
+ String[] instructions =
+ {
+ "This is an AUTOMATIC test, simply wait until it is done.",
+ "The result (passed or failed) will be shown in the",
+ "message window below."
+ };
+ Sysout.createDialog( );
+ Sysout.printInstructions( instructions );
+
+
+ // Create a frame with two non-opaque JInternalFrame's containing
+ // heavyweight buttons.
+ JFrame jframe = new JFrame("mixing test");
+ JDesktopPane desktop = new JDesktopPane();
+ jframe.setContentPane(desktop);
+ JInternalFrame iframe1 = new JInternalFrame("iframe 1");
+ iframe1.setIconifiable(true);
+ iframe1.add(new MyButton());
+ iframe1.setBounds(10, 10, 100, 100);
+ iframe1.setOpaque(false);
+ iframe1.setVisible(true);
+ desktop.add(iframe1);
+ JInternalFrame iframe2 = new JInternalFrame("iframe 2");
+ iframe2.setIconifiable(true);
+ iframe2.add(new MyButton());
+ iframe2.setBounds(50, 50, 100, 100);
+ iframe2.setOpaque(false);
+ iframe2.setVisible(true);
+ desktop.add(iframe2);
+ jframe.setSize(300, 300);
+ jframe.setVisible(true);
+
+ Robot robot = Util.createRobot();
+ robot.setAutoDelay(20);
+
+ Util.waitForIdle(robot);
+
+ // Try selecting the bottommost frame
+ try {
+ iframe2.setSelected(true);
+ } catch (PropertyVetoException ex) {
+ ex.printStackTrace();
+ }
+
+ // Click the title bar of the internal frame
+ Point lLoc = iframe2.getLocationOnScreen();
+ System.err.println("lLoc: " + lLoc);
+ robot.mouseMove(lLoc.x + 10, lLoc.y + 10);
+ Util.waitForIdle(robot);
+
+ robot.mousePress(InputEvent.BUTTON1_MASK);
+ robot.mouseRelease(InputEvent.BUTTON1_MASK);
+ Util.waitForIdle(robot);
+
+
+ if (failed) {
+ fail("The JInternalFrame is considered non-opaque.");
+ } else {
+ pass();
+ }
+ }//End init()
+
+
+
+ /*****************************************************
+ * 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-
+ * 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;
+
+ // Not sure about what happens if multiple of this test are
+ // instantiated in the same VM. Being static (and using
+ // static vars), it aint gonna work. Not worrying about
+ // it for now.
+ 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 pass nor test fail 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)
+ {
+ //The test harness may have interrupted the test. If so, rethrow the exception
+ // so that the harness gets it and deals with it.
+ 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();
+ }
+ 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 NonOpaqueInternalFrame
+
+//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 ****************
+
+// if want to make listeners, here is the recommended place for them, then 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
+
+ NonOpaqueInternalFrame.pass();
+ }
+ else if( tries == 20 )
+ {
+ //tried too many times without getting enough events so fail
+
+ NonOpaqueInternalFrame.fail();
+ }
+
+ }// eventDispatched()
+
+ }// NewClass class
+
+*/
+
+
+//************** End classes defined for the test *******************
+
+
+
+
+/****************************************************
+ Standard Test Machinery
+ DO NOT modify anything below -- it's a standard
+ chunk of code whose purpose is to make user
+ interaction uniform, and thereby make it simpler
+ to read and understand someone else's test.
+ ****************************************************/
+
+/**
+ This is part of the standard test machinery.
+ It creates a dialog (with the instructions), and is the interface
+ for sending text messages to the user.
+ To print the instructions, send an array of strings to Sysout.createDialog
+ WithInstructions method. Put one line of instructions per array entry.
+ To display a message for the tester to see, simply call Sysout.println
+ with the string to be displayed.
+ This mimics System.out.println but works within the test harness as well
+ as standalone.
+ */
+
+class Sysout
+{
+ private static TestDialog dialog;
+
+ public static void createDialogWithInstructions( String[] instructions )
+ {
+ dialog = new TestDialog( new Frame(), "Instructions" );
+ dialog.printInstructions( instructions );
+ dialog.setVisible(true);
+ println( "Any messages for the tester will display here." );
+ }
+
+ public static void createDialog( )
+ {
+ dialog = new TestDialog( new Frame(), "Instructions" );
+ String[] defInstr = { "Instructions will appear here. ", "" } ;
+ dialog.printInstructions( defInstr );
+ dialog.setVisible(true);
+ println( "Any messages for the tester will display here." );
+ }
+
+
+ public static void printInstructions( String[] instructions )
+ {
+ dialog.printInstructions( instructions );
+ }
+
+
+ public static void println( String messageIn )
+ {
+ dialog.displayMessage( messageIn );
+ System.out.println(messageIn);
+ }
+
+}// Sysout class
+
+/**
+ This is part of the standard test machinery. It provides a place for the
+ test instructions to be displayed, and a place for interactive messages
+ to the user to be displayed.
+ To have the test instructions displayed, see Sysout.
+ To have a message to the user be displayed, see Sysout.
+ Do not call anything in this dialog directly.
+ */
+class TestDialog extends Dialog
+{
+
+ TextArea instructionsText;
+ TextArea messageText;
+ int maxStringLength = 80;
+
+ //DO NOT call this directly, go through Sysout
+ public TestDialog( Frame frame, String name )
+ {
+ super( frame, name );
+ int scrollBoth = TextArea.SCROLLBARS_BOTH;
+ instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth );
+ add( "North", instructionsText );
+
+ messageText = new TextArea( "", 5, maxStringLength, scrollBoth );
+ add("Center", messageText);
+
+ pack();
+
+ setVisible(true);
+ }// TestDialog()
+
+ //DO NOT call this directly, go through Sysout
+ public void printInstructions( String[] instructions )
+ {
+ //Clear out any current instructions
+ instructionsText.setText( "" );
+
+ //Go down array of instruction strings
+
+ String printStr, remainingStr;
+ for( int i=0; i < instructions.length; i++ )
+ {
+ //chop up each into pieces maxSringLength long
+ remainingStr = instructions[ i ];
+ while( remainingStr.length() > 0 )
+ {
+ //if longer than max then chop off first max chars to print
+ if( remainingStr.length() >= maxStringLength )
+ {
+ //Try to chop on a word boundary
+ int posOfSpace = remainingStr.
+ lastIndexOf( ' ', maxStringLength - 1 );
+
+ if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1;
+
+ printStr = remainingStr.substring( 0, posOfSpace + 1 );
+ remainingStr = remainingStr.substring( posOfSpace + 1 );
+ }
+ //else just print
+ else
+ {
+ printStr = remainingStr;
+ remainingStr = "";
+ }
+
+ instructionsText.append( printStr + "\n" );
+
+ }// while
+
+ }// for
+
+ }//printInstructions()
+
+ //DO NOT call this directly, go through Sysout
+ public void displayMessage( String messageIn )
+ {
+ messageText.append( messageIn + "\n" );
+ System.out.println(messageIn);
+ }
+
+}// TestDialog class
+
+
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/test/java/awt/Mixing/OpaqueTest.java
--- a/jdk/test/java/awt/Mixing/OpaqueTest.java Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/test/java/awt/Mixing/OpaqueTest.java Wed Jul 05 16:47:27 2017 +0200
@@ -42,6 +42,7 @@
import java.awt.event.*;
import javax.swing.*;
import test.java.awt.regtesthelpers.Util;
+import com.sun.awt.AWTUtilities;
@@ -78,6 +79,7 @@
{
public void actionPerformed(java.awt.event.ActionEvent e) {
p.setComponentZOrder(light, 0);
+ f.validate();
testSeq = testSeq + "0";
}
}
@@ -87,6 +89,7 @@
{
public void actionPerformed(java.awt.event.ActionEvent e) {
p.setComponentZOrder(heavy, 0);
+ f.validate();
testSeq = testSeq + "1";
}
}
@@ -120,10 +123,12 @@
// flag value.
for (int i = 0; i < 9; ++i) {
if (i == 3) {
- light.setOpaque(false);
+ AWTUtilities.setComponentMixingCutoutShape(light,
+ new Rectangle());
}
if (i == 6) {
- light.setOpaque(true);
+ AWTUtilities.setComponentMixingCutoutShape(light,
+ null);
}
robot.mousePress(InputEvent.BUTTON1_MASK);
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/test/java/awt/Mixing/OverlappingButtons.java
--- a/jdk/test/java/awt/Mixing/OverlappingButtons.java Wed Jul 05 16:46:57 2017 +0200
+++ b/jdk/test/java/awt/Mixing/OverlappingButtons.java Wed Jul 05 16:47:27 2017 +0200
@@ -78,6 +78,7 @@
{
public void actionPerformed(java.awt.event.ActionEvent e) {
p.setComponentZOrder(light, 0);
+ f.validate();
testSeq = testSeq + "0";
}
}
@@ -87,6 +88,7 @@
{
public void actionPerformed(java.awt.event.ActionEvent e) {
p.setComponentZOrder(heavy, 0);
+ f.validate();
testSeq = testSeq + "1";
}
}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/test/java/awt/Mouse/MaximizedFrameTest/MaximizedFrameTest.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/Mouse/MaximizedFrameTest/MaximizedFrameTest.html Wed Jul 05 16:47:27 2017 +0200
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2008 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.
+ */
+
+
+
+
+
+
+
+bug 6176814
Bug ID: 6176814
+
+ This is an AUTOMATIC test, simply wait for completion
+
+
+
+
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/test/java/awt/Mouse/MaximizedFrameTest/MaximizedFrameTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/Mouse/MaximizedFrameTest/MaximizedFrameTest.java Wed Jul 05 16:47:27 2017 +0200
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2008 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
+ @bug 6176814
+ @summary Metalworks frame maximizes after the move
+ @author Andrei.Dmitriev area=Event
+ @run applet MaximizedFrameTest.html
+*/
+
+import java.applet.Applet;
+import javax.swing.*;
+import java.awt.event.*;
+import java.awt.*;
+
+public class MaximizedFrameTest extends Applet
+{
+ final int ITERATIONS_COUNT = 20;
+ Robot robot;
+ Point framePosition;
+ Point newFrameLocation;
+ JFrame frame;
+ Rectangle gcBounds;
+ public static Object LOCK = new Object();
+
+ public void init()
+ {
+ String[] instructions =
+ {
+ "This is an AUTOMATIC test",
+ "simply wait until it is done"
+ };
+ JFrame.setDefaultLookAndFeelDecorated(true);
+ frame = new JFrame("JFrame Maximization Test");
+ frame.pack();
+ frame.setSize(450, 260);
+ }//End init()
+
+ public void start ()
+ {
+ frame.setVisible(true);
+ validate();
+ JLayeredPane lPane = frame.getLayeredPane();
+ // System.out.println("JFrame's LayeredPane " + lPane );
+ Component titleComponent = null;
+ boolean titleFound = false;
+ for (int j=0; j < lPane.getComponentsInLayer(JLayeredPane.FRAME_CONTENT_LAYER.intValue()).length; j++){
+ titleComponent = lPane.getComponentsInLayer(JLayeredPane.FRAME_CONTENT_LAYER.intValue())[j];
+ if (titleComponent.getClass().getName().equals("javax.swing.plaf.metal.MetalTitlePane")){
+ titleFound = true;
+ break;
+ }
+ }
+ if ( !titleFound ){
+ throw new RuntimeException("Test Failed. Unable to determine title's size.");
+ }
+ //--------------------------------
+ // it is sufficient to get maximized Frame only once.
+ Point tempMousePosition;
+ framePosition = frame.getLocationOnScreen();
+ try {
+ robot = new Robot();
+ tempMousePosition = new Point(framePosition.x +
+ frame.getWidth()/2,
+ framePosition.y +
+ titleComponent.getHeight()/2);
+ robot.mouseMove(tempMousePosition.x, tempMousePosition.y);
+ for (int iteration=0; iteration < ITERATIONS_COUNT; iteration++){
+ robot.mousePress(InputEvent.BUTTON1_MASK);
+ gcBounds =
+ GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices()[0].getConfigurations()[0].getBounds();
+ //Moving a mouse pointer less than a few pixels
+ //leads to rising a double click event.
+ //We have to use exceeded the AWT_MULTICLICK_SMUDGE
+ //const value (which is 4 by default on GNOME) to test that.
+ tempMousePosition.x += 5;
+ robot.mouseMove(tempMousePosition.x, tempMousePosition.y);
+ robot.delay(70);
+ robot.mouseRelease(InputEvent.BUTTON1_MASK);
+ if ( frame.getExtendedState() != 0 ){
+ throw new RuntimeException ("Test failed. JFrame was maximized. ExtendedState is : "+frame.getExtendedState());
+ }
+ robot.delay(500);
+ } //for iteration
+
+ }catch(AWTException e) {
+ throw new RuntimeException("Test Failed. AWTException thrown.");
+ }
+ System.out.println("Test passed.");
+ }// start()
+}// class
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/test/java/awt/Mouse/MouseModifiersUnitTest/ExtraButtonDrag.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/Mouse/MouseModifiersUnitTest/ExtraButtonDrag.java Wed Jul 05 16:47:27 2017 +0200
@@ -0,0 +1,131 @@
+/*
+ @test %I% %E%
+ @bug 6315717
+ @summary verifies that drag events are coming for every button if the property is set to true
+ @author Andrei Dmitriev : area=awt.mouse
+ @run main ExtraButtonDrag
+ */
+
+//events from standard should also come
+
+import java.awt.*;
+import java.awt.event.*;
+
+public class ExtraButtonDrag extends Frame {
+ static String tk = Toolkit.getDefaultToolkit().getClass().getName();
+ static Robot robot;
+ static int [] buttonsPressed;
+ static int [] buttonsReleased;
+ static int [] buttonsClicked;
+ volatile static boolean dragged = false;
+ volatile static boolean moved = false;
+
+ public ExtraButtonDrag(){
+ super("ExtraButtonDrag");
+ }
+
+ public static void main(String []s){
+ Frame frame = new ExtraButtonDrag();
+
+ MouseAdapter ma = new MouseAdapter() {
+ public void mouseDragged(MouseEvent e) {
+ System.out.println("Dragged "+e);// +" : "+ e.getButton() + " : " +e.getButtonState(e.getButton()));
+ dragged = true;
+ }
+ public void mouseMoved(MouseEvent e) {
+ System.out.println("Moved "+e);
+ moved = true;
+ }
+ public void mousePressed(MouseEvent e) {
+ System.out.println(">>> "+e);
+ }
+ public void mouseReleased(MouseEvent e) {
+ System.out.println(">>> "+e);
+ }
+
+ };
+
+ frame.addMouseMotionListener(ma);
+ frame.addMouseListener(ma);
+
+ frame.setSize(300, 300);
+ frame.setVisible(true);
+
+ int [] buttonMask = new int [MouseInfo.getNumberOfButtons()]; //InputEvent.getButtonMasks();
+
+ for (int i = 0; i < MouseInfo.getNumberOfButtons(); i++){
+ buttonMask[i] = InputEvent.getMaskForButton(i+1);
+ // System.out.println("TEST: "+tmp[i]);
+ }
+
+ try {
+ robot = new Robot();
+ robot.delay(1000);
+ Point centerFrame = new Point(frame.getLocationOnScreen().x + frame.getWidth()/2, frame.getLocationOnScreen().y + frame.getHeight()/2);
+ Point outboundsFrame = new Point(frame.getLocationOnScreen().x + frame.getWidth()*3/2, frame.getLocationOnScreen().y + frame.getHeight()/2);
+
+ System.out.println("areExtraMouseButtonsEnabled() == " + Toolkit.getDefaultToolkit().areExtraMouseButtonsEnabled() );
+
+ for (int i = 0; i < MouseInfo.getNumberOfButtons(); i++){
+ System.out.println("button to drag = " +(i+1) + " : value passed to robot = " +buttonMask[i]);
+
+ try {
+ dragMouse(buttonMask[i], centerFrame.x, centerFrame.y, outboundsFrame.x, outboundsFrame.y);
+ } catch (IllegalArgumentException e){
+ throw new RuntimeException("Test failed. Exception occured.", e);
+ }
+
+ robot.delay(500);
+ //this is a choice-case for X protocol issue: native events from extra buttons doesn't contain
+ // the correct state so it's unable to decide if there is a drag or move. By default we send MOVED event.
+ //XToolkit: extra buttons should report MOVED events only
+ //WToolkit: extra buttons should report DRAGGED events only
+ if (i > 2){ //extra buttons only
+ if (tk.equals("sun.awt.X11.XToolkit") || tk.equals("sun.awt.motif.MToolkit")) {
+ if (!moved || dragged) {
+ throw new RuntimeException("Test failed."+ tk +" Button = " +(i+1) + " moved = "+moved +" : dragged = " +dragged);
+ }
+ } else { //WToolkit
+ if (moved || !dragged) {
+ throw new RuntimeException("Test failed."+ tk +" Button = " +(i+1) + " moved = "+moved +" : dragged = " +dragged);
+ }
+ }
+ } else {
+ if (moved || !dragged){
+ throw new RuntimeException("Test failed. Button = " +(i+1) + " not dragged.");
+ }
+ }
+ }
+ } catch (Exception e){
+ throw new RuntimeException("", e);
+ }
+ }
+
+ public static void dragMouse(int button, int x0, int y0, int x1, int y1){
+ int curX = x0;
+ int curY = y0;
+ int dx = x0 < x1 ? 1 : -1;
+ int dy = y0 < y1 ? 1 : -1;
+ robot.mouseMove(x0, y0);
+
+ robot.delay(200);
+ dragged = false;
+ moved = false;
+
+ robot.mousePress(button);
+
+ while (curX != x1){
+ curX += dx;
+ robot.mouseMove(curX, curY);
+ robot.delay(5);
+ }
+ while (curY != y1 ){
+ curY += dy;
+ robot.mouseMove(curX, curY);
+ robot.delay(5);
+ }
+ robot.mouseRelease(button);
+ }
+
+}
+
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/test/java/awt/Mouse/MouseModifiersUnitTest/ModifierPermutation.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/Mouse/MouseModifiersUnitTest/ModifierPermutation.java Wed Jul 05 16:47:27 2017 +0200
@@ -0,0 +1,320 @@
+/*
+ test %I% %E%
+ @bug 6315717
+ @summary presses buttons in all permutations and verifies modifiers
+ @author Andrei Dmitriev : area=awt.mouse
+ @run main ModifierPermutation
+ */
+//package modifierpermutation;
+
+/*
+The test will try to press-release every button present on the mouse in different order.
+Here are some abbreviations:
+ BUTTON1 press = P1
+ BUTTON2 press = P2 etc.
+ BUTTON1 release = R1
+ BUTTON2 release = R2 etc.
+Only sequences alike below are possible : .
+Sequences like will not be covered by this test due to its probable complexity.
+ */
+
+import java.awt.*;
+import sun.awt.SunToolkit;
+import java.awt.event.*;
+import java.util.Arrays;
+
+public class ModifierPermutation {
+ static boolean failed = false;
+ final static int BUTTONSNUMBER = MouseInfo.getNumberOfButtons();
+
+/*
+ * Because of some problems with BUTTONx_MASK
+ * (they are not ordered. Instead, their values are: 16 8 4)
+ * We have to use array [1..n] and make every permutation on its
+ * containment. After each permutation, make the same thing with
+ * array of buttons and array of expected modifiers.
+ */
+ static SunToolkit st = (SunToolkit)(Toolkit.getDefaultToolkit());
+ //all button masks
+ static int [] mouseButtons = new int [BUTTONSNUMBER]; //BUTTONx_MASK
+ static int [] mouseButtonsDown = new int [BUTTONSNUMBER]; //BUTTONx_DOWN_MASK
+
+ //used to store mouse buttons sequences to press/to release
+ static int [] affectedButtonsToPressRelease;
+// static int [] buttonsToRelease;
+// static int [] modifiersToVerifyOnPressRelease;
+
+ static Robot robot;
+ static CheckingAdapter adapterTest1;
+ static Frame f;
+
+ static {
+ for (int i = 0; i < BUTTONSNUMBER; i++){
+ mouseButtons[i] = InputEvent.getMaskForButton(i+1); //then change first three elements here to BUTTONx_MASK
+ mouseButtonsDown[i] = InputEvent.getMaskForButton(i+1);
+ }
+ //mouseButtons initially has following values : 16 8 4.
+/* mouseButtons[0] = InputEvent.BUTTON1_MASK;
+ mouseButtons[1] = InputEvent.BUTTON2_MASK;
+ mouseButtons[2] = InputEvent.BUTTON3_MASK;
+ */
+ }
+
+ public static void main(String s[]){
+ init();
+
+ try {
+ robot = new Robot();
+ } catch (Exception e){
+ e.printStackTrace();
+ throw new RuntimeException("Test failed.", e);
+ }
+ robot.delay(500);
+ robot.mouseMove(f.getLocationOnScreen().x + f.getWidth()/2, f.getLocationOnScreen().y + f.getHeight()/2);
+ robot.delay(500);
+ //Top limit is the factorial of the number of existing buttons
+ for (int k = 0; k < factorial(mouseButtons.length)-1; k++){
+ //now we will press 2 up to maximum buttons and release them in different order and listen for
+ // PRESSED events and check it's ExModifiers
+ for (int buttonsToPressNumber = 2; buttonsToPressNumber <= BUTTONSNUMBER; buttonsToPressNumber++ ){
+ System.out.println(">>>");
+
+ //Now get the slice of affected buttons
+ affectedButtonsToPressRelease = Arrays.copyOf(mouseButtons, buttonsToPressNumber);
+// modifiersToVerifyOnPressRelease = Arrays.copyOf(mouseButtons, buttonsToPressNumber);
+
+ //Now press all these buttons in the order as they are in array affectedButtonsToPressRelease
+ //And release all these buttons in back order.
+
+ dumpArray("Affected Buttons ", affectedButtonsToPressRelease);
+ pressAllButtons(affectedButtonsToPressRelease);
+ releaseAllButtonsForwardOrder(affectedButtonsToPressRelease);
+// nextPermutation(i, buttonsToRelease);
+ //TODO: press buttons and release them backward
+ //All I have to add is :
+// pressAllButtons(affectedButtonsToPressRelease);
+// releaseAllButtonsBackwardOrder(affectedButtonsToPressRelease);
+
+ System.out.println("<<<");
+ }
+ nextPermutation(k, mouseButtons);
+// PermutationGenerator.nextPermutation(k, mouseButtonsDown);
+ dumpArray("mouseButtons (step="+k+")", mouseButtons);
+// dumpArray("mouseButtonsDown (step="+k+")", mouseButtonsDown);
+ }
+ }
+
+ private static void init(){
+ adapterTest1 = new CheckingAdapter();
+ f = new Frame("Robot presses mouse here");
+ f.setSize(300, 300);
+ f.setVisible(true);
+ f.addMouseListener(adapterTest1);
+ }
+ public static int factorial(int t){
+ if (t <=1 ) {
+ return 1;
+ } else {
+ return t*factorial(t-1);
+ }
+ }
+
+ // use this variable to get current button on EDT in checkModifiers()
+ static volatile int currentButtonIndexUnderAction;
+
+ public static void pressAllButtons(int []array){
+ for (int i = 0; i =0) {
+ if (array[i] < array[i+1]){
+ leftEl = i;
+ // System.out.println("leftEl = "+leftEl);
+ break;
+ }
+ i--;
+ }
+
+ i = array.length - 1;
+ while (i>=0) {
+ if (array[i] > array[leftEl]) {
+ rightEl = i;
+ // System.out.println("rightEl = "+rightEl);
+ break;
+ }
+ i--;
+ }
+ swapElements(array, leftEl, rightEl);
+ if (leftEl + 2 < array.length){
+ // System.out.println("sort");
+ Arrays.sort(array, leftEl + 1 , array.length);
+ }
+ }
+
+ public static void swapElements(int [] array, int leftEl, int rightEl){
+ int tmp = array[leftEl];
+ array[leftEl] = array[rightEl];
+ array[rightEl] = tmp;
+ }
+
+ public static void checkModifiersOnRelease(MouseEvent e){
+ System.out.println("CheckModifiersOnRelease. currentButtonIndexUnderAction ="+currentButtonIndexUnderAction);
+ for (int i = currentButtonIndexUnderAction+1; i=0) {
+ if (buttonIndicesToPermutate[i] < buttonIndicesToPermutate[i+1]){
+ leftEl = i;
+ // System.out.println("leftEl = "+leftEl);
+ break;
+ }
+ i--;
+ }
+
+ i = array.length - 1;
+ while (i>=0) {
+ if (buttonIndicesToPermutate[i] >buttonIndicesToPermutate[leftEl]) {
+ rightEl = i;
+ // System.out.println("rightEl = "+rightEl);
+ break;
+ }
+ i--;
+ }
+ swapElements(array, leftEl, rightEl);
+ swapElements(buttonIndicesToPermutate, leftEl, rightEl);
+
+ if (leftEl + 2 < array.length){
+ // System.out.println("sort");
+//need to make our own sorting because arraysort makes this on actual values in array...
+ Arrays.sort(array, leftEl + 1 , array.length);
+ Arrays.sort(buttonIndicesToPermutate, leftEl + 1 , buttonIndicesToPermutate.length);
+// sortArray(array, leftEl + 1 , array.length);
+ }
+ }
+ public static void swapElements(int [] array, int leftEl, int rightEl){
+ int tmp = array[leftEl];
+ array[leftEl] = array[rightEl];
+ array[rightEl] = tmp;
+ }
+}
+*/
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/test/java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Extra.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Extra.java Wed Jul 05 16:47:27 2017 +0200
@@ -0,0 +1,490 @@
+/*
+ @test %I% %E%
+ @bug 6315717
+ @summary verifies that modifiers are correct for extra buttons
+ @author Andrei Dmitriev : area=awt.mouse
+ @run main MouseModifiersUnitTest_Extra
+ */
+
+import java.awt.*;
+import java.awt.event.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+// will process extra buttons only
+// asking parameters from CMD: manual/automatic, modifier to test
+
+public class MouseModifiersUnitTest_Extra extends Frame {
+ static final int NONE = 0;
+ static final int SHIFT = 1;
+ static final int CTRL = 2;
+ static final int ALT = 3;
+ static CheckingModifierAdapter adapterTest1;
+ static CheckingModifierAdapter adapterTest2;
+ static CheckingModifierAdapter adapterTest3;
+ static CheckingModifierAdapter adapterTest4;
+
+ static boolean debug = true; //dump all errors (debug) or throw first(under jtreg) exception
+ static boolean autorun = false; //use robot or manual run
+ static int testModifier = NONE;
+
+ static int [] mouseButtons;
+ static int [] mouseButtonDownMasks;
+
+ //an arrays representing a modifiersEx of extra mouse buttons while using ALT/CTRL/SHIFT or none of them
+ static int [] modifiersExStandard;
+ static int [] modifiersExStandardSHIFT;
+ static int [] modifiersExStandardCTRL;
+ static int [] modifiersExStandardALT;
+
+ // final static int [] mouseButtons = new int [] {MouseEvent.BUTTON1_MASK, MouseEvent.BUTTON2_MASK, MouseEvent.BUTTON3_MASK};
+ // BUTTON1, 2, 3 press-release.
+ final static int modifiersStandard = 0; //InputEvent.BUTTON_DOWN_MASK;
+
+ public static void checkPressedModifiersTest(int testModifier, MouseEvent event){
+ int [] curStandardExModifiers = getStandardExArray(testModifier);
+ int button = event.getButton();
+ int modifiers = event.getModifiers();
+ int modifiersEx = event.getModifiersEx();
+ int index = (button - 4)*3;
+ dumpValues(button, modifiers, modifiersStandard, modifiersEx, curStandardExModifiers[index]);
+ if (modifiers != modifiersStandard){
+ MessageLogger.reportError("Test failed : Pressed. modifiers != modifiersStandard");
+ }
+
+ if (modifiersEx != curStandardExModifiers[index]){
+// System.out.println(">>>>>>>>>>>>>>> Pressed. modifiersEx "+modifiersEx +" : "+!= curStandardExModifiers");
+ MessageLogger.reportError("Test failed : Pressed. modifiersEx != curStandardExModifiers");
+ }
+
+ //check event.paramString() output
+ HashMap paramStringElements = tokenizeParamString(event.paramString());
+ System.out.println(event.paramString());
+ checkButton(paramStringElements, button);
+ checkModifiers(testModifier, paramStringElements, button);
+ checkExtModifiersOnPress(testModifier, paramStringElements, button);
+ }
+
+ public static void checkExtModifiersOnReleaseClick(int testModifier, HashMap h, int button){
+ String ethalon = "";
+ switch (testModifier){
+ case SHIFT:{
+ ethalon = "Shift";
+ break;
+ }
+ case ALT:{
+ ethalon = "Alt";
+ break;
+ }
+ case CTRL:{
+ ethalon = "Ctrl";
+ break;
+ }
+ }
+ //
+ if (h.get("extModifiers") == null){
+ h.put("extModifiers", "");
+ }
+ if (!ethalon.equals(h.get("extModifiers"))) {
+ MessageLogger.reportError("Test failed : Released/Clicked. extModifiers = " +h.get("extModifiers")+" instead of : "+ethalon);
+ }
+ }
+
+ public static void checkExtModifiersOnPress(int testModifier, HashMap h, int button){
+ String ethalon = "";
+ switch (testModifier){
+ case SHIFT:{
+ ethalon = "Shift+";
+ break;
+ }
+ case ALT:{
+ ethalon = "Alt+";
+ break;
+ }
+ case CTRL:{
+ ethalon = "Ctrl+";
+ break;
+ }
+ }
+ ethalon = ethalon + "Button" +button;
+
+ if (!h.get("extModifiers").equals(ethalon)) {
+ MessageLogger.reportError("Test failed : Pressed. extModifiers = " +h.get("extModifiers")+" instead of : "+ethalon);
+ }
+ }
+
+ public static void checkModifiers(int testModifier, HashMap h, int button){
+ // none of modifiers for extra button should be null
+ if (h.get("modifiers") != null) {
+ MessageLogger.reportError("Test failed : modifiers != null");
+ }
+ }
+
+ public static void checkButton(HashMap h, int button){
+ if (h.get("button") == null) {
+ MessageLogger.reportError("Test failed : checkButton(). button is absent in paramString()");
+ }
+ if (Integer.parseInt(h.get("button")) != button) {
+ MessageLogger.reportError("Test failed : checkButton. button in paramString() doesn't equal to button being pressed.");
+ }
+ }
+ public static HashMap tokenizeParamString(String param){
+ HashMap params = new HashMap();
+ StringTokenizer st = new StringTokenizer(param, ",=");
+ while (st.hasMoreTokens()){
+ String tmp = st.nextToken();
+// System.out.println("PARSER : "+tmp);
+ if (tmp.equals("button") ||
+ tmp.equals("modifiers") ||
+ tmp.equals("extModifiers")) {
+ params.put(tmp, st.nextToken());
+ }
+ }
+ return params;
+ }
+
+ public static Vector tokenizeModifiers(String modifierList){
+ Vector modifiers = new Vector();
+ StringTokenizer st = new StringTokenizer(modifierList, "+");
+ while (st.hasMoreTokens()){
+ String tmp = st.nextToken();
+ modifiers.addElement(tmp);
+ System.out.println("MODIFIER PARSER : "+tmp);
+ }
+ return modifiers;
+ }
+
+ public static void checkReleasedModifiersTest(int testModifier, MouseEvent event){
+ int [] curStandardExModifiers = getStandardExArray(testModifier);
+ int button = event.getButton();
+ int modifiers = event.getModifiers();
+ int modifiersEx = event.getModifiersEx();
+ int index = (button - 4)*3 + 1;
+ dumpValues(button, modifiers, modifiersStandard, modifiersEx, curStandardExModifiers[index]);
+ if (modifiers != modifiersStandard){
+ MessageLogger.reportError("Test failed : Released. modifiers != modifiersStandard");
+ }
+
+ if (modifiersEx != curStandardExModifiers[index]){
+ MessageLogger.reportError("Test failed : Released. modifiersEx != curStandardExModifiers");
+ }
+
+ //check event.paramString() output
+ HashMap paramStringElements = tokenizeParamString(event.paramString());
+ checkButton(paramStringElements, button);
+ checkModifiers(testModifier, paramStringElements, button);
+ System.out.println("paramStringElements = "+paramStringElements);
+ checkExtModifiersOnReleaseClick(testModifier, paramStringElements, button);
+ }
+
+ public static void checkClickedModifiersTest(int testModifier, MouseEvent event){
+ int [] curStandardExModifiers = getStandardExArray(testModifier);
+ int button = event.getButton();
+ int modifiers = event.getModifiers();
+ int modifiersEx = event.getModifiersEx();
+ int index = (button - 4)*3 + 2;
+ dumpValues(button, modifiers, modifiersStandard, modifiersEx, curStandardExModifiers[index]);
+ if (modifiers != modifiersStandard){
+ MessageLogger.reportError("Test failed : Clicked. modifiers != modifiersStandard");
+ }
+
+ if (modifiersEx != curStandardExModifiers[index]){
+ MessageLogger.reportError("Test failed : Clicked. modifiersEx != curStandardExModifiers");
+ }
+
+ //check event.paramString() output
+ HashMap paramStringElements = tokenizeParamString(event.paramString());
+ checkButton(paramStringElements, button);
+ checkModifiers(testModifier, paramStringElements, button);
+ checkExtModifiersOnReleaseClick(testModifier, paramStringElements, button);
+ }
+
+ private static int[] getStandardExArray(int testModifier) {
+ int [] curStandardExModifiers;
+ switch (testModifier){
+ case SHIFT:
+ curStandardExModifiers = modifiersExStandardSHIFT;
+ break;
+ case CTRL:
+ curStandardExModifiers = modifiersExStandardCTRL;
+ break;
+ case ALT:
+ curStandardExModifiers = modifiersExStandardALT;
+ break;
+ default: //NONE by default
+ curStandardExModifiers = modifiersExStandard;
+ }
+ return curStandardExModifiers;
+ }
+
+ static Robot robot;
+ public void init() {
+ this.setLayout(new BorderLayout());
+
+ String[] instructions =
+ {
+ "This test should be used with the mouse having more then three buttons.",
+ "Currently, " + MouseInfo.getNumberOfButtons() +" buttons are available.",
+ "If there are less then three buttons, press PASS.",
+ "1. Press each extra mouse button.",
+ "2. For each mouse event its modifiers and ExModifiers will be printed.",
+ "3. Verify that they are correct.",
+ "4. Press Pass or Fail accordingly."
+ };
+// Sysout.createDialogWithInstructions( instructions );
+
+// addMouseListener(adapterTest1);
+ try {
+ robot = new Robot();
+ } catch (Exception e) {
+ MessageLogger.reportError("Test failed. "+e);
+ }
+ }//End init()
+
+ public void start() {
+ //Get things going. Request focus, set size, et cetera
+ setSize(200,200);
+ setVisible(true);
+ validate();
+ if (autorun) {
+ testNONE();
+ testSHIFT();
+ testCTRL();
+ testALT();
+ } else {
+ switch (testModifier){
+ case SHIFT:
+ this.addMouseListener(adapterTest2);
+ break;
+ case CTRL:
+ this.addMouseListener(adapterTest3);
+ break;
+ case ALT:
+ this.addMouseListener(adapterTest4);
+ break;
+ default: //NONE by default
+ this.addMouseListener(adapterTest1);
+ }
+ }
+ }// start()
+
+ //000000000000000000000000000000000000000000000000000000000000000
+ public void testNONE(){
+ this.addMouseListener(adapterTest1);
+ robot.delay(1000);
+ robot.mouseMove(getLocationOnScreen().x + getWidth()/2, getLocationOnScreen().y + getHeight()/2);
+ for (int i = 3; i< mouseButtons.length; i++){
+ System.out.println("testNONE() => " +mouseButtons[i] );
+ robot.mousePress(mouseButtons[i]);
+ robot.delay(100);
+ robot.mouseRelease(mouseButtons[i]);
+ }
+ robot.delay(1000);
+ this.removeMouseListener(adapterTest1);
+ }
+
+ public void testSHIFT(){
+ this.addMouseListener(adapterTest2);
+ robot.delay(1000);
+ robot.mouseMove(getLocationOnScreen().x + getWidth()/2, getLocationOnScreen().y + getHeight()/2);
+ for (int i = 3; i< mouseButtons.length; i++){
+ robot.keyPress(KeyEvent.VK_SHIFT);
+ System.out.println("testSHIFT() => " +mouseButtons[i] );
+ robot.mousePress(mouseButtons[i]);
+ robot.delay(100);
+ robot.mouseRelease(mouseButtons[i]);
+ robot.keyRelease(KeyEvent.VK_SHIFT);
+ }
+ robot.delay(1000);
+ this.removeMouseListener(adapterTest2);
+ }
+
+ public void testCTRL(){
+ this.addMouseListener(adapterTest3);
+ robot.delay(1000);
+ robot.mouseMove(getLocationOnScreen().x + getWidth()/2, getLocationOnScreen().y + getHeight()/2);
+ for (int i = 3; i< mouseButtons.length; i++){
+ robot.keyPress(KeyEvent.VK_CONTROL);
+ System.out.println("testCTRL() => " +mouseButtons[i] );
+ robot.mousePress(mouseButtons[i]);
+ robot.delay(100);
+ robot.mouseRelease(mouseButtons[i]);
+ robot.keyRelease(KeyEvent.VK_CONTROL);
+ }
+ robot.delay(1000);
+ this.removeMouseListener(adapterTest3);
+ }
+
+ public void testALT(){
+ this.addMouseListener(adapterTest4);
+ robot.delay(1000);
+ robot.mouseMove(getLocationOnScreen().x + getWidth()/2, getLocationOnScreen().y + getHeight()/2);
+ for (int i = 3; i< mouseButtons.length; i++){
+ robot.keyPress(KeyEvent.VK_ALT);
+ System.out.println("testALT() => " +mouseButtons[i] );
+ robot.mousePress(mouseButtons[i]);
+ robot.delay(100);
+ robot.mouseRelease(mouseButtons[i]);
+ robot.keyRelease(KeyEvent.VK_ALT);
+ }
+ robot.delay(1000);
+ this.removeMouseListener(adapterTest4);
+ }
+
+ //**************************************************************************************************
+ public static void dumpValues(int button, int modifiers, int modifiersStandard, int modifiersEx, int modifiersExStandard){
+ System.out.println("Button = "+button + "Modifiers = "+ modifiers + "standard = "+ modifiersStandard);
+ System.out.println("Button = "+button + "ModifiersEx = "+ modifiersEx + "standardEx = "+ modifiersExStandard);
+ }
+
+ public static void initParams(String []s){
+ if (s.length != 3){
+ autorun = true;
+ debug = false;
+ testModifier = NONE;
+ } else {
+ autorun = Boolean.valueOf(s[0]);
+ debug = Boolean.valueOf(s[1]);
+
+ if (s[2].equals("NONE")){
+ testModifier = NONE;
+ }
+ if (s[2].equals("SHIFT")){
+ testModifier = SHIFT;
+ }
+ if (s[2].equals("CTRL")){
+ testModifier = CTRL;
+ }
+ if (s[2].equals("ALT")){
+ testModifier = ALT;
+ }
+ }
+ MessageLogger.setDebug(debug);
+ System.out.println("Autorun : " +autorun);
+ System.out.println("Debug mode : " +debug);
+ System.out.println("Modifier to verify : " + testModifier);
+ }
+
+ public static void initAdapters(){
+ adapterTest1 = new CheckingModifierAdapter(NONE);
+ adapterTest2 = new CheckingModifierAdapter(SHIFT);
+ adapterTest3 = new CheckingModifierAdapter(CTRL);
+ adapterTest4 = new CheckingModifierAdapter(ALT);
+ }
+
+ public static void initVars(){
+ int [] tmp = new int [MouseInfo.getNumberOfButtons()];
+ for (int i = 0; i < MouseInfo.getNumberOfButtons(); i++){
+ tmp[i] = InputEvent.getMaskForButton(i+1);
+ // System.out.println("TEST: "+tmp[i]);
+ }
+
+ mouseButtons = Arrays.copyOf(tmp, tmp.length);
+
+ for (int i = 0; i < mouseButtons.length; i++){
+ System.out.println("MouseArray [i] == "+mouseButtons[i]);
+ }
+
+ mouseButtonDownMasks = Arrays.copyOf(tmp, tmp.length);
+
+ // So we need to get the number of extra buttons on the mouse: "MouseInfo.getNumberOfButtons() - 3"
+ // and multyply on 3 because each button will generate three events : PRESS, RELEASE and CLICK.
+ tmp = new int [(MouseInfo.getNumberOfButtons()-3)*3];
+ Arrays.fill(tmp, 0);
+
+ for (int i = 0, j = 3; i < tmp.length; i = i + 3, j++){
+ tmp[i] = mouseButtonDownMasks[j];
+ }
+ modifiersExStandard = Arrays.copyOf(tmp, tmp.length);
+
+ Arrays.fill(tmp, InputEvent.SHIFT_DOWN_MASK);
+ for (int i = 0, j = 3; i < MouseInfo.getNumberOfButtons(); i = i + 3, j++){
+ tmp[i] = tmp[j] | mouseButtonDownMasks[j];
+ }
+ modifiersExStandardSHIFT = Arrays.copyOf(tmp, tmp.length);
+
+ Arrays.fill(tmp, InputEvent.CTRL_DOWN_MASK);
+ for (int i = 0, j = 3; i < MouseInfo.getNumberOfButtons(); i = i + 3, j++){
+ tmp[i] = tmp[j] | mouseButtonDownMasks[j];
+ }
+ modifiersExStandardCTRL = Arrays.copyOf(tmp, tmp.length);
+
+ Arrays.fill(tmp, InputEvent.ALT_DOWN_MASK);
+ for (int i = 0, j = 3; i < MouseInfo.getNumberOfButtons(); i = i + 3, j++){
+ tmp[i] = tmp[j] | mouseButtonDownMasks[j];
+ }
+ modifiersExStandardALT = Arrays.copyOf(tmp, tmp.length);
+ }
+
+ public static void main(String []s){
+ if (MouseInfo.getNumberOfButtons() < 4){
+ System.out.println("There are less then 4 buttons on the mouse. The test may not be accomplished. Skipping.");
+ return;
+ }
+ initVars();
+ MouseModifiersUnitTest_Extra frame = new MouseModifiersUnitTest_Extra();
+ frame.initParams(s);
+ frame.init();
+ initAdapters();
+ frame.start();
+ }
+
+}// class
+
+/* A class that invoke appropriate verification
+ * routine with current modifier.
+ */
+class CheckingModifierAdapter extends MouseAdapter{
+ int modifier;
+ public CheckingModifierAdapter(int modifier){
+ this.modifier = modifier;
+ }
+
+ public void mousePressed(MouseEvent e) {
+ System.out.println("PRESSED "+e);
+ if (e.getButton() <= MouseEvent.BUTTON3) {
+ System.out.println("Standard button affected. Skip.");
+ } else {
+ MouseModifiersUnitTest_Extra.checkPressedModifiersTest(modifier, e);
+ }
+ }
+ public void mouseReleased(MouseEvent e) {
+ System.out.println("RELEASED "+e);
+ if (e.getButton() <= MouseEvent.BUTTON3) {
+ System.out.println("Standard button affected. Skip.");
+ } else {
+ MouseModifiersUnitTest_Extra.checkReleasedModifiersTest(modifier, e);
+ }
+ }
+ public void mouseClicked(MouseEvent e) {
+ System.out.println("CLICKED "+e);
+ if (e.getButton() <= MouseEvent.BUTTON3) {
+ System.out.println("Standard button affected. Skip.");
+ } else {
+ MouseModifiersUnitTest_Extra.checkClickedModifiersTest(modifier, e);
+ }
+ }
+}
+//Utility class that could report a message depending on current purpose of the test run
+class MessageLogger{
+ private static boolean debug;
+
+ public static void setDebug(boolean d){
+ debug = d;
+ log("Switch to "+ ((debug)?"debug":"trial") +" mode");
+ }
+
+ public static void log(String message){
+ System.out.println(message);
+ }
+
+ public static void reportError(String message){
+ if (debug){
+ System.out.println(message);
+ } else {
+ throw new RuntimeException(message);
+ }
+ }
+}
diff -r 8b24486bc4f1 -r 1bf51a4c2627 jdk/test/java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Standard.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Standard.java Wed Jul 05 16:47:27 2017 +0200
@@ -0,0 +1,598 @@
+/*
+ @test %I% %E%
+ @bug 6315717
+ @summary verifies that modifiers are correct for standard (1, 2, 3, wheel) mouse buttons
+ @author Andrei Dmitriev : area=awt.mouse
+ @run main MouseModifiersUnitTest_Standard
+ */
+
+import java.awt.*;
+import java.awt.event.*;
+import java.util.HashMap;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+//the test verifies:
+// 1) verifies that modifiers are correct for standard (1, 2, 3) mouse buttons
+// TODO: 2) verifies that modifiers are correct for wheel
+// TODO: 3)
+// Case1. the test posts BUTTONx_MASK and verifies that paramString() contains correct modifiers and exModifiers
+// Case2. the test posts BUTTONx_DOWN_MASK and verifies that paramString() contains correct modifiers and exModifiers
+// Case3. the test posts getMaskForButton(n) and verifies that paramString() contains correct modifiers and exModifiers
+// repeat all cases with SHIFT/ALT/CTRL modifiers verify that paramString() contains correct modifiers and exModifiers
+// I'm verifying button, modifiers and extModifiers for now.
+
+public class MouseModifiersUnitTest_Standard {
+ static final int NONE = 0;
+ static final int SHIFT = 1;
+ static final int CTRL = 2;
+ static final int ALT = 3;
+ static boolean debug = true; //dump all errors (debug) or throw first(under jtreg) exception
+ static boolean autorun = false; //use robot or manual run
+ static int testModifier = NONE;
+ // static String testModifier = "NONE";
+ static CheckingModifierAdapter adapterTest1;
+ static CheckingModifierAdapter adapterTest2;
+ static CheckingModifierAdapter adapterTest3;
+ static CheckingModifierAdapter adapterTest4;
+ static Frame f;
+ final static int [] mouseButtons = new int [] {MouseEvent.BUTTON1_MASK, MouseEvent.BUTTON2_MASK, MouseEvent.BUTTON3_MASK};
+ // BUTTON1, 2, 3 press-release.
+ final static int [] modifiersStandardTestNONE = new int[] {MouseEvent.BUTTON1_MASK, MouseEvent.BUTTON1_MASK, MouseEvent.BUTTON1_MASK,
+ MouseEvent.BUTTON2_MASK, MouseEvent.BUTTON2_MASK, MouseEvent.BUTTON2_MASK,
+ MouseEvent.BUTTON3_MASK, MouseEvent.BUTTON3_MASK, MouseEvent.BUTTON3_MASK };
+ final static int [] modifiersExStandardTestNONE = new int[] {MouseEvent.BUTTON1_DOWN_MASK, 0, 0,
+ MouseEvent.BUTTON2_DOWN_MASK, 0, 0,
+ MouseEvent.BUTTON3_DOWN_MASK, 0, 0};
+ // BUTTON1, 2, 3 press-release with shift modifier
+ final static int [] modifiersStandardTestSHIFT = new int[] {MouseEvent.BUTTON1_MASK|InputEvent.SHIFT_MASK, MouseEvent.BUTTON1_MASK|InputEvent.SHIFT_MASK, MouseEvent.BUTTON1_MASK|InputEvent.SHIFT_MASK,
+ MouseEvent.BUTTON2_MASK|InputEvent.SHIFT_MASK, MouseEvent.BUTTON2_MASK|InputEvent.SHIFT_MASK, MouseEvent.BUTTON2_MASK|InputEvent.SHIFT_MASK,
+ MouseEvent.BUTTON3_MASK|InputEvent.SHIFT_MASK, MouseEvent.BUTTON3_MASK|InputEvent.SHIFT_MASK, MouseEvent.BUTTON3_MASK|InputEvent.SHIFT_MASK };
+ final static int [] modifiersExStandardTestSHIFT = new int[] {MouseEvent.BUTTON1_DOWN_MASK|InputEvent.SHIFT_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK,
+ MouseEvent.BUTTON2_DOWN_MASK|InputEvent.SHIFT_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK,
+ MouseEvent.BUTTON3_DOWN_MASK|InputEvent.SHIFT_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK};
+ // BUTTON1, 2, 3 press-release with CTRL modifier
+ final static int [] modifiersStandardTestCTRL = new int[] {MouseEvent.BUTTON1_MASK|InputEvent.CTRL_MASK, MouseEvent.BUTTON1_MASK|InputEvent.CTRL_MASK, MouseEvent.BUTTON1_MASK|InputEvent.CTRL_MASK,
+ MouseEvent.BUTTON2_MASK|InputEvent.CTRL_MASK, MouseEvent.BUTTON2_MASK|InputEvent.CTRL_MASK, MouseEvent.BUTTON2_MASK|InputEvent.CTRL_MASK,
+ MouseEvent.BUTTON3_MASK|InputEvent.CTRL_MASK, MouseEvent.BUTTON3_MASK|InputEvent.CTRL_MASK, MouseEvent.BUTTON3_MASK|InputEvent.CTRL_MASK };
+ final static int [] modifiersExStandardTestCTRL = new int[] {MouseEvent.BUTTON1_DOWN_MASK|InputEvent.CTRL_DOWN_MASK, InputEvent.CTRL_DOWN_MASK, InputEvent.CTRL_DOWN_MASK,
+ MouseEvent.BUTTON2_DOWN_MASK|InputEvent.CTRL_DOWN_MASK, InputEvent.CTRL_DOWN_MASK, InputEvent.CTRL_DOWN_MASK,
+ MouseEvent.BUTTON3_DOWN_MASK|InputEvent.CTRL_DOWN_MASK, InputEvent.CTRL_DOWN_MASK, InputEvent.CTRL_DOWN_MASK};
+
+ // BUTTON1, 2, 3 press-release with ALT modifier
+ final static int [] modifiersStandardTestALT = new int[] {MouseEvent.BUTTON1_MASK|InputEvent.ALT_MASK, MouseEvent.BUTTON1_MASK|InputEvent.ALT_MASK, MouseEvent.BUTTON1_MASK|InputEvent.ALT_MASK,
+ MouseEvent.BUTTON2_MASK|InputEvent.ALT_MASK, MouseEvent.BUTTON2_MASK|InputEvent.ALT_MASK, MouseEvent.BUTTON2_MASK|InputEvent.ALT_MASK,
+ MouseEvent.BUTTON3_MASK|InputEvent.ALT_MASK, MouseEvent.BUTTON3_MASK|InputEvent.ALT_MASK, MouseEvent.BUTTON3_MASK|InputEvent.ALT_MASK };
+ final static int [] modifiersExStandardTestALT = new int[] {MouseEvent.BUTTON1_DOWN_MASK|InputEvent.ALT_DOWN_MASK, InputEvent.ALT_DOWN_MASK, InputEvent.ALT_DOWN_MASK,
+ MouseEvent.BUTTON2_DOWN_MASK|InputEvent.ALT_DOWN_MASK, InputEvent.ALT_DOWN_MASK, InputEvent.ALT_DOWN_MASK,
+ MouseEvent.BUTTON3_DOWN_MASK|InputEvent.ALT_DOWN_MASK, InputEvent.ALT_DOWN_MASK, InputEvent.ALT_DOWN_MASK};
+
+ static Robot robot;
+
+ public static void main(String s[]){
+ initParams(s);
+ initAdapters();
+ f = new Frame();
+ final int [] modifiers = {InputEvent.SHIFT_MASK, InputEvent.CTRL_MASK};
+ final String [] modifierNames = {"InputEvent.SHIFT_MASK", "InputEvent.CTRL_MASK"};
+ f.setLayout(new FlowLayout());
+ f.addMouseWheelListener(new MouseWheelListener() {
+ public void mouseWheelMoved(MouseWheelEvent e) {
+ System.out.println("WHEEL "+e);
+ }
+ });
+ f.setSize(300, 300);
+ f.setVisible(true);
+
+ try {
+ robot = new Robot();
+ robot.delay(500);
+ robot.mouseMove(f.getLocationOnScreen().x + f.getWidth()/2, f.getLocationOnScreen().y + f.getHeight()/2);
+ if (autorun) {
+ //testing buttons 1, 2, 3 only
+ testPlainButtons();
+ robot.delay(500);
+
+ //testing buttons 1, 2, 3 with SHIFT, CTRL, ALT keyboard modifiers
+ testButtonsWithShift();
+ robot.delay(500);
+
+ testButtonsWithControl();
+ robot.delay(500);
+
+ testButtonsWithAlt();
+ robot.delay(500);
+ } else {
+ switch (testModifier){
+ case SHIFT:
+ f.addMouseListener(adapterTest2);
+ break;
+ case CTRL:
+ f.addMouseListener(adapterTest3);
+ break;
+ case ALT:
+ f.addMouseListener(adapterTest4);
+ break;
+ default: //NONE inclusive
+ f.addMouseListener(adapterTest1);
+ }
+ }
+ } catch (Exception e){
+ throw new RuntimeException("Test failed.");
+ }
+
+ }
+
+ public static void initAdapters(){
+ adapterTest1 = new CheckingModifierAdapter(NONE);
+ adapterTest2 = new CheckingModifierAdapter(SHIFT);
+ adapterTest3 = new CheckingModifierAdapter(CTRL);
+ adapterTest4 = new CheckingModifierAdapter(ALT);
+ }
+
+ /*======================================================================*/
+ public static void checkPressedModifiersTest(int testModifier, MouseEvent event){
+ int [] curStandardModifiers = getStandardArray(testModifier);
+ int [] curStandardExModifiers = getStandardExArray(testModifier);
+ int button = event.getButton();
+ int modifiers = event.getModifiers();
+ int modifiersEx = event.getModifiersEx();
+ int index = (button - 1)*3;
+ // int index = (button - 4)*3;
+ dumpValues(button, modifiers, curStandardModifiers[index], modifiersEx, curStandardExModifiers[index]);
+ if (modifiers != curStandardModifiers[index]){
+ if (debug){
+ System.out.println("Test failed : Pressed. modifiers != modifiersStandard");
+ } else {
+ throw new RuntimeException("Test failed : Pressed. modifiers != modifiersStandard");
+ }
+ }
+
+ if (modifiersEx != curStandardExModifiers[index]){
+// System.out.println(">>>>>>>>>>>>>>> Pressed. modifiersEx "+modifiersEx +" : "+!= curStandardExModifiers");
+ if (debug){
+ System.out.println("Test failed : Pressed. modifiersEx != curStandardExModifiers");
+ } else {
+ throw new RuntimeException("Test failed : Pressed. modifiersEx != curStandardExModifiers");
+ }
+ }
+ HashMap paramStringElements = tokenizeParamString(event.paramString());
+ System.out.println(event.paramString());
+ checkButton(paramStringElements, button);
+ checkModifiers(testModifier, paramStringElements, button);
+ checkExtModifiersOnPress(testModifier, paramStringElements, button);
+ }
+
+ public static void checkButton(HashMap h, int button){
+ if (h.get("button") == null) {
+ throw new RuntimeException("Test failed : Clicked. button is absent in paramString()");
+ }
+ if (Integer.parseInt(h.get("button")) != button) {
+ throw new RuntimeException("Test failed : Clicked. button in paramString() doesn't equal to button being pressed.");
+ }
+ }
+
+ public static void checkExtModifiersOnPress(int testModifier, HashMap h, int button){
+ String ethalon = "";
+ if (h.get("extModifiers") == null) {
+ System.out.println("Test failed : Pressed. extModifiers == null");
+ throw new RuntimeException("Test failed : Pressed. extModifiers == null");
+ }
+ switch (testModifier){
+ case SHIFT:{
+ ethalon = "Shift+";
+ break;
+ }
+ case ALT:{
+ ethalon = "Alt+";
+ break;
+ }
+ case CTRL:{
+ ethalon = "Ctrl+";
+ break;
+ }
+ default: {
+ ethalon = "";
+ }
+ ethalon = ethalon + "Button" +button;
+
+ if (!h.get("extModifiers").equals(ethalon)) {
+ System.out.println("Test failed : Pressed. extModifiers = " +h.get("extModifiers")+" instead of : "+ethalon);
+ throw new RuntimeException("Test failed : Pressed. extModifiers = " +h.get("extModifiers")+" instead of : "+ethalon);
+ }
+ }
+ }
+
+
+
+ public static void checkModifiers(int testModifier, HashMap h, int button){
+ // none of modifiers should be null
+ if (h.get("modifiers") == null) {
+ System.out.println("Test failed : modifiers == null");
+ throw new RuntimeException("Test failed : modifiers == null");
+ }
+ Vector modifierElements = tokenizeModifiers(h.get("modifiers"));
+ //check that ButtonX is there
+ String buttonEthalon = "Button" + button;
+ if (modifierElements.contains(buttonEthalon)){
+ modifierElements.remove(buttonEthalon);
+ } else {
+ System.out.println("Test failed : modifiers doesn't contain Button "+h.get("modifiers"));
+ throw new RuntimeException("Test failed : modifiers doesn't contain Button "+h.get("modifiers"));
+ }
+
+
+ //Check all explicitly pressed modifires
+// boolean altIncluded = false; //don't duplicate Alt when ALT is pressed and BUTTON2_MASK.
+ String excplicitModifier = "";
+ boolean altIncluded = false;
+ switch (testModifier){
+ case SHIFT:{
+ excplicitModifier = "Shift";
+ break;
+ }
+ case ALT:{
+ excplicitModifier = "Alt";
+ altIncluded = true; //there should be only on "Alt" for two modifiers. So check it.
+ break;
+ }
+ case CTRL:{
+ excplicitModifier = "Ctrl";
+ break;
+ }
+ }
+ if (!excplicitModifier.equals("")){
+ if (modifierElements.contains(excplicitModifier)){
+ modifierElements.remove(excplicitModifier);
+ } else {
+ System.out.println("Test failed : modifiers doesn't contain explicit modifier "+excplicitModifier + " in "+ h.get("modifiers"));
+ throw new RuntimeException("Test failed : modifiers doesn't contain explicit modifier "+excplicitModifier + " in "+ h.get("modifiers"));
+ }
+ }
+
+ //Button 2 and 3 reports about Alt+Button2 and Meta+Button3 respectively.
+ //Check these values too
+ String extraModifiers = "";
+ String extraModifiersButton3 = "";
+ switch (button){
+ //BUTTON1 with ALT reports about Alt+Button1+Button2.
+ //We should fix this but I would not change this.
+ case 1: {
+ //Alt+Button1+Button2:
+ // 1) we already handled "Alt" in excplicitModifier
+ // 2) we already took "Button1" in buttonEthalon
+ // 3) so "Button2" is only remained.
+ // This should only happen when ALT+Button1 is pressed
+ if (altIncluded){
+ extraModifiers = "Button2";
+ }
+ break;
+ }
+ case 2: {
+ //Alt+Button2 report about "Alt+Button2".
+ extraModifiers = "Alt";
+ break;
+ }
+ case 3: {
+ //ALT+BUTTON3 reports about "Alt+Meta+Button2+Button3"
+ // This should only happen when ALT+Button3 is pressed
+ extraModifiers = "Meta";
+ if (altIncluded){
+ extraModifiersButton3 = "Button2";
+ }
+ break;
+ }
+ }//switch
+
+ if (!extraModifiers.equals("")){
+ if (modifierElements.contains(extraModifiers)){
+ modifierElements.remove(extraModifiers);
+ } else {
+ //we may already removed "Alt" when filtered explicit modifiers.
+ //Here is no failure in this case.
+ if (!altIncluded) {
+ System.out.println("Test failed : modifiers doesn't contain a modifier from BUTTON2 or BUTTON3 "+extraModifiers + " in "+ h.get("modifiers"));
+ throw new RuntimeException("Test failed : modifiers doesn't contain a modifier from BUTTON2 or BUTTON3 "+extraModifiers + " in "+ h.get("modifiers"));
+ }
+ }
+ }
+
+ if (!extraModifiersButton3.equals("")){
+ if (modifierElements.contains(extraModifiersButton3)){
+ modifierElements.remove(extraModifiersButton3);
+ } else {
+ System.out.println("Test failed : modifiers doesn't contain a modifier from BUTTON2 or BUTTON3 "+extraModifiersButton3 + " in "+ h.get("modifiers"));
+ throw new RuntimeException("Test failed : modifiers doesn't contain a modifier from BUTTON2 or BUTTON3 "+extraModifiersButton3 + " in "+ h.get("modifiers"));
+ }
+ }
+
+ //the length of vector should now be zero
+ if (!modifierElements.isEmpty()){
+ System.out.println("Test failed : there is some more elements in modifiers that shouldn't be there: "+h.get("modifiers"));
+ throw new RuntimeException("Test failed : there is some more elements in modifiers that shouldn't be there: "+h.get("modifiers"));
+ }
+ }
+
+ public static void checkExtModifiersOnReleaseClick(int testModifier, HashMap h, int button){
+ String ethalon = "";
+ switch (testModifier){
+ case SHIFT:{
+ ethalon = "Shift+";
+ break;
+ }
+ case ALT:{
+ ethalon = "Alt+";
+ break;
+ }
+ case CTRL:{
+ ethalon = "Ctrl+";
+ break;
+ }
+ default: {
+ if (h.get("extModifiers") != null) {
+ System.out.println("Test failed : Released. extModifiers != null but no modifiers keys are pressed");
+ throw new RuntimeException("Test failed : Released. extModifiers != null but no modifiers keys are pressed");
+ } else {
+ //no modifiers
+ return;
+ }
+ }
+ }
+ if (h.get("extModifiers").equals(ethalon)) {
+ System.out.println("Test failed : Released. extModifiers = "+ h.get("extModifiers") +" instead of : "+ethalon);
+ throw new RuntimeException("Test failed : Released. extModifiers = "+ h.get("extModifiers") +" instead of : "+ethalon);
+ }
+ }
+
+ public static void checkReleasedModifiersTest(int testModifier, MouseEvent event){
+ int [] curStandardModifiers = getStandardArray(testModifier);
+ int [] curStandardExModifiers = getStandardExArray(testModifier);
+ // int index = (button - 4)*3 + 1;
+ int button = event.getButton();
+ int modifiers = event.getModifiers();
+ int modifiersEx = event.getModifiersEx();
+ int index = (button - 1)*3 + 1;
+ dumpValues(button, modifiers, curStandardModifiers[index], modifiersEx, curStandardExModifiers[index]);
+ if (modifiers != curStandardModifiers[index]){
+ if (debug){
+ System.out.println("Test failed : Released. modifiers != modifiersStandard");
+ } else {
+ throw new RuntimeException("Test failed : Released. modifiers != modifiersStandard");
+ }
+ }
+ if (modifiersEx != curStandardExModifiers[index]){
+ if (debug){
+ System.out.println("Test failed : Released. modifiersEx != curStandardExModifiers");
+ } else {
+ throw new RuntimeException("Test failed : Released. modifiersEx != curStandardExModifiers");
+ }
+ }
+ HashMap paramStringElements = tokenizeParamString(event.paramString());
+ System.out.println(event.paramString());
+ checkButton(paramStringElements, button);
+ checkModifiers(testModifier, paramStringElements, button);
+ checkExtModifiersOnReleaseClick(testModifier, paramStringElements, button);
+ }
+
+ public static void checkClickedModifiersTest(int testModifier, MouseEvent event){
+ int [] curStandardModifiers = getStandardArray(testModifier);
+ int [] curStandardExModifiers = getStandardExArray(testModifier);
+ // int index = (button - 4)*3 + 2;
+ int button = event.getButton();
+ int modifiers = event.getModifiers();
+ int modifiersEx = event.getModifiersEx();
+ int index = (button - 1)*3 + 2;
+ dumpValues(button, modifiers, curStandardModifiers[index], modifiersEx, curStandardExModifiers[index]);
+ if (modifiers != curStandardModifiers[index]){
+ if (debug){
+ System.out.println("Test failed : Clicked. modifiers != modifiersStandard");
+ } else {
+ throw new RuntimeException("Test failed : Clicked. modifiers != modifiersStandard");
+ }
+ }
+ if (modifiersEx != curStandardExModifiers[index]){
+ if (debug){
+ System.out.println("Test failed : Clicked. modifiersEx != curStandardExModifiers");
+ } else {
+ throw new RuntimeException("Test failed : Clicked. modifiersEx != curStandardExModifiers");
+ }
+ }
+ HashMap paramStringElements = tokenizeParamString(event.paramString());
+ checkButton(paramStringElements, button);
+ checkModifiers(testModifier, paramStringElements, button);
+ checkExtModifiersOnReleaseClick(testModifier, paramStringElements, button);
+ }
+ /*======================================================================*/
+
+ public static HashMap tokenizeParamString(String param){
+ HashMap params = new HashMap | | |