--- old/src/hotspot/os/windows/os_windows.cpp	2020-04-10 23:13:16.315484800 +0900
+++ new/src/hotspot/os/windows/os_windows.cpp	2020-04-10 23:13:15.494565700 +0900
@@ -4143,7 +4143,7 @@
 
 static errno_t convert_to_unicode(char const* char_path, LPWSTR* unicode_path) {
   // Get required buffer size to convert to Unicode
-  int unicode_path_len = MultiByteToWideChar(CP_THREAD_ACP,
+  int unicode_path_len = MultiByteToWideChar(CP_ACP,
                                              MB_ERR_INVALID_CHARS,
                                              char_path, -1,
                                              NULL, 0);
@@ -4153,7 +4153,7 @@
 
   *unicode_path = NEW_C_HEAP_ARRAY(WCHAR, unicode_path_len, mtInternal);
 
-  int result = MultiByteToWideChar(CP_THREAD_ACP,
+  int result = MultiByteToWideChar(CP_ACP,
                                    MB_ERR_INVALID_CHARS,
                                    char_path, -1,
                                    *unicode_path, unicode_path_len);
--- old/src/java.base/share/native/libzip/zip_util.c	2020-04-10 23:13:19.183894500 +0900
+++ new/src/java.base/share/native/libzip/zip_util.c	2020-04-10 23:13:18.346146900 +0900
@@ -136,7 +136,7 @@
             NULL);
     } else {
         /* Get required buffer size to convert to Unicode */
-        int wfname_len = MultiByteToWideChar(CP_THREAD_ACP, MB_ERR_INVALID_CHARS,
+        int wfname_len = MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS,
                                              fname, -1, NULL, 0);
         if (wfname_len == 0) {
             return (jlong)INVALID_HANDLE_VALUE;
@@ -144,7 +144,7 @@
         if ((wfname = (WCHAR*)malloc(wfname_len * sizeof(WCHAR))) == NULL) {
             return (jlong)INVALID_HANDLE_VALUE;
         }
-        if (MultiByteToWideChar(CP_THREAD_ACP, MB_ERR_INVALID_CHARS,
+        if (MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS,
                                 fname, -1, wfname, wfname_len) == 0) {
             free(wfname);
             return (jlong)INVALID_HANDLE_VALUE;
--- old/src/java.base/windows/native/libjava/canonicalize_md.c	2020-04-10 23:13:22.058814900 +0900
+++ new/src/java.base/windows/native/libjava/canonicalize_md.c	2020-04-10 23:13:21.217758600 +0900
@@ -334,7 +334,7 @@
     int ret = -1;
 
     /* Get required buffer size to convert to Unicode */
-    wpath_len = MultiByteToWideChar(CP_THREAD_ACP, MB_ERR_INVALID_CHARS,
+    wpath_len = MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS,
                                     orig, -1, NULL, 0);
     if (wpath_len == 0) {
         goto finish;
@@ -344,7 +344,7 @@
         goto finish;
     }
 
-    if (MultiByteToWideChar(CP_THREAD_ACP, MB_ERR_INVALID_CHARS,
+    if (MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS,
                             orig, -1, wpath, wpath_len) == 0) {
         goto finish;
     }
@@ -357,7 +357,7 @@
         goto finish;
     }
 
-    if (WideCharToMultiByte(CP_THREAD_ACP, 0,
+    if (WideCharToMultiByte(CP_ACP, 0,
                             wresult, -1, out, len, NULL, NULL) == 0) {
         goto finish;
     }
--- old/src/java.base/windows/native/libjli/java_md.c	2020-04-10 23:13:24.880826900 +0900
+++ new/src/java.base/windows/native/libjli/java_md.c	2020-04-10 23:13:24.048886900 +0900
@@ -504,7 +504,7 @@
      * Get required buffer size to convert to Unicode.
      * The return value includes the terminating null character.
      */
-    unicode_path_len = MultiByteToWideChar(CP_THREAD_ACP, MB_ERR_INVALID_CHARS,
+    unicode_path_len = MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS,
                                            path, -1, NULL, 0);
     if (unicode_path_len == 0) {
         return EINVAL;
@@ -518,7 +518,7 @@
     }
 
     wcsncpy(*wpath, prefix, prefix_len);
-    if (MultiByteToWideChar(CP_THREAD_ACP, MB_ERR_INVALID_CHARS,
+    if (MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS,
                             path, -1, &((*wpath)[prefix_len]), (int)wpath_len) == 0) {
         JLI_MemFree(*wpath);
         *wpath = NULL;
--- old/src/jdk.incubator.jpackage/windows/native/libapplauncher/WindowsPlatform.cpp	2020-04-10 23:13:27.769022200 +0900
+++ new/src/jdk.incubator.jpackage/windows/native/libapplauncher/WindowsPlatform.cpp	2020-04-10 23:13:26.932163800 +0900
@@ -404,12 +404,12 @@
         return result;
     }
 
-    count = MultiByteToWideChar(CP_THREAD_ACP, MB_ERR_INVALID_CHARS,
+    count = MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS,
                                 value, -1, NULL, 0);
 
     if (count > 0) {
         result.data = new wchar_t[count];
-        result.length = MultiByteToWideChar(CP_THREAD_ACP, MB_ERR_INVALID_CHARS,
+        result.length = MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS,
                                             value, -1, result.data, (int)count);
         if (result.length == 0) {
             delete[] result.data;