add support for Folders and skip non C++ projects

Author: IOBYTE

lib/importproject.cpp

@@ -529,27 +529,48 @@ bool ImportProject::importSlnx(const std::string& filename, const std::vector<st
         return false;
     }
 
+    if (std::strcmp(rootnode->Name(), "Solution") != 0) {
+        errors.emplace_back("Invalid Visual Studio solution file format");
+        return false;
+    }
+
     std::map<std::string, std::string, cppcheck::stricmp> variables;
     variables["SolutionDir"] = Path::simplifyPath(Path::getPathFromFilename(filename));
 
     bool found = false;
     std::vector<SharedItemsProject> sharedItemsProjects;
 
+    auto processProject = [&](const tinyxml2::XMLElement* projectNode) {
+        const char* pathAttribute = projectNode->Attribute("Path");
+        if (pathAttribute == nullptr)
+            return;
+
+        std::string vcxproj(pathAttribute);
+        vcxproj = Path::toNativeSeparators(std::move(vcxproj));
+
+        if (Path::getFilenameExtensionInLowerCase(vcxproj) != ".vcxproj")
+            return; // skip other project types
+
+        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;
+        }
+        found = true;
+    };
+
     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;
+            processProject(node);
+        } else if (std::strcmp(name, "Folder") == 0) {
+            for (const tinyxml2::XMLElement* childNode = node->FirstChildElement(); childNode; childNode = childNode->NextSiblingElement()) {
+                if (std::strcmp(childNode->Name(), "Project") == 0) {
+                    processProject(childNode);
                 }
-                found = true;
             }
         }
     }