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

GUI: fixed issue #1212 (#1224) 

"Content" of the section in "Memory Map"
This commit is contained in:
kkthx 2016-11-06 22:11:33 +01:00 committed by Duncan Ogilvie
parent 6b5b386893
commit 9e5da8d4e2
2 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/gui/Src/Gui/MemoryMapView.cpp
View File

@ -24,6 +24,7 @@ MemoryMapView::MemoryMapView(StdTable* parent)
addColumnAt(8 + charwidth * 2 * sizeof(duint), tr("Address"), false, tr("Address")); //addr addColumnAt(8 + charwidth * 2 * sizeof(duint), tr("Address"), false, tr("Address")); //addr
addColumnAt(8 + charwidth * 2 * sizeof(duint), tr("Size"), false, tr("Size")); //size addColumnAt(8 + charwidth * 2 * sizeof(duint), tr("Size"), false, tr("Size")); //size
addColumnAt(8 + charwidth * 32, tr("Info"), false, tr("Page Information")); //page information addColumnAt(8 + charwidth * 32, tr("Info"), false, tr("Page Information")); //page information
addColumnAt(8 + charwidth * 28, tr("Content"), false, tr("Content of section")); //content of section
addColumnAt(8 + charwidth * 5, tr("Type"), false, tr("Allocation Type")); //allocation type addColumnAt(8 + charwidth * 5, tr("Type"), false, tr("Allocation Type")); //allocation type
addColumnAt(8 + charwidth * 11, tr("Protection"), false, tr("Current Protection")); //current protection addColumnAt(8 + charwidth * 11, tr("Protection"), false, tr("Current Protection")); //current protection
addColumnAt(8 + charwidth * 8, tr("Initial"), false, tr("Allocation Protection")); //allocation protection addColumnAt(8 + charwidth * 8, tr("Initial"), false, tr("Allocation Protection")); //allocation protection
@ -338,21 +339,31 @@ void MemoryMapView::refreshMap()
wS = QString((wMemMapStruct.page)[wI].info); wS = QString((wMemMapStruct.page)[wI].info);
setCellContent(wI, 2, wS); setCellContent(wI, 2, wS);
// State // Content
switch(wMbi.State) if(wS.contains(".bss"))
{ wS = QString("Uninitialized data");
case MEM_FREE: else if(wS.contains(".data"))
wS = QString("FREE"); wS = QString("Initialized data");
break; else if(wS.contains(".edata"))
case MEM_COMMIT: wS = QString("Export tables");
wS = QString("COMM"); else if(wS.contains(".idata"))
break; wS = QString("Import tables");
case MEM_RESERVE: else if(wS.contains(".pdata"))
wS = QString("RESV"); wS = QString("Exception information");
break; else if(wS.contains(".rdata"))
default: wS = QString("Read-only initialized data");
wS = QString("????"); else if(wS.contains(".reloc"))
} wS = QString("Base relocations");
else if(wS.contains(".rsrc"))
wS = QString("Resources");
else if(wS.contains(".text"))
wS = QString("Executable code");
else if(wS.contains(".tls"))
wS = QString("Thread-local storage");
else if(wS.contains(".xdata"))
wS = QString("Exception information");
else
wS = QString("");
setCellContent(wI, 3, wS); setCellContent(wI, 3, wS);
// Type // Type
@ -371,15 +382,15 @@ void MemoryMapView::refreshMap()
wS = QString("N/A"); wS = QString("N/A");
break; break;
} }
setCellContent(wI, 3, wS); setCellContent(wI, 4, wS);
// current access protection // current access protection
wS = getProtectionString(wMbi.Protect); wS = getProtectionString(wMbi.Protect);
setCellContent(wI, 4, wS); setCellContent(wI, 5, wS);
// allocation protection // allocation protection
wS = getProtectionString(wMbi.AllocationProtect); wS = getProtectionString(wMbi.AllocationProtect);
setCellContent(wI, 5, wS); setCellContent(wI, 6, wS);
} }
if(wMemMapStruct.page != 0) if(wMemMapStruct.page != 0)

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

@ -242,7 +242,7 @@ Configuration::Configuration() : QObject(), noMoreMsgbox(false)
AbstractTableView::setupColumnConfigDefaultValue(guiUint, "MemoryBreakpoint", 10); AbstractTableView::setupColumnConfigDefaultValue(guiUint, "MemoryBreakpoint", 10);
AbstractTableView::setupColumnConfigDefaultValue(guiUint, "DLLBreakpoint", 8); AbstractTableView::setupColumnConfigDefaultValue(guiUint, "DLLBreakpoint", 8);
AbstractTableView::setupColumnConfigDefaultValue(guiUint, "ExceptionBreakpoint", 8); AbstractTableView::setupColumnConfigDefaultValue(guiUint, "ExceptionBreakpoint", 8);
AbstractTableView::setupColumnConfigDefaultValue(guiUint, "MemoryMap", 7); AbstractTableView::setupColumnConfigDefaultValue(guiUint, "MemoryMap", 8);
AbstractTableView::setupColumnConfigDefaultValue(guiUint, "CallStack", 4); AbstractTableView::setupColumnConfigDefaultValue(guiUint, "CallStack", 4);
AbstractTableView::setupColumnConfigDefaultValue(guiUint, "SEH", 4); AbstractTableView::setupColumnConfigDefaultValue(guiUint, "SEH", 4);
AbstractTableView::setupColumnConfigDefaultValue(guiUint, "Script", 3); AbstractTableView::setupColumnConfigDefaultValue(guiUint, "Script", 3);