From 0256fc4acf34f246050d4d6f145b883c3117b2b4 Mon Sep 17 00:00:00 2001
From: jonschz <17198703+jonschz@users.noreply.github.com>
Date: Sat, 31 Aug 2024 17:00:35 +0200
Subject: [PATCH] Fix Ghidra import call type (#1093)

Co-authored-by: jonschz <jonschz@users.noreply.github.com>
---
 .../ghidra_scripts/lego_util/function_importer.py  | 14 +++++++-------
 tools/ghidra_scripts/lego_util/pdb_extraction.py   |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/ghidra_scripts/lego_util/function_importer.py b/tools/ghidra_scripts/lego_util/function_importer.py
index 379d412f..45e93c8d 100644
--- a/tools/ghidra_scripts/lego_util/function_importer.py
+++ b/tools/ghidra_scripts/lego_util/function_importer.py
@@ -162,30 +162,30 @@ class FullPdbFunctionImporter(PdbFunctionImporter):
             return_type_match = True
 
         # match arguments: decide if thiscall or not, and whether the `this` type matches
-        thiscall_matches = (
+        calling_convention_match = (
             self.signature.call_type == ghidra_function.getCallingConventionName()
         )
 
         ghidra_params_without_this = list(ghidra_function.getParameters())
 
-        if thiscall_matches and self.signature.call_type == "__thiscall":
+        if calling_convention_match and self.signature.call_type == "__thiscall":
             this_argument = ghidra_params_without_this.pop(0)
-            thiscall_matches = self._this_type_match(this_argument)
+            calling_convention_match = self._this_type_match(this_argument)
 
         if self.is_stub:
             # We do not import the argument list for stubs, so it should be excluded in matches
             args_match = True
-        elif thiscall_matches:
+        elif calling_convention_match:
             args_match = self._parameter_lists_match(ghidra_params_without_this)
         else:
             args_match = False
 
         logger.debug(
-            "Matches: namespace=%s name=%s return_type=%s thiscall=%s args=%s",
+            "Matches: namespace=%s name=%s return_type=%s calling_convention=%s args=%s",
             namespace_match,
             name_match,
             return_type_match,
-            thiscall_matches,
+            calling_convention_match,
             "ignored" if self.is_stub else args_match,
         )
 
@@ -193,7 +193,7 @@ class FullPdbFunctionImporter(PdbFunctionImporter):
             name_match
             and namespace_match
             and return_type_match
-            and thiscall_matches
+            and calling_convention_match
             and args_match
         )
 
diff --git a/tools/ghidra_scripts/lego_util/pdb_extraction.py b/tools/ghidra_scripts/lego_util/pdb_extraction.py
index a45242b4..6a0db6f8 100644
--- a/tools/ghidra_scripts/lego_util/pdb_extraction.py
+++ b/tools/ghidra_scripts/lego_util/pdb_extraction.py
@@ -61,7 +61,7 @@ class PdbFunctionExtractor:
 
     _call_type_map = {
         "ThisCall": "__thiscall",
-        "C Near": "__thiscall",
+        "C Near": "default",
         "STD Near": "__stdcall",
     }