diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp index 47759b75196..97f1c9c72d7 100644 --- a/cli/cmdlineparser.cpp +++ b/cli/cmdlineparser.cpp @@ -1184,7 +1184,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a } if (projectType == ImportProject::Type::COMPILE_DB) mSettings.maxConfigsProject = 1; - if (projectType == ImportProject::Type::VS_SLN || projectType == ImportProject::Type::VS_VCXPROJ) { + if (projectType == ImportProject::Type::VS_SLN || projectType == ImportProject::Type::VS_SLNX || projectType == ImportProject::Type::VS_VCXPROJ) { mSettings.libraries.emplace_back("windows"); } for (const auto &error : project.errors) @@ -1210,7 +1210,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a mLogger.printError("--project-configuration parameter is empty."); return Result::Fail; } - if (projectType != ImportProject::Type::VS_SLN && projectType != ImportProject::Type::VS_VCXPROJ) { + if (projectType != ImportProject::Type::VS_SLN && projectType != ImportProject::Type::VS_SLNX && projectType != ImportProject::Type::VS_VCXPROJ) { mLogger.printError("--project-configuration has no effect - no Visual Studio project provided."); return Result::Fail; } @@ -1645,7 +1645,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a mSettings.platform.defaultSign = defaultSign; if (!mSettings.analyzeAllVsConfigs) { - if (projectType != ImportProject::Type::VS_SLN && projectType != ImportProject::Type::VS_VCXPROJ) { + if (projectType != ImportProject::Type::VS_SLN && projectType != ImportProject::Type::VS_SLNX && projectType != ImportProject::Type::VS_VCXPROJ) { if (mAnalyzeAllVsConfigsSetOnCmdLine) { mLogger.printError("--no-analyze-all-vs-configs has no effect - no Visual Studio project provided."); return Result::Fail; @@ -1931,13 +1931,13 @@ void CmdLineParser::printHelp(bool premium) const oss << " --project= Run Cppcheck on project. The can be a Visual\n" - " Studio Solution (*.sln), Visual Studio Project\n" + " Studio Solution (*.sln) or (*.slnx), Visual Studio Project\n" " (*.vcxproj), compile database (compile_commands.json),\n" " or Borland C++ Builder 6 (*.bpr). The files to analyse,\n" " include paths, defines, platform and undefines in\n" " the specified file will be used.\n" " --project-configuration=\n" - " If used together with a Visual Studio Solution (*.sln)\n" + " If used together with a Visual Studio Solution (*.sln) or (*.slnx)\n" " or Visual Studio Project (*.vcxproj) you can limit\n" " the configuration cppcheck should check.\n" " For example: '--project-configuration=Release|Win32'\n" diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index 6926183974b..eb06d07a905 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -767,7 +767,7 @@ QStringList MainWindow::selectFilesToAnalyze(QFileDialog::FileMode mode) QMap filters; filters[tr("C/C++ Source")] = FileList::getDefaultFilters().join(" "); filters[tr("Compile database")] = compile_commands_json; - filters[tr("Visual Studio")] = "*.sln *.vcxproj"; + filters[tr("Visual Studio")] = "*.sln *.slnx *.vcxproj"; filters[tr("Borland C++ Builder 6")] = "*.bpr"; QString lastFilter = mSettings->value(SETTINGS_LAST_ANALYZE_FILES_FILTER).toString(); selected = QFileDialog::getOpenFileNames(this, @@ -810,13 +810,14 @@ void MainWindow::analyzeFiles() const QString file0 = (!selected.empty() ? selected[0].toLower() : QString()); if (file0.endsWith(".sln") + || file0.endsWith(".slnx") || file0.endsWith(".vcxproj") || file0.endsWith(compile_commands_json) || file0.endsWith(".bpr")) { ImportProject p; p.import(selected[0].toStdString()); - if (file0.endsWith(".sln")) { + if (file0.endsWith(".sln") || file0.endsWith(".slnx")) { QStringList configs; for (auto it = p.fileSettings.cbegin(); it != p.fileSettings.cend(); ++it) { const QString cfg(QString::fromStdString(it->cfg)); @@ -1969,6 +1970,7 @@ void MainWindow::analyzeProject(const ProjectFile *projectFile, const QStringLis switch (result) { case ImportProject::Type::COMPILE_DB: case ImportProject::Type::VS_SLN: + case ImportProject::Type::VS_SLNX: case ImportProject::Type::VS_VCXPROJ: case ImportProject::Type::BORLAND: case ImportProject::Type::CPPCHECK_GUI: diff --git a/gui/projectfiledialog.cpp b/gui/projectfiledialog.cpp index bfa351722ec..55daf0948b8 100644 --- a/gui/projectfiledialog.cpp +++ b/gui/projectfiledialog.cpp @@ -112,7 +112,7 @@ static std::string suppressionAsText(const SuppressionList::Suppression& s) QStringList ProjectFileDialog::getProjectConfigs(const QString &fileName) { - if (!fileName.endsWith(".sln") && !fileName.endsWith(".vcxproj")) + if (!fileName.endsWith(".sln") && !fileName.endsWith(".slnx") && !fileName.endsWith(".vcxproj")) return QStringList(); QStringList ret; ImportProject importer; @@ -612,7 +612,7 @@ void ProjectFileDialog::updatePathsAndDefines() { const QString &fileName = mUI->mEditImportProject->text(); const bool importProject = !fileName.isEmpty(); - const bool hasConfigs = fileName.endsWith(".sln") || fileName.endsWith(".vcxproj"); + const bool hasConfigs = fileName.endsWith(".sln") || fileName.endsWith(".slnx") || fileName.endsWith(".vcxproj"); mUI->mBtnClearImportProject->setEnabled(importProject); mUI->mListCheckPaths->setEnabled(!importProject); mUI->mListIncludeDirs->setEnabled(!importProject); @@ -642,7 +642,7 @@ void ProjectFileDialog::browseImportProject() const QFileInfo inf(mProjectFile->getFilename()); const QDir &dir = inf.absoluteDir(); QMap filters; - filters[tr("Visual Studio")] = "*.sln *.vcxproj"; + filters[tr("Visual Studio")] = "*.sln *.slnx *.vcxproj"; filters[tr("Compile database")] = "compile_commands.json"; filters[tr("Borland C++ Builder 6")] = "*.bpr"; QString fileName = QFileDialog::getOpenFileName(this, tr("Import Project"), diff --git a/lib/importproject.cpp b/lib/importproject.cpp index acd7842224f..30c7f16503d 100644 --- a/lib/importproject.cpp +++ b/lib/importproject.cpp @@ -187,6 +187,12 @@ ImportProject::Type ImportProject::import(const std::string &filename, Settings setRelativePaths(filename); return ImportProject::Type::VS_SLN; } + } + else if (endsWith(filename, ".slnx")) { + if (importSlnx(filename, fileFilters)) { + setRelativePaths(filename); + return ImportProject::Type::VS_SLNX; + } } else if (endsWith(filename, ".vcxproj")) { std::map variables; std::vector sharedItemsProjects; @@ -488,6 +494,54 @@ bool ImportProject::importSln(std::istream &istr, const std::string &path, const return true; } +bool ImportProject::importSlnx(const std::string& filename, const std::vector& fileFilters) +{ + tinyxml2::XMLDocument doc; + const tinyxml2::XMLError error = doc.LoadFile(filename.c_str()); + if (error != tinyxml2::XML_SUCCESS) { + errors.emplace_back(std::string("Visual Studio project file is not a valid XML - ") + tinyxml2::XMLDocument::ErrorIDToName(error)); + return false; + } + + const tinyxml2::XMLElement* const rootnode = doc.FirstChildElement(); + if (rootnode == nullptr) { + errors.emplace_back("Visual Studio project file has no XML root node"); + return false; + } + + std::map variables; + variables["SolutionDir"] = Path::simplifyPath(Path::getPathFromFilename(filename)); + + bool found = false; + std::vector sharedItemsProjects; + + for (const tinyxml2::XMLElement* node = rootnode->FirstChildElement(); node; node = node->NextSiblingElement()) { + const char* name = node->Name(); + if (std::strcmp(name, "Project") == 0) { + const char* labelAttribute = node->Attribute("Path"); + if (labelAttribute) { + std::string vcxproj(labelAttribute); + vcxproj = Path::toNativeSeparators(std::move(vcxproj)); + if (!Path::isAbsolute(vcxproj)) + vcxproj = variables["SolutionDir"] + vcxproj; + vcxproj = Path::fromNativeSeparators(std::move(vcxproj)); + if (!importVcxproj(vcxproj, variables, "", fileFilters, sharedItemsProjects)) { + errors.emplace_back("failed to load '" + vcxproj + "' from Visual Studio solution"); + return false; + } + found = true; + } + } + } + + if (!found) { + errors.emplace_back("no projects found in Visual Studio solution file"); + return false; + } + + return true; +} + namespace { struct ProjectConfiguration { explicit ProjectConfiguration(const tinyxml2::XMLElement *cfg) { diff --git a/lib/importproject.h b/lib/importproject.h index 45d17a819f7..ddf46902d29 100644 --- a/lib/importproject.h +++ b/lib/importproject.h @@ -64,6 +64,7 @@ class CPPCHECKLIB WARN_UNUSED ImportProject { FAILURE, COMPILE_DB, VS_SLN, + VS_SLNX, VS_VCXPROJ, BORLAND, CPPCHECK_GUI @@ -113,6 +114,7 @@ class CPPCHECKLIB WARN_UNUSED ImportProject { }; bool importSln(std::istream &istr, const std::string &path, const std::vector &fileFilters); + bool importSlnx(const std::string& filename, const std::vector& fileFilters); SharedItemsProject importVcxitems(const std::string &filename, const std::vector &fileFilters, std::vector &cache); bool importVcxproj(const std::string &filename, std::map &variables, const std::string &additionalIncludeDirectories, const std::vector &fileFilters, std::vector &cache); bool importVcxproj(const std::string &filename, const tinyxml2::XMLDocument &doc, std::map &variables, const std::string &additionalIncludeDirectories, const std::vector &fileFilters, std::vector &cache); diff --git a/man/manual.md b/man/manual.md index d8da119f388..7aa36132655 100644 --- a/man/manual.md +++ b/man/manual.md @@ -309,12 +309,16 @@ To ignore certain folders you can use `-i`. This will skip analysis of source fi ## Visual Studio -You can run Cppcheck on individual project files (\*.vcxproj) or on a whole solution (\*.sln) +You can run Cppcheck on individual project files (\*.vcxproj) or on a whole solution (\*.sln) or (\*.slnx) Running Cppcheck on an entire Visual Studio solution: cppcheck --project=foobar.sln +Running Cppcheck on an entire Visual Studio 2026 solution: + + cppcheck --project=foobar.slnx + Running Cppcheck on a Visual Studio project: cppcheck --project=foobar.vcxproj