Clean up recursive deletion 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"
@@ skipping 284 matching lines @@
   // If it's a file, remove it directly.
   if ((attributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
     return DeleteFile(L"", path);
   }
 
   if (!path->AddW(L"\\*")) return false;
 
   WIN32_FIND_DATAW find_file_data;
   HANDLE find_handle = FindFirstFileW(path->AsStringW(), &find_file_data);
 
+  if (find_handle == INVALID_HANDLE_VALUE) {
+    return false;
+  }
+
   // Adjust the path by removing the '*' used for the search.
   int path_length = path->length() - 1;
   path->Reset(path_length);
 
-  if (find_handle == INVALID_HANDLE_VALUE) {
-    return false;
-  }
-
   do {
     if (!DeleteEntry(&find_file_data, path)) {
-      DWORD last_error = GetLastError();
-      FindClose(find_handle);
-      SetLastError(last_error);
-      return false;
+      break;
     }
     path->Reset(path_length);  // DeleteEntry adds to the path.
   } while (FindNextFileW(find_handle, &find_file_data) != 0);
 
-  path->Reset(path_length - 1);  // Drop the "\" from the end of the path.
-  if ((GetLastError() != ERROR_NO_MORE_FILES) ||
-      (FindClose(find_handle) == 0) ||
-      (RemoveDirectoryW(path->AsStringW()) == 0)) {
+  DWORD last_error = GetLastError();
+  // Always close handle.
+  FindClose(find_handle);
+  if (last_error != ERROR_NO_MORE_FILES) {
+    // Unexpected error, set and return.
+    SetLastError(last_error);
     return false;
   }
-
-  return true;
+  // All content deleted succesfully, try to delete directory.
+  path->Reset(path_length - 1);  // Drop the "\" from the end of the path.
+  return RemoveDirectoryW(path->AsStringW()) != 0;
 }
 
 
 static Directory::ExistsResult ExistsHelper(const wchar_t* dir_name) {
   DWORD attributes = GetFileAttributesW(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;
@@ skipping 136 matching lines @@
       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)