From 6e3f710c4ab4a5d874dc7ef6ddccb65c93b5f4f8 Mon Sep 17 00:00:00 2001
From: Glenn Smith <glenn@vector35.com>
Date: Wed, 25 May 2022 20:33:02 -0400
Subject: BinaryView::DefineTypes with type ids

---
 binaryview.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'binaryview.cpp')

diff --git a/binaryview.cpp b/binaryview.cpp
index 35097619..70d866ce 100644
--- a/binaryview.cpp
+++ b/binaryview.cpp
@@ -3250,13 +3250,14 @@ struct ProgressCallback
 };
 
 
-void BinaryView::DefineTypes(const vector<QualifiedNameAndType>& types, std::function<bool(size_t, size_t)> progress)
+void BinaryView::DefineTypes(const vector<pair<string, QualifiedNameAndType>>& types, std::function<bool(size_t, size_t)> progress)
 {
-	BNQualifiedNameAndType* apiTypes = new BNQualifiedNameAndType[types.size()];
+	BNQualifiedNameTypeAndId* apiTypes = new BNQualifiedNameTypeAndId[types.size()];
 	for (size_t i = 0; i < types.size(); i++)
 	{
-		apiTypes[i].name = types[i].name.GetAPIObject();
-		apiTypes[i].type = types[i].type->GetObject();
+		apiTypes[i].name = types[i].second.name.GetAPIObject();
+		apiTypes[i].type = types[i].second.type->GetObject();
+		apiTypes[i].id = BNAllocString(types[i].first.c_str());
 	}
 
 	ProgressCallback cb;
@@ -3271,6 +3272,7 @@ void BinaryView::DefineTypes(const vector<QualifiedNameAndType>& types, std::fun
 	for (size_t i = 0; i < types.size(); i++)
 	{
 		QualifiedName::FreeAPIObject(&apiTypes[i].name);
+		BNFreeString(apiTypes[i].id);
 	}
 	delete [] apiTypes;
 }
-- 
cgit v1.3.1