Fix extraction of environment variables on Windows.

runtime/bin/platform_win.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "bin/platform.h"
 #include "bin/log.h"
 #include "bin/socket.h"
 
 bool Platform::Initialize() {
   // Nothing to do on Windows.
@@ skipping 17 matching lines @@
   static bool socket_initialized = false;
   if (!socket_initialized) {
     // Initialize Socket for gethostname.
     if (!Socket::Initialize()) return false;
     socket_initialized = true;
   }
   return gethostname(buffer, buffer_length) == 0;
 }
 
 
+static char* WideToUtf8(wchar_t* wide) {
+  int len = WideCharToMultiByte(CP_UTF8, 0, wide, -1, NULL, 0, NULL, NULL);
+  char* utf8 = reinterpret_cast<char*>(malloc(len + 1));
+  WideCharToMultiByte(CP_UTF8, 0, wide, -1, utf8, len, NULL, NULL);
+  utf8[len] = '\0';
+  return utf8;
+}
+
+
 char** Platform::Environment(intptr_t* count) {
-  char* strings = GetEnvironmentStrings();
+  wchar_t* strings = GetEnvironmentStringsW();
   if (strings == NULL) return NULL;
-  char* tmp = strings;
+  wchar_t* tmp = strings;
   intptr_t i = 0;
   while (*tmp != '\0') {
     i++;
-    tmp += (strlen(tmp) + 1);
+    tmp += (wcslen(tmp) + 1);
   }
   *count = i;
   char** result = new char*[i];
   tmp = strings;
   for (intptr_t current = 0; current < i; current++) {
-    result[current] = StringUtils::SystemStringToUtf8(tmp);
-    tmp += (strlen(tmp) + 1);
+    result[current] = WideToUtf8(tmp);
+    tmp += (wcslen(tmp) + 1);
   }
-  FreeEnvironmentStrings(strings);
+  FreeEnvironmentStringsW(strings);
   return result;
 }
 
+
 void Platform::FreeEnvironment(char** env, int count) {
   for (int i = 0; i < count; i++) free(env[i]);
   delete[] env;
 }
 
 
 char* Platform::StrError(int error_code) {
   static const int kBufferSize = 1024;
   char* error = static_cast<char*>(malloc(kBufferSize));
   DWORD message_size =
@@ skipping 14 matching lines @@
   // null termination.
   if (message_size > 2 &&
       error[message_size - 2] == '\r' &&
       error[message_size - 1] == '\n') {
     error[message_size - 2] = '\0';
   } else {
     error[kBufferSize - 1] = '\0';
   }
   return error;
 }