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

some fixes

This commit is contained in:
torusrxxx 2016-08-23 12:35:12 +08:00
parent cdafdb2b8b
commit ae32f5dce0
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bridge/bridgemain.cpp
View File

@ -67,7 +67,7 @@ BRIDGE_IMPEXP const wchar_t* BridgeInit()
LOADLIBRARY(gui_lib);
LOADEXPORT(_gui_guiinit);
LOADEXPORT(_gui_sendmessage);
LOADEXPORT(_gui_translate_dbg);
LOADEXPORT(_gui_translate_text);
//DBG Load
LOADLIBRARY(dbg_lib);

9
src/dbg/debugger.cpp
View File

@ -383,7 +383,7 @@ void DebugUpdateGui(duint disasm_addr, bool stack)
if(!ModNameFromAddr(disasm_addr, modname, true))
*modname = 0;
else
sprintf(modtext, "Module: %s - ", modname);
sprintf(modtext, GuiTranslateText(QT_TRANSLATE_NOOP("DBG", "Module: %s - ")), modname);
char title[1024] = "";
sprintf(title, GuiTranslateText(QT_TRANSLATE_NOOP("DBG", "File: %s - PID: %X - %sThread: %X")), szBaseFileName, fdProcessInfo->dwProcessId, modtext, ThreadGetId(hActiveThread));
GuiUpdateWindowTitle(title);
@ -1044,7 +1044,7 @@ static void cbTXXTStep(bool bStepInto, bool bInto, void (*callback)())
cbRtrFinalStep();
return;
}
if((TraceRecord.getTraceRecordType(CIP) != TraceRecordManager::TraceRecordNone && (TraceRecord.getHitCount(CIP) == 0 ^ bInto)) || !traceCondition->ContinueTrace())
if((TraceRecord.getTraceRecordType(CIP) != TraceRecordManager::TraceRecordNone && ((TraceRecord.getHitCount(CIP) == 0) ^ bInto)) || !traceCondition->ContinueTrace())
{
_dbg_dbgtraceexecute(CIP);
auto steps = dbgcleartracecondition();
@ -1143,7 +1143,8 @@ static void cbCreateProcess(CREATE_PROCESS_DEBUG_INFO* CreateProcessInfo)
duint callbackVA = TLSCallBacks()[i] - ImageBase + pDebuggedBase;
if(MemIsValidReadPtr(callbackVA))
{
sprintf_s(command, "bp %p,\"TLS Callback %d\",ss", callbackVA, i + 1);
String breakpointname = StringUtils::sprintf(GuiTranslateText(QT_TRANSLATE_NOOP("DBG", "TLS Callback %d")), i + 1);
sprintf_s(command, "bp %p,\"%s\",ss", callbackVA, breakpointname.c_str());
cmddirectexec(command);
}
else
@ -1157,7 +1158,7 @@ static void cbCreateProcess(CREATE_PROCESS_DEBUG_INFO* CreateProcessInfo)
if(settingboolget("Events", "EntryBreakpoint"))
{
sprintf_s(command, "bp %p,\"entry breakpoint\",ss", (duint)CreateProcessInfo->lpStartAddress);
sprintf_s(command, "bp %p,\"%s\",ss", (duint)CreateProcessInfo->lpStartAddress, GuiTranslateText(QT_TRANSLATE_NOOP("DBG", "entry breakpoint")));
cmddirectexec(command);
}

13
src/dbg/instruction.cpp
View File

@ -1515,9 +1515,13 @@ static bool cbModCallFind(Capstone* disasm, BASIC_INSTRUCTION_INFO* basicinfo, R
if(!disasm || !basicinfo) //initialize
{
GuiReferenceInitialize(refinfo->name);
GuiReferenceAddColumn(2 * sizeof(duint), "Address");
GuiReferenceAddColumn(20, "Disassembly");
GuiReferenceAddColumn(MAX_LABEL_SIZE, "Destination");
String TranslatedString;
TranslatedString = GuiTranslateText(QT_TRANSLATE_NOOP("DBG", "Address"));
GuiReferenceAddColumn(2 * sizeof(duint), TranslatedString.c_str());
TranslatedString = GuiTranslateText(QT_TRANSLATE_NOOP("DBG", "Disassembly"));
GuiReferenceAddColumn(20, TranslatedString.c_str());
TranslatedString = GuiTranslateText(QT_TRANSLATE_NOOP("DBG", "Destination"));
GuiReferenceAddColumn(MAX_LABEL_SIZE, TranslatedString.c_str());
GuiReferenceReloadData();
return true;
}
@ -1568,7 +1572,8 @@ CMDRESULT cbInstrModCallFind(int argc, char* argv[])
refFindType = CURRENT_REGION;
duint ticks = GetTickCount();
int found = RefFind(addr, size, cbModCallFind, 0, false, "Calls", (REFFINDTYPE)refFindType, false);
String Calls = GuiTranslateText(QT_TRANSLATE_NOOP("DBG", "Calls"));
int found = RefFind(addr, size, cbModCallFind, 0, false, Calls.c_str(), (REFFINDTYPE)refFindType, false);
dprintf(QT_TRANSLATE_NOOP("DBG", "%u call(s) in %ums\n"), found, GetTickCount() - ticks);
varset("$result", found, false);
return STATUS_CONTINUE;

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

@ -51,7 +51,7 @@ void ThreadView::setupContextMenu()
QAction* mSetPriorityNormal = makeCommandAction(new QAction(tr("Normal"), this), "setprioritythread $, Normal");
QAction* mSetPriorityTimeCritical = makeCommandAction(new QAction(tr("Time Critical"), this), "setprioritythread $, TimeCritical");
MenuBuilder* mSetPriority = new MenuBuilder(this, [this, mSetPriorityIdle, mSetPriorityAboveNormal, mSetPriorityBelowNormal,
mSetPriorityHighest, mSetPriorityLowest, mSetPriorityNormal, mSetPriorityTimeCritical](QMenu * menu)
mSetPriorityHighest, mSetPriorityLowest, mSetPriorityNormal, mSetPriorityTimeCritical](QMenu*)
{
QString priority = getCellContent(getInitialSelection(), 6);
QAction* selectedaction = nullptr;