8242507: Add support for Visual Studio 2019

Reviewed-by: arapte, jvos
openjdk · May 5, 2020 · 2e90076 · 2e90076
1 parent 39d9c3b
commit 2e90076
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/buildSrc/win.gradle b/buildSrc/win.gradle
@@ -190,22 +190,18 @@ if (hasProperty('toolchainDir')) {
 def winSdkDllDir = "$WINDOWS_VS_WINSDKDLLINSTALLDIR/$CPU_BITS"
 
 def WINDOWS_DLL_VER = WINDOWS_VS_VER
-ext.MSVCR = null
-ext.MSVCP = null
 
 def windowsCRTVer = System.getenv("WINDOWS_CRT_VER") ?: WINDOWS_CRT_VER
 if (WINDOWS_VS_VER == "150") {
     WINDOWS_DLL_VER = "140"
-    ext.MSVCR = cygpath("${msvcRedstDir}/Microsoft.VC${windowsCRTVer}.CRT/vcruntime${WINDOWS_DLL_VER}.dll")
-    ext.MSVCP = cygpath("${msvcRedstDir}/Microsoft.VC${windowsCRTVer}.CRT/msvcp${WINDOWS_DLL_VER}.dll")
 }
 
 def vs2017DllPath = cygpath("${msvcRedstDir}/Microsoft.VC${windowsCRTVer}.CRT")
 if (file(vs2017DllPath).exists()) {
     ext.WIN.VS2017DLLNames = [
-        "concrt140.dll",
         "msvcp140.dll",
-        "vcruntime140.dll"
+        "vcruntime140.dll",
+        "vcruntime140_1.dll"
     ];
     ext.WIN.VS2017DLLs = []
     ext.WIN.VS2017DLLNames.each { vsdll->

diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/win/WinApplication.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/win/WinApplication.java
@@ -96,7 +96,7 @@ public Void run() {
                 } else {
                     overrideUIScale = 1.0f;
                 }
-                // This loading of msvcp140.dll and vcruntime140.dll (VS2017) is required on Windows platforms
+                // Load required Microsoft runtime DLLs on Windows platforms
                 Toolkit.loadMSWindowsLibraries();
                 Application.loadNativeLibrary();
                 return null;

diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/Toolkit.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/Toolkit.java
@@ -153,8 +153,8 @@ public abstract class Toolkit {
 
         // Finally load VS 2017 DLLs in the following order
         "vcruntime140",
-        "msvcp140",
-        "concrt140"
+        "vcruntime140_1",
+        "msvcp140"
 };
 
     private static String lookupToolkitClass(String name) {
@@ -207,7 +207,7 @@ public static synchronized Toolkit getToolkit() {
             return null;
         });
 
-        // This loading of msvcp140.dll and vcruntime140.dll (VS2017) is required on Windows platforms
+        // Load required Microsoft runtime DLLs on Windows platforms
         if (PlatformUtil.isWindows()) {
             loadMSWindowsLibraries();
         }