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

DBG: fixed animation + updated translations

This commit is contained in:
mrexodia 2016-09-07 15:35:24 +02:00
parent 9d609dd5ae
commit 5ff22566ba
No known key found for this signature in database
GPG Key ID: FC89E0AAA0C1AAD8
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dbg/animate.cpp
View File

@ -10,7 +10,7 @@ static DWORD WINAPI animateThread(void* arg1)
while(animate_command[0] != 0) while(animate_command[0] != 0)
{ {
auto beforeTime = GetTickCount(); auto beforeTime = GetTickCount();
if(_dbg_dbgcmdexec(animate_command) != true) if(!DbgCmdExecDirect(animate_command))
// An error occurs // An error occurs
break; break;
auto currentTime = GetTickCount(); auto currentTime = GetTickCount();

12
src/dbg/debugger_commands.cpp
View File

@ -182,7 +182,7 @@ CMDRESULT cbDebugSerun(int argc, char* argv[])
static bool skipInt3Stepping(int argc, char* argv[]) static bool skipInt3Stepping(int argc, char* argv[])
{ {
if(!bSkipInt3Stepping) if(!bSkipInt3Stepping || dbgisrunning())
return false; return false;
duint cip = GetContextDataEx(hActiveThread, UE_CIP); duint cip = GetContextDataEx(hActiveThread, UE_CIP);
unsigned char ch; unsigned char ch;
@ -518,20 +518,22 @@ CMDRESULT cbDebugBenchmark(int argc, char* argv[])
} }
CMDRESULT cbDebugPause(int argc, char* argv[]) CMDRESULT cbDebugPause(int argc, char* argv[])
{
if(!dbgisrunning())
{ {
if(_dbg_isanimating()) if(_dbg_isanimating())
{ {
_dbg_animatestop(); // pause when animating _dbg_animatestop(); // pause when animating
return STATUS_CONTINUE; return STATUS_CONTINUE;
} }
else if(!DbgIsDebugging())
{
dputs(QT_TRANSLATE_NOOP("DBG", "Not debugging!"));
return STATUS_ERROR;
}
if(!dbgisrunning())
{ {
dputs(QT_TRANSLATE_NOOP("DBG", "Program is not running")); dputs(QT_TRANSLATE_NOOP("DBG", "Program is not running"));
return STATUS_ERROR; return STATUS_ERROR;
} }
}
if(SuspendThread(hActiveThread) == -1) if(SuspendThread(hActiveThread) == -1)
{ {
dputs(QT_TRANSLATE_NOOP("DBG", "Error suspending thread")); dputs(QT_TRANSLATE_NOOP("DBG", "Error suspending thread"));

2
src/dbg/x64_dbg.cpp
View File

@ -87,7 +87,7 @@ static void registercommands()
dbgcmdnew("run\1go\1r\1g", cbDebugRun2, true); //unlock WAITID_RUN dbgcmdnew("run\1go\1r\1g", cbDebugRun2, true); //unlock WAITID_RUN
dbgcmdnew("erun\1egun\1er\1eg", cbDebugErun, true); //run + skip first chance exceptions dbgcmdnew("erun\1egun\1er\1eg", cbDebugErun, true); //run + skip first chance exceptions
dbgcmdnew("serun\1sego", cbDebugSerun, true); //run + swallow exception dbgcmdnew("serun\1sego", cbDebugSerun, true); //run + swallow exception
dbgcmdnew("pause", cbDebugPause, true); //pause debugger dbgcmdnew("pause", cbDebugPause, false); //pause debugger
dbgcmdnew("StepInto\1sti", cbDebugStepInto, true); //StepInto dbgcmdnew("StepInto\1sti", cbDebugStepInto, true); //StepInto
dbgcmdnew("eStepInto\1esti", cbDebugeStepInto, true); //StepInto + skip first chance exceptions dbgcmdnew("eStepInto\1esti", cbDebugeStepInto, true); //StepInto + skip first chance exceptions
dbgcmdnew("seStepInto\1sesti", cbDebugseStepInto, true); //StepInto + swallow exception dbgcmdnew("seStepInto\1sesti", cbDebugseStepInto, true); //StepInto + swallow exception

2
src/gui/Translations

@ -1 +1 @@
Subproject commit 42cfc5567edd52cfdad85f68a2be6822c6b37d65 Subproject commit 6a368ed8d622184ed0d421a4d3ba38e09df32094