Update Windows file implementation to use the unicode APIs.

runtime/bin/file_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/file.h"
 
 #include <fcntl.h>
 #include <io.h>
 #include <stdio.h>
 #include <string.h>
@@ skipping 87 matching lines @@
 
 
 File* File::Open(const char* name, FileOpenMode mode) {
   int flags = O_RDONLY | O_BINARY | O_NOINHERIT;
   if ((mode & kWrite) != 0) {
     flags = (O_RDWR | O_CREAT | O_BINARY | O_NOINHERIT);
   }
   if ((mode & kTruncate) != 0) {
     flags = flags | O_TRUNC;
   }
-  const char* system_name = StringUtils::Utf8ToConsoleString(name);
-  int fd = open(system_name, flags, 0666);
-  free(const_cast<char*>(system_name));
+  const wchar_t* system_name = StringUtils::Utf8ToWide(name);
+  int fd = _wopen(system_name, flags, 0666);
+  free(const_cast<wchar_t*>(system_name));
   if (fd < 0) {
     return NULL;
   }
   if (((mode & kWrite) != 0) && ((mode & kTruncate) == 0)) {
     int position = lseek(fd, 0, SEEK_END);
     if (position < 0) {
       return NULL;
     }
   }
   return new File(new FileHandle(fd));
 }
 
 
 File* File::OpenStdio(int fd) {
   UNREACHABLE();
   return NULL;
 }
 
 
 bool File::Exists(const char* name) {
-  struct stat st;
-  const char* system_name = StringUtils::Utf8ToConsoleString(name);
-  bool stat_status = stat(system_name, &st);
-  free(const_cast<char*>(system_name));
+  struct _stat st;
+  const wchar_t* system_name = StringUtils::Utf8ToWide(name);
+  bool stat_status = _wstat(system_name, &st);
+  free(const_cast<wchar_t*>(system_name));
   if (stat_status == 0) {
     return ((st.st_mode & S_IFMT) == S_IFREG);
   } else {
     return false;
   }
 }
 
 
 bool File::Create(const char* name) {
-  const char* system_name = StringUtils::Utf8ToConsoleString(name);
-  int fd = open(system_name, O_RDONLY | O_CREAT, 0666);
-  free(const_cast<char*>(system_name));
+  const wchar_t* system_name = StringUtils::Utf8ToWide(name);
+  int fd = _wopen(system_name, O_RDONLY | O_CREAT, 0666);
+  free(const_cast<wchar_t*>(system_name));
   if (fd < 0) {
     return false;
   }
   return (close(fd) == 0);
 }
 
 
 bool File::Delete(const char* name) {
-  const char* system_name = StringUtils::Utf8ToConsoleString(name);
-  int status = remove(system_name);
-  free(const_cast<char*>(system_name));
+  const wchar_t* system_name = StringUtils::Utf8ToWide(name);
+  int status = _wremove(system_name);
+  free(const_cast<wchar_t*>(system_name));
   if (status == -1) {
     return false;
   }
   return true;
 }
 
 
 off_t File::LengthFromName(const char* name) {
-  struct stat st;
-  const char* system_name = StringUtils::Utf8ToConsoleString(name);
-  int stat_status = stat(system_name, &st);
-  free(const_cast<char*>(system_name));
+  struct _stat st;
+  const wchar_t* system_name = StringUtils::Utf8ToWide(name);
+  int stat_status = _wstat(system_name, &st);
+  free(const_cast<wchar_t*>(system_name));
   if (stat_status == 0) {
     return st.st_size;
   }
   return -1;
 }
 
 
 time_t File::LastModified(const char* name) {
-  struct stat st;
-  const char* system_name = StringUtils::Utf8ToConsoleString(name);
-  int stat_status = stat(system_name, &st);
-  free(const_cast<char*>(system_name));
+  struct _stat st;
+  const wchar_t* system_name = StringUtils::Utf8ToWide(name);
+  int stat_status = _wstat(system_name, &st);
+  free(const_cast<wchar_t*>(system_name));
   if (stat_status == 0) {
     return st.st_mtime;
   }
   return -1;
 }
 
 
 bool File::IsAbsolutePath(const char* pathname) {
   // Should we consider network paths?
   if (pathname == NULL) return false;
   return (strlen(pathname) > 2) &&
       (pathname[1] == ':') &&
       (pathname[2] == '\\' || pathname[2] == '/');
 }
 
 
 char* File::GetCanonicalPath(const char* pathname) {
-  struct stat st;
-  const char* system_name = StringUtils::Utf8ToConsoleString(pathname);
-  int stat_status = stat(system_name, &st);
+  struct _stat st;
+  const wchar_t* system_name = StringUtils::Utf8ToWide(pathname);
+  int stat_status = _wstat(system_name, &st);
   if (stat_status != 0) {
     SetLastError(ERROR_FILE_NOT_FOUND);
-    free(const_cast<char*>(system_name));
+    free(const_cast<wchar_t*>(system_name));
     return NULL;
   }
-  int required_size = GetFullPathName(system_name, 0, NULL, NULL);
-  char* path = static_cast<char*>(malloc(required_size));
-  int written = GetFullPathName(system_name, required_size, path, NULL);
-  free(const_cast<char*>(system_name));
+  int required_size = GetFullPathNameW(system_name, 0, NULL, NULL);
+  wchar_t* path =
+      static_cast<wchar_t*>(malloc(required_size * sizeof(wchar_t)));
+  int written = GetFullPathNameW(system_name, required_size, path, NULL);
+  free(const_cast<wchar_t*>(system_name));
   ASSERT(written == (required_size - 1));
-  char* result = StringUtils::ConsoleStringToUtf8(path);
+  char* result = StringUtils::WideToUtf8(path);
   free(path);
   return result;
 }
 
 
 char* File::GetContainingDirectory(char* pathname) {
-  struct stat st;
-  char* system_name = StringUtils::Utf8ToConsoleString(pathname);
-  int stat_status = stat(system_name, &st);
+  struct _stat st;
+  wchar_t* system_name = StringUtils::Utf8ToWide(pathname);
+  int stat_status = _wstat(system_name, &st);
   if (stat_status == 0) {
     if ((st.st_mode & S_IFMT) != S_IFREG) {
       SetLastError(ERROR_FILE_NOT_FOUND);
       free(system_name);
       return NULL;
     }
   } else {
     SetLastError(ERROR_FILE_NOT_FOUND);
     free(system_name);
     return NULL;
   }
-  int required_size = GetFullPathName(system_name, 0, NULL, NULL);
-  char* path = static_cast<char*>(malloc(required_size));
-  char* file_part = NULL;
+  int required_size = GetFullPathNameW(system_name, 0, NULL, NULL);
+  wchar_t* path =
+      static_cast<wchar_t*>(malloc(required_size * sizeof(wchar_t)));
+  wchar_t* file_part = NULL;
   int written =
-    GetFullPathName(system_name, required_size, path, &file_part);
+    GetFullPathNameW(system_name, required_size, path, &file_part);
   free(system_name);
   ASSERT(written == (required_size - 1));
   ASSERT(file_part != NULL);
   ASSERT(file_part > path);
-  ASSERT(file_part[-1] == '\\');
+  ASSERT(file_part[-1] == L'\\');
   file_part[-1] = '\0';
-  char* result = StringUtils::ConsoleStringToUtf8(path);
+  char* result = StringUtils::WideToUtf8(path);
   free(path);
   return result;
 }
 
 
 const char* File::PathSeparator() {

[Søren Gjesse, 2012/12/12 15:26:02]

Maybe mention that this is already in UTF-8.

[Mads Ager (google), 2012/12/12 15:40:35]

Done.

   return "\\";
 }
 
 
 const char* File::StringEscapedPathSeparator() {

[Søren Gjesse, 2012/12/12 15:26:02]

Ditto.

[Mads Ager (google), 2012/12/12 15:40:35]

Done.

   return "\\\\";
 }
 
 
 File::StdioHandleType File::GetStdioHandleType(int fd) {
   // Treat all stdio handles as pipes. The Windows event handler and
   // socket code will handle the different handle types.
   return kPipe;
 }