astrelsky / Ghidra-Cpp-Class-Analyzer

Ghidra C++ Class and Run Time Type Information Analyzer
MIT License
633 stars 46 forks source link

PDB Build Breakage #23

Closed MeFisto94 closed 4 years ago

MeFisto94 commented 4 years ago

Commit https://github.com/NationalSecurityAgency/ghidra/commit/b816f4a939502942067e1d3ec4bdf3b964e1c20d has some refactorings that mess up imports and potentially more. I'll try to get it working locally and maybe submit a PR :)

MeFisto94 commented 4 years ago

Okay that was quick, another breakage stems from your PR to Ghidra. The Changes are too small to mess with a PR, but here's a diff for your convenience:

diff --git a/src/main/java/cppclassanalyzer/analysis/vs/VsConstructorAnalysisCmd.java b/src/main/java/cppclassanalyzer/analysis/vs/VsConstructorAnalysisCmd.java
index aeffa13..95dfc64 100644
--- a/src/main/java/cppclassanalyzer/analysis/vs/VsConstructorAnalysisCmd.java
+++ b/src/main/java/cppclassanalyzer/analysis/vs/VsConstructorAnalysisCmd.java
@@ -7,7 +7,7 @@ import ghidra.app.cmd.data.rtti.Vtable;
 import ghidra.app.cmd.data.rtti.gcc.ClassTypeInfoUtils;
 import ghidra.app.cmd.function.CreateFunctionCmd;
 import ghidra.app.util.XReferenceUtil;
-import ghidra.app.util.bin.format.pdb.PdbProgramAttributes;
+import ghidra.app.util.pdb.PdbProgramAttributes;
 import ghidra.program.model.address.Address;
 import ghidra.program.model.address.AddressSetView;
 import ghidra.program.model.data.InvalidDataTypeException;
diff --git a/src/main/java/cppclassanalyzer/vs/RttiModelWrapper.java b/src/main/java/cppclassanalyzer/vs/RttiModelWrapper.java
index 4ac73f6..0123240 100644
--- a/src/main/java/cppclassanalyzer/vs/RttiModelWrapper.java
+++ b/src/main/java/cppclassanalyzer/vs/RttiModelWrapper.java
@@ -190,7 +190,7 @@ public final class RttiModelWrapper implements VsClassTypeInfo {

        @Override
        public String getIdentifier() {
-               return RttiAnalyzer.TYPE_INFO_STRING;
+               return RttiUtil.TYPE_INFO_STRING;
        }

        @Override
astrelsky commented 4 years ago

Thank you. I have a few local changes I haven't pushed yet that includes this. I'll try and get them through this morning. Alternatively if you wish to submit a pr I can merge it in now.

astrelsky commented 4 years ago

This should be fixed now. Thank you!