Vector35
diff --git a/‎demangle.cpp‎
Lines changed: 13 additions & 2 deletions b/‎demangle.cpp‎
Lines changed: 13 additions & 2 deletions
@@ -47,8 +47,19 @@ namespace BinaryNinja {
 	bool DemangleMS(Architecture* arch, const std::string& mangledName, Ref<Type>& outType, QualifiedName& outVarName,
 	    BinaryView* view)
 	{
-		const bool simplify = Settings::Instance()->Get<bool>("analysis.types.templateSimplifier", view);
-		return DemangleMS(arch, mangledName, outType, outVarName, simplify);
+		BNType* localType = nullptr;
+		char** localVarName = nullptr;
+		size_t localSize = 0;
+		if (!BNDemangleMSWithOptions(arch->GetObject(), mangledName.c_str(), &localType, &localVarName, &localSize,
+			view ? view->GetObject() : nullptr))
+			return false;
+		outType = localType ? new Type(localType) : nullptr;
+		for (size_t i = 0; i < localSize; i++)
+		{
+			outVarName.push_back(localVarName[i]);
+		}
+		BNFreeDemangledName(&localVarName, localSize);
+		return true;
 	}
 
 	bool DemangleMS(Architecture* arch, const std::string& mangledName, Ref<Type>& outType, QualifiedName& outVarName,