feat: remove code optimization for shellcode generator

tishion · tishion · commit bf16d88cfeff · 2025-06-09T19:26:20.000+08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,33 +10,35 @@ string(COMPARE EQUAL "${CMAKE_SYSTEM_NAME}" Windows BUILD_PLATFORM_WINDOWS)
 message(STATUS "CMAKE_VS_PLATFORM_NAME=" ${CMAKE_VS_PLATFORM_NAME})
 
 # Determin build platform
-if ((NOT DEFINED CMAKE_VS_PLATFORM_NAME) OR (CMAKE_VS_PLATFORM_NAME STREQUAL ""))
+if((NOT DEFINED CMAKE_VS_PLATFORM_NAME) OR(CMAKE_VS_PLATFORM_NAME STREQUAL ""))
     message(STATUS "CMAKE_VS_PLATFORM_NAME is empty, use default: Win32")
     set(CMAKE_VS_PLATFORM_NAME Win32)
 endif()
+
 message(STATUS "CMAKE_VS_PLATFORM_NAME=" ${CMAKE_VS_PLATFORM_NAME})
 string(COMPARE EQUAL "${CMAKE_VS_PLATFORM_NAME}" Win32 BUILD_ARC_X8632)
 string(COMPARE EQUAL "${CMAKE_VS_PLATFORM_NAME}" x64 BUILD_ARC_X8664)
 
 # Determin build type
-if ((NOT DEFINED CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL ""))
+if((NOT DEFINED CMAKE_BUILD_TYPE) OR(CMAKE_BUILD_TYPE STREQUAL ""))
     message(STATUS "CMAKE_BUILD_TYPE is empty, use default: Debug")
     set(CMAKE_BUILD_TYPE Debug)
 endif()
+
 message(STATUS "CMAKE_BUILD_TYPE=" ${CMAKE_BUILD_TYPE})
 string(COMPARE EQUAL "${CMAKE_BUILD_TYPE}" Debug BUILD_TYPE_DEBUG)
 string(COMPARE EQUAL "${CMAKE_BUILD_TYPE}" Release BUILD_TYPE_RELEASE)
 
-# Validate the build configuration 
-if ((NOT BUILD_PLATFORM_WINDOWS) 
-    OR ((NOT BUILD_ARC_X8632) AND (NOT BUILD_ARC_X8664)) 
-    OR ((NOT BUILD_TYPE_DEBUG) AND (NOT BUILD_TYPE_RELEASE)))
+# Validate the build configuration
+if((NOT BUILD_PLATFORM_WINDOWS)
+    OR((NOT BUILD_ARC_X8632) AND(NOT BUILD_ARC_X8664))
+    OR((NOT BUILD_TYPE_DEBUG) AND(NOT BUILD_TYPE_RELEASE)))
     message(FATAL_ERROR "mmloader supportes only Windows (X86/AMD64) platform.")
 endif()
 
 # Flags
 # C standard
-set(CMAKE_C_STANDARD_REQUIRED ON) 
+set(CMAKE_C_STANDARD_REQUIRED ON)
 set(CMAKE_C_STANDARD 11)
 
 # C++ standard
@@ -46,11 +48,6 @@ set(CMAKE_CXX_STANDARD 11)
 # Build type
 set(CMAKE_CONFIGURATION_TYPES Debug Release)
 
-# Default compile flags
-# Thanks for the PR https://github.com/microsoft/vcpkg/pull/15151/files from https://github.com/BillyONeal
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GS-")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /GS-")
-
 message(STATUS "CMAKE_CXX_FLAGS=" ${CMAKE_CXX_FLAGS})
 message(STATUS "CMAKE_CXX_FLAGS_DEBUG=" ${CMAKE_CXX_FLAGS_DEBUG})
 message(STATUS "CMAKE_CXX_FLAGS_RELEASE=" ${CMAKE_CXX_FLAGS_RELEASE})
@@ -59,13 +56,14 @@ message(STATUS "CMAKE_C_FLAGS_DEBUG=" ${CMAKE_CXX_FLAGS_DEBUG})
 message(STATUS "CMAKE_C_FLAGS_RELEASE=" ${CMAKE_C_FLAGS_RELEASE})
 
 # Set ouput folder
-if (BUILD_ARC_X8632) 
+if(BUILD_ARC_X8632)
     set(MMLOADER_OUT ${CMAKE_SOURCE_DIR}/output/mmloader/x86)
 elseif(BUILD_ARC_X8664)
     set(MMLOADER_OUT ${CMAKE_SOURCE_DIR}/output/mmloader/x64)
 else()
     message(FATAL_ERROR "Unsupported Architecture")
 endif()
+
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MMLOADER_OUT}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MMLOADER_OUT}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${MMLOADER_OUT}/bin)
@@ -76,6 +74,12 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 # Definitions
 add_definitions(-D_WIN32_WINNT=0x0600) # Windows Vista +
 
+# Enable debugging for all builds
+add_compile_options(/W3 /Zi /utf-8)
+
+# Enable symbol and map file generation
+add_link_options(/DEBUG /MAP)
+
 # Include paths
 include_directories(src/mmloader)
 
@@ -88,13 +92,13 @@ add_library(${PROJECT_NAME} STATIC
 # header
 set_target_properties(${PROJECT_NAME}
     PROPERTIES
-        PUBLIC_HEADER "src/mmloader/mmloader.h"
+    PUBLIC_HEADER "src/mmloader/mmloader.h"
 )
 
 # Add post build event to copy the header files
 add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
-  COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_SOURCE_DIR}/output/mmloader/include
-  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/src/mmloader/mmLoader.h ${CMAKE_SOURCE_DIR}/output/mmloader/include/
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_SOURCE_DIR}/output/mmloader/include
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/src/mmloader/mmLoader.h ${CMAKE_SOURCE_DIR}/output/mmloader/include/
 )
 
 # install lib and header files
@@ -104,27 +108,27 @@ install(TARGETS ${PROJECT_NAME}
 )
 
 # Shellcode generator project
-if ((NOT DEFINED BUILD_SHELLCODE_GEN) OR (BUILD_SHELLCODE_GEN STREQUAL "")  OR (${BUILD_SHELLCODE_GEN} MATCHES "(FALSE|false|0|OFF)"))
+if((NOT DEFINED BUILD_SHELLCODE_GEN) OR(BUILD_SHELLCODE_GEN STREQUAL "") OR(${BUILD_SHELLCODE_GEN} MATCHES "(FALSE|false|0|OFF)"))
     option(BUILD_SHELLCODE_GEN "Generate the shellcode header files" OFF)
 elseif(${BUILD_SHELLCODE_GEN} MATCHES "(TRUE|true|1|null|ON)")
     option(BUILD_SHELLCODE_GEN "Generate the shellcode header files" ON)
 else()
     message(FATAL_ERROR "++++++++++ INVALID FLAG BUILD_SHELLCODE_GEN=" ${BUILD_SHELLCODE_GEN})
 endif()
 
-if (BUILD_SHELLCODE_GEN)
+if(BUILD_SHELLCODE_GEN)
     add_subdirectory(tools/shellcode-generator)
 endif()
 
 # Demo project
-if ((NOT DEFINED BUILD_MMLOADER_DEMO) OR (BUILD_MMLOADER_DEMO STREQUAL "")  OR (${BUILD_MMLOADER_DEMO} MATCHES "(FALSE|false|0|OFF)"))
+if((NOT DEFINED BUILD_MMLOADER_DEMO) OR(BUILD_MMLOADER_DEMO STREQUAL "") OR(${BUILD_MMLOADER_DEMO} MATCHES "(FALSE|false|0|OFF)"))
     option(BUILD_MMLOADER_DEMO "Build the aps demo" OFF)
 elseif(${BUILD_MMLOADER_DEMO} MATCHES "(TRUE|true|1|null|ON)")
     option(BUILD_MMLOADER_DEMO "Build the aps demo" ON)
 else()
     message(FATAL_ERROR "++++++++++ INVALID FLAG BUILD_MMLOADER_DEMO=" ${BUILD_MMLOADER_DEMO})
 endif()
 
-if (BUILD_MMLOADER_DEMO)
-    add_subdirectory(demo) 
-endif() 
+if(BUILD_MMLOADER_DEMO)
+    add_subdirectory(demo)
+endif()
diff --git a/demo/CMakeLists.txt b/demo/CMakeLists.txt
@@ -1,14 +1,14 @@
 project(mmloader-demo)
 
-if (BUILD_ARC_X8632) 
+if(BUILD_ARC_X8632)
     set(MMLOADER_DEMO_OUT ${CMAKE_SOURCE_DIR}/output/demo/x86)
 elseif(BUILD_ARC_X8664)
     set(MMLOADER_DEMO_OUT ${CMAKE_SOURCE_DIR}/output/demo/x64)
 else()
     message(FATAL_ERROR "Unsupported Architecture")
 endif()
 
-#################################################
+# ################################################
 file(GLOB_RECURSE demo_module_SRC_FILES
     "./demo-module/*.h"
     "./demo-module/*.c"
@@ -18,14 +18,14 @@ add_library(demo-module SHARED
     ${demo_module_SRC_FILES}
 )
 target_compile_definitions(demo-module PUBLIC -DDEMOMODULE_EXPORTS)
-set_target_properties(demo-module PROPERTIES 
+set_target_properties(demo-module PROPERTIES
     FOLDER demo
     ARCHIVE_OUTPUT_DIRECTORY "${MMLOADER_DEMO_OUT}/lib"
     LIBRARY_OUTPUT_DIRECTORY "${MMLOADER_DEMO_OUT}/bin"
     RUNTIME_OUTPUT_DIRECTORY "${MMLOADER_DEMO_OUT}/bin"
 )
 
-#################################################
+# ################################################
 file(GLOB_RECURSE demo_mmloader_SRC_FILES
     "./demo-mmloader/*.h"
     "./demo-mmloader/*.c"
@@ -36,19 +36,24 @@ add_executable(demo-mmloader
     ${demo_mmloader_SRC_FILES}
 )
 
-set_target_properties(demo-mmloader PROPERTIES 
+set_target_properties(demo-mmloader PROPERTIES
     FOLDER demo
     ARCHIVE_OUTPUT_DIRECTORY "${MMLOADER_DEMO_OUT}/lib"
     LIBRARY_OUTPUT_DIRECTORY "${MMLOADER_DEMO_OUT}/bin"
     RUNTIME_OUTPUT_DIRECTORY "${MMLOADER_DEMO_OUT}/bin"
 )
 
-target_link_libraries(demo-mmloader PUBLIC
+target_link_libraries(demo-mmloader
+    PRIVATE
+    Shlwapi
+
     mmloader
 )
 
-#################################################
-if (BUILD_SHELLCODE_GEN)
+add_dependencies(demo-mmloader demo-module)
+
+# ################################################
+if(BUILD_SHELLCODE_GEN)
     file(GLOB_RECURSE demo_mmloader_shellcode_SRC_FILES
         "./demo-mmloader-shellcode/*.h"
         "./demo-mmloader-shellcode/*.c"
@@ -59,16 +64,22 @@ if (BUILD_SHELLCODE_GEN)
         ${demo_mmloader_shellcode_SRC_FILES}
     )
 
-    add_dependencies(demo-mmloader-shellcode 
+    target_link_libraries(demo-mmloader-shellcode
+        PRIVATE
+        Shlwapi
+    )
+
+    add_dependencies(demo-mmloader-shellcode
         mmloader-shellcode-generator
     )
 
     # Include paths
-    target_include_directories(demo-mmloader-shellcode 
+    target_include_directories(demo-mmloader-shellcode
         PRIVATE
-            ${CMAKE_SOURCE_DIR}/output/mmloader/include)
+        ${CMAKE_SOURCE_DIR}/output/mmloader/include
+    )
 
-    set_target_properties(demo-mmloader-shellcode PROPERTIES 
+    set_target_properties(demo-mmloader-shellcode PROPERTIES
         FOLDER demo
         ARCHIVE_OUTPUT_DIRECTORY "${MMLOADER_DEMO_OUT}/lib"
         LIBRARY_OUTPUT_DIRECTORY "${MMLOADER_DEMO_OUT}/bin"
diff --git a/demo/demo-mmloader-shellcode/demo-mmloader-shellcode.cpp b/demo/demo-mmloader-shellcode/demo-mmloader-shellcode.cpp
@@ -6,6 +6,7 @@
 #include <windows.h>
 
 #include <strsafe.h>
+#include <Shlwapi.h>
 
 #ifdef _WIN64
 #ifdef _DEBUG
@@ -21,6 +22,8 @@
 #endif
 #endif
 
+const TCHAR *pszDllPath = _T("demo-module.dll");
+
 class AutoReleaseModuleBuffer {
 public:
   AutoReleaseModuleBuffer(LPCTSTR szDllPath) : m_pBuffer(NULL), m_hFileMapping(NULL), m_hFile(NULL) {
@@ -110,13 +113,15 @@ main() {
   Type_MemModuleHelper pfnMemModuleHelper = (Type_MemModuleHelper)lpShellCodeBase;
 
   // Here we just read the module data from disk file
-  // In your real project you can download the module data from remote without witting it to disk file
-#ifdef _DEBUG
-  TCHAR szDllPath[] = _T("demo-moduled.dll");
-#else
-  TCHAR szDllPath[] = _T("demo-module.dll");
-#endif
-  AutoReleaseModuleBuffer moduleBuffer(szDllPath);
+  // In your real project you can download the module data from remote without writing to disk file
+  // Build the module file path
+  TCHAR szFullModulePath[MAX_PATH] = {0};
+  DWORD dwLength = _countof(szFullModulePath);
+  ::GetModuleFileName(::GetModuleHandle(nullptr), szFullModulePath, dwLength);
+  ::PathRemoveFileSpec(szFullModulePath);
+  ::PathCombine(szFullModulePath, szFullModulePath, pszDllPath);
+  // Read module data to memory buffer
+  AutoReleaseModuleBuffer moduleBuffer(szFullModulePath);
 
   // Load the module from the buffer
   hMemModule = (HMEMMODULE)pfnMemModuleHelper(MHM_BOOL_LOAD, moduleBuffer, (LPVOID)TRUE, &dwErrorCode);
@@ -133,7 +138,7 @@ main() {
       _tprintf(_T("Get address of demoFunction successfully. Address: 0x%p!\r\n"), lpAddr);
 
       // Function pointer type of demoFunction
-      typedef BOOL(__stdcall * Type_TargetFunction)(unsigned char *, unsigned int);
+      typedef BOOL (*Type_TargetFunction)(unsigned char *, unsigned int);
 
       // Call the demoFunction
       Type_TargetFunction pfnFunction = (Type_TargetFunction)lpAddr;
diff --git a/demo/demo-mmloader/demo-mmloader.cpp b/demo/demo-mmloader/demo-mmloader.cpp
@@ -6,9 +6,12 @@
 #include <windows.h>
 
 #include <strsafe.h>
+#include <Shlwapi.h>
 
 #include <mmLoader.h>
 
+const TCHAR *pszDllPath = _T("demo-module.dll");
+
 class AutoReleaseModuleBuffer {
 public:
   AutoReleaseModuleBuffer(LPCTSTR szDllPath) : m_pBuffer(NULL), m_hFileMapping(NULL), m_hFile(NULL) {
@@ -85,8 +88,14 @@ main() {
 
   // Here we just read the module data from disk file
   // In your real project you can download the module data from remote without writing to disk file
-  TCHAR szDllPath[] = _T("demo-module.dll");
-  AutoReleaseModuleBuffer moduleBuffer(szDllPath);
+  // Build the module file path
+  TCHAR szFullModulePath[MAX_PATH] = {0};
+  DWORD dwLength = _countof(szFullModulePath);
+  ::GetModuleFileName(::GetModuleHandle(nullptr), szFullModulePath, dwLength);
+  ::PathRemoveFileSpec(szFullModulePath);
+  ::PathCombine(szFullModulePath, szFullModulePath, pszDllPath);
+  // Read module data to memory buffer
+  AutoReleaseModuleBuffer moduleBuffer(szFullModulePath);
 
   // Load the module from the buffer
   hMemModule = (HMEMMODULE)MemModuleHelper(MHM_BOOL_LOAD, moduleBuffer, (LPVOID)TRUE, &dwErrorCode);
@@ -103,7 +112,7 @@ main() {
       _tprintf(_T("Get address of demoFunction successfully. Address: 0x%p!\r\n"), lpAddr);
 
       // Function pointer type of demoFunction
-      typedef BOOL(_stdcall * Type_TargetFunction)(unsigned char *, unsigned int);
+      typedef BOOL (*Type_TargetFunction)(unsigned char *, unsigned int);
 
       // Call the demoFunction
       Type_TargetFunction pfnFunction = (Type_TargetFunction)lpAddr;
diff --git a/gen-win-x86.bat b/gen-win-x86.bat
@@ -1,6 +1,6 @@
 cmake ^
     -S . ^
-    -B .build ^
+    -B .build/win32 ^
     -A Win32 ^
     -DCMAKE_INSTALL_PREFIX=./pacakge ^
     -DBUILD_SHELLCODE_GEN=TRUE ^
diff --git a/gen-win-x86_64.bat b/gen-win-x86_64.bat
@@ -0,0 +1,7 @@
+cmake ^
+    -S . ^
+    -B .build/win64 ^
+    -A x64 ^
+    -DCMAKE_INSTALL_PREFIX=./pacakge ^
+    -DBUILD_SHELLCODE_GEN=TRUE ^
+    -DBUILD_MMLOADER_DEMO=TRUE
diff --git a/src/mmLoader/mmLoader.c b/src/mmLoader/mmLoader.c
@@ -42,7 +42,7 @@ typedef struct __MEMMODULE_S {
     HMODULE hModule;
     LPVOID lpBase;
     PIMAGE_DOS_HEADER pImageDosHeader;
-  };                   // MemModule base
+  }; // MemModule base
   DWORD dwSizeOfImage; // MemModule size
   DWORD dwCrc;         // MemModule crc32
 
diff --git a/tools/shellcode-generator/CMakeLists.txt b/tools/shellcode-generator/CMakeLists.txt
