Merge branch 'dev' into dev

1 files changed, 40 insertions, 0 deletions

diff --git a/binaryninjaapi.cpp b/binaryninjaapi.cpp
index e1dab528..68cc2f43 100644
--- a/binaryninjaapi.cpp
+++ b/binaryninjaapi.cpp
@@ -59,6 +59,17 @@ void BinaryNinja::SetBundledPluginDirectory(const string& path)
 }
 
 
+string BinaryNinja::GetInstallDirectory()
+{
+	char* path = BNGetInstallDirectory();
+	if (!path)
+		return string();
+	string result = path;
+	BNFreeString(path);
+	return result;
+}
+
+
 string BinaryNinja::GetUserPluginDirectory()
 {
 	char* path = BNGetUserPluginDirectory();
@@ -122,6 +133,26 @@ string BinaryNinja::GetVersionString()
 	return result;
 }
 
+string BinaryNinja::GetProduct()
+{
+	char* str = BNGetProduct();
+	string result = str;
+	BNFreeString(str);
+	return result;
+}
+
+string BinaryNinja::GetProductType()
+{
+	char* str = BNGetProductType();
+	string result = str;
+	BNFreeString(str);
+	return result;
+}
+
+int BinaryNinja::GetLicenseCount()
+{
+	return BNGetLicenseCount();
+}
 
 uint32_t BinaryNinja::GetBuildId()
 {
@@ -237,3 +268,12 @@ void BinaryNinja::SetWorkerThreadCount(size_t count)
 {
 	BNSetWorkerThreadCount(count);
 }
+
+
+string BinaryNinja::GetUniqueIdentifierString()
+{
+	char* str = BNGetUniqueIdentifierString();
+	string result = str;
+	BNFreeString(str);
+	return result;
+}