Use FormatMessageW for Windows error messages to handle internationalized messages correctly.

runtime/bin/directory_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/directory.h"
 
 #include <errno.h>
 #include <sys/stat.h>
 
 #include "bin/log.h"
 
-static int SetOsErrorMessage(char* os_error_message,
-                             int os_error_message_len) {
-  int error_code = GetLastError();
-  DWORD message_size =
-      FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-                    NULL,
-                    error_code,
-                    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                    os_error_message,
-                    os_error_message_len,
-                    NULL);
-  if (message_size == 0) {
-    if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
-      Log::PrintErr("FormatMessage failed %d\n", GetLastError());
-    }
-    snprintf(os_error_message, os_error_message_len, "OS Error %d", error_code);
-  }
-  os_error_message[os_error_message_len - 1] = '\0';
-  return error_code;
-}
-
-
 // Forward declaration.
 static bool ListRecursively(const char* dir_name,
                             bool recursive,
                             DirectoryListing* listing);
 static bool DeleteRecursively(const char* dir_name);
 
 
 static bool HandleDir(char* dir_name,
                       char* path,
                       int path_length,
                       bool recursive,
                       DirectoryListing* listing) {
   if (strcmp(dir_name, ".") != 0 &&
       strcmp(dir_name, "..") != 0) {
     size_t written = snprintf(path + path_length,
                               MAX_PATH - path_length,
                               "%s",
                               dir_name);
     if (written != strlen(dir_name)) {
       return false;
     }
-    char* utf8_path = StringUtils::SystemStringToUtf8(path);
+    char* utf8_path = StringUtils::ConsoleStringToUtf8(path);
     bool ok = listing->HandleDirectory(utf8_path);
     free(utf8_path);
     if (!ok) return ok;
     if (recursive) {
       return ListRecursively(path, recursive, listing);
     }
   }
   return true;
 }
 
 
 static bool HandleFile(char* file_name,
                        char* path,
                        int path_length,
                        DirectoryListing* listing) {
   size_t written = snprintf(path + path_length,
                             MAX_PATH - path_length,
                             "%s",
                             file_name);
   if (written != strlen(file_name)) {
     return false;
   };
-  char* utf8_path = StringUtils::SystemStringToUtf8(path);
+  char* utf8_path = StringUtils::ConsoleStringToUtf8(path);
   bool ok = listing->HandleFile(utf8_path);
   free(utf8_path);
   return ok;
 }
 
 
 static bool HandleEntry(LPWIN32_FIND_DATA find_file_data,
                         char* path,
                         int path_length,
                         bool recursive,
@@ skipping 33 matching lines @@
                      "\\*");
   if (written != 2) {
     return false;
   }
   *path_length += written;
   return true;
 }
 
 static void PostError(DirectoryListing* listing,
                       const char* dir_name) {
-  const char* utf8_path = StringUtils::SystemStringToUtf8(dir_name);
+  const char* utf8_path = StringUtils::ConsoleStringToUtf8(dir_name);
   listing->HandleError(utf8_path);
   free(const_cast<char*>(utf8_path));
 }
 
 
 static bool ListRecursively(const char* dir_name,
                             bool recursive,
                             DirectoryListing* listing) {
   // Compute full path for the directory currently being listed.  The
   // path buffer will be used to construct the current path in the
@@ skipping 170 matching lines @@
     return false;
   }
 
   return success;
 }
 
 
 bool Directory::List(const char* dir_name,
                      bool recursive,
                      DirectoryListing* listing) {
-  const char* system_name = StringUtils::Utf8ToSystemString(dir_name);
+  const char* system_name = StringUtils::Utf8ToConsoleString(dir_name);
   bool completed = ListRecursively(system_name, recursive, listing);
   free(const_cast<char*>(system_name));
   return completed;
 }
 
 
 static Directory::ExistsResult ExistsHelper(const char* dir_name) {
   DWORD attributes = GetFileAttributes(dir_name);
   if (attributes == INVALID_FILE_ATTRIBUTES) {
     DWORD last_error = GetLastError();
     if (last_error == ERROR_FILE_NOT_FOUND ||
         last_error == ERROR_PATH_NOT_FOUND) {
       return Directory::DOES_NOT_EXIST;
     } else {
       // We might not be able to get the file attributes for other
       // reasons such as lack of permissions. In that case we do
       // not know if the directory exists.
       return Directory::UNKNOWN;
     }
   }
   bool exists = (attributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
   return exists ? Directory::EXISTS : Directory::DOES_NOT_EXIST;
 }
 
 
 Directory::ExistsResult Directory::Exists(const char* dir_name) {
-  const char* system_name = StringUtils::Utf8ToSystemString(dir_name);
+  const char* system_name = StringUtils::Utf8ToConsoleString(dir_name);
   Directory::ExistsResult result = ExistsHelper(system_name);
   free(const_cast<char*>(system_name));
   return result;
 }
 
 
 char* Directory::Current() {
   int length = GetCurrentDirectory(0, NULL);
   char* current = reinterpret_cast<char*>(malloc(length + 1));
   GetCurrentDirectory(length + 1, current);
-  char* result = StringUtils::SystemStringToUtf8(current);
+  char* result = StringUtils::ConsoleStringToUtf8(current);
   free(current);
   return result;
 }
 
 
 bool Directory::Create(const char* dir_name) {
-  const char* system_name = StringUtils::Utf8ToSystemString(dir_name);
+  const char* system_name = StringUtils::Utf8ToConsoleString(dir_name);
   // If the directory already exists and is a directory do not
   // attempt to create it again and treat it as a success.
   if (ExistsHelper(system_name) == EXISTS) {
     free(const_cast<char*>(system_name));
     return true;
   }
   int create_status = CreateDirectory(system_name, NULL);
   free(const_cast<char*>(system_name));
   return (create_status != 0);
 }
 
 
 char* Directory::CreateTemp(const char* const_template) {
   // Returns a new, unused directory name, modifying the contents of
   // dir_template.  Creates this directory, with a default security
   // descriptor inherited from its parent directory.
   // The return value must be freed by the caller.
   char* path = static_cast<char*>(malloc(MAX_PATH));
   int path_length;
   if (0 == strncmp(const_template, "", 1)) {
     path_length = GetTempPath(MAX_PATH, path);
     if (path_length == 0) {
       free(path);
       return NULL;
     }
   } else {
     const char* system_template =
-        StringUtils::Utf8ToSystemString(const_template);
+        StringUtils::Utf8ToConsoleString(const_template);
     snprintf(path, MAX_PATH, "%s", system_template);
     free(const_cast<char*>(system_template));
     path_length = strlen(path);
   }
   // Length of tempdir-xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx is 44.
   if (path_length > MAX_PATH - 44) {
     free(path);
     return NULL;
   }
   if ((path)[path_length - 1] == '\\') {
@@ skipping 13 matching lines @@
   if (status != RPC_S_OK) {
     free(path);
     return NULL;
   }
 
   snprintf(path + path_length, MAX_PATH - path_length, "-%s", uuid_string);
   if (!CreateDirectory(path, NULL)) {
     free(path);
     return NULL;
   }
-  char* result = StringUtils::SystemStringToUtf8(path);
+  char* result = StringUtils::ConsoleStringToUtf8(path);
   free(path);
   return result;
 }
 
 
 bool Directory::Delete(const char* dir_name, bool recursive) {
   bool result = false;
   const char* system_dir_name =
-      StringUtils::Utf8ToSystemString(dir_name);
+      StringUtils::Utf8ToConsoleString(dir_name);
   if (!recursive) {
     result = (RemoveDirectory(system_dir_name) != 0);
   } else {
     result = DeleteRecursively(system_dir_name);
   }
   free(const_cast<char*>(system_dir_name));
   return result;
 }
 
 
 bool Directory::Rename(const char* path, const char* new_path) {
-  const char* system_path = StringUtils::Utf8ToSystemString(path);
+  const char* system_path = StringUtils::Utf8ToConsoleString(path);
   const char* system_new_path =
-      StringUtils::Utf8ToSystemString(new_path);
+      StringUtils::Utf8ToConsoleString(new_path);
   ExistsResult exists = ExistsHelper(system_path);
   if (exists != EXISTS) return false;
   ExistsResult new_exists = ExistsHelper(system_new_path);
   // MoveFile does not allow replacing exising directories. Therefore,
   // if the new_path is currently a directory we need to delete it
   // first.
   if (new_exists == EXISTS) {
     bool success = DeleteRecursively(system_new_path);
     if (!success) return false;
   }
   DWORD flags = MOVEFILE_WRITE_THROUGH;
   int move_status =
       MoveFileEx(system_path, system_new_path, flags);
   free(const_cast<char*>(system_path));
   free(const_cast<char*>(system_new_path));
   return (move_status != 0);
 }