--- old/src/windows/native/java/lang/ProcessImpl_md.c	2013-07-15 12:48:37.381430400 +0400
+++ new/src/windows/native/java/lang/ProcessImpl_md.c	2013-07-15 12:48:36.202430400 +0400
@@ -40,20 +40,88 @@
  */
 #define PIPE_SIZE (4096+24)
 
+/* We have THREE locales in action: 
+ * 1. Thread default locale - dictates UNICODE-to-8bit conversion
+ * 2. System locale that defines the message localization
+ * 3. The file name locale
+ * Each locale could be an extended locale, that means that text cannot be
+ * mapped to 8bit sequence without multibyte encoding. 
+ * VM is ready for that, if text is UTF-8.
+ * Here we make the work right from the beginning.
+ */
+
+ /* Unicode version of JVM call:
+  *  hotspot/src/os/windows/vm/os_windows.cpp:
+  *     size_t os::lasterror(char* buf, size_t len)
+  * JVM version need to be fixed accordingly as well as
+  *  jdk/src/windows/native/java/io/io_util_md.c
+  *     size_t getLastErrorString(char *buf, size_t len)
+  */
+ size_t os_lasterror(WCHAR* buf, size_t len) {
+  DWORD errval;
+  if ((errval = GetLastError()) != 0) {
+    /* DOS error*/
+    size_t n = (size_t)FormatMessageW(
+          FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS,
+          NULL,
+          errval,
+          0,
+          buf,
+          (DWORD)len,
+          NULL);
+    if (n > 3) {
+        // Drop final '.', CR, LF
+        if (buf[n - 1] == L'\n') n--;
+        if (buf[n - 1] == L'\r') n--;
+        if (buf[n - 1] == L'.') n--;
+        buf[n] = L'\0';
+    }
+    return n;
+  }
+
+  if (errno != 0) {
+        /* C runtime error that has no corresponding DOS error code */
+        const WCHAR* s = _wcserror(errno);
+        size_t n = wcslen(s);
+        if (n >= len) n = len - 1;
+        wcsncpy(buf, s, n);
+        buf[n] = L'\0';
+        return n;
+  }
+
+  return 0;
+}
+
+#define MESAGE_LENGTH (256 + 100)
+#define ARRAY_SIZE(x) (sizeof(x)/sizeof(*x))
+
 static void
-win32Error(JNIEnv *env, const char *functionName)
+win32Error(JNIEnv *env, const WCHAR *functionName)
 {
-    static const char * const format = "%s error=%d, %s";
-    static const char * const fallbackFormat = "%s failed, error=%d";
-    char buf[256];
-    char errmsg[sizeof(buf) + 100];
+    WCHAR utf16_OSErrorMsg[MESAGE_LENGTH - 100];
+    WCHAR utf16_javaMessage[MESAGE_LENGTH];
+    /*Good suggestion about 2-bytes-per-symbol in localized error reports*/
+    char  utf8_javaMessage[MESAGE_LENGTH*2];
     const int errnum = GetLastError();
-    const int n = JVM_GetLastErrorString(buf, sizeof(buf));
+    const int n = os_lasterror(utf16_OSErrorMsg, ARRAY_SIZE(utf16_OSErrorMsg));
     if (n > 0)
-        sprintf(errmsg, format, functionName, errnum, buf);
+        swprintf(utf16_javaMessage, MESAGE_LENGTH, L"%s error=%d, %s", functionName, errnum, utf16_OSErrorMsg);
     else
-        sprintf(errmsg, fallbackFormat, functionName, errnum);
-    JNU_ThrowIOException(env, errmsg);
+        swprintf(utf16_javaMessage, MESAGE_LENGTH, L"%s failed, error=%d", functionName, errnum);
+
+    WideCharToMultiByte(
+        CP_UTF8,
+        0,
+        utf16_javaMessage,
+        MESAGE_LENGTH,
+        utf8_javaMessage,
+        MESAGE_LENGTH*2,
+        NULL,
+        NULL);
+
+    /*no way to die*/
+    utf8_javaMessage[MESAGE_LENGTH*2 - 1] = '\0';
+    JNU_ThrowIOException(env, utf8_javaMessage);
 }
 
 static void
@@ -116,7 +184,7 @@
         handles[0] = (jlong) -1;
     } else {
         if (! CreatePipe(&inRead,  &inWrite,  &sa, PIPE_SIZE)) {
-            win32Error(env, "CreatePipe");
+            win32Error(env, L"CreatePipe");
             goto Catch;
         }
         si.hStdInput = inRead;
@@ -132,7 +200,7 @@
         handles[1] = (jlong) -1;
     } else {
         if (! CreatePipe(&outRead, &outWrite, &sa, PIPE_SIZE)) {
-            win32Error(env, "CreatePipe");
+            win32Error(env, L"CreatePipe");
             goto Catch;
         }
         si.hStdOutput = outWrite;
@@ -151,7 +219,7 @@
         handles[2] = (jlong) -1;
     } else {
         if (! CreatePipe(&errRead, &errWrite, &sa, PIPE_SIZE)) {
-            win32Error(env, "CreatePipe");
+            win32Error(env, L"CreatePipe");
             goto Catch;
         }
         si.hStdError = errWrite;
@@ -174,7 +242,7 @@
                          &si,              /* (in)  startup information */
                          &pi);             /* (out) process information */
     if (!ret) {
-        win32Error(env, "CreateProcess");
+        win32Error(env, L"CreateProcess");
         goto Catch;
     }
 
@@ -210,7 +278,7 @@
 {
     DWORD exit_code;
     if (GetExitCodeProcess((HANDLE) handle, &exit_code) == 0)
-        win32Error(env, "GetExitCodeProcess");
+        win32Error(env, L"GetExitCodeProcess");
     return exit_code;
 }
 
@@ -231,7 +299,7 @@
                                FALSE,    /* Wait for ANY event */
                                INFINITE)  /* Wait forever */
         == WAIT_FAILED)
-        win32Error(env, "WaitForMultipleObjects");
+        win32Error(env, L"WaitForMultipleObjects");
 }
 
 JNIEXPORT void JNICALL
@@ -250,7 +318,7 @@
                                     dwTimeout);  /* Wait for dwTimeout */
 
     if (result == WAIT_FAILED)
-        win32Error(env, "WaitForMultipleObjects");
+        win32Error(env, L"WaitForMultipleObjects");
 }
 
 JNIEXPORT void JNICALL
@@ -263,7 +331,7 @@
 Java_java_lang_ProcessImpl_isProcessAlive(JNIEnv *env, jclass ignored, jlong handle)
 {
     DWORD dwExitStatus;
-    GetExitCodeProcess(handle, &dwExitStatus);
+    GetExitCodeProcess((HANDLE) handle, &dwExitStatus);
     return dwExitStatus == STILL_ACTIVE;
 }