[libc++] Fix directory_iterator compilation on Win32

[thrimbor]

Summary

This patch fixes some typos and other small errors in directory_iterator.cpp that prevented this file from being compiled for Win32.

[EricWF]

Thanks for the patch

[thrimbor]

Thanks for accepting! Can you commit the patch for me? I don't have commit access myself.

libcxx/trunk/src/filesystem/directory_iterator.cpp

 //===------------------ directory_iterator.cpp ----------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "filesystem"
 #include "__config"
 #if defined(_LIBCPP_WIN32API)
 #define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
+#include <windows.h>
 #else
 #include <dirent.h>
 #endif
 #include <errno.h>
 
 #include "filesystem_common.h"
 
 _LIBCPP_BEGIN_NAMESPACE_FILESYSTEM

 #else
 
 static file_type get_file_type(const WIN32_FIND_DATA& data) {
   //auto attrs = data.dwFileAttributes;
   // FIXME(EricWF)
   return file_type::unknown;
 }
 static uintmax_t get_file_size(const WIN32_FIND_DATA& data) {
-  return (data.nFileSizeHight * (MAXDWORD + 1)) + data.nFileSizeLow;
+  return (data.nFileSizeHigh * (MAXDWORD + 1)) + data.nFileSizeLow;
 }
 static file_time_type get_write_time(const WIN32_FIND_DATA& data) {
   ULARGE_INTEGER tmp;
-  FILETIME& time = data.ftLastWriteTime;
+  const FILETIME& time = data.ftLastWriteTime;
   tmp.u.LowPart = time.dwLowDateTime;
   tmp.u.HighPart = time.dwHighDateTime;
-  return file_time_type(file_time_type::duration(time.QuadPart));
+  return file_time_type(file_time_type::duration(tmp.QuadPart));
 }
 
 #endif
 
 } // namespace
 } // namespace detail
 
 using detail::ErrorHandler;
 
 #if defined(_LIBCPP_WIN32API)
 class __dir_stream {
 public:
   __dir_stream() = delete;
   __dir_stream& operator=(const __dir_stream&) = delete;
 
   __dir_stream(__dir_stream&& __ds) noexcept : __stream_(__ds.__stream_),
                                                __root_(move(__ds.__root_)),
                                                __entry_(move(__ds.__entry_)) {
     __ds.__stream_ = INVALID_HANDLE_VALUE;
   }
 
   __dir_stream(const path& root, directory_options opts, error_code& ec)
       : __stream_(INVALID_HANDLE_VALUE), __root_(root) {
-    __stream_ = ::FindFirstFileEx(root.c_str(), &__data_);
+    __stream_ = ::FindFirstFile(root.c_str(), &__data_);
     if (__stream_ == INVALID_HANDLE_VALUE) {
       ec = error_code(::GetLastError(), generic_category());
       const bool ignore_permission_denied =
           bool(opts & directory_options::skip_permission_denied);
       if (ignore_permission_denied && ec.value() == ERROR_ACCESS_DENIED)
         ec.clear();
       return;
     }
while (::FindNextFile(__stream_, &__data_)) {
         continue;
       // FIXME: Cache more of this
       //directory_entry::__cached_data cdata;
       //cdata.__type_ = get_file_type(__data_);
       //cdata.__size_ = get_file_size(__data_);
       //cdata.__write_time_ = get_write_time(__data_);
       __entry_.__assign_iter_entry(
           __root_ / __data_.cFileName,
-          directory_entry::__create_iter_result(get_file_type(__data)));
+          directory_entry::__create_iter_result(detail::get_file_type(__data)));
       return true;
     }
     ec = error_code(::GetLastError(), generic_category());
     close();
     return false;
   }
 
 private: