mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/GP-3223_ghidra_LaunchFunctionDefEditFromCompositeEditor' into
patch (#4541)
This commit is contained in:
Ryan Kurtz
2023-05-22 15:29:18 -04:00
parent 69549f576f a52d2244f4
commit dd85623f3d
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompositeEditorModel.java
View File

@@ -941,7 +941,8 @@ public abstract class CompositeEditorModel extends CompositeViewerModel implemen
}
return ((baseDt != null) && !(baseDt instanceof BuiltInDataType) &&
!(baseDt instanceof MissingBuiltInDataType) &&
((baseDt instanceof Structure) || baseDt instanceof Union || baseDt instanceof Enum));
((baseDt instanceof Structure) || (baseDt instanceof Union) ||
(baseDt instanceof Enum) || (baseDt instanceof FunctionDefinition)));
}
@Override

15
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/EditComponentAction.java
View File

@@ -19,7 +19,6 @@ import docking.ActionContext;
import ghidra.app.plugin.core.datamgr.util.DataTypeUtils;
import ghidra.app.services.DataTypeManagerService;
import ghidra.program.model.data.*;
import ghidra.program.model.data.Enum;
/**
* Action for use in the composite data type editor.
@@ -49,17 +48,15 @@ public class EditComponentAction extends CompositeEditorTableAction {
return;
}
if (!model.isEditComponentAllowed()) {
model.setStatus("Can only edit a structure, union, enum or function-definition.");
return;
}
DataTypeComponent comp = model.getComponent(row);
DataType clickedType = comp.getDataType();
DataType dt = DataTypeUtils.getBaseDataType(clickedType);
boolean isEditableType =
(dt instanceof Structure) || (dt instanceof Union) || (dt instanceof Enum);
if (isEditableType) {
edit(dt, clickedType.getName());
}
else {
model.setStatus("Can only edit a structure, union or enum.");
}
edit(dt, clickedType.getName());
requestTableFocus();
}