x64dbg
/
x64dbg
1
0
Fork 0
Code Releases 2 Activity

Merge pull request #3233 from x64dbg/fix-3198 

Fix #3198: Implement GuiSelectionSet for GUI_MEMMAP
development
Duncan Ogilvie 2023-10-05 13:27:27 +02:00 committed by GitHub
parent 3e1b3d61bc f6c3e4219a
commit 56ee888a0b
Signed by: GitHub
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/Src/Bridge/Bridge.cpp
View File

@ -576,6 +576,9 @@ void* Bridge::processMessage(GUIMSG type, void* param1, void* param2)
case GUI_STACK:
emit selectionStackSet(selection);
break;
case GUI_MEMMAP:
emit selectionMemmapSet(selection);
break;
default:
return (void*)false;
}

1
src/gui/Src/Bridge/Bridge.h
View File

@ -123,6 +123,7 @@ signals:
void selectionStackSet(const SELECTIONDATA* selection);
void selectionGraphGet(SELECTIONDATA* selection);
void selectionMemmapGet(SELECTIONDATA* selection);
void selectionMemmapSet(const SELECTIONDATA* selection);
void selectionSymmodGet(SELECTIONDATA* selection);
void getStrWindow(const QString title, QString* text);
void autoCompleteAddCmd(const QString cmd);

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

@ -37,6 +37,7 @@ MemoryMapView::MemoryMapView(StdTable* parent)
connect(Bridge::getBridge(), SIGNAL(dbgStateChanged(DBGSTATE)), this, SLOT(stateChangedSlot(DBGSTATE)));
connect(Bridge::getBridge(), SIGNAL(selectInMemoryMap(duint)), this, SLOT(selectAddress(duint)));
connect(Bridge::getBridge(), SIGNAL(selectionMemmapGet(SELECTIONDATA*)), this, SLOT(selectionGetSlot(SELECTIONDATA*)));
connect(Bridge::getBridge(), SIGNAL(selectionMemmapSet(const SELECTIONDATA*)), this, SLOT(selectionSetSlot(const SELECTIONDATA*)));
connect(Bridge::getBridge(), SIGNAL(disassembleAt(duint, duint)), this, SLOT(disassembleAtSlot(duint, duint)));
connect(Bridge::getBridge(), SIGNAL(focusMemmap()), this, SLOT(setFocus()));
connect(this, SIGNAL(contextMenuSignal(QPoint)), this, SLOT(contextMenuSlot(QPoint)));
@ -736,6 +737,47 @@ void MemoryMapView::selectionGetSlot(SELECTIONDATA* selection)
Bridge::getBridge()->setResult(BridgeResult::SelectionGet, 1);
}
void MemoryMapView::selectionSetSlot(const SELECTIONDATA* selection)
{
const auto rowCount = getRowCount();
if(rowCount == 0)
{
Bridge::getBridge()->setResult(BridgeResult::SelectionSet, 0);
return;
}
const auto badIndex = (duint) - 1;
duint firstIdx = badIndex;
duint lastIdx = badIndex;
for(duint row = 0; row < rowCount; row++)
{
const duint addrStart = getCellUserdata(row, ColAddress);
if(addrStart < selection->start)
continue;
const duint addrEnd = addrStart + getCellUserdata(row, ColSize);
if(addrEnd > selection->end)
break;
if(firstIdx == badIndex)
firstIdx = row;
lastIdx = row;
}
if(firstIdx == badIndex || lastIdx == badIndex)
{
Bridge::getBridge()->setResult(BridgeResult::SelectionSet, 0);
return;
}
setSingleSelection(firstIdx);
expandSelectionUpTo(lastIdx);
reloadData();
Bridge::getBridge()->setResult(BridgeResult::SelectionSet, 1);
}
void MemoryMapView::disassembleAtSlot(duint va, duint cip)
{
Q_UNUSED(va)

1
src/gui/Src/Gui/MemoryMapView.h
View File

@ -39,6 +39,7 @@ public slots:
void addVirtualModSlot();
void findReferencesSlot();
void selectionGetSlot(SELECTIONDATA* selection);
void selectionSetSlot(const SELECTIONDATA* selection);
void disassembleAtSlot(duint va, duint cip);
private: