fix linux

include/moehoo/hook.h

@@ -5,9 +5,9 @@
 
 #if defined(_WIN_PLATFORM_)
 #include <Windows.h>
-#elif defined(_LINUX_PLATFORM_)
+#elif defined(_LINUX_PLATFORM_) || defined(_MAC_PLATFORM_)
+#include "proc_maps.h"
 #include <cstring>
-#include <unistd.h>
 #include <sys/mman.h>
 #endif
 

include/moehoo/proc_maps.h

@@ -0,0 +1,182 @@
+#ifndef PROC_MAPS_H
+#define PROC_MAPS_H
+#if defined(_MAC_PLATFORM_) || defined(_LINUX_PLATFORM_)
+
+#include <memory>
+#include <fstream>
+#include <sstream>
+#include <string>
+#include <vector>
+#include <functional>
+#include <unistd.h>
+
+namespace hak
+{
+    class proc_maps : public std::enable_shared_from_this<proc_maps>
+    {
+        std::shared_ptr<proc_maps> _head;
+        std::shared_ptr<proc_maps> _tail;
+
+        uint64_t _start;
+        uint64_t _end;
+
+    public:
+        proc_maps(uint64_t start, uint64_t end);
+
+        bool readable = false;
+        bool writable = false;
+        bool executable = false;
+        bool is_private = false;
+        uint32_t offset = 0;
+        std::string module_name;
+
+        void insert(std::shared_ptr<proc_maps> maps);
+
+        void remove();
+
+        // The speed of this api is not very fast~~~!
+        auto size() -> size_t;
+
+        [[nodiscard]] auto start() const -> uint64_t;
+
+        [[nodiscard]] auto end() const -> uint64_t;
+
+        auto last() -> std::shared_ptr<proc_maps>;
+
+        auto next() -> std::shared_ptr<proc_maps> &;
+    };
+
+    auto get_maps(pid_t pid = 0) -> std::shared_ptr<proc_maps>;
+}
+
+#include "proc_maps.h"
+
+inline hak::proc_maps::proc_maps(uint64_t start, uint64_t end)
+{
+    this->_start = start;
+    this->_end = end;
+}
+
+inline void hak::proc_maps::insert(std::shared_ptr<hak::proc_maps> maps)
+{ // NOLINT(*-unnecessary-value-param)
+    if (maps == shared_from_this())
+    {
+        return;
+    }
+    if (this->_tail == nullptr)
+    {
+        this->_tail = maps;
+    }
+    else
+    {
+        auto temp = this->_tail;
+        maps->_head = shared_from_this();
+        maps->last()->_tail = temp;
+        this->_tail = maps;
+    }
+}
+
+inline void hak::proc_maps::remove()
+{
+    _head->_tail = _tail;
+    _tail->_head = _head;
+}
+
+inline auto hak::proc_maps::size() -> size_t
+{
+    size_t size = 1;
+    auto curr = shared_from_this();
+    while ((curr = curr->next()) != nullptr)
+    {
+        size++;
+    }
+    return size;
+}
+
+inline auto hak::proc_maps::start() const -> uint64_t
+{
+    return _start;
+}
+
+inline auto hak::proc_maps::end() const -> uint64_t
+{
+    return _end;
+}
+
+inline auto hak::proc_maps::next() -> std::shared_ptr<hak::proc_maps> &
+{
+    return _tail;
+}
+
+inline auto hak::proc_maps::last() -> std::shared_ptr<hak::proc_maps>
+{
+    auto curr = shared_from_this();
+    std::shared_ptr<proc_maps> result = curr;
+    while ((curr = curr->next()) != nullptr)
+    {
+        result = curr;
+    }
+    return result;
+}
+
+inline void llex_maps(pid_t pid, const std::function<void(std::shared_ptr<hak::proc_maps>)> &callback)
+{
+    std::ifstream maps(std::string("/proc/") + (pid == 0 ? std::string("self") : std::to_string(pid)) + "/maps");
+    if (!maps.is_open())
+    {
+        throw std::exception();
+    }
+
+    std::string line;
+    bool last_is_cd = false;
+    while (getline(maps, line))
+    {
+        std::istringstream iss(line);
+        std::vector<std::string> tokens;
+        std::string token;
+
+        while (getline(iss, token, ' '))
+        {
+            tokens.push_back(token);
+        }
+
+        auto address = tokens[0];
+        std::string::size_type pos = address.find('-');
+        uint64_t start_addr = std::stoull(address.substr(0, pos), nullptr, 16);
+        uint64_t end_addr = std::stoull(address.substr(pos + 1), nullptr, 16);
+        auto pmaps = std::make_shared<hak::proc_maps>(start_addr, end_addr);
+        auto perms = tokens[1];
+        pmaps->readable = perms[0] == 'r';
+        pmaps->writable = perms[1] == 'w';
+        pmaps->executable = perms[2] == 'x';
+        pmaps->is_private = perms[3] == 'p';
+        pmaps->offset = std::stoull(tokens[2], nullptr, 16);
+        if (tokens.size() > 5)
+        {
+            for (int i = 5; i < tokens.size(); i++)
+            {
+                pmaps->module_name += tokens[i];
+            }
+        }
+        callback(pmaps);
+    }
+}
+
+inline auto hak::get_maps(pid_t pid) -> std::shared_ptr<proc_maps>
+{
+    std::shared_ptr<proc_maps> head;
+    llex_maps(pid, [&](std::shared_ptr<proc_maps> maps) { // NOLINT(*-unnecessary-value-param)
+        if (head == nullptr)
+        {
+            head.swap(maps);
+        }
+        else
+        {
+            head->insert(maps);
+        }
+    });
+    return head;
+}
+
+#endif
+#endif // PROC_MAPS_H

src/proc_maps.cpp

@@ -1,110 +0,0 @@
-#if defined(_MAC_PLATFORM_) || defined(_LINUX_PLATFORM_)
-
-#include "proc_maps.h"
-
-hak::proc_maps::proc_maps(uint64_t start, uint64_t end) {
-    this->_start = start;
-    this->_end = end;
-}
-
-void hak::proc_maps::insert(std::shared_ptr<hak::proc_maps> maps) { // NOLINT(*-unnecessary-value-param)
-    if (maps == shared_from_this()) {
-        return;
-    }
-    if (this->_tail == nullptr) {
-        this->_tail = maps;
-    }
-    else {
-        auto temp = this->_tail;
-        maps->_head = shared_from_this();
-        maps->last()->_tail = temp;
-        this->_tail = maps;
-    }
-}
-
-void hak::proc_maps::remove() {
-    _head->_tail = _tail;
-    _tail->_head = _head;
-}
-
-auto hak::proc_maps::size() -> size_t {
-    size_t size = 1;
-    auto curr = shared_from_this();
-    while ((curr = curr->next()) != nullptr) {
-        size++;
-    }
-    return size;
-}
-
-auto hak::proc_maps::start() const -> uint64_t {
-    return _start;
-}
-
-auto hak::proc_maps::end() const -> uint64_t {
-    return _end;
-}
-
-auto hak::proc_maps::next() -> std::shared_ptr<hak::proc_maps> & {
-    return _tail;
-}
-
-auto hak::proc_maps::last() -> std::shared_ptr<hak::proc_maps> {
-    auto curr = shared_from_this();
-    std::shared_ptr<proc_maps> result = curr;
-    while ((curr = curr->next()) != nullptr) {
-        result = curr;
-    }
-    return result;
-}
-
-void llex_maps(pid_t pid, const std::function<void(std::shared_ptr<hak::proc_maps>)> &callback) {
-    std::ifstream maps(std::string("/proc/") + (pid == 0 ? std::string("self") : std::to_string(pid)) + "/maps");
-    if (!maps.is_open()) {
-        throw std::exception();
-    }
-
-    std::string line;
-    bool last_is_cd = false;
-    while (getline(maps, line)) {
-        std::istringstream iss(line);
-        std::vector<std::string> tokens;
-        std::string token;
-
-        while (getline(iss, token, ' ')) {
-            tokens.push_back(token);
-        }
-
-        auto address = tokens[0];
-        std::string::size_type pos = address.find('-');
-        uint64_t start_addr = std::stoull(address.substr(0, pos), nullptr, 16);
-        uint64_t end_addr = std::stoull(address.substr(pos + 1), nullptr, 16);
-        auto pmaps = std::make_shared<hak::proc_maps>(start_addr, end_addr);
-        auto perms = tokens[1];
-        pmaps->readable = perms[0] == 'r';
-        pmaps->writable = perms[1] == 'w';
-        pmaps->executable = perms[2] == 'x';
-        pmaps->is_private = perms[3] == 'p';
-        pmaps->offset = std::stoull(tokens[2], nullptr, 16);
-        if (tokens.size() > 5) {
-            for (int i = 5; i < tokens.size(); i++) {
-                pmaps->module_name += tokens[i];
-            }
-        }
-        callback(pmaps);
-    }
-}
-
-auto hak::get_maps(pid_t pid) -> std::shared_ptr<proc_maps> {
-    std::shared_ptr<proc_maps> head;
-    llex_maps(pid, [&](std::shared_ptr<proc_maps> maps) { // NOLINT(*-unnecessary-value-param)
-        if (head == nullptr) {
-            head.swap(maps);
-        }
-        else {
-            head->insert(maps);
-        }
-    });
-    return head;
-}
-
-#endif

src/proc_maps.h

@@ -1,49 +0,0 @@
-#ifndef PROC_MAPS_H
-#define PROC_MAPS_H
-
-#include <memory>
-#include <fstream>
-#include <sstream>
-#include <string>
-#include <vector>
-#include <functional>
-
-#include <unistd.h>
-
-namespace hak {
-    class proc_maps: public std::enable_shared_from_this<proc_maps> {
-        std::shared_ptr<proc_maps> _head;
-        std::shared_ptr<proc_maps> _tail;
-
-        uint64_t _start;
-        uint64_t _end;
-    public:
-        proc_maps(uint64_t start, uint64_t end);
-
-        bool readable = false;
-        bool writable = false;
-        bool executable = false;
-        bool is_private = false;
-        uint32_t offset = 0;
-        std::string module_name;
-
-        void insert(std::shared_ptr<proc_maps> maps);
-
-        void remove();
-
-        // The speed of this api is not very fast~~~!
-        auto size() -> size_t;
-
-        [[nodiscard]] auto start() const -> uint64_t;
-
-        [[nodiscard]] auto end() const -> uint64_t;
-
-        auto last() -> std::shared_ptr<proc_maps>;
-
-        auto next() -> std::shared_ptr<proc_maps>&;
-    };
-
-    auto get_maps(pid_t pid = 0) -> std::shared_ptr<proc_maps>;
-}
-
-#endif // PROC_MAPS_H

src/sign.cpp

@@ -15,7 +15,7 @@
 #include <Windows.h>
 #include <psapi.h>
 #elif defined(_MAC_PLATFORM_) || defined(_LINUX_PLATFORM_)
-#include "proc_maps.h"
+#include "../include/moehoo/proc_maps.h"
 #include <cstring>
 #endif
 

start.bat

@@ -1,7 +1,7 @@
 @echo off
 setlocal enabledelayedexpansion
 
-for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\Currentdbghelp\Uninstall\QQ" /v "UninstallString"') do (
+for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
     set "RetString=%%b"
     goto :boot
 )