From 74103976a158a7e05e036f447d45d22d7e2f8c29 Mon Sep 17 00:00:00 2001
From: caheckman <48068198+caheckman@users.noreply.github.com>
Date: Wed, 9 Sep 2020 12:00:02 -0400
Subject: [PATCH] more wiring in

---
 .../Decompiler/certification.manifest         |   3 +++
 .../src/main/doc/decompileplugin.xml          |   9 ++++++++
 .../src/main/doc/decompileplugin_html.xsl     |   2 +-
 .../images/page_white_copy.png                | Bin 0 -> 309 bytes
 .../topics/DecompilePlugin/images/reload3.png | Bin 0 -> 979 bytes
 .../DecompilerCommentsActionFactory.java      |  21 +++++++++---------
 .../core/decompile/DecompilerProvider.java    |   2 +-
 .../actions/OverridePrototypeAction.java      |   1 -
 8 files changed, 24 insertions(+), 14 deletions(-)
 create mode 100644 Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/images/page_white_copy.png
 create mode 100644 Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/images/reload3.png

diff --git a/Ghidra/Features/Decompiler/certification.manifest b/Ghidra/Features/Decompiler/certification.manifest
index 3328c543bc..bfb6006c00 100644
--- a/Ghidra/Features/Decompiler/certification.manifest
+++ b/Ghidra/Features/Decompiler/certification.manifest
@@ -1,4 +1,5 @@
 ##VERSION: 2.0
+##MODULE IP: Crystal Clear Icons - LGPL 2.1
 ##MODULE IP: FAMFAMFAM Icons - CC 2.5
 ##MODULE IP: Oxygen Icons - LGPL 3.0
 ##MODULE IP: Tango Icons - Public Domain
@@ -53,4 +54,6 @@ src/main/help/help/topics/DecompilePlugin/images/Structnotapplied.png||GHIDRA|||
 src/main/help/help/topics/DecompilePlugin/images/camera-photo.png||Tango Icons - Public Domain|||Tango|END|
 src/main/help/help/topics/DecompilePlugin/images/decompileFunction.gif||GHIDRA||reviewed||END|
 src/main/help/help/topics/DecompilePlugin/images/page_edit.png||FAMFAMFAM Icons - CC 2.5||||END|
+src/main/help/help/topics/DecompilePlugin/images/page_white_copy.png||FAMFAMFAM Icons - CC 2.5||||END|
+src/main/help/help/topics/DecompilePlugin/images/reload3.png||Crystal Clear Icons - LGPL 2.1||||END|
 src/main/resources/images/decompileFunction.gif||GHIDRA||reviewed||END|
diff --git a/Ghidra/Features/Decompiler/src/main/doc/decompileplugin.xml b/Ghidra/Features/Decompiler/src/main/doc/decompileplugin.xml
index d732acd4c7..48dcc113e4 100644
--- a/Ghidra/Features/Decompiler/src/main/doc/decompileplugin.xml
+++ b/Ghidra/Features/Decompiler/src/main/doc/decompileplugin.xml
@@ -3367,6 +3367,15 @@
       generally where the variable is on the left-hand side of an assignment expression,
       is highlighted in a different color.  If the variable is written on multiple merging
       control-flow paths, no written token is highlighted.
+      </para>
+      <para>
+	In the following example, the token representing the first write to the
+	variable <emphasis>a</emphasis> is selected when Def-Use is chosen.
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="images/Defuse.png" width="100%" contentwidth="3.8462in" contentdepth="2.8558in" align="center"/>
+	  </imageobject>
+	</mediaobject>
       </para></listitem>
     </varlistentry>
     <varlistentry>
diff --git a/Ghidra/Features/Decompiler/src/main/doc/decompileplugin_html.xsl b/Ghidra/Features/Decompiler/src/main/doc/decompileplugin_html.xsl
index ac7773d335..c714eb520b 100644
--- a/Ghidra/Features/Decompiler/src/main/doc/decompileplugin_html.xsl
+++ b/Ghidra/Features/Decompiler/src/main/doc/decompileplugin_html.xsl
@@ -52,5 +52,5 @@
 
 <xsl:param name="admon.textlabel" select="0"/>  <!-- Don't display title for important/note tags -->
 
-<!-- <xsl:param name="admon.graphics.path" select="shared/"/>  -->
+<xsl:param name="admon.graphics.path" select="'../../shared/'"/>
 </xsl:stylesheet>
diff --git a/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/images/page_white_copy.png b/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/images/page_white_copy.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9f31a278e17993d8d4e13beac2f9d5f7b42d08f
GIT binary patch
literal 309
zcmV-50m}Y~P)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy$4Nv%R4C7N
zkxg#GFcb#A<Q_%21Hw5EM?&g?t8|A@3u~?cLP(?}@sBiJIM^nrnvECZ=aHYZ&`KuJ
zs758y%Gp3<<a0AuBoi3uxN#=Xv)!n96GnROTnGd_YE`RJRS2Gu2X{_<aYSpixkobb
z-bl|5$Gm3}qO#|`CkX+|H?KVbnL=><kbAD2OTpuD9LPN#xA_FmF`X<uzmw3UZ*H~D
z&sl~jAXO8!+C0tSo<jQ6D)&VG5i+*Z@^!UMv3Mh+r9S=u_uEaN=S{!n00000NkvXX
Hu0mjfd8B?p

literal 0
HcmV?d00001

diff --git a/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/images/reload3.png b/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/images/reload3.png
new file mode 100644
index 0000000000000000000000000000000000000000..b80c72091f65b5983642df8a262d9ddabdb41784
GIT binary patch
literal 979
zcmV;^11$WBP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#Wl2OqRCwBA
zWJqRUU=RdiULa-yVr~X0P9Bz86;YXJO+huzpZ|X{TzGx`;q$j|=KT8jZ#KhUhPMo#
zfa<;iF(U&5Kmai_7y%hvK+Flme;DMs__?-5I>dNaS~s#g$a^svC|EEli)sk{VEyIt
z?#El_pPzr8Vfe-HoZ&ab0Du5u0TE!+{xPsJ3o<w9JL&6js&g<*`#FW-`l0I#&mKIx
z`s>H9hXQ;8l1x9CjDePH1**0M>bnD^82|!^ks%eV8DyFgiv!C|;V5C2zu*5dd|vYT
z%g;+c3xQ7F0QBMypc)Q_{|p*H{!}1-55&$uU4H=rhy_SQ0{zYmqz(T_{$Y9f|0M&%
z5g_jr!%?94SD->khR+O_nWPxL@CY#+`E-TB8t8>?pqv3v)meZ5Vq}N`D%D{yWl#ok
z)qz+Di0=dO4X_~$K+Q?O@R`q~&%hul&%p5Z9s|RVM?mrKkT3uUASR&W{1_fFoMDg#
z3a|q4Tc{x*`VB)R(5Cqe3JeVY*%-LqzG0a4n}@-JK?W$t2T>0YK+Fuf3||<YGVBG~
z=)oYtAOeocbwGRw=u8%d29Rc8)PlftZ$rNn7DiULSI=MV1M<N!0T4h;U@2CHdq7u2
zF>GRZ#jpj)Kg}=~7%F89;=o{I1v>N_LzlX?da|yiK7*yRl^Cxm?=oOGD1o#B1Q0WW
zKEy9Th0hsYGF)MJ2K3#3hI|HLp!tGe<15%~*y;p51sSe0Tw{31_K<;Di&^B;-A~p)
zZ*B$%AV!9Gr~&_h_&qdDumQ0o*w92^3Z2Jj&B*Xy4X8i^DE1nt{2Gvd8_2)Na2g<h
zATIdNU<@Sdfc`%Sq<=9$+y+Y8e}V2f%y5-~he3=%g#j1~Kpq3bN`^k5OQ!*4j{yV_
z3phzKFkAp~G=T;k1+ue&sqF^PH9r{M0lme_U=ECCYj9w`0jvB24ECu&m)!%o8X$mJ
z7$D#;!%v13pwwZYO@|rS8O{Ua|2Z)2$pbZNGgv`0+HN2|&#(-r@iEw9pjQC`h!L0$
zAz|<h?0+L*;LQR$));J~I1uwg<*tIAe+g)?AJDLe;M@xgWPkudHQ*cAEy6%&rveqE
z02RoC<vs#K;se7{psmfowDAla;2;A87#IKo3;@hR^x#9ciar1U002ovPDHLkV1lJI
BoAv+z

literal 0
HcmV?d00001

diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/comments/DecompilerCommentsActionFactory.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/comments/DecompilerCommentsActionFactory.java
index f744caf862..b6a0f80089 100644
--- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/comments/DecompilerCommentsActionFactory.java
+++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/comments/DecompilerCommentsActionFactory.java
@@ -1,6 +1,5 @@
 /* ###
  * IP: GHIDRA
- * REVIEWED: YES
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,19 +15,19 @@
  */
 package ghidra.app.plugin.core.comments;
 
-import ghidra.app.context.ListingActionContext;
-import ghidra.app.context.ProgramLocationActionContext;
-import ghidra.app.decompiler.DecompilerLocation;
-import ghidra.app.plugin.core.decompile.DecompilerActionContext;
-import ghidra.program.model.address.Address;
-import ghidra.program.model.listing.CodeUnit;
-import ghidra.program.util.*;
-import ghidra.util.HelpLocation;
-
 import java.awt.event.KeyEvent;
 
 import docking.ActionContext;
 import docking.action.*;
+import ghidra.app.context.ListingActionContext;
+import ghidra.app.context.ProgramLocationActionContext;
+import ghidra.app.decompiler.DecompilerLocation;
+import ghidra.app.plugin.core.decompile.DecompilerActionContext;
+import ghidra.app.util.HelpTopics;
+import ghidra.program.model.address.Address;
+import ghidra.program.model.listing.CodeUnit;
+import ghidra.program.util.*;
+import ghidra.util.HelpLocation;
 
 public class DecompilerCommentsActionFactory extends CommentsActionFactory {
 
@@ -64,7 +63,7 @@ public class DecompilerCommentsActionFactory extends CommentsActionFactory {
             this.commentType = commentType;
             setPopupMenuData(new MenuData(new String[] { "Comments",
                     actionName + "..." }, "comments"));
-            setHelpLocation(new HelpLocation("CommentsPlugin", "Edit_Comments"));
+			setHelpLocation(new HelpLocation(HelpTopics.DECOMPILER, "ActionComments"));
         }
 
         protected int getEditCommentType(ActionContext context) {
diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/DecompilerProvider.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/DecompilerProvider.java
index af595de985..ce18481026 100644
--- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/DecompilerProvider.java
+++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/DecompilerProvider.java
@@ -172,7 +172,7 @@ public class DecompilerProvider extends NavigatableComponentProviderAdapter
 		setWindowMenuGroup("Decompile");
 		setDefaultWindowPosition(WindowPosition.RIGHT);
 		createActions(isConnected);
-		setHelpLocation(new HelpLocation(plugin.getName(), "Decompiler"));
+		setHelpLocation(new HelpLocation(HelpTopics.DECOMPILER, "DecompilerIntro"));
 		addToTool();
 
 		redecompileUpdater = new SwingUpdateManager(500, 5000, () -> doRefresh());
diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/OverridePrototypeAction.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/OverridePrototypeAction.java
index d8f6bd5355..39ddda0173 100644
--- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/OverridePrototypeAction.java
+++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/OverridePrototypeAction.java
@@ -260,7 +260,6 @@ public class OverridePrototypeAction extends AbstractDecompilerAction {
 		String signature = generateSignature(op, name);
 		PluginTool tool = context.getTool();
 		ProtoOverrideDialog dialog = new ProtoOverrideDialog(tool, func, signature, conv);
-		//     dialog.setHelpLocation( new HelpLocation( getOwner(), "Edit_Function_Signature" ) );
 		tool.showDialog(dialog);
 		FunctionDefinition fdef = dialog.getFunctionDefinition();
 		if (fdef == null) {