8242283: Can't start JVM when java home path includes non-ASCII chara…

…cter Reviewed-by: yan Backport-of: d34f732
openjdk · Feb 12, 2021 · c229f3c · c229f3c · openjdk-notifier · Feb 12, 2021
1 parent 8519133
commit c229f3c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
@@ -4282,7 +4282,7 @@ static void file_attribute_data_to_stat(struct stat* sbuf, WIN32_FILE_ATTRIBUTE_
 
 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);
@@ -4292,7 +4292,7 @@ static errno_t convert_to_unicode(char const* char_path, LPWSTR* unicode_path) {
 
   *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);