Improve the encoding/decoding to/from system encoding on Windows

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 "platform/globals.h"
 #if defined(TARGET_OS_WINDOWS)
 
 #include "bin/directory.h"
 #include "bin/file.h"
 #include "bin/utils.h"
+#include "bin/utils_win.h"
 
 #include <errno.h>  // NOLINT
 #include <sys/stat.h>  // NOLINT
 
 #include "bin/log.h"
 
 #undef DeleteFile
 
 #define MAX_LONG_PATH 32767
 
 namespace dart {
 namespace bin {
 
 PathBuffer::PathBuffer() : length_(0) {
   data_ = calloc(MAX_LONG_PATH + 1,  sizeof(wchar_t));  // NOLINT
 }
 
 char* PathBuffer::AsString() const {
-  return StringUtils::WideToUtf8(AsStringW());
+  return StringUtilsWin::WideToUtf8(AsStringW());
 }
 
 wchar_t* PathBuffer::AsStringW() const {
   return reinterpret_cast<wchar_t*>(data_);
 }
 
 bool PathBuffer::Add(const char* name) {
-  const wchar_t* wide_name = StringUtils::Utf8ToWide(name);
+  const wchar_t* wide_name = StringUtilsWin::Utf8ToWide(name);
   bool success = AddW(wide_name);
   free(const_cast<wchar_t*>(wide_name));
   return success;
 }
 
 bool PathBuffer::AddW(const wchar_t* name) {
   wchar_t* data = AsStringW();
   int written = _snwprintf(data + length_,
                            MAX_LONG_PATH - length_,
                            L"%s",
@@ skipping 297 matching lines @@
       return Directory::UNKNOWN;
     }
   }
   bool exists = (attributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
   exists = exists && !IsBrokenLink(dir_name);
   return exists ? Directory::EXISTS : Directory::DOES_NOT_EXIST;
 }
 
 
 Directory::ExistsResult Directory::Exists(const char* dir_name) {
-  const wchar_t* system_name = StringUtils::Utf8ToWide(dir_name);
+  const wchar_t* system_name = StringUtilsWin::Utf8ToWide(dir_name);
   Directory::ExistsResult result = ExistsHelper(system_name);
   free(const_cast<wchar_t*>(system_name));
   return result;
 }
 
 
 char* Directory::Current() {
   int length = GetCurrentDirectoryW(0, NULL);
   if (length == 0) return NULL;
   wchar_t* current = new wchar_t[length + 1];
   GetCurrentDirectoryW(length + 1, current);
-  char* result = StringUtils::WideToUtf8(current);
+  char* result = StringUtilsWin::WideToUtf8(current);
   delete[] current;
   return result;
 }
 
 
 bool Directory::SetCurrent(const char* path) {
-  const wchar_t* system_path = StringUtils::Utf8ToWide(path);
+  const wchar_t* system_path = StringUtilsWin::Utf8ToWide(path);
   bool result = SetCurrentDirectoryW(system_path) != 0;
   free(const_cast<wchar_t*>(system_path));
   return result;
 }
 
 
 bool Directory::Create(const char* dir_name) {
-  const wchar_t* system_name = StringUtils::Utf8ToWide(dir_name);
+  const wchar_t* system_name = StringUtilsWin::Utf8ToWide(dir_name);
   int create_status = CreateDirectoryW(system_name, NULL);
   // If the directory already existed, treat it as a success.
   if (create_status == 0 &&
       GetLastError() == ERROR_ALREADY_EXISTS &&
       ExistsHelper(system_name) == EXISTS) {
     free(const_cast<wchar_t*>(system_name));
     return true;
   }
   free(const_cast<wchar_t*>(system_name));
   return (create_status != 0);
 }
 
 
 char* Directory::SystemTemp() {
   PathBuffer path;
   // Remove \ at end.
   path.Reset(GetTempPathW(MAX_LONG_PATH, path.AsStringW()) - 1);
   return path.AsString();
 }
 
 
 char* Directory::CreateTemp(const char* prefix) {
   // Returns a new, unused directory name, adding characters to the
   // end of prefix.
   // Creates this directory, with a default security
   // descriptor inherited from its parent directory.
   // The return value must be freed by the caller.
   PathBuffer path;
-  const wchar_t* system_prefix = StringUtils::Utf8ToWide(prefix);
+  const wchar_t* system_prefix = StringUtilsWin::Utf8ToWide(prefix);
   path.AddW(system_prefix);
   free(const_cast<wchar_t*>(system_prefix));
 
   // Length of xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx is 36.
   if (path.length() > MAX_LONG_PATH - 36) {
     return NULL;
   }
 
   UUID uuid;
   RPC_STATUS status = UuidCreateSequential(&uuid);
@@ skipping 12 matching lines @@
   if (!CreateDirectoryW(path.AsStringW(), NULL)) {
     return NULL;
   }
   char* result = path.AsString();
   return result;
 }
 
 
 bool Directory::Delete(const char* dir_name, bool recursive) {
   bool result = false;
-  const wchar_t* system_dir_name = StringUtils::Utf8ToWide(dir_name);
+  const wchar_t* system_dir_name = StringUtilsWin::Utf8ToWide(dir_name);
   if (!recursive) {
     if (File::GetType(dir_name, true) == File::kIsDirectory) {
       result = (RemoveDirectoryW(system_dir_name) != 0);
     } else {
       SetLastError(ERROR_FILE_NOT_FOUND);
     }
   } else {
     PathBuffer path;
     if (path.AddW(system_dir_name)) {
       result = DeleteRecursively(&path);
     }
   }
   free(const_cast<wchar_t*>(system_dir_name));
   return result;
 }
 
 
 bool Directory::Rename(const char* path, const char* new_path) {
-  const wchar_t* system_path = StringUtils::Utf8ToWide(path);
-  const wchar_t* system_new_path = StringUtils::Utf8ToWide(new_path);
+  const wchar_t* system_path = StringUtilsWin::Utf8ToWide(path);
+  const wchar_t* system_new_path = StringUtilsWin::Utf8ToWide(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 = Delete(new_path, true);
     if (!success) return false;
   }
   DWORD flags = MOVEFILE_WRITE_THROUGH;
   int move_status =
       MoveFileExW(system_path, system_new_path, flags);
   free(const_cast<wchar_t*>(system_path));
   free(const_cast<wchar_t*>(system_new_path));
   return (move_status != 0);
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_WINDOWS)