yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 10:49:34 +02:00
Code Issues Releases Wiki Activity

Merge branch 'GP-1806_ryanmkurtz_PR-4021_benstone_pe-resource-menu-track-depth'

Browse source
This commit is contained in:
Ryan Kurtz 2022-03-11 13:57:42 -05:00
commit 5195a648d0
2 changed files with 43 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/MenuResourceDataType.java
View file

@ -15,8 +15,7 @@
*/
package ghidra.program.model.data;
import java.util.ArrayList;
import java.util.List;
import java.util.*;
import ghidra.docking.settings.Settings;
import ghidra.program.model.address.Address;
@ -30,7 +29,6 @@ public class MenuResourceDataType extends DynamicDataType {
private static short MF_POPUP = 0x0010;
private static short MF_END = 0x0080;
private static short LAST = 0x0090;
static {
ClassTranslator.put("ghidra.app.plugin.prototype.data.MenuResourceDataType",
@ -68,7 +66,6 @@ public class MenuResourceDataType extends DynamicDataType {
protected DataTypeComponent[] getAllComponents(MemBuffer mbIn) {
List<DataTypeComponent> comps = new ArrayList<>();
int tempOffset = 0;
boolean lastMenuItem = false;
MemBuffer memBuffer = mbIn;
short option;
@ -81,18 +78,30 @@ public class MenuResourceDataType extends DynamicDataType {
//loop through menu items and add them
boolean lastItem = false;
// keep options from parent popup menu items
Stack<Short> parentItemOptions = new Stack<>();
parentItemOptions.push((short) 0);
while (!lastItem) {
option = memBuffer.getShort(tempOffset);
tempOffset = addMenuItemTemplate(memBuffer, comps, tempOffset, option);
//last item in a menu
if (option == MF_END) {
if (lastMenuItem == true) {
lastItem = true;
if ((option & MF_POPUP) == MF_POPUP) {
// Increase the depth
parentItemOptions.push(option);
}
else if ((option & MF_END) == MF_END) {
// Decrease the depth until we have found a parent menu item that isn't also the last item
short parentOptions = parentItemOptions.pop();
while ((parentOptions & MF_END) == MF_END) {
parentOptions = parentItemOptions.pop();
}
}
//last menu
if (option == LAST) {
lastMenuItem = true;
// We have finished when there are no more parent menu items
if (parentItemOptions.size() == 0) {
lastItem = true;
}
}
}