AuroraSupport/AuroraRuntime
2
1
Fork 0
Code Issues 27 Pull Requests Releases Wiki Activity

[+] IFileStream::GetHandle()

Browse Source
This commit is contained in:
Reece Wilson 2023-07-29 09:13:43 +01:00
parent 9f78555693
commit 9ce4e08d36
3 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Include/Aurora/IO/FS/IFileStream.hpp
View File

@ -64,5 +64,9 @@ namespace Aurora::IO::FS
*/ */
virtual void MakeTemporary() = 0; virtual void MakeTemporary() = 0;
/**
* @brief Returns the IO handle backing the file stream, if available.
*/
virtual AuSPtr<IIOHandle> GetHandle() = 0;
}; };
} }

40
Source/IO/FS/FileStream.NT.cpp
View File

@ -31,7 +31,7 @@ namespace Aurora::IO::FS
LARGE_INTEGER distance {}; LARGE_INTEGER distance {};
LARGE_INTEGER pos {}; LARGE_INTEGER pos {};
auto hHandle = this->GetHandle(); auto hHandle = this->GetWin32Handle();
if (hHandle == INVALID_HANDLE_VALUE) if (hHandle == INVALID_HANDLE_VALUE)
{ {
@ -56,7 +56,7 @@ namespace Aurora::IO::FS
LARGE_INTEGER distance {}; LARGE_INTEGER distance {};
LARGE_INTEGER pos {}; LARGE_INTEGER pos {};
auto hHandle = this->GetHandle(); auto hHandle = this->GetWin32Handle();
if (hHandle == INVALID_HANDLE_VALUE) if (hHandle == INVALID_HANDLE_VALUE)
{ {
@ -79,7 +79,7 @@ namespace Aurora::IO::FS
{ {
LARGE_INTEGER length; LARGE_INTEGER length;
auto hHandle = this->GetHandle(); auto hHandle = this->GetWin32Handle();
if (hHandle == INVALID_HANDLE_VALUE) if (hHandle == INVALID_HANDLE_VALUE)
{ {
@ -98,7 +98,7 @@ namespace Aurora::IO::FS
bool WinFileStream::Read(const Memory::MemoryViewStreamWrite &parameters) bool WinFileStream::Read(const Memory::MemoryViewStreamWrite &parameters)
{ {
auto hHandle = this->GetHandle(); auto hHandle = this->GetWin32Handle();
HANDLE hEventHandle { INVALID_HANDLE_VALUE }; HANDLE hEventHandle { INVALID_HANDLE_VALUE };
if (hHandle == INVALID_HANDLE_VALUE) if (hHandle == INVALID_HANDLE_VALUE)
@ -184,7 +184,7 @@ namespace Aurora::IO::FS
bool WinFileStream::Write(const Memory::MemoryViewStreamRead &parameters) bool WinFileStream::Write(const Memory::MemoryViewStreamRead &parameters)
{ {
auto hHandle = this->GetHandle(); auto hHandle = this->GetWin32Handle();
HANDLE hEventHandle { INVALID_HANDLE_VALUE }; HANDLE hEventHandle { INVALID_HANDLE_VALUE };
if (hHandle == INVALID_HANDLE_VALUE) if (hHandle == INVALID_HANDLE_VALUE)
@ -275,7 +275,7 @@ namespace Aurora::IO::FS
void WinFileStream::WriteEoS() void WinFileStream::WriteEoS()
{ {
auto hHandle = this->GetHandle(); auto hHandle = this->GetWin32Handle();
if (hHandle == INVALID_HANDLE_VALUE) if (hHandle == INVALID_HANDLE_VALUE)
{ {
@ -288,7 +288,9 @@ namespace Aurora::IO::FS
void WinFileStream::Close() void WinFileStream::Close()
{ {
auto hHandle = this->GetHandle(); auto hHandle = this->GetWin32Handle();
bool bDeleteFailed {};
AuString path;
if ((hHandle != INVALID_HANDLE_VALUE) && if ((hHandle != INVALID_HANDLE_VALUE) &&
(this->bShouldDelete)) (this->bShouldDelete))
@ -298,16 +300,29 @@ namespace Aurora::IO::FS
if (!(pSetFileInformationByHandle && if (!(pSetFileInformationByHandle &&
pSetFileInformationByHandle(hHandle, _FILE_INFO_BY_HANDLE_CLASS::FileDispositionInfo, &rm, sizeof(rm)))) pSetFileInformationByHandle(hHandle, _FILE_INFO_BY_HANDLE_CLASS::FileDispositionInfo, &rm, sizeof(rm))))
{ {
SysPushErrorIO("Couldn't delete temporary file {}", this->pHandle_ ? this->pHandle_->GetPath() : ""); path = this->pHandle_ ? this->pHandle_->GetPath() : "";
SysPushErrorIO("Couldn't delete temporary file {}", path);
if (path.length())
{
bDeleteFailed = true;
}
} }
} }
AuResetMember(this->pHandle_); AuResetMember(this->pHandle_);
// a bit of a hack for problematic NT-like platforms and Windows XP
if (bDeleteFailed)
{
AuFS::Remove(path);
}
} }
void WinFileStream::Flush() void WinFileStream::Flush()
{ {
auto hHandle = this->GetHandle(); auto hHandle = this->GetWin32Handle();
::FlushFileBuffers(hHandle); ::FlushFileBuffers(hHandle);
} }
@ -317,7 +332,12 @@ namespace Aurora::IO::FS
this->bShouldDelete = true; this->bShouldDelete = true;
} }
HANDLE WinFileStream::GetHandle() AuSPtr<IIOHandle> WinFileStream::GetHandle()
{
return this->pHandle_;
}
HANDLE WinFileStream::GetWin32Handle()
{ {
return this->pHandle_ ? return this->pHandle_ ?
(HANDLE)this->pHandle_->GetOSWriteHandleSafe().ValueOr(this->pHandle_->GetOSReadHandleSafe().ValueOr((AuUInt)INVALID_HANDLE_VALUE)) : (HANDLE)this->pHandle_->GetOSWriteHandleSafe().ValueOr(this->pHandle_->GetOSReadHandleSafe().ValueOr((AuUInt)INVALID_HANDLE_VALUE)) :

3
Source/IO/FS/FileStream.NT.hpp
View File

@ -26,8 +26,9 @@ namespace Aurora::IO::FS
void Flush() override; void Flush() override;
void WriteEoS() override; void WriteEoS() override;
void MakeTemporary() override; void MakeTemporary() override;
AuSPtr<IIOHandle> GetHandle() override;
HANDLE GetHandle(); HANDLE GetWin32Handle();
private: private:
AuSPtr<IIOHandle> pHandle_; AuSPtr<IIOHandle> pHandle_;