--- old/src/java.base/windows/native/libjava/ProcessHandleImpl_win.c	2020-03-26 13:30:38.000000000 +0900
+++ new/src/java.base/windows/native/libjava/ProcessHandleImpl_win.c	2020-03-26 13:30:36.000000000 +0900
@@ -469,12 +469,13 @@
 }
 
 static void getCmdlineInfo(JNIEnv *env, HANDLE handle, jobject jinfo) {
-    char exeName[1024];
-    int bufsize = sizeof exeName;
+    WCHAR exeName[1024];
+    DWORD bufsize = sizeof(exeName)/sizeof(WCHAR);
     jstring commandObj;
 
-    if (QueryFullProcessImageName(handle, 0,  exeName, &bufsize)) {
-        commandObj = (*env)->NewStringUTF(env, exeName);
+    if (QueryFullProcessImageNameW(handle, 0,  exeName, &bufsize)) {
+        commandObj = (*env)->NewString(env, (const jchar *)exeName,
+                                       (jsize)wcslen(exeName));
         CHECK_NULL(commandObj);
         (*env)->SetObjectField(env, jinfo,
                                ProcessHandleImpl_Info_commandID, commandObj);