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

Highlight user modules

This commit is contained in:
torusrxxx 2020-08-07 12:04:55 +08:00 committed by Duncan Ogilvie
parent 351aa627ce
commit 01989be2fb
4 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/Src/Gui/AppearanceDialog.cpp
View File

@ -553,6 +553,8 @@ void AppearanceDialog::colorInfoListInit()
colorInfoListAppend(tr("Breakpoint Summary Keywords"), "BreakpointSummaryKeywordColor", "");
colorInfoListAppend(tr("Breakpoint Summary Strings"), "BreakpointSummaryStringColor", "");
colorInfoListAppend(tr("Patch located in relocation region"), "PatchRelocatedByteHighlightColor", "");
colorInfoListAppend(tr("Symbol User Module Text"), "SymbolUserTextColor", "");
colorInfoListAppend(tr("Symbol System Module Text"), "SymbolSystemTextColor", "");
colorInfoListAppend(tr("Symbol Unloaded Text"), "SymbolUnloadedTextColor", "");
colorInfoListAppend(tr("Symbol Loading Text"), "SymbolLoadingTextColor", "");
colorInfoListAppend(tr("Symbol Loaded Text"), "SymbolLoadedTextColor", "");

29
src/gui/Src/Gui/MemoryMapView.cpp
View File

@ -229,12 +229,7 @@ void MemoryMapView::contextMenuSlot(const QPoint & pos)
wMenu.addMenu(&wCopyMenu);
}
QString wStr = getCellContent(getInitialSelection(), 0);
#ifdef _WIN64
duint selectedAddr = wStr.toULongLong(0, 16);
#else //x86
duint selectedAddr = wStr.toULong(0, 16);
#endif //_WIN64
duint selectedAddr = getCellUserdata(getInitialSelection(), 0);
if((DbgGetBpxTypeAt(selectedAddr) & bp_memory) == bp_memory) //memory breakpoint set
{
mMemoryAccessMenu->menuAction()->setVisible(false);
@ -315,6 +310,12 @@ QString MemoryMapView::paintContent(QPainter* painter, dsint rowBase, int rowOff
painter->drawText(QRect(x + 4, y, getColumnWidth(col) - 4, getRowHeight()), Qt::AlignVCenter | Qt::AlignLeft, wStr);
return QString();
}
else if(DbgFunctions()->ModGetParty(getCellUserdata(rowBase + rowOffset, 0)) == 0)
{
painter->setPen(ConfigColor("SymbolUserTextColor"));
painter->drawText(QRect(x + 4, y, getColumnWidth(col) - 4, getRowHeight()), Qt::AlignVCenter | Qt::AlignLeft, wStr);
return QString();
}
}
else if(col == 4) //CPROT
{
@ -378,9 +379,11 @@ void MemoryMapView::refreshMap()
// Base address
setCellContent(wI, 0, ToPtrString((duint)wMbi.BaseAddress));
setCellUserdata(wI, 0, (duint)wMbi.BaseAddress);
// Size
setCellContent(wI, 1, ToPtrString((duint)wMbi.RegionSize));
setCellUserdata(wI, 1, (duint)wMbi.RegionSize);
// Information
wS = QString((wMemMapStruct.page)[wI].info);
@ -498,8 +501,8 @@ void MemoryMapView::pageMemoryRights()
{
PageMemoryRights PageMemoryRightsDialog(this);
connect(&PageMemoryRightsDialog, SIGNAL(refreshMemoryMap()), this, SLOT(refreshMap()));
duint addr = getCellContent(getInitialSelection(), 0).toULongLong(0, 16);
duint size = getCellContent(getInitialSelection(), 1).toULongLong(0, 16);
duint addr = getCellUserdata(getInitialSelection(), 0);
duint size = getCellUserdata(getInitialSelection(), 1);
PageMemoryRightsDialog.RunAddrSize(addr, size, getCellContent(getInitialSelection(), 3));
}
@ -616,8 +619,8 @@ void MemoryMapView::gotoExpressionSlot()
void MemoryMapView::addVirtualModSlot()
{
auto base = duint(getCellContent(getInitialSelection(), 0).toULongLong(nullptr, 16));
auto size = duint(getCellContent(getInitialSelection(), 1).toULongLong(nullptr, 16));
auto base = getCellUserdata(getInitialSelection(), 0);
auto size = getCellUserdata(getInitialSelection(), 1);
VirtualModDialog mDialog(this);
mDialog.setData("", base, size);
if(mDialog.exec() != QDialog::Accepted)
@ -630,8 +633,8 @@ void MemoryMapView::addVirtualModSlot()
void MemoryMapView::findReferencesSlot()
{
auto base = duint(getCellContent(getInitialSelection(), 0).toULongLong(nullptr, 16));
auto size = duint(getCellContent(getInitialSelection(), 1).toULongLong(nullptr, 16));
auto base = getCellUserdata(getInitialSelection(), 0);
auto size = getCellUserdata(getInitialSelection(), 1);
DbgCmdExec(QString("reffindrange %1, %2, dis.sel()").arg(ToPtrString(base)).arg(ToPtrString(base + size)).toUtf8().constData());
emit showReferences();
}
@ -650,7 +653,7 @@ void MemoryMapView::disassembleAtSlot(dsint va, dsint cip)
void MemoryMapView::commentSlot()
{
duint wVA = duint(getCellContent(getInitialSelection(), 0).toULongLong(nullptr, 16));
duint wVA = getCellUserdata(getInitialSelection(), 0);
LineEditDialog mLineEdit(this);
QString addr_text = ToPtrString(wVA);
char comment_text[MAX_COMMENT_SIZE] = "";

11
src/gui/Src/Gui/SymbolView.cpp
View File

@ -34,10 +34,19 @@ public:
mSymbolUnloadedTextColor = ConfigColor("SymbolUnloadedTextColor");
mSymbolLoadingTextColor = ConfigColor("SymbolLoadingTextColor");
mSymbolLoadedTextColor = ConfigColor("SymbolLoadedTextColor");
mSymbolUserTextColor = ConfigColor("SymbolUserTextColor");
mSymbolSystemTextColor = ConfigColor("SymbolSystemTextColor");
}
QColor getCellColor(int r, int c) override
{
if(c == ColParty || c == ColPath)
{
if(DbgFunctions()->ModGetParty(getCellUserdata(r, ColBase)) != 1)
return mSymbolUserTextColor;
else
return mSymbolSystemTextColor;
}
if(c != ColModule && c != ColStatus)
return mTextColor;
switch(getStatus(r))
@ -74,6 +83,8 @@ private:
return DbgFunctions()->ModSymbolStatus(getCellUserdata(r, 0));
}
QColor mSymbolSystemTextColor;
QColor mSymbolUserTextColor;
QColor mSymbolUnloadedTextColor;
QColor mSymbolLoadingTextColor;
QColor mSymbolLoadedTextColor;

2
src/gui/Src/Utils/Configuration.cpp
View File

@ -239,6 +239,8 @@ Configuration::Configuration() : QObject(), noMoreMsgbox(false)
defaultColors.insert("BreakpointSummaryKeywordColor", QColor("#8B671F"));
defaultColors.insert("BreakpointSummaryStringColor", QColor("#008000"));
defaultColors.insert("PatchRelocatedByteHighlightColor", QColor("#0000DD"));
defaultColors.insert("SymbolUserTextColor", QColor("#FF0000"));
defaultColors.insert("SymbolSystemTextColor", QColor("#000000"));
defaultColors.insert("SymbolUnloadedTextColor", QColor("#000000"));
defaultColors.insert("SymbolLoadingTextColor", QColor("#8B671F"));
defaultColors.insert("SymbolLoadedTextColor", QColor("#008000"));