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:31:18 +10:00
commit 261ba6d643
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/core/StarFile_windows.cpp
View File

@ -377,12 +377,10 @@ 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); StreamOffset pos = ftell(f);
if (pos != 0) fseek(f, 0, IOSeek::Absolute); fseek(f, 0, IOSeek::Absolute);
int ret = ReadFile(file, data, len, &numRead, &overlapped); int ret = ReadFile(file, data, len, &numRead, &overlapped);
if (pos != 0) fseek(f, pos, IOSeek::Absolute); fseek(f, pos, IOSeek::Absolute);
if (ret == 0) { if (ret == 0) {
auto err = GetLastError(); auto err = GetLastError();
if (err != ERROR_IO_PENDING) if (err != ERROR_IO_PENDING)
@ -396,12 +394,10 @@ 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); StreamOffset pos = ftell(f);
if (pos != 0) fseek(f, 0, IOSeek::Absolute); fseek(f, 0, IOSeek::Absolute);
int ret = WriteFile(file, data, len, &numWritten, &overlapped); int ret = WriteFile(file, data, len, &numWritten, &overlapped);
if (pos != 0) fseek(f, pos, IOSeek::Absolute); fseek(f, pos, IOSeek::Absolute);
if (ret == 0) { if (ret == 0) {
auto err = GetLastError(); auto err = GetLastError();
if (err != ERROR_IO_PENDING) if (err != ERROR_IO_PENDING)