update for ghidra 11.1.1

zeroKilo · Jun 22, 2024 · 00a15ee · 00a15ee
1 parent d4e5964
commit 00a15ee
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/XEXLoaderWV/src/main/java/xexloaderwv/LoadPdbTask.java b/XEXLoaderWV/src/main/java/xexloaderwv/LoadPdbTask.java
@@ -123,12 +123,14 @@ private boolean parseWithNewParser(MessageLog log, TaskMonitor monitor) throws I
 		PdbReaderOptions pdbReaderOptions = new PdbReaderOptions(); 
 		PdbApplicatorOptions pdbApplicatorOptions = new PdbApplicatorOptions();
 		pdbApplicatorOptions.setProcessingControl(control);
-		try (AbstractPdb pdb = ghidra.app.util.bin.format.pdb2.pdbreader.PdbParser.parse(pdbFile.getAbsolutePath(), pdbReaderOptions, monitor)) 
+		try (AbstractPdb pdb = ghidra.app.util.bin.format.pdb2.pdbreader.PdbParser.parse(new File(pdbFile.getAbsolutePath()), pdbReaderOptions, monitor)) 
 		{
 			monitor.setMessage("PDB: Parsing " + pdbFile + "...");
 			pdb.deserialize();
-			DefaultPdbApplicator applicator = new DefaultPdbApplicator(pdb);
-			applicator.applyTo(program, program.getDataTypeManager(), program.getImageBase(), pdbApplicatorOptions, log);
+			DefaultPdbApplicator applicator = new DefaultPdbApplicator(pdb, program, program.getDataTypeManager(), program.getImageBase(), pdbApplicatorOptions, log);
+			applicator.applyDataTypesAndMainSymbolsAnalysis();
+			applicator.applyFunctionInternalsAnalysis();
+			DefaultPdbApplicator.applyAnalysisReporting(program);
 			return true;
 		}
 		catch (ghidra.app.util.bin.format.pdb2.pdbreader.PdbException e)