x64dbg/x64dbg
x64dbg
/
x64dbg
1
0
Fork 0
Code Releases 5 Activity

minor enhancement to trace file reader

This commit is contained in:
torusrxxx 2020-07-12 11:40:35 +08:00 committed by Duncan Ogilvie
parent 37d0729795
commit bd178e2b35
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/Src/Tracer/TraceFileReader.cpp
View File

@ -317,6 +317,7 @@ static bool checkKey(const QJsonObject & root, const QString & key, const QStrin
void TraceFileParser::readFileHeader(TraceFileReader* that)
{
LARGE_INTEGER header;
bool ok;
if(that->traceFile.read((char*)&header, 8) != 8)
throw std::wstring(L"Unspecified");
if(header.LowPart != MAKEFOURCC('T', 'R', 'A', 'C'))
@ -325,15 +326,15 @@ void TraceFileParser::readFileHeader(TraceFileReader* that)
throw std::wstring(L"Header info is too big");
QByteArray jsonData = that->traceFile.read(header.HighPart);
if(jsonData.size() != header.HighPart)
throw std::wstring(L"Unspecified");
throw std::wstring(L"JSON header is corrupted");
QJsonDocument jsonDoc = QJsonDocument::fromJson(jsonData);
if(jsonDoc.isNull())
throw std::wstring(L"Unspecified");
throw std::wstring(L"JSON header is corrupted");
const QJsonObject jsonRoot = jsonDoc.object();
const auto ver = jsonRoot.find("ver");
if(ver == jsonRoot.constEnd())
throw std::wstring(L"Unspecified");
throw std::wstring(L"Version not supported");
QJsonValue verVal = ver.value();
if(verVal.toInt(0) != 1)
throw std::wstring(L"Version not supported");
@ -354,10 +355,12 @@ void TraceFileParser::readFileHeader(TraceFileReader* that)
{
a = a.mid(2);
#ifdef _WIN64
that->hashValue = a.toLongLong(nullptr, 16);
that->hashValue = a.toLongLong(&ok, 16);
#else //x86
that->hashValue = a.toLong(nullptr, 16);
that->hashValue = a.toLong(&ok, 16);
#endif //_WIN64
if(!ok)
that->hashValue = 0;
}
}
}
@ -436,6 +439,8 @@ void TraceFileParser::run()
lastIndex = index + 1;
//Update progress
that->progress.store(that->traceFile.pos() * 100 / that->traceFile.size());
if(that->progress == 100)
that->progress = 99;
if(this->isInterruptionRequested() && !that->traceFile.atEnd()) //Cancel loading
throw std::wstring(L"Canceled");
}
@ -445,6 +450,7 @@ void TraceFileParser::run()
that->fileIndex.back().second.second = index - (lastIndex - 1);
that->error = false;
that->length = index;
that->progress = 100;
}
catch(const std::wstring & errReason)
{