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

Rescope the branch to focus on single address actions

This commit is contained in:
torusrxxx 2020-11-20 16:09:52 +08:00
parent 4475af2513
commit 72c958754d
No known key found for this signature in database
GPG Key ID: A795C73A0F1CFADD
2 changed files with 28 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/gui/Src/Utils/CommonActions.cpp
View File

@ -15,11 +15,6 @@ CommonActions::CommonActions(QWidget* parent, ActionHelperFuncs funcs, GetSelect
} }
void CommonActions::build(MenuBuilder* builder, int actions) void CommonActions::build(MenuBuilder* builder, int actions)
{
build(builder, actions, [](QList<std::pair<QString, duint>> &, CommonActionsList) {});
}
void CommonActions::build(MenuBuilder* builder, int actions, std::function<void(QList<std::pair<QString, duint>>&, CommonActionsList)> additionalAddress)
{ {
// Condition Lambda // Condition Lambda
auto wIsDebugging = [this](QMenu*) auto wIsDebugging = [this](QMenu*)
@ -282,6 +277,20 @@ void CommonActions::setBookmarkSlot()
GuiUpdateAllViews(); GuiUpdateAllViews();
} }
bool CommonActions::WarningBoxNotExecutable(const QString & text, duint wVA)
{
if(DbgFunctions()->IsDepEnabled() && !DbgFunctions()->MemIsCodePage(wVA, false))
{
QMessageBox msgyn(QMessageBox::Warning, tr("Current address is not executable"), text, QMessageBox::Yes | QMessageBox::No, widgetparent());
msgyn.setWindowIcon(DIcon("compile-warning.png"));
msgyn.setParent(widgetparent(), Qt::Dialog);
msgyn.setWindowFlags(msgyn.windowFlags() & (~Qt::WindowContextHelpButtonHint));
if(msgyn.exec() == QMessageBox::No)
return false;
}
return true;
}
void CommonActions::toggleInt3BPActionSlot() void CommonActions::toggleInt3BPActionSlot()
{ {
if(!DbgIsDebugging()) if(!DbgIsDebugging())
@ -291,21 +300,11 @@ void CommonActions::toggleInt3BPActionSlot()
QString wCmd; QString wCmd;
if((wBpType & bp_normal) == bp_normal) if((wBpType & bp_normal) == bp_normal)
{
wCmd = "bc " + ToPtrString(wVA); wCmd = "bc " + ToPtrString(wVA);
}
else else
{ {
if(DbgFunctions()->IsDepEnabled() && !DbgFunctions()->MemIsCodePage(wVA, false)) if(!WarningBoxNotExecutable(tr("Setting software breakpoint here may result in crash. Do you really want to continue?"), wVA))
{ return;
QMessageBox msgyn(QMessageBox::Warning, tr("Current address is not executable"),
tr("Setting software breakpoint here may result in crash. Do you really want to continue?"), QMessageBox::Yes | QMessageBox::No, (QWidget*)parent());
msgyn.setWindowIcon(DIcon("compile-warning.png"));
msgyn.setParent((QWidget*)parent(), Qt::Dialog);
msgyn.setWindowFlags(msgyn.windowFlags() & (~Qt::WindowContextHelpButtonHint));
if(msgyn.exec() == QMessageBox::No)
return;
}
wCmd = "bp " + ToPtrString(wVA); wCmd = "bp " + ToPtrString(wVA);
} }
@ -320,13 +319,13 @@ void CommonActions::editSoftBpActionSlot()
return; return;
BPXTYPE bpType = DbgGetBpxTypeAt(selection); BPXTYPE bpType = DbgGetBpxTypeAt(selection);
if((bpType & bp_hardware) == bp_hardware) if((bpType & bp_hardware) == bp_hardware)
Breakpoints::editBP(bp_hardware, ToHexString(selection), dynamic_cast<QWidget*>(parent())); Breakpoints::editBP(bp_hardware, ToHexString(selection), widgetparent());
else if((bpType & bp_normal) == bp_normal) else if((bpType & bp_normal) == bp_normal)
Breakpoints::editBP(bp_normal, ToHexString(selection), dynamic_cast<QWidget*>(parent())); Breakpoints::editBP(bp_normal, ToHexString(selection), widgetparent());
else else
{ {
DbgCmdExecDirect(QString("bp %1").arg(ToHexString(selection))); //Blocking call DbgCmdExecDirect(QString("bp %1").arg(ToHexString(selection))); //Blocking call
if(!Breakpoints::editBP(bp_normal, ToHexString(selection), dynamic_cast<QWidget*>(parent()))) if(!Breakpoints::editBP(bp_normal, ToHexString(selection), widgetparent()))
Breakpoints::removeBP(bp_normal, selection); Breakpoints::removeBP(bp_normal, selection);
} }
} }
@ -413,36 +412,20 @@ void CommonActions::setNewOriginHereActionSlot()
if(!DbgIsDebugging()) if(!DbgIsDebugging())
return; return;
duint wVA = mGetSelection(); duint wVA = mGetSelection();
if(DbgFunctions()->IsDepEnabled() && !DbgFunctions()->MemIsCodePage(wVA, false)) if(!WarningBoxNotExecutable(tr("Setting new origin here may result in crash. Do you really want to continue?"), wVA))
{ return;
QMessageBox msg(QMessageBox::Warning, tr("Current address is not executable"),
tr("Setting new origin here may result in crash. Do you really want to continue?"), QMessageBox::Yes | QMessageBox::No, widgetparent());
msg.setWindowIcon(DIcon("compile-warning.png"));
msg.setParent(widgetparent(), Qt::Dialog);
msg.setWindowFlags(msg.windowFlags() & (~Qt::WindowContextHelpButtonHint));
if(msg.exec() == QMessageBox::No)
return;
}
QString wCmd = "cip=" + ToPtrString(wVA); QString wCmd = "cip=" + ToPtrString(wVA);
DbgCmdExec(wCmd); DbgCmdExec(wCmd);
} }
void CommonActions::createThreadSlot() void CommonActions::createThreadSlot()
{ {
duint addr = mGetSelection(); duint wVA = mGetSelection();
if(DbgFunctions()->IsDepEnabled() && !DbgFunctions()->MemIsCodePage(addr, false)) if(!WarningBoxNotExecutable(tr("Creating new thread here may result in crash. Do you really want to continue?"), wVA))
{ return;
QMessageBox msg(QMessageBox::Warning, tr("Current address is not executable"),
tr("Creating new thread here may result in crash. Do you really want to continue?"), QMessageBox::Yes | QMessageBox::No, widgetparent());
msg.setWindowIcon(DIcon("compile-warning.png"));
msg.setParent(widgetparent(), Qt::Dialog);
msg.setWindowFlags(msg.windowFlags() & (~Qt::WindowContextHelpButtonHint));
if(msg.exec() == QMessageBox::No)
return;
}
WordEditDialog argWindow(widgetparent()); WordEditDialog argWindow(widgetparent());
argWindow.setup(tr("Argument for the new thread"), 0, sizeof(duint)); argWindow.setup(tr("Argument for the new thread"), 0, sizeof(duint));
if(argWindow.exec() != QDialog::Accepted) if(argWindow.exec() != QDialog::Accepted)
return; return;
DbgCmdExec(QString("createthread %1, %2").arg(ToPtrString(addr)).arg(ToPtrString(argWindow.getVal()))); DbgCmdExec(QString("createthread %1, %2").arg(ToPtrString(wVA)).arg(ToPtrString(argWindow.getVal())));
} }

4
src/gui/Src/Utils/CommonActions.h
View File

@ -48,7 +48,8 @@ public:
explicit CommonActions(QWidget* parent, ActionHelperFuncs funcs, GetSelectionFunc getSelection); explicit CommonActions(QWidget* parent, ActionHelperFuncs funcs, GetSelectionFunc getSelection);
void build(MenuBuilder* builder, int actions); void build(MenuBuilder* builder, int actions);
void build(MenuBuilder* builder, int actions, std::function<void(QList<std::pair<QString, duint>>&, CommonActionsList)> additionalAddress); //Reserved for future use (submenu for Dump and Search with more addresses)
//void build(MenuBuilder* builder, int actions, std::function<void(QList<std::pair<QString, duint>>&, CommonActionsList)> additionalAddress);
QAction* makeCommandAction(const QIcon & icon, const QString & text, const char* cmd, const char* shortcut); QAction* makeCommandAction(const QIcon & icon, const QString & text, const char* cmd, const char* shortcut);
QAction* makeCommandAction(const QIcon & icon, const QString & text, const char* cmd); QAction* makeCommandAction(const QIcon & icon, const QString & text, const char* cmd);
@ -71,6 +72,7 @@ public slots:
void createThreadSlot(); void createThreadSlot();
private: private:
GetSelectionFunc mGetSelection; GetSelectionFunc mGetSelection;
bool WarningBoxNotExecutable(const QString & text, duint wVA);
QWidget* widgetparent(); QWidget* widgetparent();
}; };