Fix recursive directory-deletion of top-level files/links.

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"
 
@@ skipping 245 matching lines @@
 
   if ((attributes & FILE_ATTRIBUTE_DIRECTORY) != 0) {
     return DeleteDir(find_file_data->cFileName, path);
   } else {
     return DeleteFile(find_file_data->cFileName, path);
   }
 }
 
 
 static bool DeleteRecursively(PathBuffer* path) {
+  DWORD attributes = GetFileAttributesW(path->data);
+  if ((attributes == INVALID_FILE_ATTRIBUTES)) {
+    return false;
+  }
   // If the directory is a junction, it's pointing to some other place in the
   // filesystem that we do not want to recurse into.
-  DWORD attributes = GetFileAttributesW(path->data);
-  if ((attributes != INVALID_FILE_ATTRIBUTES) &&
-      (attributes & FILE_ATTRIBUTE_REPARSE_POINT) != 0) {
-    if (IsBrokenLink(path->data)) {
-      return false;
-    } else {
-      // Just delete the junction itself.
-      return RemoveDirectoryW(path->data) != 0;
-    }
+  if ((attributes & FILE_ATTRIBUTE_REPARSE_POINT) != 0) {
+    // Just delete the junction itself.
+    return RemoveDirectoryW(path->data) != 0;
+  }
+  // If it's a file, remove it directly.
+  if ((attributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
+    return DeleteFile(L"", path);
   }
 
   if (!path->Add(L"\\*")) return false;
 
   WIN32_FIND_DATAW find_file_data;
   HANDLE find_handle = FindFirstFileW(path->data, &find_file_data);
 
   // Adjust the path by removing the '*' used for the search.
   int path_length = path->length - 1;
   path->Reset(path_length);
@@ skipping 171 matching lines @@
   }
   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);
 }
 
 #endif  // defined(TARGET_OS_WINDOWS)