Skip to content

small file fixes, removed locks on windows files #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Cooolrik merged 1 commit into from
Oct 18, 2025
Merged

small file fixes, removed locks on windows files #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions include/ctle/file_funcs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ status _file_object::open_read(const std::string& filepath)
// convert the utf8 string to wstring fullpath for the API call
const auto wpath = utf8string_to_wstringfullpath(filepath);

this->file_handle = ::CreateFileW(wpath.c_str(), GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, nullptr);
this->file_handle = ::CreateFileW(wpath.c_str(), GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, nullptr);
if (this->file_handle == INVALID_HANDLE_VALUE)
{
// failed to open the file
Expand All @@ -275,7 +275,7 @@ status _file_object::open_write(const std::string& filepath, bool overwrite_exis

// convert the utf8 string to wstring fullpath for the API call
const auto wpath = utf8string_to_wstringfullpath(filepath);
this->file_handle = (void*)::CreateFileW( wpath.c_str(), GENERIC_WRITE, FILE_SHARE_WRITE, nullptr, ( overwrite_existing ) ? ( CREATE_ALWAYS ) : ( CREATE_NEW ), FILE_ATTRIBUTE_NORMAL, nullptr );
this->file_handle = (void*)::CreateFileW( wpath.c_str(), GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, nullptr, ( overwrite_existing ) ? ( CREATE_ALWAYS ) : ( CREATE_NEW ), FILE_ATTRIBUTE_NORMAL, nullptr );
if( this->file_handle == INVALID_HANDLE_VALUE )
{
// file open failed. return reason in error code
Expand Down Expand Up @@ -327,6 +327,10 @@ status _file_object::read(u8* dest, const u64 size)
// failed to read from the file
return status::cant_read;
}
if( bytes_that_were_read == 0 )
{
break; // EOF reached
}

// update number of bytes that were read
bytes_read += bytes_that_were_read;
Expand All @@ -346,14 +350,15 @@ status _file_object::write(const u8* src, const u64 size)
// check how much to write, capped at UINT_MAX
const u64 bytes_left = size - bytes_written;
const DWORD bytes_to_write_this_time = (bytes_left < UINT_MAX) ? ((DWORD)bytes_left) : (UINT_MAX);

// write the bytes to file
DWORD bytes_that_were_written = 0;
if( !::WriteFile( this->file_handle, &src[bytes_written], (DWORD)bytes_to_write_this_time, &bytes_that_were_written, nullptr ) )
{
// failed to write to file
return status::cant_write;
}
ctSanityCheck( bytes_that_were_written != 0 ); // this should not happen with a regular file

// update number of bytes that were written
bytes_written += bytes_that_were_written;
Expand Down
2 changes: 1 addition & 1 deletion version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.7.4
1.7.5