fix
This commit is contained in:
parent
27b37eb570
commit
b35e100bb2
@ -346,8 +346,10 @@ auto remote_winfsp_drive::ReadDirectory(PVOID /*file_node*/, PVOID file_desc,
|
|||||||
PVOID buffer, ULONG buffer_length,
|
PVOID buffer, ULONG buffer_length,
|
||||||
PULONG bytes_transferred) -> NTSTATUS {
|
PULONG bytes_transferred) -> NTSTATUS {
|
||||||
json item_list;
|
json item_list;
|
||||||
auto ret = remote_instance_->winfsp_read_directory(file_desc, pattern, marker,
|
auto ret{
|
||||||
item_list);
|
static_cast<NTSTATUS>(remote_instance_->winfsp_read_directory(
|
||||||
|
file_desc, pattern, marker, item_list)),
|
||||||
|
};
|
||||||
if (ret == STATUS_SUCCESS) {
|
if (ret == STATUS_SUCCESS) {
|
||||||
PVOID *directory_buffer{nullptr};
|
PVOID *directory_buffer{nullptr};
|
||||||
if ((ret = remote_instance_->winfsp_get_dir_buffer(
|
if ((ret = remote_instance_->winfsp_get_dir_buffer(
|
||||||
|
@ -1324,14 +1324,18 @@ TEST(file_manager,
|
|||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
EXPECT_EQ(api_error::success, fm.open(non_writeable, {}, handle, f));
|
EXPECT_EQ(api_error::success, fm.open(non_writeable, {}, handle, f));
|
||||||
EXPECT_CALL(*non_writeable, get_open_data())
|
EXPECT_CALL(*non_writeable, get_open_data())
|
||||||
.WillOnce([&handle]() -> std::map<std::uint64_t, open_file_data> {
|
.WillOnce([&handle]() -> std::map<std::uint64_t, open_file_data>& {
|
||||||
return {{handle, {}}};
|
static std::map<std::uint64_t, open_file_data> map;
|
||||||
|
map[handle]={};
|
||||||
|
return map;
|
||||||
});
|
});
|
||||||
#else
|
#else
|
||||||
EXPECT_EQ(api_error::success, fm.open(non_writeable, O_RDWR, handle, f));
|
EXPECT_EQ(api_error::success, fm.open(non_writeable, O_RDWR, handle, f));
|
||||||
EXPECT_CALL(*non_writeable, get_open_data())
|
EXPECT_CALL(*non_writeable, get_open_data())
|
||||||
.WillOnce([&handle]() -> std::map<std::uint64_t, open_file_data> {
|
.WillOnce([&handle]() -> std::map<std::uint64_t, open_file_data>& {
|
||||||
return {{handle, O_RDWR}};
|
static std::map<std::uint64_t, open_file_data> map;
|
||||||
|
map[handle]=O_RDWR;
|
||||||
|
return map;
|
||||||
});
|
});
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user