From 61de7357d988b6d1685ec20bc897ce159c53597f Mon Sep 17 00:00:00 2001 From: disinvite Date: Sun, 2 Mar 2025 12:46:28 -0500 Subject: [PATCH] Make sure import entities have a name --- reccmp/isledecomp/compare/core.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/reccmp/isledecomp/compare/core.py b/reccmp/isledecomp/compare/core.py index eab6abef..a934a5be 100644 --- a/reccmp/isledecomp/compare/core.py +++ b/reccmp/isledecomp/compare/core.py @@ -534,13 +534,23 @@ def _match_imports(self): for dll, name, addr in self.orig_bin.imports: import_name = f"{dll.upper()}:{name}" batch.set_orig( - addr, import_name=import_name, size=4, type=EntityType.IMPORT + addr, + name=f"__imp__{name}", + import_name=import_name, + size=4, + type=EntityType.IMPORT, ) for dll, name, addr in self.recomp_bin.imports: + # TODO: recomp imports should already have a name from the PDB + # but set it anyway to avoid problems later. import_name = f"{dll.upper()}:{name}" batch.set_recomp( - addr, import_name=import_name, size=4, type=EntityType.IMPORT + addr, + name=f"__imp__{name}", + import_name=import_name, + size=4, + type=EntityType.IMPORT, ) # Combine these two dictionaries. We don't care about imports from recomp