Follow functions into both primary and secondary programs when double clicking

ubfx · ubfx · commit 8eeb81d6c422 · 2025-02-12T22:38:40.000+01:00
Fix #32
diff --git a/src/main/java/bindiffhelper/BinDiffHelperProvider.java b/src/main/java/bindiffhelper/BinDiffHelperProvider.java
@@ -49,10 +49,14 @@
 import docking.wizard.WizardManager;
 import ghidra.app.decompiler.DecompInterface;
 import ghidra.app.decompiler.DecompileResults;
+import ghidra.app.events.ProgramLocationPluginEvent;
 import ghidra.app.services.CodeViewerService;
 import ghidra.framework.cmd.Command;
+import ghidra.framework.model.DomainFile;
 import ghidra.framework.model.Project;
 import ghidra.framework.plugintool.ComponentProviderAdapter;
+import ghidra.framework.plugintool.PluginEvent;
+import ghidra.framework.plugintool.PluginTool;
 import ghidra.program.model.address.Address;
 import ghidra.program.model.address.AddressSpace;
 import ghidra.program.model.listing.Function;
@@ -213,6 +217,7 @@ protected boolean isMetadataVersionOK(Connection c) throws Exception {
 	}
 
 	public class DiffState {
+		DomainFile df;
 		BinExport2File beFile;
 		Program prog;
 		String addressCol, filename, exefilename, hash;
@@ -394,11 +399,21 @@ protected void doDiffWork() {
 			public void mousePressed(MouseEvent e) {
 				if (e.getClickCount() == 2 && table.getSelectedRow() != -1) {
 					var entry = ctm.getEntry(table.getSelectedRow());
-					cvs.goTo(new ProgramLocation(program, entry.primaryAddress), true);
-					if (secondary.prog != null) {
+					//cvs.goTo(new ProgramLocation(program, entry.primaryAddress), true);
+					PluginEvent ev = new ProgramLocationPluginEvent(null, new ProgramLocation(program, entry.primaryAddress), program);
+					tool.firePluginEvent(ev);
+					
+					if (secondary.prog != null && secondary.df != null) {
 						Address secAddress = secondary.prog.getAddressFactory().getDefaultAddressSpace()
 								.getAddress(entry.secondaryAddress);
-						secondary.cvs.goTo(new ProgramLocation(secondary.prog, secAddress), true);
+						//secondary.cvs.goTo(new ProgramLocation(secondary.prog, secAddress), true);
+						PluginEvent secev = new ProgramLocationPluginEvent(null, new ProgramLocation(secondary.prog, secAddress), secondary.prog);
+						
+						for (var consumer : secondary.df.getConsumers()) {
+							if (consumer instanceof PluginTool pt)
+								pt.firePluginEvent(secev);
+						}
+						tool.firePluginEvent(secev);
 					}
 				}
 				if (secondary.prog != null && e.getClickCount() == 3 && table.getSelectedRow() != -1) {
diff --git a/src/main/java/bindiffhelper/DiffWizard.java b/src/main/java/bindiffhelper/DiffWizard.java
@@ -390,6 +390,10 @@ public CodeViewerService getCvs() {
 	public Program getProg() {
 		return program;
 	}
+	
+	public DomainFile getDf() {
+		return tp.getSelectedDomainFile();
+	}
 }
 
 class DiffPanelManager implements PanelManager {
@@ -516,18 +520,27 @@ public void finish() throws IllegalPanelStateException {
 
 			plugin.provider.secondary.cvs = program2Panel.getCvs();
 			plugin.provider.secondary.prog = program2Panel.getProg();
+			plugin.provider.secondary.df = program2Panel.getDf();
 			plugin.provider.doDiffWork();
 			wizardMgr.close();
 		} else {
 			// from project
-			plugin.callBinDiff(fromProjectPanel.getDf(), files -> {
+			DomainFile df = fromProjectPanel.getDf();
+			plugin.callBinDiff(df, files -> {
 				if (files != null) {
 					try {
 						plugin.provider.openExternalDBWithBinExports(files[2].getAbsolutePath(), files[0], files[1]);
 					} catch (Exception e) {
 						e.printStackTrace();
 					}
-
+					plugin.provider.secondary.df = df;
+					try {
+						var dof = df.getReadOnlyDomainObject(plugin, DomainFile.DEFAULT_VERSION, TaskMonitor.DUMMY);
+						if (dof instanceof Program p)
+							plugin.provider.secondary.prog = p;
+					} catch (Exception e) {
+						
+					}
 					plugin.provider.doDiffWork();
 					wizardMgr.close();
 				}
