Bugfix (speedup), yet another fix for #16, setting proper values to _MSC_VER and __cplusplus

Author: VioletGiraffe

CPPCheckPlugin/AnalyzerCppcheck.cs

@@ -65,19 +65,36 @@ public override void analyze(List<SourceFile> filesToAnalyze, OutputWindowPane o
 				cppheckargs += " \"" + file.FilePath + "\"";
 			}
 
-			if (filesToAnalyze.Count > 1) // For single file only checking current configuration (for speed)
+			// Creating the list of all different macros (no duplicates)
+			HashSet<string> macros = new HashSet<string>();
+			macros.Add("__cplusplus=199711L"); // At least in VS2012, this is still 199711L
+			// Assuming all files passed here are from the same project / same toolset, which should be true, so peeking the first file for global settings
+			switch (filesToAnalyze[0].vcCompilerVersion)
+			{
+				case SourceFile.VCCompilerVersion.vc2010:
+					macros.Add("_MSC_VER=1600");
+					break;
+				case SourceFile.VCCompilerVersion.vc2012:
+					macros.Add("_MSC_VER=1700");
+					break;
+				case SourceFile.VCCompilerVersion.vc2013:
+					macros.Add("_MSC_VER=1800");
+					break;
+				case SourceFile.VCCompilerVersion.vcFuture:
+					macros.Add("_MSC_VER=1900");
+					break;
+			}
+			
+			if (filesToAnalyze.Count == 1) // For single file only checking current configuration (for speed)
 			{
-				// Creating the list of all different macros (no duplicates)
-				HashSet<string> macros = new HashSet<string>();
 				foreach (var file in filesToAnalyze)
 				{
 					foreach (string macro in file.Macros)
 						macros.Add(macro);
 				}
-				macros.Add("_MSC_VER");
 				macros.Add("WIN32");
 				macros.Add("_WIN32");
-				macros.Add("__cplusplus");
+				
 				if (is64bitConfiguration)
 				{
 					macros.Add("_M_X64");
@@ -90,12 +107,12 @@ public override void analyze(List<SourceFile> filesToAnalyze, OutputWindowPane o
 
 				if (isDebugConfiguration)
 					macros.Add("_DEBUG");
+			}
 
-				foreach (string macro in macros)
-				{
-					String macroArgument = " -D" + macro;
-					cppheckargs += macroArgument;
-				}
+			foreach (string macro in macros)
+			{
+				String macroArgument = " -D" + macro;
+				cppheckargs += macroArgument;
 			}
 
 			string analyzerPath = Properties.Settings.Default.CPPcheckPath;

CPPCheckPlugin/CPPCheckPluginPackage.cs

@@ -179,7 +179,8 @@ SourceFile createSourceFile(string filePath, Configuration targetConfig, dynamic
 			{
 				var configurationName = targetConfig.ConfigurationName;
 				dynamic config = project.Configurations.Item(configurationName);
-				SourceFile sourceForAnalysis = new SourceFile(filePath, project.ProjectDirectory.Replace(@"""", ""));
+				String toolSetName = config.PlatformToolsetShortName;
+				SourceFile sourceForAnalysis = new SourceFile(filePath, project.ProjectDirectory.Replace("\"", ""), toolSetName);
 				dynamic toolsCollection = config.Tools;
 				foreach (var tool in toolsCollection)
 				{

CPPCheckPlugin/SourceFile.cs

@@ -7,19 +7,37 @@ namespace VSPackage.CPPCheckPlugin
 {
 	class SourceFile
 	{
-		public SourceFile(string fullPath, string projectBasePath)
+		public enum VCCompilerVersion { vc2010, vc2012, vc2013, vcFuture };
+
+		public SourceFile(string fullPath, string projectBasePath, string vcCompilerName)
 		{
 			_fullPath = cleanPath(fullPath);
 			_projectBasePath = cleanPath(projectBasePath);
+
+			if (vcCompilerName.Contains("2010"))
+				_compilerVersion = VCCompilerVersion.vc2010;
+			else if (vcCompilerName.Contains("2012"))
+				_compilerVersion = VCCompilerVersion.vc2012;
+			else if (vcCompilerName.Contains("2013"))
+				_compilerVersion = VCCompilerVersion.vc2013;
+			else
+				_compilerVersion = VCCompilerVersion.vcFuture;
 		}
 
 		// All include paths being added are resolved against projectBasePath
 		public void addIncludePath(string path)
 		{
-			if (!String.IsNullOrEmpty(_projectBasePath) && !String.IsNullOrEmpty(path))
+			if (!String.IsNullOrEmpty(_projectBasePath) && !String.IsNullOrEmpty(path) && !path.Equals(".") && !path.Equals("\\\".\\\""))
 			{
-				Debug.WriteLine("Processing path: " + path);
-				_includePaths.Add(cleanPath(path.Contains(":") ? path : Path.Combine(_projectBasePath, path)));
+				Debug.WriteLine("Processing path: " + path);				
+				if (path.Contains("\\:")) // absolute path
+					_includePaths.Add(cleanPath(path));
+				else
+				{
+					// Relative path - converting to absolute
+					String pathForCombine = path.Replace("\"", String.Empty).TrimStart('\\', '/');
+					_includePaths.Add(cleanPath(Path.GetFullPath(Path.Combine(_projectBasePath, pathForCombine)))); // Workaround for Path.Combine bugs
+				}
 			}
 		}
 
@@ -71,6 +89,11 @@ public List<string> Macros
 			get { return _activeMacros; }
 		}
 
+		public VCCompilerVersion vcCompilerVersion
+		{
+			get { return _compilerVersion; }
+		}
+
 		private static string cleanPath(string path)
 		{
 			string result = path.Replace("\"", "").Replace("\\\\", "\\");
@@ -85,5 +108,6 @@ private static string cleanPath(string path)
 		private string _projectBasePath = null;
 		private List<string> _includePaths = new List<string>();
 		private List<string> _activeMacros = new List<string>();
+		private VCCompilerVersion _compilerVersion;
 	}
 }