JRE-1199: added the list of files required for stripped JBR bundle (follow up)

(cherry picked from commit a4e7fdb61c)

jbr_file_list_linux.txt

@@ -0,0 +1,167 @@
+bin/jaotc
+bin/java
+bin/jjs
+bin/jrunscript
+bin/keytool
+bin/pack200
+bin/rmid
+bin/rmiregistry
+bin/unpack200
+conf/logging.properties
+conf/management/jmxremote.access
+conf/management/jmxremote.password.template
+conf/management/management.properties
+conf/net.properties
+conf/security/java.policy
+conf/security/java.security
+conf/security/policy/limited/default_local.policy
+conf/security/policy/limited/default_US_export.policy
+conf/security/policy/limited/exempt_local.policy
+conf/security/policy/README.txt
+conf/security/policy/unlimited/default_local.policy
+conf/security/policy/unlimited/default_US_export.policy
+conf/sound.properties
+legal/java.base/ADDITIONAL_LICENSE_INFO
+legal/java.base/aes.md
+legal/java.base/asm.md
+legal/java.base/ASSEMBLY_EXCEPTION
+legal/java.base/c-libutl.md
+legal/java.base/cldr.md
+legal/java.base/icu.md
+legal/java.base/LICENSE
+legal/java.base/public_suffix.md
+legal/java.base/unicode.md
+legal/java.desktop/colorimaging.md
+legal/java.desktop/giflib.md
+legal/java.desktop/harfbuzz.md
+legal/java.desktop/jpeg.md
+legal/java.desktop/lcms.md
+legal/java.desktop/libpng.md
+legal/java.desktop/mesa3d.md
+legal/java.desktop/opengl.md
+legal/java.desktop/xwindows.md
+legal/java.smartcardio/pcsclite.md
+legal/java.xml/bcel.md
+legal/java.xml/dom.md
+legal/java.xml/jcup.md
+legal/java.xml/xalan.md
+legal/java.xml/xerces.md
+legal/java.xml.crypto/santuario.md
+legal/jdk.crypto.cryptoki/pkcs11cryptotoken.md
+legal/jdk.crypto.cryptoki/pkcs11wrapper.md
+legal/jdk.crypto.ec/ecc.md
+legal/jdk.dynalink/dynalink.md
+legal/jdk.internal.le/jline.md
+legal/jdk.localedata/thaidict.md
+legal/jdk.scripting.nashorn/double-conversion.md
+legal/jdk.scripting.nashorn/joni.md
+lib/classlist
+lib/jexec
+lib/jfr/default.jfc
+lib/jfr/profile.jfc
+lib/jli/libjli.so
+lib/jrt-fs.jar
+lib/jvm.cfg
+lib/libawt.so
+lib/libawt_headless.so
+lib/libawt_xawt.so
+lib/libdt_socket.so
+lib/libextnet.so
+lib/libfontmanager.so
+lib/libinstrument.so
+lib/libj2gss.so
+lib/libj2pcsc.so
+lib/libj2pkcs11.so
+lib/libjaas.so
+lib/libjava.so
+lib/libjavajpeg.so
+lib/libjawt.so
+lib/libjdwp.so
+lib/libjimage.so
+lib/libjsig.so
+lib/libjsound.so
+lib/liblcms.so
+lib/libmanagement.so
+lib/libmanagement_agent.so
+lib/libmanagement_ext.so
+lib/libmlib_image.so
+lib/libnet.so
+lib/libnio.so
+lib/libprefs.so
+lib/librmi.so
+lib/libsctp.so
+lib/libsplashscreen.so
+lib/libsunec.so
+lib/libunpack.so
+lib/libverify.so
+lib/libzip.so
+lib/modules
+lib/psfont.properties.ja
+lib/psfontj2d.properties
+lib/security/blacklisted.certs
+lib/security/cacerts
+lib/security/default.policy
+lib/security/public_suffix_list.dat
+lib/server/libjsig.so
+lib/server/libjvm.so
+lib/server/Xusage.txt
+lib/tzdb.dat
+man/ja_JP.UTF-8/man1/java.1
+man/ja_JP.UTF-8/man1/jjs.1
+man/ja_JP.UTF-8/man1/keytool.1
+man/ja_JP.UTF-8/man1/pack200.1
+man/ja_JP.UTF-8/man1/rmid.1
+man/ja_JP.UTF-8/man1/rmiregistry.1
+man/ja_JP.UTF-8/man1/unpack200.1
+man/man1/java.1
+man/man1/jjs.1
+man/man1/keytool.1
+man/man1/pack200.1
+man/man1/rmid.1
+man/man1/rmiregistry.1
+man/man1/unpack200.1
+release
+bin/javapackager
+lib/libjavafx_font_pango.so
+lib/libavplugin-ffmpeg-56.so
+lib/libavplugin-56.so
+lib/libglass.so
+lib/libavplugin-57.so
+lib/libavplugin-ffmpeg-57.so
+lib/libprism_sw.so
+lib/libavplugin-53.so
+lib/libjfxmedia.so
+lib/javafx.properties
+lib/libfxplugins.so
+lib/javafx-swt.jar
+lib/ant-javafx.jar
+lib/libglassgtk3.so
+lib/libjavafx_iio.so
+lib/libgstreamer-lite.so
+lib/libprism_common.so
+lib/libjavafx_font_freetype.so
+lib/libglassgtk2.so
+lib/libavplugin-54.so
+lib/libprism_es2.so
+lib/libjfxwebkit.so
+lib/libdecora_sse.so
+lib/libjavafx_font.so
+lib/libavplugin-55.so
+legal/javafx.media/glib.md
+legal/javafx.media/gstreamer.md
+legal/javafx.media/libffi.md
+legal/javafx.media/applecoreaudio.md
+legal/javafx.web/icu_v51.md
+legal/javafx.web/webkit.md
+legal/javafx.web/libxslt.md
+legal/javafx.web/libxml2.md
+legal/javafx.graphics/jpeg_v7.md
+jmods/javafx.base.jmod
+jmods/javafx.media.jmod
+jmods/javafx.swing.jmod
+jmods/javafx.controls.jmod
+jmods/jdk.packager.services.jmod
+jmods/jdk.packager.jmod
+jmods/javafx.web.jmod
+jmods/javafx.fxml.jmod
+jmods/javafx.graphics.jmod

jbr_file_list_osx.txt

@@ -0,0 +1,167 @@
+jdk/Contents/Home/bin/jaotc
+jdk/Contents/Home/bin/java
+jdk/Contents/Home/bin/jjs
+jdk/Contents/Home/bin/jrunscript
+jdk/Contents/Home/bin/keytool
+jdk/Contents/Home/bin/pack200
+jdk/Contents/Home/bin/rmid
+jdk/Contents/Home/bin/rmiregistry
+jdk/Contents/Home/bin/unpack200
+jdk/Contents/Home/conf/logging.properties
+jdk/Contents/Home/conf/management/jmxremote.access
+jdk/Contents/Home/conf/management/jmxremote.password.template
+jdk/Contents/Home/conf/management/management.properties
+jdk/Contents/Home/conf/net.properties
+jdk/Contents/Home/conf/security/java.policy
+jdk/Contents/Home/conf/security/java.security
+jdk/Contents/Home/conf/security/policy/limited/default_local.policy
+jdk/Contents/Home/conf/security/policy/limited/default_US_export.policy
+jdk/Contents/Home/conf/security/policy/limited/exempt_local.policy
+jdk/Contents/Home/conf/security/policy/README.txt
+jdk/Contents/Home/conf/security/policy/unlimited/default_local.policy
+jdk/Contents/Home/conf/security/policy/unlimited/default_US_export.policy
+jdk/Contents/Home/conf/sound.properties
+jdk/Contents/Home/legal/java.base/ADDITIONAL_LICENSE_INFO
+jdk/Contents/Home/legal/java.base/aes.md
+jdk/Contents/Home/legal/java.base/asm.md
+jdk/Contents/Home/legal/java.base/ASSEMBLY_EXCEPTION
+jdk/Contents/Home/legal/java.base/c-libutl.md
+jdk/Contents/Home/legal/java.base/cldr.md
+jdk/Contents/Home/legal/java.base/icu.md
+jdk/Contents/Home/legal/java.base/LICENSE
+jdk/Contents/Home/legal/java.base/public_suffix.md
+jdk/Contents/Home/legal/java.base/unicode.md
+jdk/Contents/Home/legal/java.desktop/colorimaging.md
+jdk/Contents/Home/legal/java.desktop/freetype.md
+jdk/Contents/Home/legal/java.desktop/giflib.md
+jdk/Contents/Home/legal/java.desktop/harfbuzz.md
+jdk/Contents/Home/legal/java.desktop/jpeg.md
+jdk/Contents/Home/legal/java.desktop/lcms.md
+jdk/Contents/Home/legal/java.desktop/libpng.md
+jdk/Contents/Home/legal/java.desktop/mesa3d.md
+jdk/Contents/Home/legal/java.desktop/opengl.md
+jdk/Contents/Home/legal/java.desktop/xwindows.md
+jdk/Contents/Home/legal/java.smartcardio/pcsclite.md
+jdk/Contents/Home/legal/java.xml/bcel.md
+jdk/Contents/Home/legal/java.xml/dom.md
+jdk/Contents/Home/legal/java.xml/jcup.md
+jdk/Contents/Home/legal/java.xml/xalan.md
+jdk/Contents/Home/legal/java.xml/xerces.md
+jdk/Contents/Home/legal/java.xml.crypto/santuario.md
+jdk/Contents/Home/legal/jdk.crypto.cryptoki/pkcs11cryptotoken.md
+jdk/Contents/Home/legal/jdk.crypto.cryptoki/pkcs11wrapper.md
+jdk/Contents/Home/legal/jdk.crypto.ec/ecc.md
+jdk/Contents/Home/legal/jdk.dynalink/dynalink.md
+jdk/Contents/Home/legal/jdk.internal.le/jline.md
+jdk/Contents/Home/legal/jdk.localedata/thaidict.md
+jdk/Contents/Home/legal/jdk.scripting.nashorn/double-conversion.md
+jdk/Contents/Home/legal/jdk.scripting.nashorn/joni.md
+jdk/Contents/Home/lib/classlist
+jdk/Contents/Home/lib/fontconfig.bfc
+jdk/Contents/Home/lib/fontconfig.properties.src
+jdk/Contents/Home/lib/jfr/default.jfc
+jdk/Contents/Home/lib/jfr/profile.jfc
+jdk/Contents/Home/lib/jli/libjli.dylib
+jdk/Contents/Home/lib/jrt-fs.jar
+jdk/Contents/Home/lib/jspawnhelper
+jdk/Contents/Home/lib/jvm.cfg
+jdk/Contents/Home/lib/libawt.dylib
+jdk/Contents/Home/lib/libawt_lwawt.dylib
+jdk/Contents/Home/lib/libdt_socket.dylib
+jdk/Contents/Home/lib/libextnet.dylib
+jdk/Contents/Home/lib/libfontmanager.dylib
+jdk/Contents/Home/lib/libfreetype.dylib
+jdk/Contents/Home/lib/libinstrument.dylib
+jdk/Contents/Home/lib/libj2gss.dylib
+jdk/Contents/Home/lib/libj2pcsc.dylib
+jdk/Contents/Home/lib/libj2pkcs11.dylib
+jdk/Contents/Home/lib/libjaas.dylib
+jdk/Contents/Home/lib/libjava.dylib
+jdk/Contents/Home/lib/libjavajpeg.dylib
+jdk/Contents/Home/lib/libjawt.dylib
+jdk/Contents/Home/lib/libjdwp.dylib
+jdk/Contents/Home/lib/libjimage.dylib
+jdk/Contents/Home/lib/libjsig.dylib
+jdk/Contents/Home/lib/libjsound.dylib
+jdk/Contents/Home/lib/liblcms.dylib
+jdk/Contents/Home/lib/libmanagement.dylib
+jdk/Contents/Home/lib/libmanagement_agent.dylib
+jdk/Contents/Home/lib/libmanagement_ext.dylib
+jdk/Contents/Home/lib/libmlib_image.dylib
+jdk/Contents/Home/lib/libnet.dylib
+jdk/Contents/Home/lib/libnio.dylib
+jdk/Contents/Home/lib/libosx.dylib
+jdk/Contents/Home/lib/libosxapp.dylib
+jdk/Contents/Home/lib/libosxkrb5.dylib
+jdk/Contents/Home/lib/libosxsecurity.dylib
+jdk/Contents/Home/lib/libosxui.dylib
+jdk/Contents/Home/lib/libprefs.dylib
+jdk/Contents/Home/lib/librmi.dylib
+jdk/Contents/Home/lib/libsplashscreen.dylib
+jdk/Contents/Home/lib/libsunec.dylib
+jdk/Contents/Home/lib/libunpack.dylib
+jdk/Contents/Home/lib/libverify.dylib
+jdk/Contents/Home/lib/libzip.dylib
+jdk/Contents/Home/lib/modules
+jdk/Contents/Home/lib/psfont.properties.ja
+jdk/Contents/Home/lib/psfontj2d.properties
+jdk/Contents/Home/lib/security/blacklisted.certs
+jdk/Contents/Home/lib/security/cacerts
+jdk/Contents/Home/lib/security/default.policy
+jdk/Contents/Home/lib/security/public_suffix_list.dat
+jdk/Contents/Home/lib/server/libjsig.dylib
+jdk/Contents/Home/lib/server/libjvm.dylib
+jdk/Contents/Home/lib/server/Xusage.txt
+jdk/Contents/Home/lib/tzdb.dat
+jdk/Contents/Home/man/ja_JP.UTF-8/man1/java.1
+jdk/Contents/Home/man/ja_JP.UTF-8/man1/jjs.1
+jdk/Contents/Home/man/ja_JP.UTF-8/man1/keytool.1
+jdk/Contents/Home/man/ja_JP.UTF-8/man1/pack200.1
+jdk/Contents/Home/man/ja_JP.UTF-8/man1/rmid.1
+jdk/Contents/Home/man/ja_JP.UTF-8/man1/rmiregistry.1
+jdk/Contents/Home/man/ja_JP.UTF-8/man1/unpack200.1
+jdk/Contents/Home/man/man1/java.1
+jdk/Contents/Home/man/man1/jjs.1
+jdk/Contents/Home/man/man1/keytool.1
+jdk/Contents/Home/man/man1/pack200.1
+jdk/Contents/Home/man/man1/rmid.1
+jdk/Contents/Home/man/man1/rmiregistry.1
+jdk/Contents/Home/man/man1/unpack200.1
+jdk/Contents/Home/release
+jdk/Contents/Info.plist
+jdk/Contents/Home/bin/javapackager
+jdk/Contents/Home/lib/libjavafx_iio.dylib
+jdk/Contents/Home/lib/libjfxmedia_avf.dylib
+jdk/Contents/Home/lib/javafx.properties
+jdk/Contents/Home/lib/libglib-lite.dylib
+jdk/Contents/Home/lib/javafx-swt.jar
+jdk/Contents/Home/lib/libfxplugins.dylib
+jdk/Contents/Home/lib/ant-javafx.jar
+jdk/Contents/Home/lib/libglass.dylib
+jdk/Contents/Home/lib/libjavafx_font.dylib
+jdk/Contents/Home/lib/libgstreamer-lite.dylib
+jdk/Contents/Home/lib/libjfxwebkit.dylib
+jdk/Contents/Home/lib/libprism_common.dylib
+jdk/Contents/Home/lib/libprism_es2.dylib
+jdk/Contents/Home/lib/libdecora_sse.dylib
+jdk/Contents/Home/lib/libjfxmedia.dylib
+jdk/Contents/Home/lib/libprism_sw.dylib
+jdk/Contents/Home/legal/javafx.media/glib.md
+jdk/Contents/Home/legal/javafx.media/gstreamer.md
+jdk/Contents/Home/legal/javafx.media/libffi.md
+jdk/Contents/Home/legal/javafx.media/applecoreaudio.md
+jdk/Contents/Home/legal/javafx.web/icu_v51.md
+jdk/Contents/Home/legal/javafx.web/webkit.md
+jdk/Contents/Home/legal/javafx.web/libxslt.md
+jdk/Contents/Home/legal/javafx.web/libxml2.md
+jdk/Contents/Home/legal/javafx.graphics/jpeg_v7.md
+jdk/Contents/Home/jmods/javafx.base.jmod
+jdk/Contents/Home/jmods/javafx.media.jmod
+jdk/Contents/Home/jmods/javafx.swing.jmod
+jdk/Contents/Home/jmods/javafx.controls.jmod
+jdk/Contents/Home/jmods/jdk.packager.services.jmod
+jdk/Contents/Home/jmods/jdk.packager.jmod
+jdk/Contents/Home/jmods/javafx.web.jmod
+jdk/Contents/Home/jmods/javafx.fxml.jmod
+jdk/Contents/Home/jmods/javafx.graphics.jmod
+jdk/Contents/MacOS/libjli.dylib

jbr_file_list_windows.txt

@@ -0,0 +1,383 @@
+bin/awt.dll
+bin/dt_socket.dll
+bin/fontmanager.dll
+bin/freetype.dll
+bin/instrument.dll
+bin/j2gss.dll
+bin/j2pcsc.dll
+bin/j2pkcs11.dll
+bin/jaas.dll
+bin/jabswitch.exe
+bin/jaccessinspector.exe
+bin/jaccesswalker.exe
+bin/jaotc.exe
+bin/java.dll
+bin/java.exe
+bin/javaaccessbridge.dll
+bin/javajpeg.dll
+bin/javaw.exe
+bin/jawt.dll
+bin/jdwp.dll
+bin/jimage.dll
+bin/jjs.exe
+bin/jli.dll
+bin/jrunscript.exe
+bin/jsound.dll
+bin/keytool.exe
+bin/kinit.exe
+bin/klist.exe
+bin/ktab.exe
+bin/lcms.dll
+bin/le.dll
+bin/management.dll
+bin/management_agent.dll
+bin/management_ext.dll
+bin/mlib_image.dll
+bin/msvcp140.dll
+bin/net.dll
+bin/nio.dll
+bin/pack200.exe
+bin/prefs.dll
+bin/rmi.dll
+bin/rmid.exe
+bin/rmiregistry.exe
+bin/server/jvm.dll
+bin/splashscreen.dll
+bin/sunec.dll
+bin/sunmscapi.dll
+bin/unpack.dll
+bin/unpack200.exe
+bin/verify.dll
+bin/w2k_lsa_auth.dll
+bin/windowsaccessbridge-64.dll
+bin/zip.dll
+conf/logging.properties
+conf/management/jmxremote.access
+conf/management/jmxremote.password.template
+conf/management/management.properties
+conf/net.properties
+conf/security/java.policy
+conf/security/java.security
+conf/security/policy/limited/default_local.policy
+conf/security/policy/limited/default_US_export.policy
+conf/security/policy/limited/exempt_local.policy
+conf/security/policy/README.txt
+conf/security/policy/unlimited/default_local.policy
+conf/security/policy/unlimited/default_US_export.policy
+conf/sound.properties
+legal/java.base/ADDITIONAL_LICENSE_INFO
+legal/java.base/aes.md
+legal/java.base/asm.md
+legal/java.base/ASSEMBLY_EXCEPTION
+legal/java.base/c-libutl.md
+legal/java.base/cldr.md
+legal/java.base/icu.md
+legal/java.base/LICENSE
+legal/java.base/public_suffix.md
+legal/java.base/unicode.md
+legal/java.base/zlib.md
+legal/java.compiler/ADDITIONAL_LICENSE_INFO
+legal/java.compiler/ASSEMBLY_EXCEPTION
+legal/java.compiler/LICENSE
+legal/java.datatransfer/ADDITIONAL_LICENSE_INFO
+legal/java.datatransfer/ASSEMBLY_EXCEPTION
+legal/java.datatransfer/LICENSE
+legal/java.desktop/ADDITIONAL_LICENSE_INFO
+legal/java.desktop/ASSEMBLY_EXCEPTION
+legal/java.desktop/colorimaging.md
+legal/java.desktop/freetype.md
+legal/java.desktop/giflib.md
+legal/java.desktop/harfbuzz.md
+legal/java.desktop/jpeg.md
+legal/java.desktop/lcms.md
+legal/java.desktop/libpng.md
+legal/java.desktop/LICENSE
+legal/java.desktop/mesa3d.md
+legal/java.desktop/opengl.md
+legal/java.instrument/ADDITIONAL_LICENSE_INFO
+legal/java.instrument/ASSEMBLY_EXCEPTION
+legal/java.instrument/LICENSE
+legal/java.logging/ADDITIONAL_LICENSE_INFO
+legal/java.logging/ASSEMBLY_EXCEPTION
+legal/java.logging/LICENSE
+legal/java.management/ADDITIONAL_LICENSE_INFO
+legal/java.management/ASSEMBLY_EXCEPTION
+legal/java.management/LICENSE
+legal/java.management.rmi/ADDITIONAL_LICENSE_INFO
+legal/java.management.rmi/ASSEMBLY_EXCEPTION
+legal/java.management.rmi/LICENSE
+legal/java.naming/ADDITIONAL_LICENSE_INFO
+legal/java.naming/ASSEMBLY_EXCEPTION
+legal/java.naming/LICENSE
+legal/java.net.http/ADDITIONAL_LICENSE_INFO
+legal/java.net.http/ASSEMBLY_EXCEPTION
+legal/java.net.http/LICENSE
+legal/java.prefs/ADDITIONAL_LICENSE_INFO
+legal/java.prefs/ASSEMBLY_EXCEPTION
+legal/java.prefs/LICENSE
+legal/java.rmi/ADDITIONAL_LICENSE_INFO
+legal/java.rmi/ASSEMBLY_EXCEPTION
+legal/java.rmi/LICENSE
+legal/java.scripting/ADDITIONAL_LICENSE_INFO
+legal/java.scripting/ASSEMBLY_EXCEPTION
+legal/java.scripting/LICENSE
+legal/java.se/ADDITIONAL_LICENSE_INFO
+legal/java.se/ASSEMBLY_EXCEPTION
+legal/java.se/LICENSE
+legal/java.security.jgss/ADDITIONAL_LICENSE_INFO
+legal/java.security.jgss/ASSEMBLY_EXCEPTION
+legal/java.security.jgss/LICENSE
+legal/java.security.sasl/ADDITIONAL_LICENSE_INFO
+legal/java.security.sasl/ASSEMBLY_EXCEPTION
+legal/java.security.sasl/LICENSE
+legal/java.smartcardio/ADDITIONAL_LICENSE_INFO
+legal/java.smartcardio/ASSEMBLY_EXCEPTION
+legal/java.smartcardio/LICENSE
+legal/java.sql/ADDITIONAL_LICENSE_INFO
+legal/java.sql/ASSEMBLY_EXCEPTION
+legal/java.sql/LICENSE
+legal/java.sql.rowset/ADDITIONAL_LICENSE_INFO
+legal/java.sql.rowset/ASSEMBLY_EXCEPTION
+legal/java.sql.rowset/LICENSE
+legal/java.transaction.xa/ADDITIONAL_LICENSE_INFO
+legal/java.transaction.xa/ASSEMBLY_EXCEPTION
+legal/java.transaction.xa/LICENSE
+legal/java.xml/ADDITIONAL_LICENSE_INFO
+legal/java.xml/ASSEMBLY_EXCEPTION
+legal/java.xml/bcel.md
+legal/java.xml/dom.md
+legal/java.xml/jcup.md
+legal/java.xml/LICENSE
+legal/java.xml/xalan.md
+legal/java.xml/xerces.md
+legal/java.xml.crypto/ADDITIONAL_LICENSE_INFO
+legal/java.xml.crypto/ASSEMBLY_EXCEPTION
+legal/java.xml.crypto/LICENSE
+legal/java.xml.crypto/santuario.md
+legal/jdk.accessibility/ADDITIONAL_LICENSE_INFO
+legal/jdk.accessibility/ASSEMBLY_EXCEPTION
+legal/jdk.accessibility/LICENSE
+legal/jdk.aot/ADDITIONAL_LICENSE_INFO
+legal/jdk.aot/ASSEMBLY_EXCEPTION
+legal/jdk.aot/LICENSE
+legal/jdk.charsets/ADDITIONAL_LICENSE_INFO
+legal/jdk.charsets/ASSEMBLY_EXCEPTION
+legal/jdk.charsets/LICENSE
+legal/jdk.crypto.cryptoki/ADDITIONAL_LICENSE_INFO
+legal/jdk.crypto.cryptoki/ASSEMBLY_EXCEPTION
+legal/jdk.crypto.cryptoki/LICENSE
+legal/jdk.crypto.cryptoki/pkcs11cryptotoken.md
+legal/jdk.crypto.cryptoki/pkcs11wrapper.md
+legal/jdk.crypto.ec/ADDITIONAL_LICENSE_INFO
+legal/jdk.crypto.ec/ASSEMBLY_EXCEPTION
+legal/jdk.crypto.ec/ecc.md
+legal/jdk.crypto.ec/LICENSE
+legal/jdk.crypto.mscapi/ADDITIONAL_LICENSE_INFO
+legal/jdk.crypto.mscapi/ASSEMBLY_EXCEPTION
+legal/jdk.crypto.mscapi/LICENSE
+legal/jdk.dynalink/ADDITIONAL_LICENSE_INFO
+legal/jdk.dynalink/ASSEMBLY_EXCEPTION
+legal/jdk.dynalink/dynalink.md
+legal/jdk.dynalink/LICENSE
+legal/jdk.httpserver/ADDITIONAL_LICENSE_INFO
+legal/jdk.httpserver/ASSEMBLY_EXCEPTION
+legal/jdk.httpserver/LICENSE
+legal/jdk.internal.ed/ADDITIONAL_LICENSE_INFO
+legal/jdk.internal.ed/ASSEMBLY_EXCEPTION
+legal/jdk.internal.ed/LICENSE
+legal/jdk.internal.le/ADDITIONAL_LICENSE_INFO
+legal/jdk.internal.le/ASSEMBLY_EXCEPTION
+legal/jdk.internal.le/jline.md
+legal/jdk.internal.le/LICENSE
+legal/jdk.internal.vm.ci/ADDITIONAL_LICENSE_INFO
+legal/jdk.internal.vm.ci/ASSEMBLY_EXCEPTION
+legal/jdk.internal.vm.ci/LICENSE
+legal/jdk.internal.vm.compiler/ADDITIONAL_LICENSE_INFO
+legal/jdk.internal.vm.compiler/ASSEMBLY_EXCEPTION
+legal/jdk.internal.vm.compiler/LICENSE
+legal/jdk.internal.vm.compiler.management/ADDITIONAL_LICENSE_INFO
+legal/jdk.internal.vm.compiler.management/ASSEMBLY_EXCEPTION
+legal/jdk.internal.vm.compiler.management/LICENSE
+legal/jdk.jdwp.agent/ADDITIONAL_LICENSE_INFO
+legal/jdk.jdwp.agent/ASSEMBLY_EXCEPTION
+legal/jdk.jdwp.agent/LICENSE
+legal/jdk.jfr/ADDITIONAL_LICENSE_INFO
+legal/jdk.jfr/ASSEMBLY_EXCEPTION
+legal/jdk.jfr/LICENSE
+legal/jdk.jsobject/ADDITIONAL_LICENSE_INFO
+legal/jdk.jsobject/ASSEMBLY_EXCEPTION
+legal/jdk.jsobject/LICENSE
+legal/jdk.localedata/ADDITIONAL_LICENSE_INFO
+legal/jdk.localedata/ASSEMBLY_EXCEPTION
+legal/jdk.localedata/cldr.md
+legal/jdk.localedata/LICENSE
+legal/jdk.localedata/thaidict.md
+legal/jdk.management/ADDITIONAL_LICENSE_INFO
+legal/jdk.management/ASSEMBLY_EXCEPTION
+legal/jdk.management/LICENSE
+legal/jdk.management.agent/ADDITIONAL_LICENSE_INFO
+legal/jdk.management.agent/ASSEMBLY_EXCEPTION
+legal/jdk.management.agent/LICENSE
+legal/jdk.management.jfr/ADDITIONAL_LICENSE_INFO
+legal/jdk.management.jfr/ASSEMBLY_EXCEPTION
+legal/jdk.management.jfr/LICENSE
+legal/jdk.naming.dns/ADDITIONAL_LICENSE_INFO
+legal/jdk.naming.dns/ASSEMBLY_EXCEPTION
+legal/jdk.naming.dns/LICENSE
+legal/jdk.naming.rmi/ADDITIONAL_LICENSE_INFO
+legal/jdk.naming.rmi/ASSEMBLY_EXCEPTION
+legal/jdk.naming.rmi/LICENSE
+legal/jdk.net/ADDITIONAL_LICENSE_INFO
+legal/jdk.net/ASSEMBLY_EXCEPTION
+legal/jdk.net/LICENSE
+legal/jdk.pack/ADDITIONAL_LICENSE_INFO
+legal/jdk.pack/ASSEMBLY_EXCEPTION
+legal/jdk.pack/LICENSE
+legal/jdk.scripting.nashorn/ADDITIONAL_LICENSE_INFO
+legal/jdk.scripting.nashorn/ASSEMBLY_EXCEPTION
+legal/jdk.scripting.nashorn/double-conversion.md
+legal/jdk.scripting.nashorn/joni.md
+legal/jdk.scripting.nashorn/LICENSE
+legal/jdk.scripting.nashorn.shell/ADDITIONAL_LICENSE_INFO
+legal/jdk.scripting.nashorn.shell/ASSEMBLY_EXCEPTION
+legal/jdk.scripting.nashorn.shell/LICENSE
+legal/jdk.sctp/ADDITIONAL_LICENSE_INFO
+legal/jdk.sctp/ASSEMBLY_EXCEPTION
+legal/jdk.sctp/LICENSE
+legal/jdk.security.auth/ADDITIONAL_LICENSE_INFO
+legal/jdk.security.auth/ASSEMBLY_EXCEPTION
+legal/jdk.security.auth/LICENSE
+legal/jdk.security.jgss/ADDITIONAL_LICENSE_INFO
+legal/jdk.security.jgss/ASSEMBLY_EXCEPTION
+legal/jdk.security.jgss/LICENSE
+legal/jdk.unsupported/ADDITIONAL_LICENSE_INFO
+legal/jdk.unsupported/ASSEMBLY_EXCEPTION
+legal/jdk.unsupported/LICENSE
+legal/jdk.xml.dom/ADDITIONAL_LICENSE_INFO
+legal/jdk.xml.dom/ASSEMBLY_EXCEPTION
+legal/jdk.xml.dom/LICENSE
+legal/jdk.zipfs/ADDITIONAL_LICENSE_INFO
+legal/jdk.zipfs/ASSEMBLY_EXCEPTION
+legal/jdk.zipfs/LICENSE
+lib/classlist
+lib/fontconfig.bfc
+lib/fontconfig.properties.src
+lib/jawt.lib
+lib/jfr/default.jfc
+lib/jfr/profile.jfc
+lib/jrt-fs.jar
+lib/jvm.cfg
+lib/jvm.lib
+lib/modules
+lib/psfont.properties.ja
+lib/psfontj2d.properties
+lib/security/blacklisted.certs
+lib/security/cacerts
+lib/security/default.policy
+lib/security/public_suffix_list.dat
+lib/server/Xusage.txt
+lib/tzdb.dat
+lib/tzmappings
+release
+bin/fxplugins.dll
+bin/api-ms-win-crt-time-l1-1-0.dll
+bin/api-ms-win-crt-filesystem-l1-1-0.dll
+bin/javafx_iio.dll
+bin/gstreamer-lite.dll
+bin/api-ms-win-crt-utility-l1-1-0.dll
+bin/api-ms-win-core-console-l1-1-0.dll
+bin/glass.dll
+bin/api-ms-win-core-processenvironment-l1-1-0.dll
+bin/prism_common.dll
+bin/ucrtbase.dll
+bin/prism_sw.dll
+bin/api-ms-win-core-file-l1-1-0.dll
+bin/api-ms-win-core-errorhandling-l1-1-0.dll
+bin/api-ms-win-crt-process-l1-1-0.dll
+bin/prism_d3d.dll
+bin/api-ms-win-core-heap-l1-1-0.dll
+bin/glib-lite.dll
+bin/api-ms-win-core-processthreads-l1-1-1.dll
+bin/api-ms-win-core-processthreads-l1-1-0.dll
+bin/javapackager.exe
+bin/api-ms-win-crt-convert-l1-1-0.dll
+bin/api-ms-win-crt-private-l1-1-0.dll
+bin/api-ms-win-core-file-l2-1-0.dll
+bin/jfxwebkit.dll
+bin/api-ms-win-core-debug-l1-1-0.dll
+bin/api-ms-win-crt-stdio-l1-1-0.dll
+bin/api-ms-win-core-localization-l1-2-0.dll
+bin/api-ms-win-core-datetime-l1-1-0.dll
+bin/api-ms-win-crt-math-l1-1-0.dll
+bin/api-ms-win-core-file-l1-2-0.dll
+bin/api-ms-win-core-timezone-l1-1-0.dll
+bin/api-ms-win-core-rtlsupport-l1-1-0.dll
+bin/api-ms-win-core-handle-l1-1-0.dll
+bin/decora_sse.dll
+bin/api-ms-win-core-synch-l1-1-0.dll
+bin/api-ms-win-core-string-l1-1-0.dll
+bin/api-ms-win-core-interlocked-l1-1-0.dll
+bin/api-ms-win-core-memory-l1-1-0.dll
+bin/api-ms-win-core-util-l1-1-0.dll
+bin/api-ms-win-core-namedpipe-l1-1-0.dll
+bin/api-ms-win-crt-conio-l1-1-0.dll
+bin/api-ms-win-crt-runtime-l1-1-0.dll
+bin/api-ms-win-crt-string-l1-1-0.dll
+bin/api-ms-win-crt-multibyte-l1-1-0.dll
+bin/api-ms-win-core-synch-l1-2-0.dll
+bin/api-ms-win-core-profile-l1-1-0.dll
+bin/api-ms-win-crt-locale-l1-1-0.dll
+bin/api-ms-win-crt-heap-l1-1-0.dll
+bin/api-ms-win-core-sysinfo-l1-1-0.dll
+bin/javafx_font.dll
+bin/api-ms-win-core-libraryloader-l1-1-0.dll
+bin/api-ms-win-crt-environment-l1-1-0.dll
+bin/jfxmedia.dll
+lib/javafx.properties
+lib/javafx-swt.jar
+lib/ant-javafx.jar
+legal/jdk.packager.services/LICENSE
+legal/jdk.packager.services/ADDITIONAL_LICENSE_INFO
+legal/jdk.packager.services/ASSEMBLY_EXCEPTION
+legal/jdk.packager/LICENSE
+legal/jdk.packager/ADDITIONAL_LICENSE_INFO
+legal/jdk.packager/ASSEMBLY_EXCEPTION
+legal/javafx.media/glib.md
+legal/javafx.media/gstreamer.md
+legal/javafx.media/libffi.md
+legal/javafx.media/LICENSE
+legal/javafx.media/applecoreaudio.md
+legal/javafx.media/ADDITIONAL_LICENSE_INFO
+legal/javafx.media/ASSEMBLY_EXCEPTION
+legal/javafx.web/icu_v51.md
+legal/javafx.web/LICENSE
+legal/javafx.web/webkit.md
+legal/javafx.web/libxslt.md
+legal/javafx.web/ADDITIONAL_LICENSE_INFO
+legal/javafx.web/ASSEMBLY_EXCEPTION
+legal/javafx.web/libxml2.md
+legal/javafx.swing/LICENSE
+legal/javafx.swing/ADDITIONAL_LICENSE_INFO
+legal/javafx.swing/ASSEMBLY_EXCEPTION
+legal/javafx.graphics/LICENSE
+legal/javafx.graphics/ADDITIONAL_LICENSE_INFO
+legal/javafx.graphics/ASSEMBLY_EXCEPTION
+legal/javafx.graphics/jpeg_v7.md
+legal/javafx.base/LICENSE
+legal/javafx.base/ADDITIONAL_LICENSE_INFO
+legal/javafx.base/ASSEMBLY_EXCEPTION
+legal/javafx.controls/LICENSE
+legal/javafx.controls/ADDITIONAL_LICENSE_INFO
+legal/javafx.controls/ASSEMBLY_EXCEPTION
+legal/javafx.fxml/LICENSE
+legal/javafx.fxml/ADDITIONAL_LICENSE_INFO
+legal/javafx.fxml/ASSEMBLY_EXCEPTION
+jmods/javafx.base.jmod
+jmods/javafx.media.jmod
+jmods/javafx.swing.jmod
+jmods/javafx.controls.jmod
+jmods/jdk.packager.services.jmod
+jmods/jdk.packager.jmod
+jmods/javafx.web.jmod
+jmods/javafx.fxml.jmod
+jmods/javafx.graphics.jmod

src/java.desktop/share/classes/java/awt/Window.java

@@ -3970,6 +3970,18 @@ public class Window extends Container implements Accessible {
         }
     }
 
+    private volatile boolean hasCustomDecoration;
+
+    boolean hasCustomDecoration() {
+        return hasCustomDecoration;
+    }
+
+    /**
+     * Set via reflection (JB JdkEx API).
+     */
+    void setHasCustomDecoration() {
+        hasCustomDecoration = true;
+    }
 
     // ************************** MIXING CODE *******************************
 

src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java

@@ -345,19 +345,19 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
             System.setProperty("sun.awt.enableExtraMouseButtons", ""+areExtraMouseButtonsEnabled);
 
             // Detect display mode changes
-            XlibWrapper.XSelectInput(XToolkit.getDisplay(), XToolkit.getDefaultRootWindow(), XConstants.StructureNotifyMask);
-            XToolkit.addEventDispatcher(XToolkit.getDefaultRootWindow(), new XEventDispatcher() {
-                @Override
-                public void dispatchEvent(XEvent ev) {
-                    if (ev.get_type() == XConstants.ConfigureNotify) {
-                        awtUnlock();
-                        try {
-                            ((X11GraphicsEnvironment)GraphicsEnvironment.
-                             getLocalGraphicsEnvironment()).
-                                displayChanged();
-                        } finally {
-                            awtLock();
-                        }
+            XlibWrapper.XSelectInput(XToolkit.getDisplay(), XToolkit.getDefaultRootWindow(), XConstants.StructureNotifyMask | XConstants.PropertyChangeMask);
+            XToolkit.addEventDispatcher(XToolkit.getDefaultRootWindow(), ev -> {
+                if (ev.get_type() == XConstants.ConfigureNotify ||
+                    (ev.get_type() == XConstants.PropertyNotify &&
+                     ev.get_xproperty().get_atom() == XWM.XA_NET_DESKTOP_GEOMETRY.getAtom())) // possible DPI change
+                {
+                    awtUnlock();
+                    try {
+                        ((X11GraphicsEnvironment)GraphicsEnvironment.
+                         getLocalGraphicsEnvironment()).
+                            displayChanged();
+                    } finally {
+                        awtLock();
                     }
                 }
             });

src/java.desktop/unix/classes/sun/awt/X11/XWM.java

@@ -89,6 +89,9 @@ final class XWM
     static final XAtom XA_NET_FRAME_EXTENTS = new XAtom();
     static final XAtom XA_NET_REQUEST_FRAME_EXTENTS = new XAtom();
 
+/* Root window */
+    static final XAtom XA_NET_DESKTOP_GEOMETRY = new XAtom();
+
     static final int
         UNDETERMINED_WM = 1,
         NO_WM = 2,
@@ -213,6 +216,7 @@ final class XWM
             { XA_MWM_HINTS,                  "_MOTIF_WM_HINTS"               },
             { XA_NET_FRAME_EXTENTS,          "_NET_FRAME_EXTENTS"            },
             { XA_NET_REQUEST_FRAME_EXTENTS,  "_NET_REQUEST_FRAME_EXTENTS"    },
+            { XA_NET_DESKTOP_GEOMETRY,       "_NET_DESKTOP_GEOMETRY"         }
         };
 
         String[] names = new String[atomInitList.length];

src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c

@@ -2246,17 +2246,21 @@ Java_sun_awt_X11GraphicsDevice_getNativeScaleFactor
     // Ubuntu 18.04 introduced a new settings for a scale factor: Settings > Devices > Displays > Scale.
     // It is propagated to Xresource (and is read fine with 'xrdb' util) but is not propagated to GSettings
     // (gtk3 doesn't see it in 'gtk-xft-dpi'). So, retrieve "Xft.dpi" from Xresource via X11 API call.
-    if (scale <= 0 && awt_display) {
-        char *resource_manager = XResourceManagerString(awt_display);
-        if (resource_manager) {
-            XrmDatabase db = XrmGetStringDatabase(resource_manager);
-            if (db) {
-                XrmValue value;
-                char *type;
-                if (XrmGetResource(db, "Xft.dpi", "Xft.dpi", &type, &value)) {
-                    scale = (double)atoi(value.addr) / 96;
+    if (scale <= 0) {
+        Display *display = XOpenDisplay(NULL); // need to open new display to get up-to-date XResource value
+        if (display) {
+            char *resource_manager = XResourceManagerString(display);
+            if (resource_manager) {
+                XrmDatabase db = XrmGetStringDatabase(resource_manager);
+                if (db) {
+                    XrmValue value;
+                    char *type;
+                    if (XrmGetResource(db, "Xft.dpi", "Xft.dpi", &type, &value)) {
+                        scale = (double)atoi(value.addr) / 96;
+                    }
                 }
             }
+            XCloseDisplay(display);
         }
     }
 #endif

src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java

@@ -58,6 +58,7 @@ import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import sun.awt.AWTAccessor;
 import sun.awt.AppContext;
@@ -1090,4 +1091,18 @@ public class WWindowPeer extends WPanelPeer implements WindowPeer,
         }
         return err;
     }
+
+    private volatile List<Rectangle> hitTestSpots;
+
+    private void setCustomDecorationHitTestSpots(List<Rectangle> hitTestSpots) {
+        this.hitTestSpots = new CopyOnWriteArrayList<>(hitTestSpots);
+    }
+
+    private boolean hitTestCustomDecoration(int x, int y) {
+        if (hitTestSpots == null) return false;
+        for (Rectangle spot : hitTestSpots) {
+            if (spot.contains(x, y)) return true;
+        }
+        return false;
+    }
 }

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

@@ -1943,7 +1943,7 @@ LRESULT AwtComponent::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
           mr = WmNcPaint((HRGN)wParam);
           break;
       case WM_NCHITTEST:
-          mr = WmNcHitTest(LOWORD(lParam), HIWORD(lParam), retValue);
+          mr = WmNcHitTest(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), retValue);
           break;
 
       case WM_AWT_RESHAPE_COMPONENT: {
@@ -4681,7 +4681,7 @@ MsgRouting AwtComponent::WmNcPaint(HRGN hrgn)
     return mrDoDefault;
 }
 
-MsgRouting AwtComponent::WmNcHitTest(UINT x, UINT y, LRESULT &retVal)
+MsgRouting AwtComponent::WmNcHitTest(int x, int y, LRESULT &retVal)
 {
     return mrDoDefault;
 }

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

@@ -585,7 +585,7 @@ public:
                                     LPNCCALCSIZE_PARAMS lpncsp,
                                     LRESULT &retVal);
     virtual MsgRouting WmNcPaint(HRGN hrgn);
-    virtual MsgRouting WmNcHitTest(UINT x, UINT y, LRESULT &retVal);
+    virtual MsgRouting WmNcHitTest(int x, int y, LRESULT &retVal);
     virtual MsgRouting WmSysCommand(UINT uCmdType, int xPos, int yPos);
     virtual MsgRouting WmEnterSizeMove();
     virtual MsgRouting WmExitSizeMove();

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

@@ -32,6 +32,8 @@
 #include "ComCtl32Util.h"
 
 #include <windowsx.h>
+#include <uxtheme.h>
+#include <dwmapi.h>
 
 #include <java_lang_Integer.h>
 #include <sun_awt_windows_WEmbeddedFrame.h>
@@ -126,6 +128,7 @@ AwtFrame::AwtFrame() {
     m_zoomed = FALSE;
     m_maxBoundsSet = FALSE;
     m_forceResetZoomed = FALSE;
+    m_pHasCustomDecoration = NULL;
 
     isInManualMoveOrSize = FALSE;
     grabbedHitTest = 0;
@@ -1695,6 +1698,118 @@ ret:
     delete nmbs;
 }
 
+// {start} Custom Decoration Support
+
+BOOL AwtFrame::HasCustomDecoration()
+{
+    if (!m_pHasCustomDecoration) {
+        m_pHasCustomDecoration = new BOOL;
+        JNIEnv *env = (JNIEnv *) JNU_GetEnv(jvm, JNI_VERSION_1_2);
+        *m_pHasCustomDecoration = JNU_CallMethodByName(env, NULL, GetTarget(env), "hasCustomDecoration", "()Z").z;
+    }
+    return *m_pHasCustomDecoration;
+}
+
+void GetSysInsets(RECT* insets) {
+    static RECT* sysInsets = NULL;
+
+    if (!sysInsets) {
+        sysInsets = new RECT;
+        sysInsets->left = sysInsets->right = ::GetSystemMetrics(SM_CXSIZEFRAME);
+        sysInsets->top = sysInsets->bottom = ::GetSystemMetrics(SM_CYSIZEFRAME);
+        sysInsets->top += ::GetSystemMetrics(SM_CYCAPTION);
+    }
+    ::CopyRect(insets, sysInsets);
+}
+
+LRESULT HitTestNCA(AwtFrame* frame, int x, int y) {
+    RECT rcWindow;
+    RECT insets;
+
+    GetSysInsets(&insets);
+    GetWindowRect(frame->GetHWnd(), &rcWindow);
+
+    // Get the frame rectangle, adjusted for the style without a caption.
+    RECT rcFrame = {0};
+    AdjustWindowRectEx(&rcFrame, WS_OVERLAPPEDWINDOW & ~WS_CAPTION, FALSE, NULL);
+
+    USHORT uRow = 1;
+    USHORT uCol = 1;
+    BOOL fOnResizeBorder = FALSE;
+
+    if (y >= rcWindow.top &&
+        y < rcWindow.top + insets.top)
+    {
+        JNIEnv *env = (JNIEnv *) JNU_GetEnv(jvm, JNI_VERSION_1_2);
+        if (JNU_CallMethodByName(env, NULL, frame->GetPeer(env),
+                                 "hitTestCustomDecoration", "(II)Z",
+                                 frame->ScaleDownX(x - rcWindow.left),
+                                 frame->ScaleDownY(y - rcWindow.top)).z)
+        {
+            return HTNOWHERE;
+        }
+        fOnResizeBorder = (y < (rcWindow.top - rcFrame.top));
+        uRow = 0;
+    } else if (y < rcWindow.bottom &&
+               y >= rcWindow.bottom - insets.bottom) {
+        uRow = 2;
+    }
+
+    if (x >= rcWindow.left &&
+        x < rcWindow.left + insets.left)
+    {
+        uCol = 0;
+    } else if (x < rcWindow.right &&
+               x >= rcWindow.right - insets.right)
+    {
+        uCol = 2;
+    }
+
+    LRESULT hitTests[3][3] = {
+            {HTTOPLEFT, fOnResizeBorder ? HTTOP : HTCAPTION, HTTOPRIGHT},
+            {HTLEFT, HTNOWHERE, HTRIGHT},
+            {HTBOTTOMLEFT, HTBOTTOM, HTBOTTOMRIGHT},
+    };
+
+    return hitTests[uRow][uCol];
+}
+
+MsgRouting AwtFrame::WmNcCalcSize(BOOL wParam, LPNCCALCSIZE_PARAMS lpncsp, LRESULT& retVal)
+{
+    if (!wParam || !HasCustomDecoration()) {
+        return AwtWindow::WmNcCalcSize(wParam, lpncsp, retVal);
+    }
+    if (::IsZoomed(GetHWnd())) {
+        RECT insets;
+        GetSysInsets(&insets);
+        static int xBorder = ::GetSystemMetrics(SM_CXBORDER);
+        static int yBorder = ::GetSystemMetrics(SM_CYBORDER);
+
+        // When maximized we should include insets or otherwise the client area edges get out of a screen
+        lpncsp->rgrc[0].left = lpncsp->rgrc[0].left + insets.left - xBorder;
+        lpncsp->rgrc[0].top = lpncsp->rgrc[0].top + insets.bottom - yBorder; // do not count caption
+        lpncsp->rgrc[0].right = lpncsp->rgrc[0].right - insets.right + xBorder;
+        lpncsp->rgrc[0].bottom = lpncsp->rgrc[0].bottom - insets.bottom + yBorder;
+    }
+    retVal = 0L;
+    return mrConsume;
+}
+
+MsgRouting AwtFrame::WmNcHitTest(int x, int y, LRESULT& retVal)
+{
+    if (!HasCustomDecoration()) {
+        return AwtWindow::WmNcHitTest(x, y, retVal);
+    }
+    if (::IsWindow(GetModalBlocker(GetHWnd()))) {
+        retVal = HTCLIENT;
+        return mrConsume;
+    }
+    retVal = HitTestNCA(this, x, y);
+    return retVal == HTNOWHERE ? mrDoDefault : mrConsume;
+}
+
+// {end} Custom Decoration Support
+
 /************************************************************************
  * WFramePeer native methods
  */

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

@@ -117,6 +117,8 @@ public:
     MsgRouting WmGetIcon(WPARAM iconType, LRESULT& retVal);
     MsgRouting WmShowWindow(BOOL show, UINT status);
     MsgRouting WmDPIChanged(UINT xDPI, UINT yDPI, RECT* bounds);
+    MsgRouting WmNcCalcSize(BOOL fCalcValidRects, LPNCCALCSIZE_PARAMS lpncsp, LRESULT& retVal);
+    MsgRouting WmNcHitTest(int x, int y, LRESULT& retVal);
 
     virtual MsgRouting WmSysCommand(UINT uCmdType, int xPos, int yPos);
 
@@ -161,6 +163,9 @@ public:
     INLINE HWND GetImeTargetComponent() { return m_imeTargetComponent; }
     INLINE void SetImeTargetComponent(HWND hwnd) { m_imeTargetComponent = hwnd; }
 
+    BOOL* m_pHasCustomDecoration;
+    BOOL HasCustomDecoration();
+
 protected:
     /* The frame is undecorated. */
     BOOL m_isUndecorated;

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

@@ -412,7 +412,7 @@ AwtList::OwnerMeasureItem(UINT /*ctrlId*/, MEASUREITEMSTRUCT& measureInfo)
 }
 
 MsgRouting
-AwtList::WmNcHitTest(UINT x, UINT y, LRESULT& retVal)
+AwtList::WmNcHitTest(int x, int y, LRESULT& retVal)
 {
     if (::IsWindow(AwtWindow::GetModalBlocker(AwtComponent::GetTopLevelParentForWindow(GetHWnd())))) {
         retVal = HTCLIENT;

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

@@ -110,7 +110,7 @@ public:
     /*
      * Windows message handler functions
      */
-    MsgRouting WmNcHitTest(UINT x, UINT y, LRESULT& retVal);
+    MsgRouting WmNcHitTest(int x, int y, LRESULT& retVal);
     MsgRouting WmMouseDown(UINT flags, int x, int y, int button);
     MsgRouting WmMouseUp(UINT flags, int x, int y, int button);
     MsgRouting WmNotify(UINT notifyCode);

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

@@ -359,7 +359,7 @@ void AwtScrollPane::PostScrollEvent(int orient, int scrollCode, int pos) {
 }
 
 MsgRouting
-AwtScrollPane::WmNcHitTest(UINT x, UINT y, LRESULT& retVal)
+AwtScrollPane::WmNcHitTest(int x, int y, LRESULT& retVal)
 {
     if (::IsWindow(AwtWindow::GetModalBlocker(AwtComponent::GetTopLevelParentForWindow(GetHWnd())))) {
         retVal = HTCLIENT;

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

@@ -75,7 +75,7 @@ public:
     /*
      * Windows message handler functions
      */
-    virtual MsgRouting WmNcHitTest(UINT x, UINT y, LRESULT& retVal);
+    virtual MsgRouting WmNcHitTest(int x, int y, LRESULT& retVal);
     virtual MsgRouting WmHScroll(UINT scrollCode, UINT pos, HWND hScrollBar);
     virtual MsgRouting WmVScroll(UINT scrollCode, UINT pos, HWND hScrollBar);
 

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

@@ -223,7 +223,7 @@ AwtScrollbar::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
 }
 
 MsgRouting
-AwtScrollbar::WmNcHitTest(UINT x, UINT y, LRESULT& retVal)
+AwtScrollbar::WmNcHitTest(int x, int y, LRESULT& retVal)
 {
     if (::IsWindow(AwtWindow::GetModalBlocker(AwtComponent::GetTopLevelParentForWindow(GetHWnd())))) {
         retVal = HTCLIENT;

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

@@ -71,7 +71,7 @@ public:
 
     // Prevent KB Q102552 race.
     virtual MsgRouting WmMouseDown(UINT flags, int x, int y, int button);
-    virtual MsgRouting WmNcHitTest(UINT x, UINT y, LRESULT& retVal);
+    virtual MsgRouting WmNcHitTest(int x, int y, LRESULT& retVal);
 
     virtual MsgRouting HandleEvent(MSG *msg, BOOL synthetic);
 

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

@@ -138,7 +138,7 @@ AwtTextArea::WindowProc(UINT message, WPARAM wParam, LPARAM lParam) {
 }
 
 MsgRouting
-AwtTextArea::WmNcHitTest(UINT x, UINT y, LRESULT& retVal)
+AwtTextArea::WmNcHitTest(int x, int y, LRESULT& retVal)
 {
     if (::IsWindow(AwtWindow::GetModalBlocker(AwtComponent::GetTopLevelParentForWindow(GetHWnd())))) {
         retVal = HTCLIENT;

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

@@ -59,7 +59,7 @@ public:
     LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam);
 
     MsgRouting WmEnable(BOOL fEnabled);
-    MsgRouting WmNcHitTest(UINT x, UINT y, LRESULT &retVal);
+    MsgRouting WmNcHitTest(int x, int y, LRESULT &retVal);
     MsgRouting HandleEvent(MSG *msg, BOOL synthetic);
 
     virtual BOOL InheritsNativeMouseWheelBehavior();

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

@@ -250,6 +250,8 @@ AwtWindow::AwtWindow() {
     prevScaleRec.scaleX = -1.0f;
     prevScaleRec.scaleY = -1.0f;*/
     m_overriddenHwnd = NULL;
+
+    ::SetRect(&m_boundsOnDPIChange, 0, 0, 0, 0);
 }
 
 AwtWindow::~AwtWindow()
@@ -991,7 +993,8 @@ MsgRouting AwtWindow::WmDPIChanged(UINT xDPI, UINT yDPI, RECT* bounds) {
                            bounds->right - bounds->left, bounds->bottom - bounds->top,
                            SWP_NOZORDER | SWP_NOACTIVATE);
     } else {
-        // DPI of this screen changed. Store the new bounds for async update.
+        // Either DPI of this screen changed, or the window moved to a new screen by a shortcut (shift+meta+arrow).
+        // Store the new bounds for async update.
         ::CopyRect(&m_boundsOnDPIChange, bounds);
     }
     return mrConsume;
@@ -2032,7 +2035,7 @@ MsgRouting AwtWindow::WmNcCalcSize(BOOL fCalcValidRects,
     return mrRetVal;
 }
 
-MsgRouting AwtWindow::WmNcHitTest(UINT x, UINT y, LRESULT& retVal)
+MsgRouting AwtWindow::WmNcHitTest(int x, int y, LRESULT& retVal)
 {
     // If this window is blocked by modal dialog, return HTCLIENT for any point of it.
     // That prevents it to be moved or resized using the mouse. Disabling these

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

@@ -182,7 +182,7 @@ public:
     virtual MsgRouting WmSettingChange(UINT wFlag, LPCTSTR pszSection);
     virtual MsgRouting WmNcCalcSize(BOOL fCalcValidRects,
                                     LPNCCALCSIZE_PARAMS lpncsp, LRESULT& retVal);
-    virtual MsgRouting WmNcHitTest(UINT x, UINT y, LRESULT& retVal);
+    virtual MsgRouting WmNcHitTest(int x, int y, LRESULT& retVal);
     virtual MsgRouting WmNcMouseDown(WPARAM hitTest, int x, int y, int button);
     virtual MsgRouting WmGetIcon(WPARAM iconType, LRESULT& retVal);
     virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam);
@@ -270,6 +270,8 @@ public:
     inline HWND GetOverriddenHWnd() { return m_overriddenHwnd; }
     inline void OverrideHWnd(HWND hwnd) { m_overriddenHwnd = hwnd; }
 
+    virtual BOOL HasCustomDecoration() { return FALSE; }
+
 private:
     static int ms_instanceCounter;
     static HHOOK ms_hCBTFilter;