Integrate Path with GameTree and binary

noisecode3 · noisecode3 · commit c4fa1e5ac8b8 · 2025-08-05T16:32:26.000+02:00
diff --git a/src/FileManager.cpp b/src/FileManager.cpp
@@ -265,12 +265,10 @@ bool FileManager::extractZip(
 }
 
 Path FileManager::getExtraPathToExe(Path path) {
-    const QString s = path.get();
-    qDebug() << "levelPath :" << s;
+    qDebug() << "levelPath :" << path.get();
 
     StaticTrees staticTrees;
-    QDir dir(s);
-    GameFileTree tree(dir);
+    GameFileTree tree(path);
     tree.printTree(1);
 
     QStringList extraPath;
diff --git a/src/GameFileTree.cpp b/src/GameFileTree.cpp
@@ -32,37 +32,27 @@
 
 GameFileTree::GameFileTree(
         const QString &fileName, GameFileTree *parent)
-    // cppcheck-suppress misra-c2012-12.3
     : m_fileName(fileName), m_parentItem(parent)
 {}
 
-GameFileTree::~GameFileTree() {
-    for (GameFileTree* child : m_childItems) {
-        delete child;
-    }
-}
-
 GameFileTree::GameFileTree(const QStringList& pathList)
-    // cppcheck-suppress misra-c2012-12.3
     : m_parentItem(nullptr) {
     addPathList(pathList);
 }
 
-GameFileTree::GameFileTree(const QDir &dir)
-    // cppcheck-suppress misra-c2012-12.3
+GameFileTree::GameFileTree(Path dirPath)
     : m_parentItem(nullptr) {
-    if (dir.exists() == true) {
+    if (dirPath.exists() == true && dirPath.isDir()) {
         QStringList pathList;
-        // Skapa en kö för att hantera kataloger iterativt
         QQueue<QString> dirQueue;
-        const QString base = dir.absolutePath();
+        const QString base = dirPath.get();  // Inside home and absolute
+        const QDir baseDir(base);
         dirQueue.enqueue(base);
 
         while (!dirQueue.isEmpty()) {
             QString currentDirPath = dirQueue.dequeue();
             QDir currentDir(currentDirPath);
 
-            // Hämta alla filer och mappar i den aktuella katalogen
             QFileInfoList fileList = currentDir.entryInfoList(
                 QDir::Files |
                 QDir::Dirs |
@@ -71,9 +61,9 @@ GameFileTree::GameFileTree(const QDir &dir)
                 QDir::Name);
 
             for (const QFileInfo& fileInfo : fileList) {
-                pathList << QString(fileInfo.absoluteFilePath().split(base)[1]);
+                pathList << baseDir
+                        .relativeFilePath(fileInfo.absoluteFilePath());
 
-                // Om objektet är en katalog, lägg till den i kön
                 if (fileInfo.isDir() == true) {
                     dirQueue.enqueue(fileInfo.absoluteFilePath());
                 }
@@ -82,7 +72,13 @@ GameFileTree::GameFileTree(const QDir &dir)
         addPathList(pathList);
     } else {
         QTextStream(stdout) << "Directory does not exist: "
-            << dir.absolutePath() << Qt::endl;
+            << dirPath.get() << Qt::endl;
+    }
+}
+
+GameFileTree::~GameFileTree() {
+    for (GameFileTree* child : m_childItems) {
+        delete child;
     }
 }
 
@@ -96,7 +92,7 @@ void GameFileTree::addPathList(const QStringList& pathList) {
             // Check if a child node with this name already exists
             auto it = std::find_if(
                 current->m_childItems.begin(), current->m_childItems.end(),
-                [&component](GameFileTree* child) {
+                [&component](const GameFileTree* child) {
                     return child->m_fileName == component;
             });
 
@@ -145,38 +141,57 @@ void GameFileTree::printTree(int level) const {
 }
 
 bool GameFileTree::matchesSubtree(const GameFileTree* other) const {
-    if (!other) return false;
+    bool status = true;
+
+    if (other == nullptr) {
+        status = false;
+    }
 
-    if (m_fileName.toUpper() != other->m_fileName.toUpper())
-        return false;
+    // Check if first node name match
+    if (status && (m_fileName.toUpper() != other->m_fileName.toUpper())) {
+        status = false;
+    }
 
-    for (const GameFileTree* childOther : other->m_childItems) {
-        bool matched = false;
-        for (const GameFileTree* childThis : m_childItems) {
-            if (childThis->matchesSubtree(childOther)) {
-                matched = true;
+    /* Check other recursively from 'this'
+     * It matches the branches like an Enarmad bandit machine
+     * throught all child nodes at this point. This builds up the
+     * matching "tower" on the stack by trying all Lego pieces
+     * available at this node until ONE Lego is not found
+     * it cancels the branch.
+     */
+    if (status) {
+        for (const GameFileTree* childOther : other->m_childItems) {
+            bool matched = std::any_of(
+                m_childItems.begin(), m_childItems.end(),
+                [childOther](const GameFileTree* childThis) {
+                    return childThis->matchesSubtree(childOther);
+                });
+
+            if (matched == false) {
+                status = false;
                 break;
             }
         }
-        if (!matched)
-            return false;
     }
 
-    return true;
+    return status;
 }
 
 QStringList GameFileTree::matchesFromAnyNode(const GameFileTree* other) {
-    if (matchesSubtree(other)) {
-        return QStringList{ m_fileName };
-    }
+    QStringList result;
 
-    for (GameFileTree* child : m_childItems) {
-        QStringList childPath = child->matchesFromAnyNode(other);
-        if (!childPath.isEmpty()) {
-            childPath.prepend(m_fileName);  // its a bit backwards
-            return childPath;
+    if (matchesSubtree(other)) {
+        result.append(m_fileName);
+    } else {
+        for (GameFileTree* child : m_childItems) {
+            QStringList childPath = child->matchesFromAnyNode(other);
+            if (!childPath.isEmpty()) {
+                childPath.prepend(m_fileName);  // its a bit backwards later
+                result = childPath;
+                break;
+            }
         }
     }
 
-    return {};
+    return result;
 }
diff --git a/src/GameFileTree.hpp b/src/GameFileTree.hpp
@@ -20,10 +20,11 @@
 #include <QStringList>
 #include <QDebug>
 #include <QList>
+#include "../src/Path.hpp"
 
 class GameFileTree {
  public:
-    explicit GameFileTree(const QDir& fullPath);
+    explicit GameFileTree(Path dirPath);
     explicit GameFileTree(const QStringList& pathList);
     ~GameFileTree();
 
@@ -35,7 +36,6 @@ class GameFileTree {
     explicit GameFileTree(
         const QString &fileName, GameFileTree *parentItem);
     void addPathList(const QStringList& pathList);
-    void addNode(GameFileTree* node);  // maybe dont need this
     QVector<GameFileTree*> m_childItems;
     QString m_fileName;
     GameFileTree *m_parentItem;
diff --git a/src/binary.cpp b/src/binary.cpp
@@ -19,6 +19,7 @@
 #include <memory>
 #include <string>
 #include <LIEF/LIEF.hpp>
+#include "../src/Path.hpp"
 
 QString decideExe(const QDir& dir) {
     QString fileName;
@@ -65,9 +66,9 @@ void analyzeImportTable(const std::string& binaryPath) {
     }
 }
 
-void readPEHeader(const QString &filePath) {
-    QFile file(filePath);
-    if (file.open(QIODevice::ReadOnly) == true) {
+void readPEHeader(Path filePath) {
+    QFile file(filePath.get());
+    if (file.open(QIODevice::ReadOnly) == true) {  // flawfinder: ignore
         QDataStream in(&file);
         in.setByteOrder(QDataStream::LittleEndian);
 
@@ -104,15 +105,15 @@ void readPEHeader(const QString &filePath) {
         }
         file.close();
     } else {
-        qCritical() << "Failed to open file:" << filePath;
+        qCritical() << "Failed to open file:" << filePath.get();
     }
 }
 
 
-void readExportTable(const QString &filePath) {
-    QFile file(filePath);
-    if (!file.open(QIODevice::ReadOnly)) {
-        qCritical() << "Failed to open file:" << filePath;
+void readExportTable(Path filePath) {
+    QFile file(filePath.get());
+    if (!file.open(QIODevice::ReadOnly)) {  // flawfinder: ignore
+        qCritical() << "Failed to open file:" << filePath.get();
         return;
     }
 
@@ -142,7 +143,8 @@ void readExportTable(const QString &filePath) {
     file.seek(dosHeader.e_lfanew + sizeof(PEHeader));
 
     // Read Optional Header
-    QByteArray optionalHeaderData(peHeader.sizeOfOptionalHeader, Qt::Uninitialized);
+    QByteArray optionalHeaderData(
+            peHeader.sizeOfOptionalHeader, Qt::Uninitialized);
     in.readRawData(optionalHeaderData.data(), peHeader.sizeOfOptionalHeader);
 
     // Get Data Directory
@@ -152,16 +154,23 @@ void readExportTable(const QString &filePath) {
     };
 
     constexpr int IMAGE_DIRECTORY_ENTRY_EXPORT = 0;
-    auto dataDirectory = reinterpret_cast<DataDirectory*>(optionalHeaderData.data() + 96); // Offset 96: start of Data Directory
-    quint32 exportTableRVA = dataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].virtualAddress;
+    // Offset 96: start of Data Directory
+    auto dataDirectory =
+            reinterpret_cast<DataDirectory*>(optionalHeaderData.data() + 96);
+
+    quint32 exportTableRVA =
+        dataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].virtualAddress;
 
     if (exportTableRVA == 0) {
         qCritical() << "No Export Table found in this PE file.";
         return;
     }
 
     // Find the section that contains the Export Table
-    file.seek(dosHeader.e_lfanew + sizeof(PEHeader) + peHeader.sizeOfOptionalHeader);
+    file.seek(dosHeader.e_lfanew +
+                sizeof(PEHeader) +
+                peHeader.sizeOfOptionalHeader);
+
     quint16 numSections = peHeader.numSections;
 
     struct SectionHeader {
@@ -181,13 +190,15 @@ void readExportTable(const QString &filePath) {
     quint32 exportTableFileOffset = 0;
 
     for (quint16 i = 0; i < numSections; i++) {
-        in.readRawData(reinterpret_cast<char*>(&section), sizeof(SectionHeader));
+        in.readRawData(
+                reinterpret_cast<char*>(&section), sizeof(SectionHeader));
         quint32 sectionStart = section.virtualAddress;
         quint32 sectionEnd = sectionStart + section.virtualSize;
 
         if (exportTableRVA >= sectionStart && exportTableRVA < sectionEnd) {
             quint32 offsetWithinSection = exportTableRVA - sectionStart;
-            exportTableFileOffset = section.pointerToRawData + offsetWithinSection;
+            exportTableFileOffset =
+                    section.pointerToRawData + offsetWithinSection;
             break;
         }
     }
@@ -200,10 +211,13 @@ void readExportTable(const QString &filePath) {
     // Read Export Directory
     file.seek(exportTableFileOffset);
     ExportDirectory exportDirectory;
-    in.readRawData(reinterpret_cast<char*>(&exportDirectory), sizeof(ExportDirectory));
+    in.readRawData(
+            reinterpret_cast<char*>(&exportDirectory), sizeof(ExportDirectory));
 
     // Read the DLL Name
-    file.seek(section.pointerToRawData + (exportDirectory.nameRVA - section.virtualAddress));
+    file.seek(section.pointerToRawData +
+            (exportDirectory.nameRVA - section.virtualAddress));
+
     QByteArray dllName;
     char c;
     while (file.getChar(&c) && c != '\0') {
@@ -216,7 +230,9 @@ void readExportTable(const QString &filePath) {
         qDebug() << "Exported Functions:";
 
         // Name Pointer Table
-        quint32 namePointerOffset = section.pointerToRawData + (exportDirectory.namePointerRVA - section.virtualAddress);
+        quint32 namePointerOffset = section.pointerToRawData +
+                (exportDirectory.namePointerRVA - section.virtualAddress);
+
         file.seek(namePointerOffset);
 
         QVector<quint32> nameRVAs(exportDirectory.numNamePointers);
@@ -225,7 +241,9 @@ void readExportTable(const QString &filePath) {
         }
 
         for (const quint32 &nameRVA : nameRVAs) {
-            quint32 nameOffset = section.pointerToRawData + (nameRVA - section.virtualAddress);
+            quint32 nameOffset = section.pointerToRawData +
+                    (nameRVA - section.virtualAddress);
+
             file.seek(nameOffset);
 
             QByteArray functionName;
@@ -291,14 +309,15 @@ qint64 findReplacePattern(QFile* const file) {
  * @retval 2 Could not preform the first read only opening of the file.
  * @return error qint64.
  */
-qint64 widescreen_set(const QString& path) {
+qint64 widescreen_set(Path filePath) {
     qint64 status = 0;
-    QFileInfo fileInfo(path);
-    QFile file(path);
+    QFile file(filePath.get());
 
     // Open the file
-    if (!fileInfo.exists() || !fileInfo.isFile()) {
-        qCritical() << "Error: The exe path is not a regular file: " << path;
+    if (!filePath.exists() || !filePath.isFile()) {
+        qCritical()
+                << "Error: The exe path is not a regular file: "
+                                                        << filePath.get();
         status = 1;  // Invalid file path
     } else if (!file.open(QIODevice::ReadOnly)) {  // flawfinder: ignore
         qCritical() << "Error opening file for reading!";
diff --git a/src/binary.hpp b/src/binary.hpp
@@ -21,6 +21,7 @@
 #include <QDebug>
 #include <QDataStream>
 #include <string>
+#include "../src/Path.hpp"
 
 // Define structures for PE headers
 #pragma pack(push, 1)  // Set 1-byte alignment
@@ -75,9 +76,9 @@ struct ExportDirectory {
 
 QString decideExe(const QDir& dir);
 void analyzeImportTable(const std::string& peFilePath);
-void readPEHeader(const QString &filePath);
-void readExportTable(const QString &filePath);
+void readPEHeader(Path filePath);
+void readExportTable(Path filePath);
 qint64 findReplacePattern(QFile* const file);
-qint64 widescreen_set(const QString& path);
+qint64 widescreen_set(Path filePath);
 
 #endif  // SRC_BINARY_HPP_
