From 0a44083bbfa46b3a14c3c3f58be5ccf2ec9f40a6 Mon Sep 17 00:00:00 2001
From: boykopovar <boykopovar@gmail.com>
Date: Tue, 4 Aug 2026 14:29:32 +0300
Subject: [PATCH] refactor(patcher): separate linux and windows elf patchers

---
 core/CMakeLists.txt                           |  3 +-
 .../LinuxElfPatcher.hpp}                      | 10 ++---
 .../elfpatcher/windows/WindowsElfPatcher.hpp  | 37 +++++++++++++++++++
 .../LinuxElfPatcher.cpp}                      | 10 ++---
 .../src/windows/WindowsElfPatcher.cpp         | 27 ++++++++++++++
 core/main.cpp                                 |  4 +-
 6 files changed, 78 insertions(+), 13 deletions(-)
 rename core/elfpatcher/include/elfpatcher/{ElfPatcher.hpp => linux/LinuxElfPatcher.hpp} (86%)
 create mode 100644 core/elfpatcher/include/elfpatcher/windows/WindowsElfPatcher.hpp
 rename core/elfpatcher/src/{ElfPatcher.cpp => linux/LinuxElfPatcher.cpp} (95%)
 create mode 100644 core/elfpatcher/src/windows/WindowsElfPatcher.cpp

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 8c009c2cb..a4384a099 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_executable(relinker
         ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/elfpatcher/src/ElfPatcher.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/elfpatcher/src/linux/LinuxElfPatcher.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/elfpatcher/src/windows/WindowsElfPatcher.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/elfpatcher/src/filtering/SegmentFilter.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/elfpatcher/src/stub/EntryStubBuilder.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/elfpatcher/src/layout/ProgramHeaderLayoutBuilder.cpp
diff --git a/core/elfpatcher/include/elfpatcher/ElfPatcher.hpp b/core/elfpatcher/include/elfpatcher/linux/LinuxElfPatcher.hpp
similarity index 86%
rename from core/elfpatcher/include/elfpatcher/ElfPatcher.hpp
rename to core/elfpatcher/include/elfpatcher/linux/LinuxElfPatcher.hpp
index cbf0f28b6..5f222b92c 100644
--- a/core/elfpatcher/include/elfpatcher/ElfPatcher.hpp
+++ b/core/elfpatcher/include/elfpatcher/linux/LinuxElfPatcher.hpp
@@ -1,5 +1,5 @@
-#ifndef ELFPATCHER_ELFPATCHER_HPP
-#define ELFPATCHER_ELFPATCHER_HPP
+#ifndef ELFPATCHER_LINUX_LINUXELFPATCHER_HPP
+#define ELFPATCHER_LINUX_LINUXELFPATCHER_HPP
 
 #include <elfpatcher/IElfPatcher.hpp>
 #include <elfpatcher/domain/IEntryStubBuilder.hpp>
@@ -8,11 +8,11 @@
 #include <io/IByteWriter.hpp>
 #include <memory>
 
-namespace Elfpatcher {
+namespace Elfpatcher::Linux {
 
-class ElfPatcher : public IElfPatcher {
+class LinuxElfPatcher : public IElfPatcher {
 public:
-    ElfPatcher(
+    LinuxElfPatcher(
         std::shared_ptr<IEntryStubBuilder> entryStubBuilder,
         std::shared_ptr<IProgramHeaderLayoutBuilder> programHeaderLayoutBuilder,
         std::shared_ptr<ISectionHeaderTableBuilder> sectionHeaderTableBuilder,
diff --git a/core/elfpatcher/include/elfpatcher/windows/WindowsElfPatcher.hpp b/core/elfpatcher/include/elfpatcher/windows/WindowsElfPatcher.hpp
new file mode 100644
index 000000000..f18e7cd78
--- /dev/null
+++ b/core/elfpatcher/include/elfpatcher/windows/WindowsElfPatcher.hpp
@@ -0,0 +1,37 @@
+#ifndef ELFPATCHER_WINDOWS_WINDOWSELFPATCHER_HPP
+#define ELFPATCHER_WINDOWS_WINDOWSELFPATCHER_HPP
+
+#include <elfpatcher/IElfPatcher.hpp>
+#include <elfpatcher/domain/IEntryStubBuilder.hpp>
+#include <elfpatcher/domain/IProgramHeaderLayoutBuilder.hpp>
+#include <elfpatcher/domain/ISectionHeaderTableBuilder.hpp>
+#include <io/IByteWriter.hpp>
+#include <memory>
+
+namespace Elfpatcher::Windows {
+
+class WindowsElfPatcher : public IElfPatcher {
+public:
+    WindowsElfPatcher(
+        std::shared_ptr<IEntryStubBuilder> entryStubBuilder,
+        std::shared_ptr<IProgramHeaderLayoutBuilder> programHeaderLayoutBuilder,
+        std::shared_ptr<ISectionHeaderTableBuilder> sectionHeaderTableBuilder,
+        std::shared_ptr<Io::IByteWriter> byteWriter
+    );
+
+    std::vector<std::uint8_t> Patch(
+        const std::vector<std::uint8_t>& sourceElf,
+        const std::vector<Domain::ProgramHeader>& originalHeaders,
+        const Domain::SysVDynamicSection& dynamicSection
+    ) override;
+
+private:
+    std::shared_ptr<IEntryStubBuilder> _entryStubBuilder;
+    std::shared_ptr<IProgramHeaderLayoutBuilder> _programHeaderLayoutBuilder;
+    std::shared_ptr<ISectionHeaderTableBuilder> _sectionHeaderTableBuilder;
+    std::shared_ptr<Io::IByteWriter> _byteWriter;
+};
+
+}
+
+#endif
diff --git a/core/elfpatcher/src/ElfPatcher.cpp b/core/elfpatcher/src/linux/LinuxElfPatcher.cpp
similarity index 95%
rename from core/elfpatcher/src/ElfPatcher.cpp
rename to core/elfpatcher/src/linux/LinuxElfPatcher.cpp
index cb58b0b33..f5571d5a4 100644
--- a/core/elfpatcher/src/ElfPatcher.cpp
+++ b/core/elfpatcher/src/linux/LinuxElfPatcher.cpp
@@ -1,11 +1,11 @@
-#include <elfpatcher/ElfPatcher.hpp>
+#include <elfpatcher/linux/LinuxElfPatcher.hpp>
 #include <elfpatcher/domain/ElfConstants.hpp>
 #include <elfpatcher/domain/ProgramHeaderLayoutRequest.hpp>
 #include <elfpatcher/domain/SectionHeaderTableRequest.hpp>
 
-namespace Elfpatcher {
+namespace Elfpatcher::Linux {
 
-ElfPatcher::ElfPatcher(
+LinuxElfPatcher::LinuxElfPatcher(
     std::shared_ptr<IEntryStubBuilder> entryStubBuilder,
     std::shared_ptr<IProgramHeaderLayoutBuilder> programHeaderLayoutBuilder,
     std::shared_ptr<ISectionHeaderTableBuilder> sectionHeaderTableBuilder,
@@ -18,12 +18,12 @@ ElfPatcher::ElfPatcher(
 {
 }
 
-void ElfPatcher::_appendDynEntry(std::vector<std::uint8_t>& buf, std::int64_t tag, std::uint64_t val) const {
+void LinuxElfPatcher::_appendDynEntry(std::vector<std::uint8_t>& buf, std::int64_t tag, std::uint64_t val) const {
     _byteWriter->AppendI64(buf, tag);
     _byteWriter->AppendU64(buf, val);
 }
 
-std::vector<std::uint8_t> ElfPatcher::Patch(
+std::vector<std::uint8_t> LinuxElfPatcher::Patch(
     const std::vector<std::uint8_t>& sourceElf,
     const std::vector<Domain::ProgramHeader>& originalHeaders,
     const Domain::SysVDynamicSection& dynSection)
diff --git a/core/elfpatcher/src/windows/WindowsElfPatcher.cpp b/core/elfpatcher/src/windows/WindowsElfPatcher.cpp
new file mode 100644
index 000000000..1e5a4d8ca
--- /dev/null
+++ b/core/elfpatcher/src/windows/WindowsElfPatcher.cpp
@@ -0,0 +1,27 @@
+#include <elfpatcher/windows/WindowsElfPatcher.hpp>
+#include <domain/Types.hpp>
+
+namespace Elfpatcher::Windows {
+
+WindowsElfPatcher::WindowsElfPatcher(
+    std::shared_ptr<IEntryStubBuilder> entryStubBuilder,
+    std::shared_ptr<IProgramHeaderLayoutBuilder> programHeaderLayoutBuilder,
+    std::shared_ptr<ISectionHeaderTableBuilder> sectionHeaderTableBuilder,
+    std::shared_ptr<Io::IByteWriter> byteWriter
+)
+    : _entryStubBuilder(std::move(entryStubBuilder))
+    , _programHeaderLayoutBuilder(std::move(programHeaderLayoutBuilder))
+    , _sectionHeaderTableBuilder(std::move(sectionHeaderTableBuilder))
+    , _byteWriter(std::move(byteWriter))
+{
+}
+
+std::vector<std::uint8_t> WindowsElfPatcher::Patch(
+    const std::vector<std::uint8_t>& sourceElf,
+    const std::vector<Domain::ProgramHeader>& originalHeaders,
+    const Domain::SysVDynamicSection& dynamicSection)
+{
+    throw Domain::RelinkerException("Not implemented");
+}
+
+}
diff --git a/core/main.cpp b/core/main.cpp
index 0d4254da4..d2371056f 100644
--- a/core/main.cpp
+++ b/core/main.cpp
@@ -1,7 +1,7 @@
 #include <domain/Types.hpp>
 #include <io/FileReader.hpp>
 #include <io/FileWriter.hpp>
-#include <elfpatcher/ElfPatcher.hpp>
+#include <elfpatcher/linux/LinuxElfPatcher.hpp>
 #include <elfpatcher/filtering/SegmentFilter.hpp>
 #include <elfpatcher/stub/EntryStubBuilder.hpp>
 #include <elfpatcher/layout/ProgramHeaderLayoutBuilder.hpp>
@@ -71,7 +71,7 @@ int main(const int argc, char* argv[]) {
         }
 
         auto byteWriter = std::make_shared<Io::ByteWriter>();
-        Elfpatcher::ElfPatcher elfPatcher(
+        Elfpatcher::Linux::LinuxElfPatcher elfPatcher(
             std::make_shared<Elfpatcher::EntryStubBuilder>(),
             std::make_shared<Elfpatcher::ProgramHeaderLayoutBuilder>(
                 std::make_shared<Elfpatcher::SegmentFilter>(),