JBR-4188 add exec permissions

Added check for AppContext

jb/project/tools/test/perfcmp.sh

@@ -49,7 +49,7 @@ echo $refFile
 echo $resFile
 
 curValues=`cat "$curFile" | cut -f 2 | tr -d '\t'`
-if [ -z noHeaders ]; then
+if [ -z $noHeaders ]; then
   curValuesHeader=`echo "$curValues" | head -n +1`_cur
   header=`cat "$refFile" | head -n +1 | awk -F'\t' -v x=$curValuesHeader '{print "  "$1"\t"$2"_ref\t"x"\tratio"}'`
   testContent=`paste -d '\t' $refFile <(echo "$curValues") | tail -n +2`
@@ -58,7 +58,7 @@ else
 fi
 
 testContent=`echo "$testContent" | awk -F'\t' '{ if ($3>$2+$2*0.1) {print "* "$1"\t"$2"\t"$3"\t"(($2==0)?"-":$3/$2)} else {print "  "$1"\t"$2"\t"$3"\t"(($2==0)?"-":$3/$2)} }'`
-if [ -z noHeaders ]; then
+if [ -z $noHeaders ]; then
   echo "$header" > $resFile
 fi
 echo "$testContent" >> $resFile

src/java.base/windows/classes/sun/nio/fs/WindowsDirectoryStream.java

@@ -175,15 +175,17 @@ class WindowsDirectoryStream
                         nextOffset = 0;
                     }
 
-                    long fullDirInformationAddress = queryDirectoryInformationBuffer.address() + nextOffset;
-                    int nextEntryOffset = WindowsFileAttributes.getNextOffsetFromFileIdFullDirInformation(fullDirInformationAddress);
+                    long dirInformationAddress = queryDirectoryInformationBuffer.address() + nextOffset;
+                    int nextEntryOffset = WindowsFileAttributes.getNextOffsetFromFileDirInformation(
+                            queryDirectoryInformation, dirInformationAddress);
                     nextOffset = nextEntryOffset == 0 ? -1 : nextOffset + nextEntryOffset;
-                    name = WindowsFileAttributes.getFileNameFromFileIdFullDirInformation(fullDirInformationAddress);
+                    name = WindowsFileAttributes.getFileNameFromFileDirInformation(
+                            queryDirectoryInformation, dirInformationAddress);
                     if (isSelfOrParent(name)) {
                         // Skip "." and ".."
                         continue;
                     }
-                    attrs = WindowsFileAttributes.fromFileIdFullDirInformation(fullDirInformationAddress, queryDirectoryInformation.volSerialNumber());
+                    attrs = WindowsFileAttributes.fromFileDirInformation(queryDirectoryInformation, dirInformationAddress);
                 }
 
                 // return entry if accepted by filter

src/java.base/windows/classes/sun/nio/fs/WindowsFileAttributes.java

@@ -141,6 +141,30 @@ class WindowsFileAttributes
     private static final int OFFSETOF_FULL_DIR_INFO_FILE_ID = 72;
     private static final int OFFSETOF_FULL_DIR_INFO_FILENAME = 80;
 
+    /**
+     * struct _FILE_DIRECTORY_INFORMATION {
+     *   ULONG         NextEntryOffset;  // offset = 0
+     *   ULONG         FileIndex;        // offset = 4
+     *   LARGE_INTEGER CreationTime;     // offset = 8
+     *   LARGE_INTEGER LastAccessTime;   // offset = 16
+     *   LARGE_INTEGER LastWriteTime;    // offset = 24
+     *   LARGE_INTEGER ChangeTime;       // offset = 32
+     *   LARGE_INTEGER EndOfFile;        // offset = 40
+     *   LARGE_INTEGER AllocationSize;   // offset = 48
+     *   ULONG         FileAttributes;   // offset = 56
+     *   ULONG         FileNameLength;   // offset = 60
+     *   WCHAR         FileName[1];      // offset = 64
+     * }
+     */
+    private static final int OFFSETOF_DIR_INFO_NEXT_ENTRY_OFFSET = 0;
+    private static final int OFFSETOF_DIR_INFO_CREATION_TIME = 8;
+    private static final int OFFSETOF_DIR_INFO_LAST_ACCESS_TIME = 16;
+    private static final int OFFSETOF_DIR_INFO_LAST_WRITE_TIME = 24;
+    private static final int OFFSETOF_DIR_INFO_END_OF_FILE = 40;
+    private static final int OFFSETOF_DIR_INFO_FILE_ATTRIBUTES = 56;
+    private static final int OFFSETOF_DIR_INFO_FILENAME_LENGTH = 60;
+    private static final int OFFSETOF_DIR_INFO_FILENAME = 64;
+
     // used to adjust values between Windows and java epoch
     private static final long WINDOWS_EPOCH_IN_MICROSECONDS = -11644473600000000L;
 
@@ -293,43 +317,79 @@ class WindowsFileAttributes
     }
 
     /**
-     * Create a WindowsFileAttributes from a FILE_ID_FULL_DIR_INFORMATION structure
+     * Create a WindowsFileAttributes from either a FILE_ID_FULL_DIR_INFORMATION
+     * or FILE_DIRECTORY_INFORMATION structure depending on the value of
+     * QueryDirectoryInformation.supportsFullIdInfo().
      */
-    static WindowsFileAttributes fromFileIdFullDirInformation(long address, int volSerialNumber) {
-        int fileAttrs = unsafe.getInt(address + OFFSETOF_FULL_DIR_INFO_FILE_ATTRIBUTES);
-        long creationTime = unsafe.getLong(address + OFFSETOF_FULL_DIR_INFO_CREATION_TIME);
-        long lastAccessTime = unsafe.getLong(address + OFFSETOF_FULL_DIR_INFO_LAST_ACCESS_TIME);
-        long lastWriteTime = unsafe.getLong(address + OFFSETOF_FULL_DIR_INFO_LAST_WRITE_TIME);
-        long size = unsafe.getLong(address + OFFSETOF_FULL_DIR_INFO_END_OF_FILE);
-        int reparseTag = isReparsePoint(fileAttrs) ?
-            unsafe.getInt(address + OFFSETOF_FULL_DIR_INFO_EA_SIZE) : 0;
-        int fileIndexLow = unsafe.getInt(address + OFFSETOF_FULL_DIR_INFO_FILE_ID);
-        int fileIndexHigh = unsafe.getInt(address + OFFSETOF_FULL_DIR_INFO_FILE_ID + 4);
+    static WindowsFileAttributes fromFileDirInformation(QueryDirectoryInformation info, long address) {
+        if (info.supportsFullIdInfo()) { // address points to struct FILE_ID_FULL_DIR_INFORMATION
+            int fileAttrs = unsafe.getInt(address + OFFSETOF_FULL_DIR_INFO_FILE_ATTRIBUTES);
+            long creationTime = unsafe.getLong(address + OFFSETOF_FULL_DIR_INFO_CREATION_TIME);
+            long lastAccessTime = unsafe.getLong(address + OFFSETOF_FULL_DIR_INFO_LAST_ACCESS_TIME);
+            long lastWriteTime = unsafe.getLong(address + OFFSETOF_FULL_DIR_INFO_LAST_WRITE_TIME);
+            long size = unsafe.getLong(address + OFFSETOF_FULL_DIR_INFO_END_OF_FILE);
+            int reparseTag = isReparsePoint(fileAttrs) ?
+                    unsafe.getInt(address + OFFSETOF_FULL_DIR_INFO_EA_SIZE) : 0;
+            int volSerialNumber = info.volSerialNumber();
+            int fileIndexLow = unsafe.getInt(address + OFFSETOF_FULL_DIR_INFO_FILE_ID);
+            int fileIndexHigh = unsafe.getInt(address + OFFSETOF_FULL_DIR_INFO_FILE_ID + 4);
 
-        return new WindowsFileAttributes(fileAttrs,
-                                         creationTime,
-                                         lastAccessTime,
-                                         lastWriteTime,
-                                         size,
-                                         reparseTag,
-                                         volSerialNumber,
-                                         fileIndexHigh,  // fileIndexHigh
-                                         fileIndexLow); // fileIndexLow
+            return new WindowsFileAttributes(fileAttrs,
+                    creationTime,
+                    lastAccessTime,
+                    lastWriteTime,
+                    size,
+                    reparseTag,
+                    volSerialNumber,
+                    fileIndexHigh,  // fileIndexHigh
+                    fileIndexLow); // fileIndexLow
+        } else { // address points to FILE_DIRECTORY_INFORMATION
+            int fileAttrs = unsafe.getInt(address + OFFSETOF_DIR_INFO_FILE_ATTRIBUTES);
+            long creationTime = unsafe.getLong(address + OFFSETOF_DIR_INFO_CREATION_TIME);
+            long lastAccessTime = unsafe.getLong(address + OFFSETOF_DIR_INFO_LAST_ACCESS_TIME);
+            long lastWriteTime = unsafe.getLong(address + OFFSETOF_DIR_INFO_LAST_WRITE_TIME);
+            long size = unsafe.getLong(address + OFFSETOF_DIR_INFO_END_OF_FILE);
+            int reparseTag = 0;
+            // Don't provide the real serial number  as the reset of the code assumes that presence of
+            // the volume serial means that the file id is also valid, which isn't the case here.
+            // This will make comparing Path's for equality slower as the file id serves as
+            // a unique file key (@see fileKey()).
+            int volSerialNumber = 0;
+            int fileIndexLow = 0;
+            int fileIndexHigh = 0;
+
+            return new WindowsFileAttributes(fileAttrs,
+                    creationTime,
+                    lastAccessTime,
+                    lastWriteTime,
+                    size,
+                    reparseTag,
+                    volSerialNumber,
+                    fileIndexHigh,
+                    fileIndexLow);
+        }
     }
 
-    static int getNextOffsetFromFileIdFullDirInformation(long address) {
-        return unsafe.getInt(address + OFFSETOF_FULL_DIR_INFO_NEXT_ENTRY_OFFSET);
+    static int getNextOffsetFromFileDirInformation(QueryDirectoryInformation info, long address) {
+        return unsafe.getInt(address
+                + (info.supportsFullIdInfo() ? OFFSETOF_FULL_DIR_INFO_NEXT_ENTRY_OFFSET
+                                             : OFFSETOF_DIR_INFO_NEXT_ENTRY_OFFSET));
     }
 
-    static String getFileNameFromFileIdFullDirInformation(long address) {
+    static String getFileNameFromFileDirInformation(QueryDirectoryInformation info, long address) {
         // copy the name
-        int nameLengthInBytes = unsafe.getInt(address + OFFSETOF_FULL_DIR_INFO_FILENAME_LENGTH);
+        int nameLengthInBytes = unsafe.getInt(address
+                + (info.supportsFullIdInfo() ? OFFSETOF_FULL_DIR_INFO_FILENAME_LENGTH
+                                             : OFFSETOF_DIR_INFO_FILENAME_LENGTH));
         if ((nameLengthInBytes % 2) != 0) {
             throw new AssertionError("FileNameLength is not a multiple of 2");
         }
         char[] nameAsArray = new char[nameLengthInBytes/2];
-        unsafe.copyMemory(null, address + OFFSETOF_FULL_DIR_INFO_FILENAME, nameAsArray,
-            Unsafe.ARRAY_CHAR_BASE_OFFSET, nameLengthInBytes);
+        unsafe.copyMemory(null,
+                address + (info.supportsFullIdInfo() ? OFFSETOF_FULL_DIR_INFO_FILENAME
+                                                     : OFFSETOF_DIR_INFO_FILENAME),
+                nameAsArray,
+                Unsafe.ARRAY_CHAR_BASE_OFFSET, nameLengthInBytes);
         return new String(nameAsArray);
     }
 

src/java.base/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java

@@ -298,19 +298,26 @@ class WindowsNativeDispatcher {
     static class QueryDirectoryInformation {
         private long handle;
         private int volSerialNumber;
+        /**
+         * Set by OpenNtQueryDirectoryInformation0() to
+         * true if dealing with struct FILE_ID_FULL_DIR_INFORMATION
+         * and to false if it's struct FILE_DIRECTORY_INFORMATION.
+         */
+        private boolean supportsFullIdInfo;
 
         private QueryDirectoryInformation() { }
         public long handle()         { return handle; }
         public int volSerialNumber() { return volSerialNumber; }
+        public boolean supportsFullIdInfo() { return supportsFullIdInfo; }
     }
     private static native void OpenNtQueryDirectoryInformation0(long lpFileName, long buffer, int bufferSize, QueryDirectoryInformation obj)
         throws WindowsException;
 
     static boolean NextNtQueryDirectoryInformation(QueryDirectoryInformation data, NativeBuffer buffer) throws WindowsException {
-        return NextNtQueryDirectoryInformation0(data.handle(), buffer.address(), buffer.size());
+        return NextNtQueryDirectoryInformation0(data.handle(), data.supportsFullIdInfo(), buffer.address(), buffer.size());
     }
 
-    private static native boolean NextNtQueryDirectoryInformation0(long handle, long buffer, int bufferSize)
+    private static native boolean NextNtQueryDirectoryInformation0(long handle, boolean supportsFullIdInfo, long buffer, int bufferSize)
         throws WindowsException;
 
     static void CloseNtQueryDirectoryInformation(QueryDirectoryInformation data) throws WindowsException {

src/java.base/windows/native/libnio/fs/WindowsNativeDispatcher.c

@@ -54,6 +54,7 @@ static jfieldID findStream_name;
 
 static jfieldID queryDirectoryInformation_handle;
 static jfieldID queryDirectoryInformation_volSerialNumber;
+static jfieldID queryDirectoryInformation_supportsFullIdInfo;
 
 static jfieldID volumeInfo_fsName;
 static jfieldID volumeInfo_volName;
@@ -121,8 +122,10 @@ Java_sun_nio_fs_WindowsNativeDispatcher_initIDs(JNIEnv* env, jclass this)
     CHECK_NULL(clazz);
     queryDirectoryInformation_handle = (*env)->GetFieldID(env, clazz, "handle", "J");
     CHECK_NULL(queryDirectoryInformation_handle);
-    queryDirectoryInformation_volSerialNumber = (*env)->GetFieldID(env, clazz, "volSerialNumber", "I");;
+    queryDirectoryInformation_volSerialNumber = (*env)->GetFieldID(env, clazz, "volSerialNumber", "I");
     CHECK_NULL(queryDirectoryInformation_volSerialNumber);
+    queryDirectoryInformation_supportsFullIdInfo = (*env)->GetFieldID(env, clazz, "supportsFullIdInfo", "Z");
+    CHECK_NULL(queryDirectoryInformation_supportsFullIdInfo);
 
     clazz = (*env)->FindClass(env, "sun/nio/fs/WindowsNativeDispatcher$VolumeInformation");
     CHECK_NULL(clazz);
@@ -483,6 +486,7 @@ Java_sun_nio_fs_WindowsNativeDispatcher_OpenNtQueryDirectoryInformation0(JNIEnv*
         return;
     }
 
+    jboolean supportsFullIdInfo = JNI_TRUE;
     status = NtQueryDirectoryFile_func(
         handle, // FileHandle
         NULL, // Event
@@ -505,15 +509,42 @@ Java_sun_nio_fs_WindowsNativeDispatcher_OpenNtQueryDirectoryInformation0(JNIEnv*
         */
         if (status == STATUS_INVALID_PARAMETER) {
             DWORD attributes = GetFileAttributesW(lpFileName);
-            if ((attributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
-                status = STATUS_NOT_A_DIRECTORY;
+            const jboolean areAttributesValid = (attributes != INVALID_FILE_ATTRIBUTES);
+            const jboolean isDirectory = areAttributesValid
+                    && (attributes & FILE_ATTRIBUTE_DIRECTORY);
+            if (!areAttributesValid || !isDirectory) {
+                if (areAttributesValid && !isDirectory) status = STATUS_NOT_A_DIRECTORY;
+                win32ErrorCode = RtlNtStatusToDosError_func(status);
+                throwWindowsException(env, win32ErrorCode);
+                CloseHandle(handle);
+                return;
             }
-        }
 
-        win32ErrorCode = RtlNtStatusToDosError_func(status);
-        throwWindowsException(env, win32ErrorCode);
-        CloseHandle(handle);
-        return;
+            /* If it's a directory, we can have another go by asking for
+             * less information with the FileDirectoryInformation
+             * information class. This works on a mounted Google Drive, for instance.
+             */
+            status = NtQueryDirectoryFile_func(
+                handle, // FileHandle
+                NULL, // Event
+                NULL, // ApcRoutine
+                NULL, // ApcContext
+                &ioStatusBlock, // IoStatusBlock
+                jlong_to_ptr(bufferAddress), // FileInformation
+                bufferSize, // Length
+                FileDirectoryInformation, // FileInformationClass
+                FALSE, // ReturnSingleEntry
+                NULL, // FileName
+                FALSE); // RestartScan
+
+            if (!NT_SUCCESS(status)) {
+                win32ErrorCode = RtlNtStatusToDosError_func(status);
+                throwWindowsException(env, win32ErrorCode);
+                CloseHandle(handle);
+                return;
+            }
+            supportsFullIdInfo = JNI_FALSE;
+        }
     }
 
     // This call allows retrieving the volume ID of this directory (and all its entries)
@@ -526,11 +557,12 @@ Java_sun_nio_fs_WindowsNativeDispatcher_OpenNtQueryDirectoryInformation0(JNIEnv*
 
     (*env)->SetLongField(env, obj, queryDirectoryInformation_handle, ptr_to_jlong(handle));
     (*env)->SetIntField(env, obj, queryDirectoryInformation_volSerialNumber, info.dwVolumeSerialNumber);
+    (*env)->SetBooleanField(env, obj, queryDirectoryInformation_supportsFullIdInfo, supportsFullIdInfo);
 }
 
 JNIEXPORT jboolean JNICALL
 Java_sun_nio_fs_WindowsNativeDispatcher_NextNtQueryDirectoryInformation0(JNIEnv* env, jclass this,
-    jlong handle, jlong address, jint size)
+    jlong handle, jboolean supportsFullIdInfo, jlong address, jint size)
 {
     HANDLE h = (HANDLE)jlong_to_ptr(handle);
     ULONG win32ErrorCode;
@@ -550,7 +582,8 @@ Java_sun_nio_fs_WindowsNativeDispatcher_NextNtQueryDirectoryInformation0(JNIEnv*
         &ioStatusBlock, // IoStatusBlock
         jlong_to_ptr(address), // FileInformation
         size, // Length
-        FileIdFullDirectoryInformation, // FileInformationClass
+        supportsFullIdInfo ? FileIdFullDirectoryInformation
+                           : FileDirectoryInformation, // FileInformationClass
         FALSE, // ReturnSingleEntry
         NULL, // FileName
         FALSE); // RestartScan

src/java.desktop/macosx/classes/com/apple/eawt/_AppEventHandler.java

@@ -267,8 +267,11 @@ class _AppEventHandler {
                 instance.systemSleepDispatcher.dispatch(new _NativeEvent(Boolean.FALSE));
                 break;
             case NOTIFY_SCREEN_CHANGE_PARAMETERS:
-                EventQueue.invokeLater(() -> ((SunGraphicsEnvironment)SunGraphicsEnvironment.
-                        getLocalGraphicsEnvironment()).displayChanged());
+                if (AppContext.getAppContext() != null) {
+                    EventQueue.invokeLater(
+                            () -> ((SunGraphicsEnvironment)SunGraphicsEnvironment.
+                                    getLocalGraphicsEnvironment()).displayChanged());
+                }
                 break;
             default:
                 System.err.println("EAWT unknown native notification: " + code);

test/jdk/ProblemList.txt

@@ -736,6 +736,9 @@ javax/swing/JRootPane/4670486/bug4670486.java 8042381 macosx-all
 javax/swing/JButton/8151303/PressedIconTest.java 8266246 macosx-aarch64
 javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java 8273573 macosx-all
 
+# macos12 failure
+javax/swing/JMenu/4515762/bug4515762.java 8276074 macosx-all
+
 sanity/client/SwingSet/src/ToolTipDemoTest.java 8225012 windows-all,macosx-all
 sanity/client/SwingSet/src/ScrollPaneDemoTest.java 8225013 linux-all
 sanity/client/SwingSet/src/ButtonDemoScreenshotTest.java 8265770 macosx-all

test/jdk/java/awt/FullScreen/FullScreenInsets/FullScreenInsets.java

@@ -23,13 +23,16 @@
 
 import java.awt.AWTException;
 import java.awt.Color;
+import java.awt.Cursor;
 import java.awt.Dimension;
 import java.awt.DisplayMode;
 import java.awt.Frame;
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
 import java.awt.Insets;
+import java.awt.Point;
 import java.awt.Robot;
+import java.awt.Toolkit;
 import java.awt.Window;
 import java.awt.image.BufferedImage;
 
@@ -50,9 +53,14 @@ public final class FullScreenInsets {
                 .getLocalGraphicsEnvironment();
         final GraphicsDevice[] devices = ge.getScreenDevices();
 
+        final Cursor transparentCursor = Toolkit.getDefaultToolkit().createCustomCursor(
+                new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB),
+                new Point(0, 0), "transparent cursor");
+
         final Window wGreen = new Frame();
         wGreen.setBackground(Color.GREEN);
         wGreen.setSize(300, 300);
+        wGreen.setCursor(transparentCursor);
         wGreen.setVisible(true);
         sleep();
         final Insets iGreen = wGreen.getInsets();
@@ -61,6 +69,7 @@ public final class FullScreenInsets {
         final Window wRed = new Frame();
         wRed.setBackground(Color.RED);
         wRed.setSize(300, 300);
+        wRed.setCursor(transparentCursor);
         wRed.setVisible(true);
         sleep();
         final Insets iRed = wGreen.getInsets();
@@ -129,13 +138,18 @@ public final class FullScreenInsets {
             passed = false;
             return;
         }
+        int cRGB = color.getRGB();
         final BufferedImage bi = r.createScreenCapture(w.getBounds());
         for (int y = 0; y < bi.getHeight(); y++) {
             for (int x = 0; x < bi.getWidth(); x++) {
-                if (bi.getRGB(x, y) != color.getRGB()) {
+                int bRGB = bi.getRGB(x, y);
+                if (Math.abs((bRGB&0xFF) - (cRGB&0xFF)) > 1 ||
+                    Math.abs((bRGB&0xFF00)>>8 - (cRGB&0xFF00)>>8) > 1 ||
+                    Math.abs((bRGB&0xFF0000)>>16 - (cRGB&0xFF0000)>>16) > 1)
+                {
                     System.err.println(
                             "Incorrect pixel at " + x + "x" + y + " : " +
-                            Integer.toHexString(bi.getRGB(x, y)) +
+                            Integer.toHexString(bRGB) +
                             " ,expected : " + Integer.toHexString(
                                     color.getRGB()));
                     passed = false;

test/jdk/java/awt/GraphicsDevice/DisplayModes/UnknownRefrshRateTest.java

@@ -33,6 +33,7 @@ import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
 
 public class UnknownRefrshRateTest {
+    private static final int MAX_MODES = 10;
 
     public static void main(String[] args) throws Exception {
 
@@ -50,7 +51,9 @@ public class UnknownRefrshRateTest {
             DisplayMode[] modes = d.getDisplayModes();
             System.out.println("There are " + modes.length + " modes.");
             try {
-                for (int i=0; i<modes.length; i++) {
+                int modesCount = modes.length < MAX_MODES ? modes.length : MAX_MODES;
+
+                for (int i=0; i<modesCount; i++) {
                     DisplayMode mode = modes[i];
                     System.out.println("copying from mode " + i + " : " + mode);
                     int w = mode.getWidth();

test/jdk/jb/java/awt/Window/FullScreenChildWindow.java

@@ -55,6 +55,7 @@ public class FullScreenChildWindow {
 
     public static void main(String[] args) throws Exception {
         robot = new Robot();
+        robot.setAutoDelay(50); // without delay between key presses, 'switchToPreviousSpace' doesn't always work
         try {
             SwingUtilities.invokeAndWait(FullScreenChildWindow::initUI);
             shownAtFullScreen.get(5, TimeUnit.SECONDS);

test/jdk/jb/java/awt/Window/FullScreenInactiveDialog.java

@@ -51,6 +51,7 @@ public class FullScreenInactiveDialog {
 
     public static void main(String[] args) throws Exception {
         robot = new Robot();
+        robot.setAutoDelay(50); // without delay between key presses, 'switchToPreviousSpace' doesn't always work
         try {
             SwingUtilities.invokeAndWait(FullScreenInactiveDialog::initUI);
             shownAtFullScreen.get(5, TimeUnit.SECONDS);

test/jdk/jb/java/awt/Window/FullScreenInactiveModalDialog.java

@@ -51,6 +51,7 @@ public class FullScreenInactiveModalDialog {
 
     public static void main(String[] args) throws Exception {
         robot = new Robot();
+        robot.setAutoDelay(50); // without delay between key presses, 'switchToPreviousSpace'/'switchToNextSpace' don't always work
         try {
             SwingUtilities.invokeAndWait(FullScreenInactiveModalDialog::initUI);
             shownAtFullScreen.get(5, TimeUnit.SECONDS);

test/jdk/jbProblemList.txt

@@ -234,6 +234,7 @@ java/awt/Window/ShapedAndTranslucentWindows/Translucent.java 8222328 windows-all
 java/awt/Window/AlwaysOnTop/AutoTestOnTop.java 6847593 linux-all
 java/awt/Window/GrabSequence/GrabSequence.java 6848409 macosx-all,linux-all
 java/awt/Window/LocationAtScreenCorner/LocationAtScreenCorner.java 8203371 linux-all
+java/awt/font/GlyphVector/NLGlyphTest.java 8273321 linux-all
 java/awt/font/TextLayout/TextLayoutBounds.java 8169188 generic-all
 java/awt/FontMetrics/FontCrash.java 8198336 windows-all
 java/awt/image/BufferedImage/ICMColorDataTest/ICMColorDataTest.java 8233028 generic-all
@@ -520,7 +521,7 @@ java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.java 71
 java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java 6848810 macosx-all,linux-all
 java/awt/FileDialog/ModalFocus/FileDialogModalFocusTest.java 8194751 linux-all
 java/awt/image/VolatileImage/BitmaskVolatileImage.java 8133102 linux-all
-java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java 8134231 windows-all,linux-all
+java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java 8134231 windows-all,linux-all,macosx-all
 java/awt/SplashScreen/MultiResolutionSplash/unix/UnixMultiResolutionSplashTest.java 8203004 linux-all
 java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java 7107528 linux-all,macosx-all
 java/awt/Mouse/MouseDragEvent/MouseDraggedTest.java 8080676 linux-all
@@ -682,7 +683,7 @@ javax/net/ssl/DTLS/CipherSuite.java                             8202059 macosx-x
 
 sun/security/provider/KeyStore/DKSTest.sh                       8180266 windows-all
 
-sun/security/pkcs11/KeyStore/SecretKeysBasic.sh                 8209398 generic-all
+sun/security/pkcs11/KeyStore/SecretKeysBasic.java               8209398 generic-all
 
 security/infra/java/security/cert/CertPathValidator/certification/ActalisCA.java  8224768 generic-all
 
@@ -737,6 +738,7 @@ javax/swing/border/TestTitledBorderLeak.java 8213531 linux-all,windows-all
 javax/swing/JButton/8151303/PressedIconTest.java 8266246 macosx-aarch64
 javax/swing/JComponent/6683775/bug6683775.java 8172337 generic-all
 javax/swing/JLabel/6596966/bug6596966.java 8197552 windows-all
+javax/swing/JMenu/4515762/bug4515762.java 8276074 windows-all,macosx-all
 javax/swing/JWindow/ShapedAndTranslucentWindows/ShapedTranslucentPerPixelTranslucentGradient.java 8233582 linux-all
 javax/swing/JWindow/ShapedAndTranslucentWindows/ShapedPerPixelTranslucentGradient.java 8233582 linux-all
 javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentSwing.java 8194128 macosx-all
@@ -888,6 +890,7 @@ java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter.java 8254841 macos
 java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest1.java 8256289 windows-x64
 java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java 8258103 linux-all
 
+com/sun/jndi/dns/ConfigTests/Timeout.java 8220213 generic-all
 
 ############################################################################
 
@@ -925,4 +928,7 @@ javax/print/attribute/SupportedPrintableAreas.java
 
 java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.java               JBR-890  macosx-all
 java/awt/dnd/NoFormatsCrashTest/NoFormatsCrashTest.java                             JBR-1011 macosx-all
-java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java                   JBR-1011 macosx-all
+java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java                   JBR-1011 macosx-all
+
+com/sun/java/swing/plaf/windows/Test8173145.java                                    JBR-4197 windows-all
+com/sun/java/swing/plaf/windows/AltFocusIssueTest.java                              JBR-4197 windows-all

test/jdk/jbScale2ProblemList.txt

@@ -1,3 +1,3 @@
 java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.java               JBR-890  generic-all
 java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java                   JBR-1011 generic-all
-java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java          8279190 linux-all,windows-all
+java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java          8279190 linux-all,windows-all,macosx-all