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

DBG: allow multiple commands to be executed at once

This commit is contained in:
mrexodia 2016-10-13 17:00:18 +02:00
parent 3e59b6a14e
commit 37ff27c0b4
No known key found for this signature in database
GPG Key ID: FC89E0AAA0C1AAD8
3 changed files with 72 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
src/dbg/command.cpp
View File

@ -10,6 +10,7 @@
#include "commandparser.h"
#include "expressionparser.h"
#include "variable.h"
#include "cmd-undocumented.h"
COMMAND* cmd_list = 0;
@ -202,81 +203,63 @@ bool cmddel(const char* name)
return true;
}
/*
command_list: command list
cbUnknownCommand: function to execute when an unknown command was found
cbCommandProvider: function that provides commands (fgets for example), does not return until a command was found
cbCommandFinder: non-default command finder
error_is_fatal: error return of a command callback stops the command processing
*/
bool cbCommandProvider(char* cmd, int maxlen);
/**
\brief Initiates a command loop. This function will not return until a command returns ::STATUS_EXIT.
\param [in] command_list Command list to use for the command lookups.
\param cbUnknownCommand The unknown command callback.
\param cbCommandProvider The command provider callback.
\param cbCommandFinder The command finder callback.
\param error_is_fatal true if commands that return ::STATUS_ERROR terminate the command loop.
\brief Initiates the command loop. This function will not return until a command returns ::STATUS_EXIT.
\return A CMDRESULT, will always be ::STATUS_EXIT.
*/
CMDRESULT cmdloop(CBCOMMAND cbUnknownCommand, CBCOMMANDPROVIDER cbCommandProvider, CBCOMMANDFINDER cbCommandFinder, bool error_is_fatal)
void cmdloop()
{
if(!cbUnknownCommand || !cbCommandProvider)
return STATUS_ERROR;
char command[deflen] = "";
char command_[deflen] = "";
bool bLoop = true;
StringList commands;
commands.reserve(100);
while(bLoop)
{
if(!cbCommandProvider(command, deflen))
if(!cbCommandProvider(command_, deflen))
break;
if(strlen(command))
StringUtils::Split(command_, ';', commands);
for(auto & command : commands)
{
strcpy_s(command, StringUtils::Trim(command).c_str());
COMMAND* cmd;
if(!cbCommandFinder) //'clean' command processing
cmd = cmdget(command);
else //'dirty' command processing
cmd = cbCommandFinder(command);
if(!command.empty())
{
command = StringUtils::Trim(command);
COMMAND* cmd = cmdget(command.c_str());
if(!cmd || !cmd->cbCommand) //unknown command
{
char* argv[1];
*argv = command;
CMDRESULT res = cbUnknownCommand(1, argv);
if((error_is_fatal && res == STATUS_ERROR) || res == STATUS_EXIT)
bLoop = false;
}
else
{
if(cmd->debugonly && !DbgIsDebugging())
if(!cmd || !cmd->cbCommand) //unknown command
{
dputs(QT_TRANSLATE_NOOP("DBG", "this command is debug-only"));
if(error_is_fatal)
bLoop = false;
char* argv[1];
*argv = (char*)command.c_str();
cbBadCmd(1, argv);
}
else
{
Command commandParsed(command);
int argcount = commandParsed.GetArgCount();
char** argv = (char**)emalloc((argcount + 1) * sizeof(char*), "cmdloop:argv");
argv[0] = command;
for(int i = 0; i < argcount; i++)
if(cmd->debugonly && !DbgIsDebugging())
{
argv[i + 1] = (char*)emalloc(deflen, "cmdloop:argv[i+1]");
*argv[i + 1] = 0;
strcpy_s(argv[i + 1], deflen, commandParsed.GetArg(i).c_str());
dputs(QT_TRANSLATE_NOOP("DBG", "this command is debug-only"));
}
else
{
Command commandParsed(command);
int argcount = commandParsed.GetArgCount();
char** argv = (char**)emalloc((argcount + 1) * sizeof(char*), "cmdloop:argv");
argv[0] = (char*)command.c_str();
for(int i = 0; i < argcount; i++)
{
argv[i + 1] = (char*)emalloc(deflen, "cmdloop:argv[i+1]");
*argv[i + 1] = 0;
strcpy_s(argv[i + 1], deflen, commandParsed.GetArg(i).c_str());
}
cmd->cbCommand(argcount + 1, argv);
for(int i = 0; i < argcount; i++)
efree(argv[i + 1], "cmdloop:argv[i+1]");
efree(argv, "cmdloop:argv");
}
CMDRESULT res = cmd->cbCommand(argcount + 1, argv);
for(int i = 0; i < argcount; i++)
efree(argv[i + 1], "cmdloop:argv[i+1]");
efree(argv, "cmdloop:argv");
if((error_is_fatal && res == STATUS_ERROR) || res == STATUS_EXIT)
bLoop = false;
}
}
}
}
return STATUS_EXIT;
}
/**
@ -291,36 +274,39 @@ CMDRESULT cmddirectexec(const char* cmd)
if(!cmd)
return STATUS_ERROR;
char command[deflen];
strcpy_s(command, StringUtils::Trim(cmd).c_str());
if(!*command)
return STATUS_ERROR;
COMMAND* found = cmdget(command);
if(!found || !found->cbCommand)
StringList commands;
StringUtils::Split(cmd, ';');
for(auto & command : commands)
{
ExpressionParser parser(command);
duint result;
if(!parser.Calculate(result, valuesignedcalc(), true, false))
command = StringUtils::Trim(command);
COMMAND* found = cmdget(command.c_str());
if(!found || !found->cbCommand)
{
ExpressionParser parser(command);
duint result;
if(!parser.Calculate(result, valuesignedcalc(), true, false))
return STATUS_ERROR;
varset("$ans", result, true);
continue;
}
if(found->debugonly && !DbgIsDebugging())
return STATUS_ERROR;
varset("$ans", result, true);
return STATUS_CONTINUE;
Command cmdParsed(command);
int argcount = cmdParsed.GetArgCount();
char** argv = (char**)emalloc((argcount + 1) * sizeof(char*), "cmddirectexec:argv");
argv[0] = (char*)command.c_str();
for(int i = 0; i < argcount; i++)
{
argv[i + 1] = (char*)emalloc(deflen, "cmddirectexec:argv[i+1]");
*argv[i + 1] = 0;
strcpy_s(argv[i + 1], deflen, cmdParsed.GetArg(i).c_str());
}
CMDRESULT res = found->cbCommand(argcount + 1, argv);
for(int i = 0; i < argcount; i++)
efree(argv[i + 1], "cmddirectexec:argv[i+1]");
efree(argv, "cmddirectexec:argv");
if(res != STATUS_CONTINUE)
return res;
}
if(found->debugonly && !DbgIsDebugging())
return STATUS_ERROR;
Command cmdParsed(command);
int argcount = cmdParsed.GetArgCount();
char** argv = (char**)emalloc((argcount + 1) * sizeof(char*), "cmddirectexec:argv");
argv[0] = command;
for(int i = 0; i < argcount; i++)
{
argv[i + 1] = (char*)emalloc(deflen, "cmddirectexec:argv[i+1]");
*argv[i + 1] = 0;
strcpy_s(argv[i + 1], deflen, cmdParsed.GetArg(i).c_str());
}
CMDRESULT res = found->cbCommand(argcount + 1, argv);
for(int i = 0; i < argcount; i++)
efree(argv[i + 1], "cmddirectexec:argv[i+1]");
efree(argv, "cmddirectexec:argv");
return res;
return STATUS_CONTINUE;
}

2
src/dbg/command.h
View File

@ -38,7 +38,7 @@ bool cmdnew(const char* name, CBCOMMAND cbCommand, bool debugonly);
COMMAND* cmdget(const char* cmd);
CBCOMMAND cmdset(const char* name, CBCOMMAND cbCommand, bool debugonly);
bool cmddel(const char* name);
CMDRESULT cmdloop(CBCOMMAND cbUnknownCommand, CBCOMMANDPROVIDER cbCommandProvider, CBCOMMANDFINDER cbCommandFinder, bool error_is_fatal);
void cmdloop();
CMDRESULT cmddirectexec(const char* cmd);
#endif // _COMMAND_H

4
src/dbg/x64dbg.cpp
View File

@ -423,7 +423,7 @@ static void registercommands()
dbgcmdnew("focusinfo", cbInstrFocusinfo, false);
};
static bool cbCommandProvider(char* cmd, int maxlen)
bool cbCommandProvider(char* cmd, int maxlen)
{
MESSAGE msg;
MsgWait(gMsgStack, &msg);
@ -453,7 +453,7 @@ extern "C" DLL_EXPORT bool _dbg_dbgcmdexec(const char* cmd)
static DWORD WINAPI DbgCommandLoopThread(void* a)
{
cmdloop(cbBadCmd, cbCommandProvider, nullptr, false);
cmdloop();
return 0;
}