Fix directory enumation with filesystem mappings

src/windows-emulator/file_system.hpp

@@ -56,6 +56,19 @@ class file_system
         return root;
     }
 
+    template <typename F>
+    void access_mapped_entries(const windows_path& win_path, const F& accessor) const
+    {
+        for (const auto& mapping : this->mappings_)
+        {
+            const auto& mapped_path = mapping.first;
+            if (!mapped_path.empty() && mapped_path.parent() == win_path)
+            {
+                accessor(mapping);
+            }
+        }
+    }
+
     windows_path local_to_windows_path(const std::filesystem::path& local_path) const
     {
         const auto absolute_local_path = weakly_canonical(absolute(local_path));

src/windows-emulator/syscalls/file.cpp

@@ -17,6 +17,35 @@
 
 namespace syscalls
 {
+    namespace
+    {
+        std::pair<utils::file_handle, NTSTATUS> open_file(const file_system& file_sys, const windows_path& path,
+                                                          const std::u16string& mode)
+        {
+            FILE* file{};
+            const auto error = open_unicode(&file, file_sys.translate(path), mode);
+
+            if (file)
+            {
+                return {file, STATUS_SUCCESS};
+            }
+
+            using fh = utils::file_handle;
+
+            switch (error)
+            {
+            case ENOENT:
+                return {fh{}, STATUS_OBJECT_NAME_NOT_FOUND};
+            case EACCES:
+                return {fh{}, STATUS_ACCESS_DENIED};
+            case EISDIR:
+                return {fh{}, STATUS_FILE_IS_A_DIRECTORY};
+            default:
+                return {fh{}, STATUS_NOT_SUPPORTED};
+            }
+        }
+    }
+
     NTSTATUS handle_NtSetInformationFile(const syscall_context& c, const handle file_handle,
                                          const emulator_object<IO_STATUS_BLOCK<EmulatorTraits<Emu64>>> io_status_block,
                                          const uint64_t file_information, const ULONG length,
@@ -117,10 +146,13 @@ namespace syscalls
         }
     }
 
-    std::vector<file_entry> scan_directory(const std::filesystem::path& dir, const std::u16string_view file_mask)
+    std::vector<file_entry> scan_directory(const file_system& file_sys, const windows_path& win_path,
+                                           const std::u16string_view file_mask)
     {
         std::vector<file_entry> files{};
 
+        const auto dir = file_sys.translate(win_path);
+
         if (file_mask.empty() || file_mask == u"*")
         {
             files.emplace_back(file_entry{.file_path = ".", .is_directory = true});
@@ -142,6 +174,27 @@ namespace syscalls
             });
         }
 
+        file_sys.access_mapped_entries(win_path, [&](const std::pair<windows_path, std::filesystem::path>& entry) {
+            const auto filename = entry.first.leaf();
+
+            if (!file_mask.empty() && !utils::wildcard::match_filename(filename, file_mask))
+            {
+                return;
+            }
+
+            const std::filesystem::directory_entry dir_entry(entry.second, ec);
+            if (ec || !dir_entry.exists())
+            {
+                return;
+            }
+
+            files.emplace_back(file_entry{
+                .file_path = filename,
+                .file_size = dir_entry.file_size(),
+                .is_directory = dir_entry.is_directory(),
+            });
+        });
+
         return files;
     }
 
@@ -166,7 +219,7 @@ namespace syscalls
             }
 
             f->enumeration_state.emplace(file_enumeration_state{});
-            f->enumeration_state->files = scan_directory(c.win_emu.file_sys.translate(f->name), mask);
+            f->enumeration_state->files = scan_directory(c.win_emu.file_sys, f->name, mask);
         }
 
         auto& enum_state = *f->enumeration_state;
@@ -464,32 +517,6 @@ namespace syscalls
         return ret(STATUS_NOT_SUPPORTED);
     }
 
-    static std::pair<utils::file_handle, NTSTATUS> open_file(const file_system& file_sys, const windows_path& path,
-                                                             const std::u16string& mode)
-    {
-        FILE* file{};
-        const auto error = open_unicode(&file, file_sys.translate(path), mode);
-
-        if (file)
-        {
-            return {file, STATUS_SUCCESS};
-        }
-
-        using fh = utils::file_handle;
-
-        switch (error)
-        {
-        case ENOENT:
-            return {fh{}, STATUS_OBJECT_NAME_NOT_FOUND};
-        case EACCES:
-            return {fh{}, STATUS_ACCESS_DENIED};
-        case EISDIR:
-            return {fh{}, STATUS_FILE_IS_A_DIRECTORY};
-        default:
-            return {fh{}, STATUS_NOT_SUPPORTED};
-        }
-    }
-
     NTSTATUS handle_NtQueryInformationByName(
         const syscall_context& c, const emulator_object<OBJECT_ATTRIBUTES<EmulatorTraits<Emu64>>> object_attributes,
         const emulator_object<IO_STATUS_BLOCK<EmulatorTraits<Emu64>>> io_status_block, const uint64_t file_information,

src/windows-emulator/windows_path.hpp

@@ -224,6 +224,16 @@ class windows_path
         return {this->drive_, std::move(folders)};
     }
 
+    std::u16string leaf() const
+    {
+        if (this->folders_.empty())
+        {
+            return {};
+        }
+
+        return this->folders_.back();
+    }
+
     void serialize(utils::buffer_serializer& buffer) const
     {
         buffer.write_optional(this->drive_);