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

Different colors for user and system call stack

This commit is contained in:
torusrxxx 2016-07-31 13:11:13 +08:00
parent d40897b9f7
commit f38d8a3bee
4 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -518,7 +518,8 @@ void AppearanceDialog::colorInfoListInit()
colorInfoListAppend(tr("Addresses"), "StackAddressColor", "StackAddressBackgroundColor");
colorInfoListAppend(tr("Selected Addresses"), "StackSelectedAddressColor", "StackSelectedAddressBackgroundColor");
colorInfoListAppend(tr("Labels"), "StackLabelColor", "StackLabelBackgroundColor");
colorInfoListAppend(tr("Stack Frame Line"), "StackFrameColor", "");
colorInfoListAppend(tr("User Stack Frame Line"), "StackFrameColor", "");
colorInfoListAppend(tr("System Stack Frame Line"), "StackFrameSystemColor", "");
colorInfoListAppend(tr("HexEdit:"), "", "");
colorInfoListAppend(tr("Text"), "HexEditTextColor", "");

17
src/gui/Src/Gui/CPUStack.cpp
View File

@ -59,7 +59,8 @@ void CPUStack::updateColors()
backgroundColor = ConfigColor("StackBackgroundColor");
textColor = ConfigColor("StackTextColor");
selectionColor = ConfigColor("StackSelectionColor");
mStackFrameColor = ConfigColor("StackFrameColor");
mUserStackFrameColor = ConfigColor("StackFrameColor");
mSystemStackFrameColor = ConfigColor("StackFrameSystemColor");
}
void CPUStack::updateFonts()
@ -437,6 +438,7 @@ QString CPUStack::paintContent(QPainter* painter, dsint rowBase, int rowOffset,
if(mCallstack.size())
{
int stackFrameBitfield = 0; // 0:none, 1:top of stack frame, 2:bottom of stack frame, 4:middle of stack frame
int party = 0;
if(wVa >= mCallstack[0].addr)
{
for(size_t i = 0; i < mCallstack.size() - 1; i++)
@ -447,6 +449,7 @@ QString CPUStack::paintContent(QPainter* painter, dsint rowBase, int rowOffset,
stackFrameBitfield |= (mCallstack[i + 1].addr == wVa + sizeof(duint)) ? 2 : 0;
if(stackFrameBitfield == 0)
stackFrameBitfield = 4;
party = mCallstack[i].party;
break;
}
}
@ -455,7 +458,10 @@ QString CPUStack::paintContent(QPainter* painter, dsint rowBase, int rowOffset,
return HexDump::paintContent(painter, rowBase, rowOffset, 1, x, y, w, h);
else
{
painter->setPen(QPen(mStackFrameColor, 2));
if(party == 0)
painter->setPen(QPen(mUserStackFrameColor, 2));
else
painter->setPen(QPen(mSystemStackFrameColor, 2));
int height = getRowHeight();
int halfHeight = height / 2;
int width = 5;
@ -630,7 +636,10 @@ void CPUStack::stackDumpAt(duint addr, duint csp)
return 1;
});
for(size_t i = 0; i < mCallstack.size(); i++)
mCallstack[i] = callstack.entries[i];
{
mCallstack[i].addr = callstack.entries[i].addr;
mCallstack[i].party = DbgFunctions()->ModGetParty(callstack.entries[i].to);
}
BridgeFree(callstack.entries);
}
@ -653,7 +662,7 @@ void CPUStack::gotoBpSlot()
#endif //_WIN64
}
static int getCurrentFrame(const std::vector<DBGCALLSTACKENTRY> & mCallstack, duint wVA)
int CPUStack::getCurrentFrame(const std::vector<CPUStack::CPUCallStack> & mCallstack, duint wVA)
{
if(mCallstack.size())
for(size_t i = 0; i < mCallstack.size() - 1; i++)

12
src/gui/Src/Gui/CPUStack.h
View File

@ -130,8 +130,16 @@ private:
GotoDialog* mGoto;
CPUMultiDump* mMultiDump;
QColor mStackFrameColor;
std::vector<DBGCALLSTACKENTRY> mCallstack;
QColor mUserStackFrameColor;
QColor mSystemStackFrameColor;
struct CPUCallStack
{
duint addr;
int party;
};
std::vector<CPUCallStack> mCallstack;
static int CPUStack::getCurrentFrame(const std::vector<CPUStack::CPUCallStack> & mCallstack, duint wVA);
};
#endif // CPUSTACK_H

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

@ -154,6 +154,7 @@ Configuration::Configuration() : QObject(), noMoreMsgbox(false)
defaultColors.insert("StackLabelColor", QColor("#FF0000"));
defaultColors.insert("StackLabelBackgroundColor", Qt::transparent);
defaultColors.insert("StackFrameColor", QColor("#000000"));
defaultColors.insert("StackFrameSystemColor", QColor("#0000FF"));
defaultColors.insert("HexEditTextColor", QColor("#000000"));
defaultColors.insert("HexEditWildcardColor", QColor("#FF0000"));