src/java.base/windows/native/libjli/java_md.c

*** 1015,1019 ****
--- 1015,1097 ----
      }
      JLI_MemFree(nargv);
      JLI_MemFree(filteredargs);
      return outArray;
  }
+ 
+ /*
+  * Translate Unicode command line arguments to multi byte chars.
+  */
+ static jboolean
+ DecodeUnicodeArgs(LPWSTR cmd_line_wide, LPSTR* cmd_line_utf8) {
+     int cmd_line_utf8_length;
+ 
+     // First call to WideCharToMultiByte calculates destination buffer length.
+     cmd_line_utf8_length = WideCharToMultiByte(CP_UTF8,
+                                             0,
+                                             cmd_line_wide,
+                                             -1,
+                                             NULL,
+                                             0,
+                                             NULL,
+                                             NULL);
+     if (!cmd_line_utf8_length) {
+         JLI_ReportErrorMessage(
+             "WideCharToMultiByte failed to calculate destination buffer length "
+             "with error code %d", GetLastError());
+         return JNI_FALSE;
+     }
+ 
+     // Allocate buffer to receive conversion to UTF-8.
+     *cmd_line_utf8 = JLI_MemAlloc((size_t)cmd_line_utf8_length * sizeof(CHAR));
+ 
+     // Second call to WideCharToMultiByte does the actual conversion.
+     if (!WideCharToMultiByte(CP_UTF8,
+                              0,
+                              cmd_line_wide,
+                              -1,
+                              *cmd_line_utf8,
+                              cmd_line_utf8_length,
+                              NULL,
+                              NULL)) {
+         JLI_ReportErrorMessage(
+             "WideCharToMultiByte failed to convert to UTF-8 "
+             "with error code %d", GetLastError());
+         JLI_MemFree(*cmd_line_utf8);
+         *cmd_line_utf8 = NULL;
+         return JNI_FALSE;
+     }
+     return JNI_TRUE;
+ }
+ 
+ /*
+  * Translate command line arguments from Windows format to argc+argv.
+  */
+ static void
+ ConvertWinArgsToCommonFormat(LPSTR cmd_line, int *pargc, char*** pargv) {
+     JLI_CmdToArgs(cmd_line);
+ 
+     *pargc = JLI_GetStdArgc();
+     // add one more to mark the end
+     *pargv = (char **)JLI_MemAlloc((*pargc + 1) * (sizeof(char *)));
+     {
+         int i = 0;
+         StdArg *stdargs = JLI_GetStdArgs();
+         for (i = 0 ; i < *pargc ; ++i) {
+             (*pargv)[i] = stdargs[i].arg;
+         }
+         (*pargv)[i] = NULL;
+     }
+ }
+ 
+ jboolean
+ JLI_DecodeArgs(int *pargc, char*** pargv) {
+     LPSTR cmdLineUtf8;
+ 
+     if (!DecodeUnicodeArgs(GetCommandLineW(), &cmdLineUtf8)) {
+         return JNI_FALSE;
+     }
+     ConvertWinArgsToCommonFormat(cmdLineUtf8, pargc, pargv);
+     JLI_MemFree(cmdLineUtf8);
+ 
+     return JNI_TRUE;
+ }