fix:修复忽略 C++ 运行库的问题, C++ 运行库也会被一并复制;

Author: JKWTCN

CMakeLists.txt

@@ -4,15 +4,15 @@ cmake_minimum_required(VERSION 3.10)
 string(TIMESTAMP PROJECT_YEAR "%Y")
 
 project(win_deploy
-    VERSION 1.1.0.0
+    VERSION 1.1.1.0
     DESCRIPTION "Windows DLL dependency analyzer and deployment tool"
     LANGUAGES CXX
 )
 
 # Project version configuration (explicit for flexibility)
 set(PROJECT_VERSION_MAJOR 1)
 set(PROJECT_VERSION_MINOR 1)
-set(PROJECT_VERSION_PATCH 0)
+set(PROJECT_VERSION_PATCH 1)
 set(PROJECT_VERSION_TWEAK 0)
 set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.${PROJECT_VERSION_TWEAK}")
 set(PROJECT_NAME "win_deploy")

README.md

@@ -1,21 +1,19 @@
-# WinDeploy - Windows Dependency DLL Analysis and Deployment Tool
+# WinDeploy - Windows DLL Dependency Analysis and Deployment Tool
 
-**[English](README.MD) | [中文](README_CN.MD)**
+## Introduction
 
-## Project Introduction
-
-WinDeploy is a command-line tool for analyzing the dependency DLLs of Windows executable files (.exe) and optionally copying these DLL files to a specified directory. This tool is particularly useful for the deployment and distribution of Windows applications, helping developers collect all necessary dependency libraries.
+WinDeploy is a command-line tool for analyzing the DLL dependencies of Windows executable files (.exe) and dynamic-link libraries (.dll), with an option to copy these dependent DLL files to a specified directory. This tool is particularly useful for Windows application deployment and distribution, helping developers collect all necessary dependencies.
 
 ## Features
 
-- Analyze PE headers of Windows executable files to extract the list of dependent DLLs
-- Support recursive analysis of all levels of DLL dependencies
-- Support searching for DLL files in multiple locations (executable directory, system directories, PATH environment variables, etc.)
+- Analyze PE headers of Windows executables and DLLs to extract lists of dependent DLLs
+- Support recursive analysis of DLL dependencies at all levels
+- Support searching for DLL files in multiple locations (executable directory, system directories, PATH environment variable, etc.)
 - Support loading additional search directories and ignore lists from files
-- Optionally copy dependent DLLs to a specified directory
-- Automatically identify and skip Windows system core DLLs (such as KERNEL32.dll, USER32.dll, etc.)
-- Support for x64 and x86 architecture PE files
-- Use RAII pattern to manage Windows resources, ensuring proper resource release
+- Option to copy dependent DLLs to a specified directory
+- Automatically identify and skip Windows core DLLs (such as KERNEL32.dll, USER32.dll, etc.)
+- Support both x64 and x86 architecture PE files
+- Use RAII pattern for Windows resource management, ensuring proper resource cleanup
 - Detailed error handling and log output
 
 ## Build Requirements
@@ -49,40 +47,43 @@ cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=Release
 cmake --build .
 ```
 
-After building, the executable file will be located in the `build/bin` directory.
+After building, the executable will be located in the `build/bin` directory.
 
 ## Usage
 
 ### Basic Usage
 
 ```bash
-# Analyze dependency DLLs of an executable (first level only)
+# Analyze executable file's dependent DLLs (first level only)
 win_deploy.exe C:\Path\To\YourApp.exe
 
-# Recursively analyze all levels of dependency DLLs
+# Analyze DLL file's dependencies
+win_deploy.exe C:\Path\To\YourLibrary.dll
+
+# Recursively analyze all levels of dependent DLLs
 win_deploy.exe C:\Path\To\YourApp.exe --recursive
 
-# Recursively analyze with specified maximum depth (default: 20)
+# Recursively analyze with specified maximum depth (default 20)
 win_deploy.exe C:\Path\To\YourApp.exe --recursive 10
 ```
 
 ### Release Mode
 
 ```bash
-# Release mode: Recursively analyze dependencies (depth: 2) and copy to executable's directory
+# Release mode: recursively analyze dependencies (depth 2) and copy to executable directory
 win_deploy.exe C:\Path\To\YourApp.exe --release
 
 # Release mode with specified recursion depth
 win_deploy.exe C:\Path\To\YourApp.exe --release 3
 ```
 
-### Copy Dependency DLLs
+### Copying Dependent DLLs
 
 ```bash
-# Copy dependency DLLs to a specified directory
+# Copy dependent DLLs to specified directory
 win_deploy.exe C:\Path\To\YourApp.exe --copy C:\DestDir
 
-# Copy dependency DLLs to the executable's directory
+# Copy dependent DLLs to executable file's directory
 win_deploy.exe C:\Path\To\YourApp.exe --copy-exe-dir
 
 # Copy all DLLs (including system core DLLs)
@@ -101,7 +102,7 @@ win_deploy.exe C:\Path\To\YourApp.exe --search-dirs search_paths.txt
 # # Lines starting with # or ; are treated as comments
 ```
 
-### Using Ignore List
+### Using Ignore Lists
 
 ```bash
 # Load ignore list from file
@@ -123,23 +124,23 @@ win_deploy.exe C:\Path\To\YourApp.exe --ignore-dll ignore.txt
 win_deploy.exe C:\Path\To\YourApp.exe --release --search-dirs search_paths.txt --ignore-dll ignore.txt
 ```
 
-### Command Line Arguments
+### Command Line Parameters
 
 ```
-Usage: win_deploy.exe <executable_path> [options]
+Usage: win_deploy.exe <executable_path|dll_path> [options]
 
 Options:
-  --release [depth]     Release mode: Recursively analyze dependencies (default depth: 2)
-                        and copy to the executable's directory
+  --release [depth]     Release mode: recursively analyze dependencies (default depth: 2) and copy to file's directory
   --recursive [depth]   Recursively analyze all DLL dependencies (default depth: 20)
-  --copy <target_dir>   Copy dependency DLLs to the specified directory
-  --copy-exe-dir        Copy dependency DLLs to the executable's directory
+  --copy <dest_dir>     Copy dependent DLLs to specified directory
+  --copy-exe-dir        Copy dependent DLLs to the file's directory
   --copy-all            Copy all DLLs (including system core DLLs)
   --search-dirs <file>  Load additional search directories from file (one path per line)
   --ignore-dll <file>   Load ignore list from file (DLL names, paths, or directories)
 
 Examples:
   win_deploy.exe C:\Path\To\YourApp.exe
+  win_deploy.exe C:\Path\To\YourLibrary.dll
   win_deploy.exe C:\Path\To\YourApp.exe --release
   win_deploy.exe C:\Path\To\YourApp.exe --release 3
   win_deploy.exe C:\Path\To\YourApp.exe --recursive
@@ -160,20 +161,18 @@ Examples:
 
 ## How It Works
 
-1. **PE File Analysis**: The tool reads the PE header of the executable file, parses the Import Directory and Delay Load Import Directory, and obtains all dependent DLL names.
-
-2. **Recursive Analysis**: If recursive mode is enabled, the tool will逐层 analyze the dependencies of each dependent DLL until the maximum recursion depth is reached or all dependencies are analyzed.
-
-3. **DLL Search**: Search for DLL files in the following priority order:
+1. **PE File Analysis**: The tool reads the PE header of the executable or DLL, parsing the Import Directory and Delay Import Directory to obtain all dependent DLL names.
+2. **Recursive Analysis**: If recursive mode is enabled, the tool analyzes the dependencies of each dependent DLL level by level until the maximum recursion depth is reached or all dependencies are analyzed.
+3. **DLL Search**: DLL files are searched in the following priority order:
 
    - **Additional specified search directories** (specified via `--search-dirs` parameter, highest priority)
-   - Executable file directory
+   - Directory of the analyzed file
    - Current working directory
    - System directory (System32)
    - Windows directory
-   - All directories in the PATH environment variable
+   - All directories in PATH environment variable
+4. **File Copying**: If copy options are specified, the tool copies found DLL files to the target directory:
 
-4. **File Copying**: If the copy option is specified, the tool will copy the found DLL files to the target directory:
    - Automatically identify and skip Windows system core DLLs (unless using `--copy-all`)
    - Skip DLLs in the ignore list
    - Automatically create target directory
@@ -183,9 +182,9 @@ Examples:
 
 - Use Windows API for file operations and PE file parsing
 - Implement RVA (Relative Virtual Address) to file offset conversion
-- Support parsing of regular import tables and delay load import tables
+- Support parsing both regular import tables and delay-load import tables
 - Use RAII pattern to manage Windows handles and memory-mapped views
-- Support detection of various PE file architectures (x64, x86)
+- Support detection of multiple PE file architectures (x64, x86)
 - Include complete error handling and boundary checks
 - Automatically detect system core DLL list, including KERNEL32, USER32, GDI32, ADVAPI32, etc.
 
@@ -204,18 +203,3 @@ windeployexe/
 ## License
 
 MIT
-
-## Contributing
-
-Bug reports and feature requests are welcome. If you want to contribute code, please ensure:
-
-1. Code follows the project's coding style
-2. Add appropriate comments and documentation
-3. Ensure the code compiles and runs correctly on the target platform
-
-## Contact
-
-For questions or suggestions, please contact through:
-
-- Create a GitHub Issue
-- Send an email to the project maintainer

README_CN.MD

@@ -2,7 +2,7 @@
 
 ## 项目简介
 
-WinDeploy 是一个命令行工具，用于分析 Windows 可执行文件（.exe）的依赖 DLL，并可以选择性地将这些 DLL 文件复制到指定目录。该工具特别适用于 Windows 应用程序的部署和分发，帮助开发者收集所有必要的依赖库。
+WinDeploy 是一个命令行工具，用于分析 Windows 可执行文件（.exe）和动态链接库（.dll）的依赖关系，并可以选择性地将这些依赖的 DLL 文件复制到指定目录。该工具特别适用于 Windows 应用程序的部署和分发，帮助开发者收集所有必要的依赖库。
 
 ## 功能特点
 
@@ -57,6 +57,9 @@ cmake --build .
 # 分析可执行文件的依赖 DLL（仅第一层）
 win_deploy.exe C:\Path\To\YourApp.exe
 
+# 分析 DLL 文件的依赖
+win_deploy.exe C:\Path\To\YourLibrary.dll
+
 # 递归分析所有层级的依赖 DLL
 win_deploy.exe C:\Path\To\YourApp.exe --recursive
 
@@ -124,19 +127,20 @@ win_deploy.exe C:\Path\To\YourApp.exe --release --search-dirs search_paths.txt -
 ### 命令行参数
 
 ```
-用法: win_deploy.exe <可执行文件路径> [选项]
+用法: win_deploy.exe <可执行文件路径|DLL文件路径> [选项]
 
 选项:
-  --release [depth]     发布模式：递归分析依赖（默认深度：2）并复制到可执行文件所在目录
+  --release [depth]     发布模式：递归分析依赖（默认深度：2）并复制到文件所在目录
   --recursive [depth]   递归分析所有 DLL 依赖（默认深度：20）
   --copy <目标目录>     复制依赖 DLL 到指定目录
-  --copy-exe-dir        复制依赖 DLL 到可执行文件所在目录
+  --copy-exe-dir        复制依赖 DLL 到文件所在目录
   --copy-all            复制所有 DLL（包括系统核心 DLL）
   --search-dirs <文件>  从文件加载额外的搜索目录（每行一个路径）
   --ignore-dll <文件>   从文件加载忽略列表（DLL 名称、路径或目录）
 
 示例:
   win_deploy.exe C:\Path\To\YourApp.exe
+  win_deploy.exe C:\Path\To\YourLibrary.dll
   win_deploy.exe C:\Path\To\YourApp.exe --release
   win_deploy.exe C:\Path\To\YourApp.exe --release 3
   win_deploy.exe C:\Path\To\YourApp.exe --recursive
@@ -157,12 +161,12 @@ win_deploy.exe C:\Path\To\YourApp.exe --release --search-dirs search_paths.txt -
 
 ## 工作原理
 
-1. **PE 文件分析**：工具读取可执行文件的 PE 头，解析导入表（Import Directory）和延迟加载导入表，获取所有依赖的 DLL 名称。
+1. **PE 文件分析**：工具读取可执行文件或 DLL 的 PE 头，解析导入表（Import Directory）和延迟加载导入表，获取所有依赖的 DLL 名称。
 2. **递归分析**：如果启用递归模式，工具会逐层分析每个依赖 DLL 的依赖关系，直到达到最大递归深度或所有依赖都被分析完毕。
 3. **DLL 搜索**：按照以下优先级顺序搜索 DLL 文件：
 
    - **额外指定的搜索目录**（通过 `--search-dirs` 参数指定，优先级最高）
-   - 可执行文件所在目录
+   - 被分析文件所在目录
    - 当前工作目录
    - 系统目录（System32）
    - Windows 目录

main.cc

@@ -398,6 +398,8 @@ std::string GetWindowsDirectory()
 }
 
 // 系统核心DLL列表
+// 注意：C++ 运行库 (MSVCR*.dll, MSVCP*.dll, UCRTBASE.dll, VCRUNTIME*.dll, VCCORLIB*.dll)
+// 不在此列表中，需要被复制
 const std::set<std::string> systemCoreDLLs = {
     "KERNEL32.dll",
     "KERNEL32.DLL",
@@ -425,22 +427,6 @@ const std::set<std::string> systemCoreDLLs = {
     "VERSION.DLL",
     "IMM32.dll",
     "IMM32.DLL",
-    "MSVCRT.dll",
-    "MSVCRT.DLL",
-    "MSVCR100.dll",
-    "MSVCR100.DLL",
-    "MSVCR110.dll",
-    "MSVCR110.DLL",
-    "MSVCR120.dll",
-    "MSVCR120.DLL",
-    "MSVCP100.dll",
-    "MSVCP100.DLL",
-    "MSVCP110.dll",
-    "MSVCP110.DLL",
-    "MSVCP120.dll",
-    "MSVCP120.DLL",
-    "UCRTBASE.dll",
-    "UCRTBASE.DLL",
     "NTDLL.dll",
     "NTDLL.DLL",
     "CRYPT32.dll",
@@ -478,6 +464,50 @@ bool IsSystemCoreDLL(const std::string &dllName)
     return false;
 }
 
+// 检查是否为 C++ 运行库 DLL
+bool IsCppRuntimeDLL(const std::string &dllName)
+{
+    // 转换为大写进行比较
+    std::string upperDllName = dllName;
+    std::transform(upperDllName.begin(), upperDllName.end(), upperDllName.begin(), ::toupper);
+
+    // 检查是否为 C 运行库 (MSVCR*.dll, VCRUNTIME*.dll)
+    if (upperDllName.find("MSVCR") == 0 && upperDllName.find(".DLL") == upperDllName.length() - 4)
+    {
+        return true;
+    }
+    if (upperDllName.find("VCRUNTIME") == 0 && upperDllName.find(".DLL") == upperDllName.length() - 4)
+    {
+        return true;
+    }
+
+    // 检查是否为 C++ 标准库 (MSVCP*.dll)
+    if (upperDllName.find("MSVCP") == 0 && upperDllName.find(".DLL") == upperDllName.length() - 4)
+    {
+        return true;
+    }
+
+    // 检查是否为 C++/CX 库 (VCCORLIB*.dll)
+    if (upperDllName.find("VCCORLIB") == 0 && upperDllName.find(".DLL") == upperDllName.length() - 4)
+    {
+        return true;
+    }
+
+    // 检查是否为 Universal C Runtime (UCRTBASE.dll)
+    if (upperDllName == "UCRTBASE.DLL")
+    {
+        return true;
+    }
+
+    // 检查是否为 ConcRT 库 (CONCRT*.dll)
+    if (upperDllName.find("CONCRT") == 0 && upperDllName.find(".DLL") == upperDllName.length() - 4)
+    {
+        return true;
+    }
+
+    return false;
+}
+
 // 判断DLL路径是否位于系统核心目录
 bool IsSystemDirectory(const std::string &dllPath)
 {
@@ -486,6 +516,15 @@ bool IsSystemDirectory(const std::string &dllPath)
         return false;
     }
 
+    // 提取 DLL 文件名
+    std::string dllName = std::filesystem::path(dllPath).filename().string();
+
+    // 如果是 C++ 运行库，即使位于系统目录也不跳过
+    if (IsCppRuntimeDLL(dllName))
+    {
+        return false;
+    }
+
     // 转换为大写进行路径比较
     std::string upperPath = dllPath;
     std::transform(upperPath.begin(), upperPath.end(), upperPath.begin(), ::toupper);

version.rc.in

@@ -17,11 +17,11 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "CompanyName", "Your Company Name"
+            VALUE "CompanyName", "icloudwar"
             VALUE "FileDescription", "@PROJECT_DESCRIPTION@"
             VALUE "FileVersion", "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@.@PROJECT_VERSION_TWEAK@"
             VALUE "InternalName", "@PROJECT_NAME@"
-            VALUE "LegalCopyright", "Copyright @PROJECT_YEAR@"
+            VALUE "LegalCopyright", "icloudwar Copyright @PROJECT_YEAR@"
             VALUE "OriginalFilename", "@[email protected]"
             VALUE "ProductName", "@PROJECT_NAME@"
             VALUE "ProductVersion", "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@.@PROJECT_VERSION_TWEAK@"