diff options
Diffstat (limited to 'src/zenutil/basicfile.cpp')
| -rw-r--r-- | src/zenutil/basicfile.cpp | 55 |
1 files changed, 42 insertions, 13 deletions
diff --git a/src/zenutil/basicfile.cpp b/src/zenutil/basicfile.cpp index 22acc346f..f91a54222 100644 --- a/src/zenutil/basicfile.cpp +++ b/src/zenutil/basicfile.cpp @@ -36,15 +36,17 @@ BasicFile::Open(const std::filesystem::path& FileName, Mode Mode) if (Ec) { - throw std::system_error(Ec, fmt::format("failed to open file '{}'", FileName)); + throw std::system_error(Ec, fmt::format("failed to open file '{}', mode: {:x}", FileName, uint32_t(Mode))); } } void -BasicFile::Open(const std::filesystem::path& FileName, Mode Mode, std::error_code& Ec) +BasicFile::Open(const std::filesystem::path& FileName, Mode InMode, std::error_code& Ec) { Ec.clear(); + Mode Mode = InMode & Mode::kModeMask; + #if ZEN_PLATFORM_WINDOWS DWORD dwCreationDisposition = 0; DWORD dwDesiredAccess = 0; @@ -72,17 +74,18 @@ BasicFile::Open(const std::filesystem::path& FileName, Mode Mode, std::error_cod break; } - const DWORD dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; - const DWORD dwFlagsAndAttributes = FILE_ATTRIBUTE_NORMAL; - HANDLE hTemplateFile = nullptr; - - HANDLE FileHandle = CreateFile(FileName.c_str(), - dwDesiredAccess, - dwShareMode, - /* lpSecurityAttributes */ nullptr, - dwCreationDisposition, - dwFlagsAndAttributes, - hTemplateFile); + const DWORD dwShareMode = FILE_SHARE_READ | (EnumHasAllFlags(InMode, Mode::kPreventWrite) ? 0 : FILE_SHARE_WRITE) | + (EnumHasAllFlags(InMode, Mode::kPreventDelete) ? 0 : FILE_SHARE_DELETE); + const DWORD dwFlagsAndAttributes = + FILE_ATTRIBUTE_NORMAL | (EnumHasAllFlags(InMode, Mode::kDeleteOnClose) ? FILE_FLAG_DELETE_ON_CLOSE : 0); + const HANDLE hTemplateFile = nullptr; + const HANDLE FileHandle = CreateFile(FileName.c_str(), + dwDesiredAccess, + dwShareMode, + /* lpSecurityAttributes */ nullptr, + dwCreationDisposition, + dwFlagsAndAttributes, + hTemplateFile); if (FileHandle == INVALID_HANDLE_VALUE) { @@ -139,6 +142,12 @@ BasicFile::Close() } } +IoBuffer +BasicFile::ReadRange(uint64_t FileOffset, uint64_t ByteCount) +{ + return IoBufferBuilder::MakeFromFileHandle(m_FileHandle, FileOffset, ByteCount); +} + void BasicFile::Read(void* Data, uint64_t BytesToRead, uint64_t FileOffset) { @@ -220,6 +229,26 @@ BasicFile::StreamByteRange(uint64_t FileOffset, uint64_t Size, std::function<voi } } +uint64_t +BasicFile::Write(CompositeBuffer Data, uint64_t FileOffset, std::error_code& Ec) +{ + uint64_t WrittenBytes = 0; + for (const SharedBuffer& Buffer : Data.GetSegments()) + { + MemoryView BlockView = Buffer.GetView(); + Write(BlockView, FileOffset, Ec); + + if (Ec) + { + return WrittenBytes; + } + + WrittenBytes += BlockView.GetSize(); + } + + return WrittenBytes; +} + void BasicFile::Write(MemoryView Data, uint64_t FileOffset, std::error_code& Ec) { |