Review fix: self-assignment check

Prevent from freeing memory with CoTaskMemFree twice

jb/project/java-common.cmake

@@ -0,0 +1,30 @@
+# common for all OS
+set(CMAKE_CXX_STANDARD 98)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE -D_REENTRANT -DVM_LITTLE_ENDIAN -D_LP64 -DTARGET_ARCH_x86 ")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DINCLUDE_SUFFIX_CPU=_x86 -DAMD64 -DHOTSPOT_LIB_ARCH='amd64' -DCOMPILER1 -DCOMPILER2")
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTARGET_COMPILER_gcc")
+endif ()
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLINUX -DTARGET_OS_FAMILY_linux -DTARGET_COMPILER_gcc -D_GNU_SOURCE")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DLINUX -DTARGET_OS_FAMILY_linux -DTARGET_COMPILER_gcc -D_GNU_SOURCE")
+endif ()
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_ALLBSD_SOURCE -DTARGET_OS_FAMILY_bsd")
+endif ()
+
+if ("${CMAKE_SYSTEM_NAME}" MATCHES "CYGWIN") #not shure about TARGET_COMPILER
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTARGET_COMPILER_visCPP -DWIN64 -D_WINDOWS -DTARGET_OS_FAMILY_windows")
+endif ()
+
+add_custom_target(configure
+        COMMAND bash configure
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../../)
+
+add_custom_target(build_images
+        COMMAND make COMPILER_WARNINGS_FATAL=false images
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../../
+        DEPENDS ${SOURCE_FILES})

modules.list

@@ -0,0 +1,61 @@
+java.base,
+java.compiler,
+java.datatransfer,
+java.desktop,
+java.instrument,
+java.logging,
+java.management,
+java.management.rmi,
+java.naming,
+java.net.http,
+java.prefs,
+java.rmi,
+java.scripting,
+java.se,
+java.security.jgss,
+java.security.sasl,
+java.smartcardio,
+java.sql,
+java.sql.rowset,
+java.transaction.xa,
+java.xml,
+java.xml.crypto,
+javafx.base,
+javafx.controls,
+javafx.fxml,
+javafx.graphics,
+javafx.media,
+javafx.swing,
+javafx.web,
+jdk.accessibility,
+jdk.aot,
+jdk.charsets,
+jdk.crypto.cryptoki,
+jdk.crypto.ec,
+jdk.dynalink,
+jdk.httpserver,
+jdk.internal.ed,
+jdk.internal.le,
+jdk.internal.vm.ci,
+jdk.internal.vm.compiler,
+jdk.internal.vm.compiler.management,
+jdk.jdi,
+jdk.jdwp.agent,
+jdk.jfr,
+jdk.jsobject,
+jdk.localedata,
+jdk.management,
+jdk.management.agent,
+jdk.management.jfr,
+jdk.naming.dns,
+jdk.naming.rmi,
+jdk.net,
+jdk.pack,
+jdk.scripting.nashorn,
+jdk.scripting.nashorn.shell,
+jdk.sctp,
+jdk.security.auth,
+jdk.security.jgss,
+jdk.unsupported,
+jdk.xml.dom,
+jdk.zipfs

src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.m

@@ -241,6 +241,8 @@ static const struct CharToVKEntry charToDeadVKTable[] = {
     {0,0}
 };
 
+static BOOL RIGHT_ALT_AS_ALT_GRAPH = YES; // to provide ability to switch off the AltGr mapping if needed
+
 // TODO: some constants below are part of CGS (private interfaces)...
 // for now we will look at the raw key code to determine left/right status
 // but not sure this is foolproof...
@@ -251,16 +253,20 @@ static struct _nsKeyToJavaModifier
     //NSUInteger cgsRightMask;
     unsigned short leftKeyCode;
     unsigned short rightKeyCode;
+    BOOL leftKeyPressed;
+    BOOL rightKeyPressed;
     jint javaExtMask;
     jint javaMask;
     jint javaKey;
 }
-const nsKeyToJavaModifierTable[] =
+nsKeyToJavaModifierTable[] =
 {
     {
         NSAlphaShiftKeyMask,
         0,
         0,
+        NO,
+        NO,
         0, // no Java equivalent
         0, // no Java equivalent
         java_awt_event_KeyEvent_VK_CAPS_LOCK
@@ -271,6 +277,8 @@ const nsKeyToJavaModifierTable[] =
         //kCGSFlagsMaskAppleRightShiftKey,
         56,
         60,
+        NO,
+        NO,
         java_awt_event_InputEvent_SHIFT_DOWN_MASK,
         java_awt_event_InputEvent_SHIFT_MASK,
         java_awt_event_KeyEvent_VK_SHIFT
@@ -281,6 +289,8 @@ const nsKeyToJavaModifierTable[] =
         //kCGSFlagsMaskAppleRightControlKey,
         59,
         62,
+        NO,
+        NO,
         java_awt_event_InputEvent_CTRL_DOWN_MASK,
         java_awt_event_InputEvent_CTRL_MASK,
         java_awt_event_KeyEvent_VK_CONTROL
@@ -291,6 +301,8 @@ const nsKeyToJavaModifierTable[] =
         //kCGSFlagsMaskAppleRightCommandKey,
         55,
         54,
+        NO,
+        NO,
         java_awt_event_InputEvent_META_DOWN_MASK,
         java_awt_event_InputEvent_META_MASK,
         java_awt_event_KeyEvent_VK_META
@@ -300,35 +312,28 @@ const nsKeyToJavaModifierTable[] =
         //kCGSFlagsMaskAppleLeftAlternateKey,
         //kCGSFlagsMaskAppleRightAlternateKey,
         58,
-        0,
+        61,
+        NO,
+        NO,
         java_awt_event_InputEvent_ALT_DOWN_MASK,
         java_awt_event_InputEvent_ALT_MASK,
         java_awt_event_KeyEvent_VK_ALT
     },
-    {
-        NSAlternateKeyMask,
-        0,
-        61,
-        java_awt_event_InputEvent_ALT_DOWN_MASK | java_awt_event_InputEvent_ALT_GRAPH_DOWN_MASK,
-        java_awt_event_InputEvent_ALT_MASK | java_awt_event_InputEvent_ALT_GRAPH_MASK,
-        java_awt_event_KeyEvent_VK_ALT | java_awt_event_KeyEvent_VK_ALT_GRAPH
-    },
     // NSNumericPadKeyMask
     {
         NSHelpKeyMask,
         0,
         0,
+        NO,
+        NO,
         0, // no Java equivalent
         0, // no Java equivalent
         java_awt_event_KeyEvent_VK_HELP
     },
     // NSFunctionKeyMask
-    {0, 0, 0, 0, 0, 0}
+    {0, 0, 0, NO, NO, 0, 0, 0}
 };
 
-static BOOL leftAltKeyPressed;
-static BOOL altGRPressed = NO;
-
 /*
  * Almost all unicode characters just go from NS to Java with no translation.
  *  For the few exceptions, we handle it here with this small table.
@@ -720,7 +725,7 @@ NsKeyModifiersToJavaKeyInfo(NSUInteger nsFlags, unsigned short eventKeyCode,
 {
     static NSUInteger sPreviousNSFlags = 0;
 
-    const struct _nsKeyToJavaModifier* cur;
+    struct _nsKeyToJavaModifier* cur;
     NSUInteger oldNSFlags = sPreviousNSFlags;
     NSUInteger changedNSFlags = oldNSFlags ^ nsFlags;
     sPreviousNSFlags = nsFlags;
@@ -730,27 +735,41 @@ NsKeyModifiersToJavaKeyInfo(NSUInteger nsFlags, unsigned short eventKeyCode,
     *javaKeyType = java_awt_event_KeyEvent_KEY_PRESSED;
 
     for (cur = nsKeyToJavaModifierTable; cur->nsMask != 0; ++cur) {
+        if (eventKeyCode != 0) {
+            // if key code is specified we are able to determine its location
+            // also it is possible to track the pressed state of the corresponding key
+            if (cur->leftKeyCode == eventKeyCode) {
+                // specified key code switches the pressed state only if the current mask is set
+                cur->leftKeyPressed = !cur->leftKeyPressed && (cur->nsMask & nsFlags);
+                *javaKeyCode = cur->javaKey;
+                *javaKeyLocation = java_awt_event_KeyEvent_KEY_LOCATION_LEFT;
+                *javaKeyType = cur->leftKeyPressed
+                        ? java_awt_event_KeyEvent_KEY_PRESSED
+                        : java_awt_event_KeyEvent_KEY_RELEASED;
+                break;
+            }
+            if (cur->rightKeyCode == eventKeyCode) {
+                // specified key code switches the pressed state only if the current mask is set
+                cur->rightKeyPressed = !cur->rightKeyPressed && (cur->nsMask & nsFlags);
+                *javaKeyCode = cur->javaKey;
+                if (RIGHT_ALT_AS_ALT_GRAPH && cur->nsMask == NSAlternateKeyMask) {
+                    // special case - consider right Alt as AltGr:
+                    *javaKeyCode = java_awt_event_KeyEvent_VK_ALT_GRAPH;
+                }
+                *javaKeyLocation = java_awt_event_KeyEvent_KEY_LOCATION_RIGHT;
+                *javaKeyType = cur->rightKeyPressed
+                        ? java_awt_event_KeyEvent_KEY_PRESSED
+                        : java_awt_event_KeyEvent_KEY_RELEASED;
+                break;
+            }
+        }
+        // skip current record in the table if current mask is not changed
         if (changedNSFlags & cur->nsMask) {
             *javaKeyCode = cur->javaKey;
             *javaKeyLocation = java_awt_event_KeyEvent_KEY_LOCATION_STANDARD;
-            // TODO: uses SPI...
-            //if (changedNSFlags & cur->cgsLeftMask) {
-            //    *javaKeyLocation = java_awt_event_KeyEvent_KEY_LOCATION_LEFT;
-            //} else if (changedNSFlags & cur->cgsRightMask) {
-            //    *javaKeyLocation = java_awt_event_KeyEvent_KEY_LOCATION_RIGHT;
-            //}
-            if (eventKeyCode == cur->leftKeyCode) {
-                leftAltKeyPressed = YES;
-                *javaKeyLocation = java_awt_event_KeyEvent_KEY_LOCATION_LEFT;
-            } else if (eventKeyCode == cur->rightKeyCode) {
-                *javaKeyLocation = java_awt_event_KeyEvent_KEY_LOCATION_RIGHT;
-            } else if (cur->nsMask == NSAlternateKeyMask) {
-                leftAltKeyPressed = NO;
-                continue;
-            }
-            *javaKeyType = (cur->nsMask & nsFlags) ?
-            java_awt_event_KeyEvent_KEY_PRESSED :
-            java_awt_event_KeyEvent_KEY_RELEASED;
+            *javaKeyType = (cur->nsMask & nsFlags)
+                    ? java_awt_event_KeyEvent_KEY_PRESSED
+                    : java_awt_event_KeyEvent_KEY_RELEASED;
             break;
         }
     }
@@ -762,22 +781,17 @@ NsKeyModifiersToJavaKeyInfo(NSUInteger nsFlags, unsigned short eventKeyCode,
 jint NsKeyModifiersToJavaModifiers(NSUInteger nsFlags, BOOL isExtMods)
 {
     jint javaModifiers = 0;
-    const struct _nsKeyToJavaModifier* cur;
+    struct _nsKeyToJavaModifier* cur;
 
     for (cur = nsKeyToJavaModifierTable; cur->nsMask != 0; ++cur) {
-        if ((cur->nsMask & nsFlags) != 0) {
-
-            if (cur->nsMask == NSAlternateKeyMask) {
-                if (leftAltKeyPressed == YES) {
-                    javaModifiers |= isExtMods? cur->javaExtMask : cur->javaMask;
-                    if (altGRPressed == NO)
-                        break;
-                    } else {
-                        leftAltKeyPressed = YES;
-                        altGRPressed = YES;
-                        continue;
-                    }
-                }
+        if (cur->nsMask & nsFlags) {
+            if (RIGHT_ALT_AS_ALT_GRAPH && cur->nsMask == NSAlternateKeyMask && cur->rightKeyPressed) {
+                // special case - consider right Alt as AltGr:
+                javaModifiers |= isExtMods
+                        ? java_awt_event_InputEvent_ALT_GRAPH_DOWN_MASK
+                        : java_awt_event_InputEvent_ALT_GRAPH_MASK;
+                if (!cur->leftKeyPressed) continue; // ignore Alt mask
+            }
             javaModifiers |= isExtMods ? cur->javaExtMask : cur->javaMask;
         }
     }
@@ -791,7 +805,7 @@ jint NsKeyModifiersToJavaModifiers(NSUInteger nsFlags, BOOL isExtMods)
 NSUInteger JavaModifiersToNsKeyModifiers(jint javaModifiers, BOOL isExtMods)
 {
     NSUInteger nsFlags = 0;
-    const struct _nsKeyToJavaModifier* cur;
+    struct _nsKeyToJavaModifier* cur;
 
     for (cur = nsKeyToJavaModifierTable; cur->nsMask != 0; ++cur) {
         jint mask = isExtMods? cur->javaExtMask : cur->javaMask;
@@ -799,15 +813,16 @@ NSUInteger JavaModifiersToNsKeyModifiers(jint javaModifiers, BOOL isExtMods)
             nsFlags |= cur->nsMask;
         }
     }
+    if (RIGHT_ALT_AS_ALT_GRAPH) {
+        // special case - consider right Alt as AltGr:
+        jint mask = isExtMods
+                ? java_awt_event_InputEvent_ALT_GRAPH_DOWN_MASK
+                : java_awt_event_InputEvent_ALT_GRAPH_MASK;
 
-    // special case
-    jint mask = isExtMods? java_awt_event_InputEvent_ALT_GRAPH_DOWN_MASK :
-                           java_awt_event_InputEvent_ALT_GRAPH_MASK;
-
-    if ((mask & javaModifiers) != 0) {
-        nsFlags |= NSAlternateKeyMask;
+        if ((mask & javaModifiers) != 0) {
+            nsFlags |= NSAlternateKeyMask;
+        }
     }
-
     return nsFlags;
 }
 

src/java.desktop/share/classes/sun/font/FontFamily.java

@@ -61,7 +61,7 @@ public class FontFamily {
      */
     static void remove(Font2D font2D) {
 
-        String name = font2D.getFamilyName(Locale.ENGLISH);
+        String name = font2D.familyName;
         FontFamily family = getFamily(name);
         if (family == null) {
             return;

src/java.desktop/share/native/libfontmanager/freetypeScaler.c

@@ -892,7 +892,7 @@ Java_sun_font_FreetypeFontScaler_getFontMetricsNative(
         jlong pScalerContext, jlong pScaler) {
 
     jobject metrics;
-    jfloat ax, ay, dx, dy, bx, by, lx, ly, mx, my, txx, txy, tyx, tyy;
+    jfloat ax, ay, dx, dy, bx, by, lx, ly, mx, my;
     jfloat f0 = 0.0;
     FTScalerContext *context =
         (FTScalerContext*) jlong_to_ptr(pScalerContext);
@@ -932,6 +932,14 @@ Java_sun_font_FreetypeFontScaler_getFontMetricsNative(
     /* See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657854 */
 #define FT_MulFixFloatShift6(a, b) (((float) (a)) * ((float) (b)) / 65536.0 / 64.0)
 
+#define contextAwareMetricsX(x, y) \
+    (FTFixedToFloat(context->transform.xx) * (x) - \
+     FTFixedToFloat(context->transform.xy) * (y))
+
+#define contextAwareMetricsY(x, y) \
+    (-FTFixedToFloat(context->transform.yx) * (x) + \
+     FTFixedToFloat(context->transform.yy) * (y))
+
     /*
      * See FreeType source code: src/base/ftobjs.c ft_recompute_scaled_metrics()
      * http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1659
@@ -961,24 +969,14 @@ Java_sun_font_FreetypeFontScaler_getFontMetricsNative(
                      OBLIQUE_MODIFIER(scalerInfo->face->size->metrics.height));
     my = 0;
 
-    // apply transformation matrix
-    txx = (jfloat)  FTFixedToFloat(context->transform.xx);
-    txy = (jfloat) -FTFixedToFloat(context->transform.xy);
-    tyx = (jfloat) -FTFixedToFloat(context->transform.yx);
-    tyy = (jfloat)  FTFixedToFloat(context->transform.yy);
-    ax = txy * ay;
-    ay = tyy * ay;
-    dx = txy * dy;
-    dy = tyy * dy;
-    lx = txy * ly;
-    ly = tyy * ly;
-    my = tyx * mx;
-    mx = txx * mx;
-
     metrics = (*env)->NewObject(env,
-                                sunFontIDs.strikeMetricsClass,
-                                sunFontIDs.strikeMetricsCtr,
-                                ax, ay, dx, dy, bx, by, lx, ly, mx, my);
+        sunFontIDs.strikeMetricsClass,
+        sunFontIDs.strikeMetricsCtr,
+        contextAwareMetricsX(ax, ay), contextAwareMetricsY(ax, ay),
+        contextAwareMetricsX(dx, dy), contextAwareMetricsY(dx, dy),
+        bx, by,
+        contextAwareMetricsX(lx, ly), contextAwareMetricsY(lx, ly),
+        contextAwareMetricsX(mx, my), contextAwareMetricsY(mx, my));
 
     return metrics;
 }
@@ -1279,7 +1277,7 @@ Java_sun_font_FreetypeFontScaler_getGlyphImageNative(
         glyphInfo->advanceX =
             (float) (advh * FTFixedToFloat(context->transform.xx));
         glyphInfo->advanceY =
-            (float) (advh * FTFixedToFloat(context->transform.xy));
+            (float) (-advh * FTFixedToFloat(context->transform.yx));
     } else {
         if (!ftglyph->advance.y) {
             glyphInfo->advanceX =

src/java.desktop/windows/native/libawt/windows/awt.h

@@ -53,7 +53,7 @@ typedef enum _PROCESS_DPI_AWARENESS {
 #endif
 
 //#ifndef _WIN32_WINNT_WIN10
-typedef BOOL(EnableNonClientDpiScalingFunc)(HWND);
+typedef BOOL(WINAPI EnableNonClientDpiScalingFunc)(HWND);
 //#endif
 
 class AwtObject;

src/java.desktop/windows/native/libawt/windows/awt_FileDialog.cpp

@@ -58,7 +58,13 @@ class CoTaskStringHolder {
 public:
     CoTaskStringHolder() : m_str(NULL) {}
 
+    CoTaskStringHolder(CoTaskStringHolder& other) {
+        m_str = other.m_str;
+        other.m_str = NULL;
+    }
+
     CoTaskStringHolder& operator=(CoTaskStringHolder& other) {
+        if (m_str == other.m_str) return *this;
         Clean();
         m_str = other.m_str;
         other.m_str = NULL;
@@ -84,8 +90,10 @@ private:
     LPTSTR m_str;
 
     void Clean() {
-        if (m_str)
+        if (m_str) {
             ::CoTaskMemFree(m_str);
+            m_str = NULL;
+        }
     }
 };
 
@@ -97,6 +105,7 @@ public:
     SmartHolderBase& operator=(const SmartHolderBase&) = delete;
 
     void Attach(T* other) {
+        if (m_pointer == other) return;
         Clean();
         m_pointer = other;
     }
@@ -116,8 +125,10 @@ protected:
     T* m_pointer;
 
     virtual void Clean() {
-        if (m_pointer)
+        if (m_pointer) {
             delete m_pointer;
+            m_pointer = NULL;
+        }
     }
 };
 
@@ -128,8 +139,10 @@ class SmartHolder : public SmartHolderBase<T> {
 template <typename T>
 class SmartHolder<T[]> : public SmartHolderBase<T> {
     virtual void Clean() {
-        if (m_pointer)
+        if (m_pointer) {
             delete [] m_pointer;
+            m_pointer = NULL;
+        }
     }
 };
 
@@ -525,10 +538,9 @@ private:
         HWND hdlg;
         OLE_HRT(pWindow->GetWindow(&hdlg));
 
-        HWND parent = ::GetParent(hdlg);
         jobject peer = data->peer;
-        env->CallVoidMethod(peer, AwtFileDialog::setHWndMID, (jlong)parent);
-        ::SetProp(parent, ModalDialogPeerProp, reinterpret_cast<HANDLE>(peer));
+        env->CallVoidMethod(peer, AwtFileDialog::setHWndMID, (jlong)hdlg);
+        ::SetProp(hdlg, ModalDialogPeerProp, reinterpret_cast<HANDLE>(peer));
 
         // fix for 4508670 - disable CS_SAVEBITS
         DWORD style = ::GetClassLong(hdlg, GCL_STYLE);
@@ -537,13 +549,13 @@ private:
         // set appropriate icon for parentless dialogs
         jobject awtParent = env->GetObjectField(peer, AwtFileDialog::parentID);
         if (awtParent == NULL) {
-            ::SendMessage(parent, WM_SETICON, (WPARAM)ICON_BIG,
+            ::SendMessage(hdlg, WM_SETICON, (WPARAM)ICON_BIG,
                           (LPARAM)AwtToolkit::GetInstance().GetAwtIcon());
         } else {
             AwtWindow *awtWindow = (AwtWindow *)JNI_GET_PDATA(awtParent);
-            ::SendMessage(parent, WM_SETICON, (WPARAM)ICON_BIG,
+            ::SendMessage(hdlg, WM_SETICON, (WPARAM)ICON_BIG,
                           (LPARAM)(awtWindow->GetHIcon()));
-            ::SendMessage(parent, WM_SETICON, (WPARAM)ICON_SMALL,
+            ::SendMessage(hdlg, WM_SETICON, (WPARAM)ICON_SMALL,
                           (LPARAM)(awtWindow->GetHIconSm()));
             env->DeleteLocalRef(awtParent);
         }
@@ -564,7 +576,7 @@ HRESULT CDialogEventHandler_CreateInstance(FileDialogData *data, REFIID riid, vo
     OLE_RETURN_HR
 }
 
-HRESULT CreateShellItem(LPTSTR path, IShellItem *shellItem) {
+HRESULT CreateShellItem(LPTSTR path, IShellItemPtr& shellItem) {
     size_t pathLength = _tcslen(path);
     for (size_t index = 0; index < pathLength; index++) {
         if (path[index] == _T('/'))
@@ -608,7 +620,7 @@ AwtFileDialog::Show(void *p)
     IFileDialogEventsPtr pfde;
     IShellItemPtr psiResult;
     FileDialogData data;
-    DWORD dwCookie;
+    DWORD dwCookie = OLE_BAD_COOKIE;
 
     OPENFILENAME ofn;
     memset(&ofn, 0, sizeof(ofn));
@@ -627,6 +639,18 @@ AwtFileDialog::Show(void *p)
         }
 //      DASSERT(awtParent);
         title = (jstring)(env)->GetObjectField(target, AwtDialog::titleID);
+        /*
+              Fix for 6488834.
+              To disable Win32 native parent modality we have to set
+              hwndOwner field to either NULL or some hidden window. For
+              parentless dialogs we use NULL to show them in the taskbar,
+              and for all other dialogs AwtToolkit's HWND is used.
+            */
+        /* [moklev] This fix does not needed anymore
+         * Tested on Windows 10 with example from JDK-4080029
+         * Revert the fix and set the proper parent to keep correct position of modal dialogs
+         */
+//        HWND hwndOwner = awtParent ? AwtToolkit::GetInstance().GetHWnd() : NULL;
         HWND hwndOwner = awtParent ? awtParent->GetHWnd() : NULL;
 
         if (title == NULL || env->GetStringLength(title)==0) {
@@ -667,18 +691,7 @@ AwtFileDialog::Show(void *p)
             ofn.lStructSize = sizeof(ofn);
             ofn.lpstrFilter = s_fileFilterString;
             ofn.nFilterIndex = 1;
-            /*
-              Fix for 6488834.
-              To disable Win32 native parent modality we have to set
-              hwndOwner field to either NULL or some hidden window. For
-              parentless dialogs we use NULL to show them in the taskbar,
-              and for all other dialogs AwtToolkit's HWND is used.
-            */
-            if (awtParent != NULL) {
-                ofn.hwndOwner = AwtToolkit::GetInstance().GetHWnd();
-            } else {
-                ofn.hwndOwner = NULL;
-            }
+            ofn.hwndOwner = hwndOwner;
             ofn.lpstrFile = fileBuffer;
             ofn.nMaxFile = bufferLimit;
             ofn.lpstrTitle = titleBuffer;
@@ -729,20 +742,29 @@ AwtFileDialog::Show(void *p)
             OLE_HRT(pfd->SetFileTypes(s_fileFilterCount, s_fileFilterSpec));
             OLE_HRT(pfd->SetFileTypeIndex(1));
 
-            IShellItemPtr directoryItem;
-            if (SUCCEEDED(CreateShellItem(directoryBuffer, directoryItem))) {
-                pfd->SetFolder(directoryItem);
+            {
+                IShellItemPtr directoryItem;
+                OLE_TRY
+                OLE_HRT(CreateShellItem(directoryBuffer, directoryItem));
+                OLE_HRT(pfd->SetFolder(directoryItem));
+                OLE_CATCH
             }
-            CoTaskStringHolder shortName = GetShortName(fileBuffer);
-            if (shortName) {
-                OLE_HRT(pfd->SetFileName(shortName));
+
+            {
+                CoTaskStringHolder shortName = GetShortName(fileBuffer);
+                if (shortName) {
+                    OLE_TRY
+                    OLE_HRT(pfd->SetFileName(shortName));
+                    OLE_CATCH
+                }
             }
+
             OLE_CATCH
         }
 
         if (useCommonItemDialog && SUCCEEDED(OLE_HR)) {
             if (mode == java_awt_FileDialog_LOAD) {
-                result = SUCCEEDED(pfd->Show(NULL)) && data.result;
+                result = SUCCEEDED(pfd->Show(hwndOwner)) && data.result;
                 if (!result) {
                     OLE_NEXT_TRY
                     OLE_HRT(pfd->GetResult(&psiResult));
@@ -755,7 +777,7 @@ AwtFileDialog::Show(void *p)
                     result = SUCCEEDED(OLE_HR);
                 }
             } else {
-                result = SUCCEEDED(pfd->Show(NULL));
+                result = SUCCEEDED(pfd->Show(hwndOwner));
                 if (result) {
                     OLE_NEXT_TRY
                     OLE_HRT(pfd->GetResult(&psiResult));
@@ -797,7 +819,7 @@ AwtFileDialog::Show(void *p)
 
         AwtDialog::ModalActivateNextWindow(NULL, target, peer);
 
-        if (useCommonItemDialog) {
+        if (!useCommonItemDialog) {
             VERIFY(::SetCurrentDirectory(currentDirectory));
         }
 
@@ -831,7 +853,7 @@ AwtFileDialog::Show(void *p)
     } catch (...) {
 
         if (useCommonItemDialog) {
-            if (pfd) {
+            if (pfd && dwCookie != OLE_BAD_COOKIE) {
                 pfd->Unadvise(dwCookie);
             }
         }
@@ -851,7 +873,7 @@ AwtFileDialog::Show(void *p)
     }
 
     if (useCommonItemDialog) {
-        if (pfd) {
+        if (pfd && dwCookie != OLE_BAD_COOKIE) {
             pfd->Unadvise(dwCookie);
         }
     }

src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp

@@ -672,21 +672,11 @@ BOOL AwtToolkit::Initialize(BOOL localPump) {
 
     awt_dnd_initialize();
 
-    SYSTEM_INFO si;
-    ::ZeroMemory(&si, sizeof(SYSTEM_INFO));
-    ::GetNativeSystemInfo(&si);
-    BOOL is_x86 = (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL);
-
-    BOOL is_wow64;
-    ::IsWow64Process(::GetCurrentProcess(), &is_wow64);
-
-    if (!is_x86 && !is_wow64) { // [tav] EnableNonClientDpiScaling crashes on x86 or WOW64, so just not using it
-        HMODULE hLibUser32Dll = JDK_LoadSystemLibrary("User32.dll");
-        if (hLibUser32Dll != NULL) {
-            lpEnableNonClientDpiScaling =
-                    (EnableNonClientDpiScalingFunc*)GetProcAddress(hLibUser32Dll, "EnableNonClientDpiScaling");
-            ::FreeLibrary(hLibUser32Dll);
-        }
+    HMODULE hLibUser32Dll = JDK_LoadSystemLibrary("User32.dll");
+    if (hLibUser32Dll != NULL) {
+        lpEnableNonClientDpiScaling =
+                (EnableNonClientDpiScalingFunc*)GetProcAddress(hLibUser32Dll, "EnableNonClientDpiScaling");
+        ::FreeLibrary(hLibUser32Dll);
     }
 
     /*

test/hotspot/jtreg/jbProblemList.txt

@@ -78,52 +78,55 @@ gc/stress/TestJNIBlockFullGC/TestJNIBlockFullGC.java 8192647 generic-all
 
 # :hotspot_runtime
 
-runtime/CompressedOops/UseCompressedOops.java 8079353 generic-all
-runtime/SharedArchiveFile/SASymbolTableTest.java 8193639 solaris-all
+runtime/CompressedOops/UseCompressedOops.java                                       8079353 generic-all
+runtime/NMT/MallocStressTest.java                                                   8079353 generic-all
+runtime/SharedArchiveFile/SASymbolTableTest.java                                    8193639 solaris-all
+vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001/TestDescription.java                 8013728 generic-all
+runtime/memory/ReadFromNoaccessArea.java                                            nobug   generic-all crash is the expected behaviour
 
 #############################################################################
 
 # :hotspot_serviceability
 
-serviceability/sa/ClhsdbAttach.java 8193639 solaris-all
-serviceability/sa/ClhsdbCDSCore.java 8207832 linux-x64
-serviceability/sa/ClhsdbCDSJstackPrintAll.java 8193639 solaris-all
-serviceability/sa/ClhsdbField.java 8193639 solaris-all
-serviceability/sa/ClhsdbFindPC.java 8193639 solaris-all
-serviceability/sa/ClhsdbFlags.java 8193639 solaris-all
-serviceability/sa/ClhsdbInspect.java 8193639 solaris-all
-serviceability/sa/ClhsdbJdis.java 8193639 solaris-all
-serviceability/sa/ClhsdbJhisto.java 8193639 solaris-all
-serviceability/sa/ClhsdbJstack.java 8193639 solaris-all
-serviceability/sa/ClhsdbLongConstant.java 8193639 solaris-all
-serviceability/sa/ClhsdbPmap.java 8193639 solaris-all
-serviceability/sa/ClhsdbPrintAll.java 8193639 solaris-all
-serviceability/sa/ClhsdbPrintAs.java 8193639 solaris-all
-serviceability/sa/ClhsdbPrintStatics.java 8193639 solaris-all
-serviceability/sa/ClhsdbPstack.java 8193639 solaris-all
-serviceability/sa/ClhsdbRegionDetailsScanOopsForG1.java 8193639 solaris-all
-serviceability/sa/ClhsdbScanOops.java 8193639 solaris-all
-serviceability/sa/ClhsdbSource.java 8193639 solaris-all
-serviceability/sa/ClhsdbSymbol.java 8193639 solaris-all
-serviceability/sa/ClhsdbSymbolTable.java 8193639 solaris-all
-serviceability/sa/ClhsdbThread.java 8193639 solaris-all
-serviceability/sa/ClhsdbVmStructsDump.java 8193639 solaris-all
-serviceability/sa/ClhsdbWhere.java 8193639 solaris-all
-serviceability/sa/DeadlockDetectionTest.java 8193639 solaris-all
-serviceability/sa/JhsdbThreadInfoTest.java 8193639 solaris-all
-serviceability/sa/sadebugd/SADebugDTest.java 8163805 generic-all
-serviceability/sa/TestClassDump.java 8193639 solaris-all
-serviceability/sa/TestCpoolForInvokeDynamic.java 8193639 solaris-all
-serviceability/sa/TestDefaultMethods.java 8193639 solaris-all
-serviceability/sa/TestG1HeapRegion.java 8193639 solaris-all
-serviceability/sa/TestHeapDumpForInvokeDynamic.java 8193639 solaris-all
-serviceability/sa/TestHeapDumpForLargeArray.java 8193639 solaris-all
-serviceability/sa/TestInstanceKlassSizeForInterface.java 8193639 solaris-all
-serviceability/sa/TestIntConstant.java 8193639 solaris-all
-serviceability/sa/TestJhsdbJstackLock.java 8193639 solaris-all
-serviceability/sa/TestRevPtrsForInvokeDynamic.java 8191270 generic-all
-serviceability/sa/TestType.java 8193639 solaris-all
-serviceability/sa/TestUniverse.java#id0 8193639 solaris-all
+serviceability/sa/ClhsdbAttach.java                                                 8193639 solaris-all
+serviceability/sa/ClhsdbCDSCore.java                                                8207832 linux-all,generic-all crash is the expected behaviour
+serviceability/sa/ClhsdbCDSJstackPrintAll.java                                      8193639 solaris-all
+serviceability/sa/ClhsdbField.java                                                  8193639 solaris-all
+serviceability/sa/ClhsdbFindPC.java                                                 8193639 solaris-all
+serviceability/sa/ClhsdbFlags.java                                                  8193639 solaris-all
+serviceability/sa/ClhsdbInspect.java                                                8193639 solaris-all
+serviceability/sa/ClhsdbJdis.java                                                   8193639 solaris-all
+serviceability/sa/ClhsdbJhisto.java                                                 8193639 solaris-all
+serviceability/sa/ClhsdbJstack.java                                                 8193639 solaris-all
+serviceability/sa/ClhsdbLongConstant.java                                           8193639 solaris-all
+serviceability/sa/ClhsdbPmap.java                                                   8193639 solaris-all
+serviceability/sa/ClhsdbPrintAll.java                                               8193639 solaris-all
+serviceability/sa/ClhsdbPrintAs.java                                                8193639 solaris-all
+serviceability/sa/ClhsdbPrintStatics.java                                           8193639 solaris-all
+serviceability/sa/ClhsdbPstack.java                                                 8193639 solaris-all
+serviceability/sa/ClhsdbRegionDetailsScanOopsForG1.java                             8193639 solaris-all
+serviceability/sa/ClhsdbScanOops.java                                               8193639 solaris-all
+serviceability/sa/ClhsdbSource.java                                                 8193639 solaris-all
+serviceability/sa/ClhsdbSymbol.java                                                 8193639 solaris-all
+serviceability/sa/ClhsdbSymbolTable.java                                            8193639 solaris-all
+serviceability/sa/ClhsdbThread.java                                                 8193639 solaris-all
+serviceability/sa/ClhsdbVmStructsDump.java                                          8193639 solaris-all
+serviceability/sa/ClhsdbWhere.java                                                  8193639 solaris-all
+serviceability/sa/DeadlockDetectionTest.java                                        8193639 solaris-all
+serviceability/sa/JhsdbThreadInfoTest.java                                          8193639 solaris-all
+serviceability/sa/sadebugd/SADebugDTest.java                                        8163805 generic-all
+serviceability/sa/TestClassDump.java                                                8193639 solaris-all
+serviceability/sa/TestCpoolForInvokeDynamic.java                                    8193639 solaris-all
+serviceability/sa/TestDefaultMethods.java                                           8193639 solaris-all
+serviceability/sa/TestG1HeapRegion.java                                             8193639 solaris-all
+serviceability/sa/TestHeapDumpForInvokeDynamic.java                                 8193639 solaris-all
+serviceability/sa/TestHeapDumpForLargeArray.java                                    8193639 solaris-all
+serviceability/sa/TestInstanceKlassSizeForInterface.java                            8193639 solaris-all
+serviceability/sa/TestIntConstant.java                                              8193639 solaris-all
+serviceability/sa/TestJhsdbJstackLock.java                                          8193639 solaris-all
+serviceability/sa/TestRevPtrsForInvokeDynamic.java                                  8191270 generic-all
+serviceability/sa/TestType.java                                                     8193639 solaris-all
+serviceability/sa/TestUniverse.java#id0                                             8193639 solaris-all
 
 #############################################################################
 
@@ -146,17 +149,27 @@ vmTestbase/nsk/monitoring/MemoryPoolMBean/isUsageThresholdExceeded/isexceeded005
 vmTestbase/nsk/monitoring/ThreadMXBean/ThreadInfo/Deadlock/JavaDeadlock001/TestDescription.java 8060733 generic-all
 
 vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend001/TestDescription.java 8153613 generic-all
-vmTestbase/nsk/jdi/ThreadReference/frameCount/framecount001/TestDescription.java 6530620 generic-all
-vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002/TestDescription.java 4903717 generic-all
-vmTestbase/nsk/jdi/ThreadReference/resume/resume001/TestDescription.java 8072701 generic-all
-vmTestbase/nsk/jdi/ThreadReference/stop/stop001/TestDescription.java 7034630 generic-all
-vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001/TestDescription.java 8013728 generic-all
-vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x004/TestDescription.java 4751860 generic-all
-vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003/TestDescription.java 8066993 generic-all
-vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds001/TestDescription.java 6604963 generic-all
+vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001/TestDescription.java                 8013728 generic-all
+vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x004/TestDescription.java               4751860 generic-all
+vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter001/TestDescription.java 8207367 linux-all,macosx-all
+vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter001/TestDescription.java 8207367 linux-all,macosx-all
+vmTestbase/nsk/jdi/Event/_itself_/event001/TestDescription.java                     8207367 linux-all,macosx-all
+vmTestbase/nsk/jdi/EventQueue/remove/remove004/TestDescription.java                 8207367 linux-all,macosx-all
+vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l004/TestDescription.java             8207367 linux-all,macosx-all
+vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l005/TestDescription.java             8068225 generic-all
+vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003/TestDescription.java       8066993 generic-all
+vmTestbase/nsk/jdi/ThreadReference/frameCount/framecount001/TestDescription.java    6530620 generic-all
+vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002/TestDescription.java  4903717 generic-all
+vmTestbase/nsk/jdi/ThreadReference/resume/resume001/TestDescription.java            8072701 generic-all
+vmTestbase/nsk/jdi/ThreadReference/stop/stop001/TestDescription.java                7034630 generic-all
+vmTestbase/nsk/jdi/ThreadReference/suspend/suspend001/TestDescription.java          8207367 linux-all,macosx-all
+vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds001/TestDescription.java               6604963 generic-all
+vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose002/TestDescription.java           8207367 linux-all,macosx-all
+vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose003/TestDescription.java           8207367 linux-all,macosx-all
+vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose004/TestDescription.java           8207367 linux-all,macosx-all
 vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021/TestDescription.java 8065773 generic-all
 vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses023/TestDescription.java 8065773 generic-all
-vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l005/TestDescription.java 8068225 generic-all
+vmTestbase/nsk/jdi/VirtualMachine/suspend/suspend001/TestDescription.java           8207367 linux-all,macosx-all
 vmTestbase/nsk/jdi/stress/ClassPrepareEvents/ClassPrepareEvents001/ClassPrepareEvents001.java 6426321 generic-all
 
 vmTestbase/metaspace/gc/firstGC_10m/TestDescription.java 8208250 generic-all
@@ -210,4 +223,4 @@ vmTestbase/nsk/jdb/exclude/exclude001/exclude001.java 8197938 windows-all
 
 vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn001/forceEarlyReturn001.java 7199837 generic-all
 
-#############################################################################
+############################################################################

test/jdk/java/awt/Paint/ComponentIsNotDrawnAfterRemoveAddTest/ComponentIsNotDrawnAfterRemoveAddTest.java

@@ -42,6 +42,7 @@ public class ComponentIsNotDrawnAfterRemoveAddTest {
     private final Frame frame;
     private final Panel panel;
     private final ArrayList<Testable> compList = new ArrayList<Testable>();
+    private final int PAUSE = 3000;
 
     public ComponentIsNotDrawnAfterRemoveAddTest() {
         frame = new Frame("ComponentIsNotDrawnAfterRemoveAddTest");
@@ -93,7 +94,7 @@ public class ComponentIsNotDrawnAfterRemoveAddTest {
 
     private void runTest() {
         try {
-            doSleep(1500);
+            doSleep(PAUSE);
             checkTestableComponents();
 
             for (int i = 0; i < 5; i++) {
@@ -104,7 +105,7 @@ public class ComponentIsNotDrawnAfterRemoveAddTest {
                 frame.validate();
                 frame.add(panel);
 
-                doSleep(1500);
+                doSleep(PAUSE);
                 checkTestableComponents();
             }
         } finally {

test/jdk/jbProblemList.txt

@@ -199,7 +199,7 @@ java/awt/Frame/LayoutOnMaximizeTest/LayoutOnMaximizeTest.java
 java/awt/Frame/MaximizedUndecorated/MaximizedUndecorated.java                       8022302 generic-all
 java/awt/Frame/MiscUndecorated/RepaintTest.java                                     8079267 windows-all,linux-all
 java/awt/Frame/SetMaximizedBounds/SetMaximizedBounds.java                           8196006 macosx-all,windows-all
-java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java                       8144030 macosx-all
+java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java                       8144030 macosx-all,linux-all
 java/awt/Frame/UnfocusableMaximizedFrameResizablity/UnfocusableMaximizedFrameResizablity.java 8208290 macosx-all
 java/awt/Frame/WindowDragTest/WindowDragTest.java                                   8169470 generic-all
 java/awt/FullScreen/8013581/bug8013581.java                                         8169471 macosx-all,windows-all,linux-all
@@ -216,8 +216,8 @@ java/awt/Graphics2D/DrawString/TextRenderingTest.java
 java/awt/Graphics2D/FillTexturePaint/FillTexturePaint.java                          8169463 windows-all
 java/awt/Graphics2D/FlipDrawImage/FlipDrawImage.java                                8169462 windows-all
 java/awt/Graphics2D/ScaledTransform/ScaledTransform.java                            8165951 windows-all,linux-all
-java/awt/GridLayout/ChangeGridSize/ChangeGridSize.java                              8197814 macosx-all,windows-all
-java/awt/GridLayout/ComponentPreferredSize/ComponentPreferredSize.java              8197814 macosx-all,windows-all
+java/awt/GridLayout/ChangeGridSize/ChangeGridSize.java                              8197814 macosx-all,linux-all,windows-all
+java/awt/GridLayout/ComponentPreferredSize/ComponentPreferredSize.java              8197814 macosx-all,linux-all,windows-all
 java/awt/GridLayout/LayoutExtraGaps/LayoutExtraGaps.java                            8000171 windows-all
 java/awt/JAWT/JAWT.sh                                                               8197798 windows-all
 java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.html JRE-898 macosx-all,linux-all
@@ -558,7 +558,7 @@ java/awt/TextField/SelectionInvisibleTest/SelectionInvisibleTest.java
 java/awt/Toolkit/DesktopProperties/rfe4758438.java                                  8193547 linux-all
 java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java                       8208514 windows-all
 java/awt/Toolkit/RealSync/Test.java                                                 6849383 macosx-all
-java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java                             6829250 windows-all
+java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java                             6829250 windows-all,macosx-all
 java/awt/Toolkit/ToolkitPropertyTest/ToolkitPropertyTest_Enable.java                6847163 generic-all
 java/awt/TrayIcon/ActionCommand/ActionCommand.java                                  8197575,8150540 macosx-all,windows-all
 java/awt/TrayIcon/ActionEventMask/ActionEventMask.java                              8197575,8150540 macosx-all,windows-all
@@ -566,7 +566,7 @@ java/awt/TrayIcon/ActionEventTest/ActionEventTest.java
 java/awt/TrayIcon/ModalityTest/ModalityTest.java                                    8197575,8150540 macosx-all,windows-all
 java/awt/TrayIcon/MouseEventMask/MouseEventMaskTest.java                            8197575,8150540 macosx-all,windows-all
 java/awt/TrayIcon/MouseMovedTest/MouseMovedTest.java                                8150540 macosx-all,windows-all
-java/awt/TrayIcon/Securityjava/awt/Window/WindowDeadlockTest/WindowDeadlockTest.javaCheck/FunctionalityCheck/FunctionalityCheck.java          8150540 macosx-all,windows-all
+java/awt/TrayIcon/SecurityCheck/FunctionalityCheck/FunctionalityCheck.java          8150540 macosx-all,windows-all
 java/awt/TrayIcon/SystemTrayInstance/SystemTrayInstanceTest.java                    8193543 linux-all
 java/awt/TrayIcon/TrayIconEventModifiers/TrayIconEventModifiersTest.java            8197575,8150540 macosx-all,windows-all
 java/awt/TrayIcon/TrayIconEvents/TrayIconEventsTest.java                            8197575,8150540 macosx-all,windows-all
@@ -584,9 +584,9 @@ java/awt/Window/ShapedAndTranslucentWindows/SetShape.java
 java/awt/Window/ShapedAndTranslucentWindows/SetShapeAndClick.java                   8197936 macosx-all,windows-all
 java/awt/Window/ShapedAndTranslucentWindows/SetShapeDynamicallyAndClick.java        8013450,8197936 macosx-all,windows-all
 java/awt/Window/ShapedAndTranslucentWindows/Shaped.java                             8078999,8198690 macosx-all,windows-all
-java/awt/Window/ShapedAndTranslucentWindows/ShapedByAPI.java                        8078999 macosx-all,windows-all
+java/awt/Window/ShapedAndTranslucentWindows/ShapedByAPI.java                        8078999 macosx-all,linux-all,windows-all
 java/awt/Window/ShapedAndTranslucentWindows/ShapedTranslucent.java                  8078999,8198690 macosx-all,windows-all
-java/awt/Window/ShapedAndTranslucentWindows/ShapedTranslucentWindowClick.java       8013450 macosx-all, windows-all (windows: commit testing time out)
+java/awt/Window/ShapedAndTranslucentWindows/ShapedTranslucentWindowClick.java       8013450 macosx-all,linux-all,windows-all (windows: commit testing time out)
 java/awt/Window/ShapedAndTranslucentWindows/StaticallyShaped.java                   8198690,8165218 macosx-all,linux-all,windows-all
 java/awt/Window/ShapedAndTranslucentWindows/TranslucentChoice.java                  8194129 macosx-all,windows-all,linux-all
 java/awt/Window/ShapedAndTranslucentWindows/TranslucentWindowClick.java             8194129 macosx-all,windows-all,linux-all
@@ -1017,7 +1017,7 @@ javax/swing/LookAndFeel/8145547/DemandGTK3.sh
 javax/swing/MultiUIDefaults/4300666/bug4300666.java                                 7105119 macosx-all
 javax/swing/MultiUIDefaults/Test6860438.java                                        8198391 generic-all
 javax/swing/Popup/TaskbarPositionTest.java                                          8065097 macosx-all,linux-all
-javax/swing/PopupFactory/6276087/NonOpaquePopupMenuTest.java                        8065099,8208565 macosx-all,windows-all
+javax/swing/PopupFactory/6276087/NonOpaquePopupMenuTest.java                        8065099,8208565 macosx-all,windows-all,linux-all
 javax/swing/PopupFactory/8048506/bug8048506.java                                    8202660 windows-all
 javax/swing/ProgressMonitor/ProgressMonitorEscapeKeyPress.java                      8197552 macosx-all,windows-all,linux-all
 javax/swing/RepaintManager/IconifyTest/IconifyTest.java                             8072110 linux-all,windows-all
@@ -1029,6 +1029,7 @@ javax/swing/SwingUtilities/TestBadBreak/TestBadBreak.java
 javax/swing/SwingWorker/6432565/bug6432565.java                                     8199077 generic-all
 javax/swing/SwingWorker/6493680/bug6493680.java                                     8198410 windows-all
 javax/swing/SwingWorker/6880336/NestedWorkers.java                                  8199049 windows-all
+javax/swing/ToolTipManager/7123767/bug7123767.java                                  8019920 macosx-all,linux-all,windows-all (linux,windows: commit testing)
 javax/swing/ToolTipManager/Test6256140.java                                         8197552,8167009,8072110 macosx-all,windows-all,linux-all
 javax/swing/UIDefaults/6302464/bug6302464.java                                      8199079 generic-all
 javax/swing/UIDefaults/8133926/InternalFrameIcon.java                               8199075 generic-all

test/jdk/jbcommitProblemList.txt

@@ -56,6 +56,7 @@ java/awt/Mixing/LWPopupMenu.java
 java/awt/Mixing/MixingInHwPanel.java                                                        nobug macosx-all,windows-all
 java/awt/Mixing/ValidBounds.java                                                            nobug macosx-all,windows-all
 java/awt/Mixing/Validating.java                                                             nobug macosx-all,windows-all
+java/awt/Modal/LWModalTest/LWModalTest.java                                                 nobug macosx-all,windows-all
 java/awt/Modal/ModalDialogOrderingTest/ModalDialogOrderingTest.java                         nobug macosx-all,windows-all
 java/awt/Modal/ToBack/ToBackModeless6Test.java                                              nobug macosx-all,linux-all,windows-all
 java/awt/Mouse/MouseComboBoxTest/MouseComboBoxTest.java                                     nobug macosx-all,windows-all
@@ -64,7 +65,6 @@ java/awt/Mouse/MouseWheelAbsXY/MouseWheelAbsXY.java
 java/awt/MouseAdapter/MouseAdapterUnitTest/MouseAdapterUnitTest.java                        nobug macosx-all,windows-all
 java/awt/MouseInfo/ComponentMousePositionTest.java                                          nobug macosx-all,windows-all
 java/awt/MouseInfo/JContainerMousePositionTest.java                                         nobug macosx-all,windows-all
-java/awt/Paint/ComponentIsNotDrawnAfterRemoveAddTest/ComponentIsNotDrawnAfterRemoveAddTest.java nobug macosx-all,windows-all
 java/awt/Paint/ExposeOnEDT.java                                                             nobug windows-all
 java/awt/PopupMenu/PopupMenuLocation.java                                                   nobug macosx-all,linux-all,windows-all
 java/awt/Robot/HiDPIMouseClick/HiDPIRobotMouseClick.java                                    nobug windows-all
@@ -84,6 +84,7 @@ java/awt/TrayIcon/SecurityCheck/FunctionalityCheck/FunctionalityCheck.java
 java/awt/Window/FindOwner/FindOwnerTest.html                                                nobug macosx-all,windows-all
 java/awt/Window/GetScreenLocation/GetScreenLocationTest.java                                nobug macosx-all,linux-all,windows-all
 java/awt/Window/MainKeyWindowTest/TestMainKeyWindow.java                                    nobug macosx-all
+java/awt/Window/MaximizeOffscreen/MaximizeOffscreenTest.java                                nobug macosx-all,linux-all
 java/awt/Window/OwnedWindowsLeak/OwnedWindowsLeak.java                                      nobug linux-all
 java/awt/Window/ScreenLocation/ScreenLocationTest.java                                      nobug linux-all
 java/awt/Window/SetWindowLocationByPlatformTest/SetWindowLocationByPlatformTest.java        nobug linux-all
@@ -144,10 +145,13 @@ javax/swing/JEditorPane/JEditorPaneGCSwitchTest/JEditorPaneGCSwitchTest.java
 javax/swing/JEditorPane/JEditorPaneGCSwitchTest/JEditorPaneGCSwitchTest_i18n.java           nobug windows-all
 javax/swing/JFileChooser/6489130/bug6489130.java                                            nobug macosx-all
 javax/swing/JFileChooser/8194044/FileSystemRootTest.java                                    nobug windows-all
+javax/swing/JFrame/4962534/bug4962534.html                                                  nobug macosx-all,windows-all
 javax/swing/JInternalFrame/6288609/TestJInternalFrameDispose.java                           nobug macosx-all,windows-all
 javax/swing/JInternalFrame/6647340/bug6647340.java                                          nobug macosx-all,windows-all
+javax/swing/JInternalFrame/6725409/bug6725409.java                                          nobug windows-all
 javax/swing/JInternalFrame/8020708/bug8020708.java                                          nobug windows-all
 javax/swing/JInternalFrame/8145060/TestJInternalFrameMinimize.java                          nobug macosx-all,windows-all
+javax/swing/JList/BasicListTest.java                                                        nobug macosx-all
 javax/swing/JMenu/6538132/bug6538132.java                                                   nobug windows-all
 javax/swing/JMenuItem/8139169/ScreenMenuBarInputTwice.java                                  nobug macosx-all
 javax/swing/JMenuItem/8158566/CloseOnMouseClickPropertyTest.java                            nobug windows-all
@@ -197,5 +201,4 @@ jb/javax/swing/JDialog/JDialog1054.java
 jb/javax/swing/JDialog/JDialog705.java                                                      nobug macosx-all,linux-all,windows-all
 jb/javax/swing/JDialog/JDialog741/JDialog741.html                                           nobug macosx-all,linux-all,windows-all
 jb/sun/awt/macos/KeyPressAndHoldTest.java                                                   nobug macosx-all
-jb/sun/awt/macos/MoveFocusShortcutTest.java                                                 nobug macosx-all
 jb/sun/lwawt/macosx/NSEvent/nsevent422.sh                                                   nobug macosx-all