This commit is contained in:
dev747368 2021-05-17 14:37:16 -04:00
parent bb924294a1
commit 522ac50dfc
3 changed files with 5 additions and 18 deletions

View File

@ -32,16 +32,6 @@ public class PdbReaderOptions extends Exception {
// Developer turn on/off options that are in still in development.
private static final boolean developerMode = false;
// Perform logging of PDB information for debugging/development.
// NOTE: This logging mechanism is not intended to live the full life of this tool, but to
// aid in getting feedback from the field during its early development.
private static final String OPTION_NAME_PDB_READER_APPLICATOR_LOGGING =
"[Dev] PDB Reader/Applicator Debug Logging";
private static final String OPTION_DESCRIPTION_PDB_READER_APPLICATOR_LOGGING =
"If checked, logs information to the pdb.analyzer.log file for debug/development.";
private static final boolean DEFAULT_PDB_READER_APPLICATOR_LOGGING = false;
private boolean pdbLogging;
// Sets the one-byte Charset to be used for PDB processing.
// NOTE: This "Option" is not intended as a permanent part of this analyzer. Should be
// replaced by target-specific Charset.
@ -81,9 +71,6 @@ public class PdbReaderOptions extends Exception {
public void registerOptions(Options options) {
HelpLocation help = null;
options.registerOption(OPTION_NAME_PDB_READER_APPLICATOR_LOGGING, pdbLogging, null,
OPTION_DESCRIPTION_PDB_READER_APPLICATOR_LOGGING);
if (developerMode) {
options.registerOption(OPTION_NAME_ONE_BYTE_CHARSET_NAME, oneByteCharsetName, help,
OPTION_DESCRIPTION_ONE_BYTE_CHARSET_NAME);
@ -94,8 +81,6 @@ public class PdbReaderOptions extends Exception {
public void loadOptions(Options options) {
pdbLogging = options.getBoolean(OPTION_NAME_PDB_READER_APPLICATOR_LOGGING, pdbLogging);
if (developerMode) {
oneByteCharsetName =
options.getString(OPTION_NAME_ONE_BYTE_CHARSET_NAME, oneByteCharsetName);
@ -110,7 +95,6 @@ public class PdbReaderOptions extends Exception {
* Set the options to their default values
*/
public void setDefaults() {
pdbLogging = DEFAULT_PDB_READER_APPLICATOR_LOGGING;
oneByteCharsetName = DEFAULT_ONE_BYTE_CHARSET_NAME;
wideCharCharsetName = DEFAULT_TWO_BYTE_CHARSET_NAME;
setOneByteCharsetForName(oneByteCharsetName);

View File

@ -546,6 +546,9 @@ public class LoadPdbDialog extends DialogComponentProvider {
universalParserButton.setSelected(false);
}
applicatorControlCombo.setEnabled(universalParserButton.isSelected());
if (!applicatorControlCombo.isEnabled()) {
applicatorControlCombo.setSelectedItem(PdbApplicatorControl.ALL);
}
}
private JPanel buildParserOptionsPanel() {
@ -647,7 +650,7 @@ public class LoadPdbDialog extends DialogComponentProvider {
return hasPerformedSearch && advancedToggleButton.isSelected() &&
remoteSymbolServerCount != 0 && !findOptions.contains(FindOption.ALLOW_REMOTE)
? new StatusText(
"Remote servers were excluded. Select \"Allow remote\" checkbox to search remote servers.",
"Remote servers were excluded. Select \"Allow Remote\" checkbox to search remote servers.",
MessageType.INFO, false)
: null;
}

View File

@ -108,5 +108,5 @@ VMARGS=--illegal-access=permit
# Limit on XML parsing. See https://docs.oracle.com/javase/tutorial/jaxp/limits/limits.html
#VMARGS=-Djdk.xml.totalEntitySizeLimit=50000000
# Enables debug logging during Pdb import and analysis
# Enables Pdb debug logging during import and analysis to .ghidra/.ghidra_ver/pdb.analyzer.log
#VMARGS=-Dpdb.logging=true