Merge pull request #5 from Everything-Compatible/dev

Dev

Author: IronHammer-Std

CHANGELOG.md

@@ -40,4 +40,10 @@ Update records:
 - 经测试能够正常工作。
 
 - Initial organization of RawFileClass_Impl completed.
-- Tested and confirmed to work correctly.
+- Tested and confirmed to work correctly.
+
+## Debug_Impl
+#### 2025-10-17 IronHammer_Std
+- 恢复了调试日志功能。
+
+- Restored the debug logging functionality.

Patch/Debug.h

@@ -2,6 +2,7 @@
 #include <Windows.h>
 #include <string>
 #include <format>
+#include <string_view>
 
 namespace Debug
 {
@@ -14,27 +15,30 @@ namespace Debug
 	void LogAndMessageString(const char* pStr);
 	void LogAndMessageString(const std::string& Str);
 
-	void LogFormat(const std::string& fmt, auto&&... args) {
-		std::string msg = std::format(fmt, std::forward<decltype(args)>(args)...);
+	template <class... _Types>
+	inline void LogFormat(const std::format_string<_Types...> fmt, _Types&&... args) {
+		std::string msg = std::vformat(fmt.get(), std::make_format_args(args...));
 		LogString(msg);
 	}
-	void LogVFormat(const std::string& fmt, std::format_args args) {
+	inline void LogVFormat(std::string_view fmt, std::format_args args) {
 		std::string msg = std::vformat(fmt, args);
 		LogString(msg);
 	}
-	void MessageFormat(const std::string& fmt, auto&&... args) {
-		std::string msg = std::format(fmt, std::forward<decltype(args)>(args)...);
+	template <class... _Types>
+	inline void MessageFormat(const std::format_string<_Types...> fmt, _Types&&... args) {
+		std::string msg = std::vformat(fmt.get(), std::make_format_args(args...));
 		MessageString(msg);
 	}
-	void MessageVFormat(const std::string& fmt, std::format_args args) {
+	inline void MessageVFormat(const std::string& fmt, std::format_args args) {
 		std::string msg = std::vformat(fmt, args);
 		MessageString(msg);
 	}
-	void LogFormatAndMessage(const std::string& fmt, auto&&... args) {
-		std::string msg = std::format(fmt, std::forward<decltype(args)>(args)...);
+	template <class... _Types>
+	inline void LogFormatAndMessage(const std::format_string<_Types...> fmt, _Types&&... args) {
+		std::string msg = std::vformat(fmt.get(), std::make_format_args(args...));
 		LogAndMessageString(msg);
 	}
-	void LogVFormatAndMessage(const std::string& fmt, std::format_args args) {
+	inline void LogVFormatAndMessage(const std::string& fmt, std::format_args args) {
 		std::string msg = std::vformat(fmt, args);
 		LogAndMessageString(msg);
 	}

Patch/DynamicPatch.cpp

@@ -1,10 +1,10 @@
-#include "DynamicPatch.h"
+#include "DynamicPatch.h"
 #include <imagehlp.h>
 #include <cstring>
 
 #pragma comment(lib, "imagehlp.lib")
 
-// 节区扫描工具
+// 节区扫描工具
 bool LocateExecutableSection(const char* sectionName, SectionInfo* result)
 {
     HMODULE moduleBase = GetModuleHandle(nullptr);
@@ -44,7 +44,7 @@ bool LocateExecutableSection(const char* sectionName, SectionInfo* result)
     return false;
 }
 
-// 执行所有存储的补丁
+// 执行所有存储的补丁
 void CodeModifier::ExecuteAllStored()
 {
     SectionInfo section;
@@ -59,22 +59,22 @@ void CodeModifier::ExecuteAllStored()
     {
         const CodeModifier* modifier = reinterpret_cast<const CodeModifier*>(current);
 
-        // 终止条件：空偏移量
+        // 终止条件：空偏移量
         if (modifier->m_targetOffset == 0) {
             break;
         }
 
-        // 验证数据有效性
+        // 验证数据有效性
         if (modifier->m_dataSize > 0 && modifier->m_patchData != nullptr) {
             modifier->Execute();
         }
 
-        // 移动到下一个补丁
+        // 移动到下一个补丁
         current += sizeof(CodeModifier);
     }
 }
 
-// 跳转和调用补丁实现
+// 跳转和调用补丁实现
 void CodeModifier::InsertFarJump(DWORD offset, DWORD target)
 {
     FarJumpInstruction instruction(offset, target);

Patch/DynamicPatch.h

@@ -1,19 +1,19 @@
-#pragma once
+#pragma once
 #include <windows.h>
 #include <initializer_list>
 #include <cstring>
 #include <memory>
 
-// 使用更独特的节区名称，避免冲突
+// 使用更独特的节区名称，避免冲突
 #define CODE_PATCH_SECTION ".codepatch"
 #pragma section(CODE_PATCH_SECTION, read, execute)
 
-// 指令结构体
+// 指令结构体
 #pragma pack(push, 1)
 struct FarJumpInstruction
 {
     BYTE opcode;        // 0xE9 for near jump, 0xEA for far jump
-    DWORD offset;       // 跳转偏移量
+    DWORD offset;       // 跳转偏移量
 
     FarJumpInstruction(DWORD from, DWORD to)
     {
@@ -25,7 +25,7 @@ struct FarJumpInstruction
 struct NearCallInstruction
 {
     BYTE opcode;        // 0xE8
-    DWORD offset;       // 调用偏移量
+    DWORD offset;       // 调用偏移量
 
     NearCallInstruction(DWORD from, DWORD to)
     {
@@ -36,18 +36,18 @@ struct NearCallInstruction
 
 struct ExtendedCallInstruction
 {
-    WORD prefix;        // 特殊调用前缀
-    DWORD offset;       // 调用偏移量
+    WORD prefix;        // 特殊调用前缀
+    DWORD offset;       // 调用偏移量
 
     ExtendedCallInstruction(DWORD from, DWORD to)
     {
-        prefix = 0x15FF; // FF15 操作码
+        prefix = 0x15FF; // FF15 操作码
         offset = to;
     }
 };
 #pragma pack(pop)
 
-// 内存保护封装类
+// 内存保护封装类
 class MemoryGuard
 {
 private:
@@ -73,19 +73,19 @@ class MemoryGuard
         }
     }
 
-    // 禁用复制
+    // 禁用复制
     MemoryGuard(const MemoryGuard&) = delete;
     MemoryGuard& operator=(const MemoryGuard&) = delete;
 };
 
-// 节区信息结构
+// 节区信息结构
 struct SectionInfo
 {
     void* virtualAddress;
     size_t virtualSize;
 };
 
-// 主补丁类
+// 主补丁类
 #pragma pack(push, 1)
 class CodeModifier
 {
@@ -95,14 +95,14 @@ class CodeModifier
     const BYTE* m_patchData;
 
 public:
-    // 默认构造函数
+    // 默认构造函数
     CodeModifier() : m_targetOffset(0), m_dataSize(0), m_patchData(nullptr) {}
 
-    // 参数化构造函数
+    // 参数化构造函数
     CodeModifier(DWORD offset, DWORD size, const BYTE* data)
         : m_targetOffset(offset), m_dataSize(size), m_patchData(data) {}
 
-    // 应用补丁到内存
+    // 应用补丁到内存
     void Execute() const
     {
         if (m_targetOffset == 0 || m_dataSize == 0 || m_patchData == nullptr) {
@@ -111,17 +111,17 @@ class CodeModifier
 
         void* targetAddress = reinterpret_cast<void*>(m_targetOffset);
 
-        // 使用RAII模式管理内存保护
+        // 使用RAII模式管理内存保护
         MemoryGuard guard(targetAddress, m_dataSize);
 
-        // 安全地复制数据
+        // 安全地复制数据
         std::memcpy(targetAddress, m_patchData, m_dataSize);
     }
 
-    // 静态方法集
+    // 静态方法集
     static void ExecuteAllStored();
 
-    // 类型化数据补丁
+    // 类型化数据补丁
     template <typename DataType>
     static void ModifyWithData(DWORD offset, std::initializer_list<DataType> dataPattern)
     {
@@ -133,49 +133,49 @@ class CodeModifier
         modifier.Execute();
     }
 
-    // 原始字节补丁（数组版本）
+    // 原始字节补丁（数组版本）
     template <size_t ArraySize>
     static void ModifyRawBytes(DWORD offset, const BYTE(&byteArray)[ArraySize])
     {
         CodeModifier modifier(offset, static_cast<DWORD>(ArraySize), byteArray);
         modifier.Execute();
     }
 
-    // 原始字节补丁（初始化列表版本）
+    // 原始字节补丁（初始化列表版本）
     static void ModifyRawBytes(DWORD offset, std::initializer_list<BYTE> byteData)
     {
         ModifyWithData<BYTE>(offset, byteData);
     }
 
-    // 原始字节补丁（指针+长度版本）
+    // 原始字节补丁（指针+长度版本）
     static void ModifyRawBytes(DWORD offset, const BYTE* dataPtr, size_t dataLength)
     {
         CodeModifier modifier(offset, static_cast<DWORD>(dataLength), dataPtr);
         modifier.Execute();
     }
 
-    // 远跳转补丁
+    // 远跳转补丁
     static void InsertFarJump(DWORD offset, DWORD jumpTarget);
     static void InsertFarJump(DWORD offset, void* jumpTarget)
     {
         InsertFarJump(offset, reinterpret_cast<DWORD>(jumpTarget));
     }
 
-    // 近调用补丁
+    // 近调用补丁
     static void InsertNearCall(DWORD offset, DWORD callTarget);
     static void InsertNearCall(DWORD offset, void* callTarget)
     {
         InsertNearCall(offset, reinterpret_cast<DWORD>(callTarget));
     }
 
-    // 6字节调用补丁（特殊格式）
+    // 6字节调用补丁（特殊格式）
     static void InsertExtendedCall(DWORD offset, DWORD callTarget);
     static void InsertExtendedCall(DWORD offset, void* callTarget)
     {
         InsertExtendedCall(offset, reinterpret_cast<DWORD>(callTarget));
     }
 
-    // 虚函数表修补
+    // 虚函数表修补
     static void UpdateVTableEntry(DWORD vtableOffset, DWORD newFunction);
     static void UpdateVTableEntry(DWORD vtableOffset, void* newFunction)
     {
@@ -200,7 +200,7 @@ class CodeModifier
         UpdateVTableEntry(vtableOffset, GetMemberFunctionAddress(memberFunc));
     }
 
-    // 偏移量修补（别名）
+    // 偏移量修补（别名）
     static void ModifyPointer(DWORD offset, DWORD newValue)
     {
         UpdateVTableEntry(offset, newValue);
@@ -212,5 +212,5 @@ class CodeModifier
 };
 #pragma pack(pop)
 
-// 节区扫描函数声明
+// 节区扫描函数声明
 bool LocateExecutableSection(const char* sectionName, SectionInfo* result);

README.md

@@ -104,12 +104,13 @@ The content of this project is open source and follows the MIT license.
 不考虑提供任何的新增或增强逻辑。
 允许也欢迎添加与调试等相关的辅助功能。
 
+所有源文件和说明文件应统一编码为 UTF8 带BOM格式。
+
 所有人注意不要直接提交到main分支。
 可以申请加入，并在dev分支上直接开发与提交；
 也可以fork本项目，并在自己的分支当中添加内容。
 以上两种方式都应通过Pull Request的方式合并到main分支。
 
-
 Please note that this project does not aim to fully reverse engineer YR. 
 Instead, it focuses on documenting critical functions and implementations.
 If you are interested, you can try to supplement more functions.
@@ -123,6 +124,9 @@ Ares/Phobos, etc. hooked and what changes they made.
 No new or enhanced logic is considered.
 Adding auxiliary features related to debugging and similar tasks is allowed and encouraged.
 
+All source files and documentation files 
+should be uniformly encoded in **UTF-8 with BOM** format.
+
 Everyone, please avoid committing directly to the main branch.
 You can apply to join and develop and commit directly on the dev branch;
 or you can fork this project and add content in your own branch.

YRDict.vcxproj

@@ -89,9 +89,14 @@
   <ItemGroup>
     <ClInclude Include="Patch\Debug.h" />
     <ClInclude Include="Patch\DynamicPatch.h" />
+    <ClInclude Include="src\Debug_Impl.h" />
     <ClInclude Include="src\FileClass_Impl.h" />
     <ClInclude Include="src\ImplBase.h" />
+    <ClInclude Include="src\InitBase.h" />
+    <ClInclude Include="src\Launch_Impl.h" />
+    <ClInclude Include="src\VanillaImpl.h" />
     <ClInclude Include="src\Version.h" />
+    <ClInclude Include="src\WinMain_Impl.h" />
     <ClInclude Include="YRpp\AbstractClass.h" />
     <ClInclude Include="YRpp\AbstractTypeClass.h" />
     <ClInclude Include="YRpp\AircraftClass.h" />
@@ -230,6 +235,7 @@
     <ClInclude Include="YRpp\ControlClass.h" />
     <ClInclude Include="YRpp\Conversions.h" />
     <ClInclude Include="YRpp\ConvertClass.h" />
+    <ClInclude Include="YRpp\CopyProtection.h" />
     <ClInclude Include="YRpp\CRC.h" />
     <ClInclude Include="YRpp\CRT.h" />
     <ClInclude Include="YRpp\Dir.h" />
@@ -364,6 +370,7 @@
     <ClInclude Include="YRpp\Surface.h" />
     <ClInclude Include="YRpp\SwizzleManagerClass.h" />
     <ClInclude Include="YRpp\Syringe.h" />
+    <ClInclude Include="YRpp\SystemData.h" />
     <ClInclude Include="YRpp\TacticalClass.h" />
     <ClInclude Include="YRpp\TActionClass.h" />
     <ClInclude Include="YRpp\TagClass.h" />
@@ -399,6 +406,7 @@
     <ClInclude Include="YRpp\Unsorted.h" />
     <ClInclude Include="YRpp\Vault.h" />
     <ClInclude Include="YRpp\VeinholeMonsterClass.h" />
+    <ClInclude Include="YRpp\VersionClass.h" />
     <ClInclude Include="YRpp\VocClass.h" />
     <ClInclude Include="YRpp\VoxClass.h" />
     <ClInclude Include="YRpp\VoxelAnimClass.h" />
@@ -424,10 +432,13 @@
     <ClCompile Include="dllmain.cpp" />
     <ClCompile Include="Patch\Debug.cpp" />
     <ClCompile Include="Patch\DynamicPatch.cpp" />
+    <ClCompile Include="src\Debug_Impl.cpp" />
     <ClCompile Include="src\FileClass_Impl.cpp" />
     <ClCompile Include="src\CopyProtection.cpp" />
+    <ClCompile Include="src\Launch_Impl.cpp" />
     <ClCompile Include="src\RawFileClass_Impl.cpp" />
     <ClCompile Include="src\VersionMark.cpp" />
+    <ClCompile Include="src\WinMain_Impl.cpp" />
     <ClCompile Include="YRpp\StaticInits.cpp" />
   </ItemGroup>
   <ItemGroup>