diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ExporterPlugin/exporter.htm b/Ghidra/Features/Base/src/main/help/help/topics/ExporterPlugin/exporter.htm index fd5950f946..f6bbdec7bd 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ExporterPlugin/exporter.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/ExporterPlugin/exporter.htm @@ -24,7 +24,9 @@
  • C/C++
    • -
  • Ghidra Zip File (.gzf)
    • +
  • Ghidra Zip File (GZF)
    • + +
  • Ghidra Data Type Archive File (GDT)
  • HTML
    • @@ -58,6 +60,16 @@
  • Press the OK button to perform the export.
    • + +

    In preparation for a file export, a selected project + file may be opened in an attempt to support export formats that require an open + file. If the selected file requires an upgrade a warning dialog + will be displayed and the affected export formats will not be available until an upgrade + is perfored, however a direct packed format of the project file may still be chosen + without performing the upgrade first (e.g., Ghidra Zip File (GZF), + Ghidra Zip File (GZF)). +

    +

    To export from the CodeBrowser tool:

    @@ -276,12 +288,28 @@ -

    Ghidra Zip File (.gzf)

    +

    Ghidra Zip File (GZF)

    -

    Creates a zip file from a program in your project. You may want to create a zip file +

    Creates a GZF file from a Program in your project. You may want to create a GZF file so that you can give it to another user who can then import into their project.

    + "help/topics/ImporterPlugin/importer.htm">import into their project. A program + export of this format from the Project Window will be based on the current saved file + content and bypass any potential upgrade that may be required by other formats. +

    +
    + +

    Ghidra Data Type Archive File (GDT)

    + +
    +

    Creates a GDT file from a Data Type Archive in your project. You may want to create a GDT file + so that you can give it to another user who can then import into their project or open directly + via the Data Type Manager as a + File Data Type Archive. + A project Data Type Archive export of this format from the Project Window will be based on + the current saved file content and bypass any potential upgrade that may be required by other formats. +

    HTML

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ImporterPlugin/importer.htm b/Ghidra/Features/Base/src/main/help/help/topics/ImporterPlugin/importer.htm index b54c4b83e6..20f9a560bf 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ImporterPlugin/importer.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/ImporterPlugin/importer.htm @@ -36,8 +36,8 @@
  • Dump File Loader
  • DYLD Shared Cache
  • Executable and Linking Format (ELF)
    • -
  • Ghidra Data Type Archive Format
    • -
  • GZF Input Format
    • +
  • Ghidra Data Type Archive File (GDT)
    • +
  • Ghidra Zip File (GZF)
  • Intel Hex
  • Java Class File
  • Mac OS X Mach-O
    • @@ -81,14 +81,40 @@
  • Use the Importer Dialog (or the Batch Importer Dialog if it is an archive) that pops up to - configure the import.
    • + perform the import. -
  • Press OK to initiate the import.
    • +
  • Press OK from the Importer Dialog to perform the import.
  • A results summary dialog will appear and, if successful, the new program will appear in the project window and if initiated from a CodeBrowser tool, it will be opened in the tool.
    • + +

    Alternative Steps (drag-and-drop):

    + + +

    Batch Import

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/OverviewPlugin/Overview.htm b/Ghidra/Features/Base/src/main/help/help/topics/OverviewPlugin/Overview.htm index fe99903c45..7e9cf8e898 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/OverviewPlugin/Overview.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/OverviewPlugin/Overview.htm @@ -81,10 +81,8 @@

    The legend indicates the colors that correspond to each type of program element shown in - the overview display. The colors are specified as options and can be changed from the default - values. To change the colors, click on the color, or edit the options through the Edit - Options... dialog. You can choose the color from a - color chooser dialog.

    + the overview display. The colors used may be changed via the associated + Options (see below).

    Options

    @@ -107,8 +105,8 @@
  • Uninitialized Color - color for memory that is not initialized
    • -

    To view the options, select Edit Options... on - the tool, then choose the Overview node in the options tree. To change a color, double +

    To view the options, select Edit Tool Options... on + the tool, then choose the Overview node in the options tree. To change a color, double click on the color bar in the Overview Options panel. Choose the color from the color chooser dialog.

    diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/DataTypeManagerPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/DataTypeManagerPlugin.java index 78a4c543d7..d8632e17e8 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/DataTypeManagerPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/DataTypeManagerPlugin.java @@ -242,7 +242,7 @@ public class DataTypeManagerPlugin extends ProgramPlugin Project project = tool.getProjectManager().getActiveProject(); if (project != null && project.getName().equals(projectName)) { DomainFile df = project.getProjectData().getFile(pathname); - if (DataTypeArchive.class.isAssignableFrom(df.getDomainObjectClass())) { + if (df != null && DataTypeArchive.class.isAssignableFrom(df.getDomainObjectClass())) { return df; } }