mirror of
https://github.com/Mauler125/r5sdk.git
synced 2025-02-09 19:15:03 +01:00
CIOStream and CSigCache class improvements
CIOStream: * Use flag based system instead (common flags are aliased; uses std::ios_base::openmode). * 'ReadString' now writes into a string buffer (reference) that needs to be passed in by programmer (avoids copy). * 'm_nSize' is now synced with any write operations. CSigCache: * Fixed bug causing crash when 'DecompressBlob' failed (results were never checked). * Light formatting improvements.
This commit is contained in:
Kawe Mazidjatari
parent
abf56ac43b
commit
4c123e20d0
@ -6,11 +6,12 @@
|
||||
//-----------------------------------------------------------------------------
|
||||
CIOStream::CIOStream()
|
||||
{
|
||||
m_eCurrentMode = Mode_t::NONE;
|
||||
m_nSize = 0;
|
||||
m_nFlags = Mode_t::NONE;
|
||||
}
|
||||
CIOStream::CIOStream(const fs::path& svFileFullPath, Mode_t eMode)
|
||||
CIOStream::CIOStream(const fs::path& svFileFullPath, int nFlags)
|
||||
{
|
||||
Open(svFileFullPath, eMode);
|
||||
Open(svFileFullPath, nFlags);
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@ -26,48 +27,31 @@ CIOStream::~CIOStream()
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: opens the file in specified mode
|
||||
// Input : fsFilePath -
|
||||
// eMode -
|
||||
// Input : &fsFilePath -
|
||||
// nFlags -
|
||||
// Output : true if operation is successful
|
||||
//-----------------------------------------------------------------------------
|
||||
bool CIOStream::Open(const fs::path& fsFilePath, Mode_t eMode)
|
||||
bool CIOStream::Open(const fs::path& fsFilePath, int nFlags)
|
||||
{
|
||||
m_eCurrentMode = eMode;
|
||||
m_nFlags = nFlags;
|
||||
|
||||
switch (m_eCurrentMode)
|
||||
if (m_Stream.is_open())
|
||||
{
|
||||
case Mode_t::READ:
|
||||
if (m_Stream.is_open())
|
||||
{
|
||||
m_Stream.close();
|
||||
}
|
||||
m_Stream.open(fsFilePath, std::ios::binary | std::ios::in);
|
||||
if (!m_Stream.is_open() || !m_Stream.good())
|
||||
{
|
||||
m_eCurrentMode = Mode_t::NONE;
|
||||
return false;
|
||||
}
|
||||
|
||||
ComputeFileSize();
|
||||
return true;
|
||||
|
||||
case Mode_t::WRITE:
|
||||
if (m_Stream.is_open())
|
||||
{
|
||||
m_Stream.close();
|
||||
}
|
||||
m_Stream.open(fsFilePath, std::ios::binary | std::ios::out);
|
||||
if (!m_Stream.is_open() || !m_Stream.good())
|
||||
{
|
||||
m_eCurrentMode = Mode_t::NONE;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
||||
default:
|
||||
m_eCurrentMode = Mode_t::NONE;
|
||||
m_Stream.close();
|
||||
}
|
||||
m_Stream.open(fsFilePath, nFlags);
|
||||
if (!m_Stream.is_open() || !m_Stream.good())
|
||||
{
|
||||
m_nFlags = Mode_t::NONE;
|
||||
return false;
|
||||
}
|
||||
|
||||
if (nFlags & Mode_t::READ)
|
||||
{
|
||||
ComputeFileSize();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@ -75,15 +59,7 @@ bool CIOStream::Open(const fs::path& fsFilePath, Mode_t eMode)
|
||||
//-----------------------------------------------------------------------------
|
||||
void CIOStream::Close()
|
||||
{
|
||||
switch (m_eCurrentMode)
|
||||
{
|
||||
case Mode_t::READ:
|
||||
m_Stream.close();
|
||||
return;
|
||||
case Mode_t::WRITE:
|
||||
m_Stream.close();
|
||||
return;
|
||||
}
|
||||
m_Stream.close();
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@ -109,11 +85,12 @@ void CIOStream::ComputeFileSize()
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: gets the position of the current character in the stream
|
||||
// Input : mode -
|
||||
// Output : std::streampos
|
||||
//-----------------------------------------------------------------------------
|
||||
std::streampos CIOStream::GetPosition()
|
||||
std::streampos CIOStream::GetPosition(Mode_t mode)
|
||||
{
|
||||
switch (m_eCurrentMode)
|
||||
switch (mode)
|
||||
{
|
||||
case Mode_t::READ:
|
||||
return m_Stream.tellg();
|
||||
@ -129,10 +106,11 @@ std::streampos CIOStream::GetPosition()
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: sets the position of the current character in the stream
|
||||
// Input : nOffset -
|
||||
// mode -
|
||||
//-----------------------------------------------------------------------------
|
||||
void CIOStream::SetPosition(std::streampos nOffset)
|
||||
void CIOStream::SetPosition(std::streampos nOffset, Mode_t mode)
|
||||
{
|
||||
switch (m_eCurrentMode)
|
||||
switch (mode)
|
||||
{
|
||||
case Mode_t::READ:
|
||||
m_Stream.seekg(nOffset);
|
||||
@ -169,19 +147,9 @@ const std::streampos CIOStream::GetSize() const
|
||||
//-----------------------------------------------------------------------------
|
||||
bool CIOStream::IsReadable()
|
||||
{
|
||||
if (m_eCurrentMode != Mode_t::READ)
|
||||
if (!(m_nFlags & Mode_t::READ) || !m_Stream || m_Stream.eof())
|
||||
return false;
|
||||
|
||||
if (!m_Stream)
|
||||
return false;
|
||||
|
||||
if (m_Stream.eof())
|
||||
{
|
||||
m_Stream.close();
|
||||
m_eCurrentMode = Mode_t::NONE;
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -191,10 +159,7 @@ bool CIOStream::IsReadable()
|
||||
//-----------------------------------------------------------------------------
|
||||
bool CIOStream::IsWritable() const
|
||||
{
|
||||
if (m_eCurrentMode != Mode_t::WRITE)
|
||||
return false;
|
||||
|
||||
if (!m_Stream)
|
||||
if (!(m_nFlags & Mode_t::WRITE) || !m_Stream)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
@ -211,35 +176,38 @@ bool CIOStream::IsEof() const
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: reads a string from the file and returns it
|
||||
// Output : string
|
||||
// Input : &svOut -
|
||||
// Output : true on success, false otherwise
|
||||
//-----------------------------------------------------------------------------
|
||||
string CIOStream::ReadString()
|
||||
bool CIOStream::ReadString(string& svOut)
|
||||
{
|
||||
string result;
|
||||
|
||||
if (IsReadable())
|
||||
{
|
||||
char c;
|
||||
while (!m_Stream.eof() && (c = Read<char>()) != '\0')
|
||||
result += c;
|
||||
svOut += c;
|
||||
|
||||
return result;
|
||||
return true;
|
||||
}
|
||||
|
||||
return result;
|
||||
return false;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: writes a string to the file
|
||||
// Input : &svInput -
|
||||
// Output : true on success, false otherwise
|
||||
//-----------------------------------------------------------------------------
|
||||
void CIOStream::WriteString(const string& svInput)
|
||||
bool CIOStream::WriteString(const string& svInput)
|
||||
{
|
||||
if (!IsWritable())
|
||||
return;
|
||||
return false;
|
||||
|
||||
const char* szText = svInput.c_str();
|
||||
size_t nSize = svInput.size();
|
||||
|
||||
m_Stream.write(szText, nSize);
|
||||
m_nSize += nSize;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -3,25 +3,26 @@
|
||||
class CIOStream
|
||||
{
|
||||
public:
|
||||
enum class Mode_t
|
||||
enum Mode_t
|
||||
{
|
||||
NONE = 0,
|
||||
READ,
|
||||
WRITE
|
||||
READ = std::ios::in,
|
||||
WRITE = std::ios::out,
|
||||
BINARY = std::ios::binary,
|
||||
};
|
||||
|
||||
CIOStream();
|
||||
CIOStream(const fs::path& fsFileFullPath, Mode_t eMode);
|
||||
CIOStream(const fs::path& fsFileFullPath, int nFlags);
|
||||
~CIOStream();
|
||||
|
||||
bool Open(const fs::path& fsFileFullPath, Mode_t eMode);
|
||||
bool Open(const fs::path& fsFileFullPath, int nFlags);
|
||||
void Close();
|
||||
void Flush();
|
||||
|
||||
void ComputeFileSize();
|
||||
|
||||
std::streampos GetPosition();
|
||||
void SetPosition(std::streampos nOffset);
|
||||
std::streampos GetPosition(Mode_t mode);
|
||||
void SetPosition(std::streampos nOffset, Mode_t mode);
|
||||
|
||||
const std::filebuf* GetData() const;
|
||||
const std::streampos GetSize() const;
|
||||
@ -64,7 +65,7 @@ public:
|
||||
m_Stream.read(reinterpret_cast<char*>(&value), sizeof(value));
|
||||
return value;
|
||||
}
|
||||
string ReadString();
|
||||
bool ReadString(string& svOut);
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: writes any value to the file
|
||||
@ -76,6 +77,7 @@ public:
|
||||
return;
|
||||
|
||||
m_Stream.write(reinterpret_cast<const char*>(&tValue), sizeof(tValue));
|
||||
m_nSize += sizeof(tValue);
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@ -88,12 +90,12 @@ public:
|
||||
return;
|
||||
|
||||
m_Stream.write(reinterpret_cast<const char*>(tValue), nSize);
|
||||
m_nSize += nSize;
|
||||
}
|
||||
void WriteString(const string& svInput);
|
||||
bool WriteString(const string& svInput);
|
||||
|
||||
private:
|
||||
|
||||
std::streampos m_nSize; // Size of ifstream.
|
||||
Mode_t m_eCurrentMode; // Current active mode.
|
||||
fstream m_Stream; // I/O file stream.
|
||||
std::streampos m_nSize; // File size.
|
||||
int m_nFlags; // Stream flags.
|
||||
fstream m_Stream; // I/O stream.
|
||||
};
|
||||
|
||||
@ -93,8 +93,8 @@ bool CSigCache::LoadCache(const string& svCacheFile)
|
||||
return false;
|
||||
}
|
||||
|
||||
CIOStream reader(svCacheFile, CIOStream::Mode_t::READ);
|
||||
if (!reader.IsReadable())
|
||||
CIOStream reader;
|
||||
if (!reader.Open(svCacheFile, CIOStream::READ | CIOStream::BINARY))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@ -127,13 +127,17 @@ bool CSigCache::LoadCache(const string& svCacheFile)
|
||||
header.m_nBlobSizeDisk = reader.Read<uint64_t>();
|
||||
header.m_nBlobChecksum = reader.Read<uint32_t>();
|
||||
|
||||
uint32_t nAdler32;
|
||||
|
||||
std::unique_ptr<uint8_t[]> pSrcBuf(new uint8_t[header.m_nBlobSizeDisk]);
|
||||
std::unique_ptr<uint8_t[]> pDstBuf(new uint8_t[header.m_nBlobSizeMem]);
|
||||
|
||||
reader.Read<uint8_t>(*pSrcBuf.get(), header.m_nBlobSizeDisk);
|
||||
DecompressBlob(header.m_nBlobSizeDisk, header.m_nBlobSizeMem, nAdler32, pSrcBuf.get(), pDstBuf.get());
|
||||
uint32_t nAdler32;
|
||||
|
||||
if (!DecompressBlob(header.m_nBlobSizeDisk, header.m_nBlobSizeMem,
|
||||
nAdler32, pSrcBuf.get(), pDstBuf.get()))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (header.m_nBlobChecksum != nAdler32)
|
||||
{
|
||||
@ -161,10 +165,11 @@ bool CSigCache::WriteCache(const string& svCacheFile) const
|
||||
return false;
|
||||
}
|
||||
|
||||
CIOStream writer(svCacheFile, CIOStream::Mode_t::WRITE);
|
||||
if (!writer.IsWritable())
|
||||
CIOStream writer;
|
||||
if (!writer.Open(svCacheFile, CIOStream::WRITE | CIOStream::BINARY))
|
||||
{
|
||||
Error(eDLL_T::COMMON, NO_ERROR, "Failed to write cache file: (read-only?)\n");
|
||||
Error(eDLL_T::COMMON, NO_ERROR, "%s - Unable to write to '%s' (read-only?)\n",
|
||||
__FUNCTION__, svCacheFile.c_str());
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -179,7 +184,8 @@ bool CSigCache::WriteCache(const string& svCacheFile) const
|
||||
header.m_nBlobSizeMem = svBuffer.size();
|
||||
uint64_t nCompSize = svBuffer.size();
|
||||
|
||||
if (!CompressBlob(svBuffer.size(), nCompSize, header.m_nBlobChecksum, reinterpret_cast<const uint8_t*>(svBuffer.data()), pBuffer.get()))
|
||||
if (!CompressBlob(svBuffer.size(), nCompSize, header.m_nBlobChecksum,
|
||||
reinterpret_cast<const uint8_t*>(svBuffer.data()), pBuffer.get()))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@ -201,7 +207,8 @@ bool CSigCache::WriteCache(const string& svCacheFile) const
|
||||
// *pDstBuf -
|
||||
// Output : true on success, false otherwise
|
||||
//-----------------------------------------------------------------------------
|
||||
bool CSigCache::DecompressBlob(const size_t nSrcLen, size_t& nDstLen, uint32_t& nAdler, const uint8_t* pSrcBuf, uint8_t* pDstBuf) const
|
||||
bool CSigCache::DecompressBlob(const size_t nSrcLen, size_t& nDstLen,
|
||||
uint32_t& nAdler, const uint8_t* pSrcBuf, uint8_t* pDstBuf) const
|
||||
{
|
||||
lzham_decompress_params lzDecompParams{};
|
||||
lzDecompParams.m_dict_size_log2 = SIGDB_DICT_SIZE;
|
||||
@ -228,7 +235,8 @@ bool CSigCache::DecompressBlob(const size_t nSrcLen, size_t& nDstLen, uint32_t&
|
||||
// *pDstBuf -
|
||||
// Output : true on success, false otherwise
|
||||
//-----------------------------------------------------------------------------
|
||||
bool CSigCache::CompressBlob(const size_t nSrcLen, size_t& nDstLen, uint32_t& nAdler, const uint8_t* pSrcBuf, uint8_t* pDstBuf) const
|
||||
bool CSigCache::CompressBlob(const size_t nSrcLen, size_t& nDstLen,
|
||||
uint32_t& nAdler, const uint8_t* pSrcBuf, uint8_t* pDstBuf) const
|
||||
{
|
||||
lzham_compress_params lzCompParams{};
|
||||
lzCompParams.m_dict_size_log2 = SIGDB_DICT_SIZE;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user