evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into wip/net-n-btree

Browse Source
This commit is contained in:
Kae 2024-09-12 23:52:01 +10:00
commit 834acaf6bd
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/core/StarFile_windows.cpp
View File

@ -18,13 +18,11 @@
namespace Star { namespace Star {
namespace { OVERLAPPED makeOverlapped(StreamOffset offset) {
OVERLAPPED makeOverlapped(StreamOffset offset) {
OVERLAPPED overlapped = {}; OVERLAPPED overlapped = {};
overlapped.Offset = offset; overlapped.Offset = offset;
overlapped.OffsetHigh = offset >> 32; overlapped.OffsetHigh = offset >> 32;
return overlapped; return overlapped;
}
} }
String File::convertDirSeparators(String const& path) { 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; HANDLE file = (HANDLE)f;
DWORD numRead = 0; DWORD numRead = 0;
OVERLAPPED overlapped = makeOverlapped(position); OVERLAPPED overlapped = makeOverlapped(position);
StreamOffset pos = ftell(f);
fseek(f, 0, IOSeek::Absolute);
int ret = ReadFile(file, data, len, &numRead, &overlapped); int ret = ReadFile(file, data, len, &numRead, &overlapped);
fseek(f, pos, IOSeek::Absolute); fseek(f, -(StreamOffset)numRead, IOSeek::Relative);
if (ret == 0) { if (ret == 0) {
auto err = GetLastError(); auto err = GetLastError();
if (err != ERROR_IO_PENDING) 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; HANDLE file = (HANDLE)f;
DWORD numWritten = 0; DWORD numWritten = 0;
OVERLAPPED overlapped = makeOverlapped(position); OVERLAPPED overlapped = makeOverlapped(position);
StreamOffset pos = ftell(f);
fseek(f, 0, IOSeek::Absolute);
int ret = WriteFile(file, data, len, &numWritten, &overlapped); int ret = WriteFile(file, data, len, &numWritten, &overlapped);
fseek(f, pos, IOSeek::Absolute); fseek(f, -(StreamOffset)numWritten, IOSeek::Relative);
if (ret == 0) { if (ret == 0) {
auto err = GetLastError(); auto err = GetLastError();
if (err != ERROR_IO_PENDING) if (err != ERROR_IO_PENDING)