Magic-Mirror/x64dbg
1
0
Fork 0
mirror of https://github.com/x64dbg/x64dbg.git synced 2024-11-23 04:50:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add more descriptive error messages in the trace browser

Browse Source
This commit is contained in:
Duncan Ogilvie 2024-02-19 03:10:42 +01:00
parent d08913bc54
commit caa578a029
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/Src/Tracer/TraceBrowser.cpp
View File

@ -292,9 +292,10 @@ QString TraceBrowser::paintContent(QPainter* painter, duint row, duint col, int
{
return "";
}
if(mTraceFile->isError())
QString reason;
if(mTraceFile->isError(reason))
{
GuiAddLogMessage(tr("An error occurred when reading trace file.\r\n").toUtf8().constData());
GuiAddLogMessage(tr("An error occurred when reading trace file (reason: %1).\r\n").arg(reason).toUtf8().constData());
mTraceFile->Close();
delete mTraceFile;
mTraceFile = nullptr;
@ -1357,9 +1358,10 @@ void TraceBrowser::closeDeleteSlot()
void TraceBrowser::parseFinishedSlot()
{
if(mTraceFile->isError())
QString reason;
if(mTraceFile->isError(reason))
{
SimpleErrorBox(this, tr("Error"), tr("Error when opening trace recording"));
SimpleErrorBox(this, tr("Error"), tr("Error when opening trace recording (reason: %1)").arg(reason));
delete mTraceFile;
mTraceFile = nullptr;
setRowCount(0);

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

@ -71,6 +71,7 @@ void TraceFileReader::Close()
hashValue = 0;
EXEPath.clear();
error = false;
errorMessage.clear();
}
bool TraceFileReader::Delete()
@ -87,6 +88,7 @@ bool TraceFileReader::Delete()
hashValue = 0;
EXEPath.clear();
error = false;
errorMessage.clear();
return value;
}
@ -105,8 +107,10 @@ void TraceFileReader::parseFinishedSlot()
}
// Return if the file read was error
bool TraceFileReader::isError() const
bool TraceFileReader::isError(QString & reason) const
{
if(error)
reason = errorMessage;
return error;
}
@ -503,18 +507,19 @@ void TraceFileParser::run()
if(index > 0)
that->fileIndex.back().second.second = index - (lastIndex - 1);
that->error = false;
that->errorMessage.clear();
that->length = index;
that->progress = 100;
}
catch(const std::wstring & errReason)
{
Q_UNUSED(errReason);
//MessageBox(0, errReason.c_str(), L"debug", MB_ICONERROR);
that->error = true;
that->errorMessage = "[TraceFileParser::run] " + QString::fromStdWString(errReason);
}
catch(std::bad_alloc &)
{
that->error = true;
that->errorMessage = "[TraceFileParser::run] std::bad_alloc";
}
that->traceFile.moveToThread(that->thread());
@ -562,12 +567,13 @@ void TraceFileReader::purgeLastPage()
if(isBlockExist)
fileIndex.back().second.second = index - (lastIndex - 1);
error = false;
errorMessage.clear();
length = index;
}
catch(std::wstring & errReason)
{
Q_UNUSED(errReason);
error = true;
errorMessage = "[TraceFileReader::purgeLastPage] " + QString::fromStdWString(errReason);
}
}
@ -684,9 +690,10 @@ TraceFilePage::TraceFilePage(TraceFileReader* parent, unsigned long long fileOff
}
}
catch(const std::exception &)
catch(const std::exception & x)
{
mParent->error = true;
mParent->errorMessage = QString("[TraceFilePage::TraceFilePage] %1").arg(x.what());
}
}

3
src/gui/Src/Tracer/TraceFileReader.h
View File

@ -20,7 +20,7 @@ public:
bool Open(const QString & fileName);
void Close();
bool Delete();
bool isError() const;
bool isError(QString & reason) const;
int Progress() const;
QString getIndexText(unsigned long long index) const;
@ -64,6 +64,7 @@ private:
std::vector<std::pair<unsigned long long, Range>> fileIndex; //index;<file offset;length>
std::atomic<int> progress;
bool error;
QString errorMessage;
TraceFilePage* lastAccessedPage;
unsigned long long lastAccessedIndexOffset;
friend class TraceFileParser;