diff options
| author | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-09-12 23:52:01 +1000 |
|---|---|---|
| committer | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-09-12 23:52:01 +1000 |
| commit | 834acaf6bd6f1c62b0f5c01f8891c814749f80ec (patch) | |
| tree | f074292d3eb3af6a55dcb8287bb6ce870964270c /source/core | |
| parent | 261ba6d643542cc10ba07711a278fac7d3e09997 (diff) | |
| parent | 7a043e472701ed6c473072cc2578c44bcdab48db (diff) | |
Merge branch 'main' into wip/net-n-btree
Diffstat (limited to 'source/core')
| -rw-r--r-- | source/core/StarFile_windows.cpp | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/source/core/StarFile_windows.cpp b/source/core/StarFile_windows.cpp index 54d6c82..6352bb7 100644 --- a/source/core/StarFile_windows.cpp +++ b/source/core/StarFile_windows.cpp @@ -18,13 +18,11 @@ namespace Star { -namespace { - OVERLAPPED makeOverlapped(StreamOffset offset) { - OVERLAPPED overlapped = {}; - overlapped.Offset = offset; - overlapped.OffsetHigh = offset >> 32; - return overlapped; - } +OVERLAPPED makeOverlapped(StreamOffset offset) { + OVERLAPPED overlapped = {}; + overlapped.Offset = offset; + overlapped.OffsetHigh = offset >> 32; + return overlapped; } String File::convertDirSeparators(String const& path) { @@ -377,10 +375,8 @@ size_t File::pread(void* f, char* data, size_t len, StreamOffset position) { HANDLE file = (HANDLE)f; DWORD numRead = 0; OVERLAPPED overlapped = makeOverlapped(position); - StreamOffset pos = ftell(f); - fseek(f, 0, IOSeek::Absolute); int ret = ReadFile(file, data, len, &numRead, &overlapped); - fseek(f, pos, IOSeek::Absolute); + fseek(f, -(StreamOffset)numRead, IOSeek::Relative); if (ret == 0) { auto err = GetLastError(); if (err != ERROR_IO_PENDING) @@ -394,10 +390,8 @@ size_t File::pwrite(void* f, char const* data, size_t len, StreamOffset position HANDLE file = (HANDLE)f; DWORD numWritten = 0; OVERLAPPED overlapped = makeOverlapped(position); - StreamOffset pos = ftell(f); - fseek(f, 0, IOSeek::Absolute); int ret = WriteFile(file, data, len, &numWritten, &overlapped); - fseek(f, pos, IOSeek::Absolute); + fseek(f, -(StreamOffset)numWritten, IOSeek::Relative); if (ret == 0) { auto err = GetLastError(); if (err != ERROR_IO_PENDING) |