make project structure simple

YuriSizuku · Oct 16, 2024 · a0fa948 · a0fa948
1 parent 621e223
commit a0fa948
Show file tree

Hide file tree

Showing 16 changed files with 23 additions and 26 deletions.
diff --git a/.github/workflows/build_wintools.yml → .github/workflows/build.yml b/.github/workflows/build_wintools.yml → .github/workflows/build.yml
@@ -18,12 +18,12 @@ jobs:
       uses: microsoft/setup-msbuild@v1.1
 
     - name: build target
-      run: .\project\winexe_winmemdll\release_msvc.bat
+      run: script/build_winmemdll.bat
 
     - name: upload release
       uses: ncipollo/release-action@v1
       if: github.event_name == 'push'
       with:
-        artifacts: "./project/winexe_winmemdll/build/winmemdll32.exe,./project/winexe_winmemdll/build/winmemdll64.exe"
+        artifacts: "build/winmemdll32.exe,build/winmemdll64.exe"
         allowUpdates: "true"
         token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -13,4 +13,4 @@
 .vscode
 __pycache__
 
-project/**/build/*
+build/*
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "depend/reversetool"]
-	path = depend/reversetool
-	url = https://github.com/YuriSizuku/ReverseTool.git
+[submodule "depend/winreverse"]
+	path = depend/winreverse
+	url = https://github.com/YuriSizuku/toolkit-WinReverse.git
diff --git a/project/winexe_winmemdll/Makefile → Makefile b/project/winexe_winmemdll/Makefile → Makefile
@@ -1,15 +1,13 @@
 # build example, tested in linux 10.0.0-3, gcc 12, wine-9.0
-# make winmemdll_shellcode CC=x86_64-w64-mingw32-gcc BUILD_TYPE=32
-# make winmemdll_shellcode CC=i686-w64-mingw32-clang BUILD_TYPE=32
-# make winmemdll_shellcode CC=x86_64-w64-mingw32-clang BUILD_TYPE=64
+# make winmemdll_shellcode CC=x86_64-w64-mingw32-clang
 # make winmemdll winmemdll_test CC=i686-w64-mingw32-gcc BUILD_TYPE=32d
 # make winmemdll winmemdll_test CC=x86_64-w64-mingw32-gcc BUILD_TYPE=64d
 
 # general config
 CC:=gcc # clang (llvm-mingw), gcc (mingw-w64), tcc (x86 stdcall name has problem)
 BUILD_TYPE:=32# 32, 32d, 64, 64d
 BUILD_DIR:=build
-INCS:=-I../../depend/reversetool/src
+INCS:=-Idepend/winreverse/src
 LIBS:=-luser32 -lgdi32 -lpsapi
 CFLAGS:=-fPIC -std=c99 \
 	-fvisibility=hidden \
@@ -58,7 +56,7 @@ winmemdll_test: src/winmemdll_test.c
 
 # only support llvm-mingw (tested 18.1), for building coff format
 # sometimes nested force inline function might cause problems
-winmemdll_shellcode: ../../depend/reversetool/project/windll_winpe/src/libwinpe.c
+winmemdll_shellcode: depend/winreverse/project/windll_winpe/src/libwinpe.c
 	@echo "## $@"
 	# use -mno-sse for not making string as constant, sse makes array assign with ds:
 	$(CC) -c -O3 -m32 -mno-sse $< -o $(BUILD_DIR)/$@32.o \

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # MemoryModule  
 
-![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/yurisizuku/memorymodule?color=green&label=MemoryModule)![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/YuriSizuku/MemoryModule/build_wintools.yml?label=build_wintools)  
+![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/yurisizuku/win-MemoryModule?color=green&label=MemoryModule)![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/YuriSizuku/win-MemoryModule/build.yml?label=build)  
 
 ☘️ A flexible PE loader, loading module in memory.
 Most of the functions can be inline,  compatible for shellcode.
@@ -22,8 +22,7 @@ Here's a example for using `llvm-mingw`
 
 ```shell
 git clone https://github.com/YuriSizuku/MemoryModule.git --recursive
-cd MemoryModule/project/win_memdll
-make winmemdll_shellcode # only if you want to generate shellcode
+make winmemdll_shellcode CC=x86_64-w64-mingw32-clang # only if you want to generate shellcode
 make winmemdll CC=i686-w64-mingw32-gcc BUILD_TYPE=32d # x86 debug
 ```
 

diff --git a/depend/reversetool b/depend/reversetool
diff --git a/depend/winreverse b/depend/winreverse
diff --git a/project/winexe_winmemdll/release_msvc.bat b/project/winexe_winmemdll/release_msvc.bat
diff --git a/script/build_winmemdll.bat b/script/build_winmemdll.bat
@@ -0,0 +1,2 @@
+msbuild winmemdll.sln -t:winmemdll:rebuild -p:configuration=release -p:Platform=x86 
+msbuild winmemdll.sln -t:winmemdll:rebuild -p:configuration=release -p:Platform=x64
diff --git a/project/winexe_winmemdll/src/winmemdll.c → src/winmemdll.c b/project/winexe_winmemdll/src/winmemdll.c → src/winmemdll.c
diff --git a/...inexe_winmemdll/src/winmemdll_shellcode.h → src/winmemdll_shellcode.h b/...inexe_winmemdll/src/winmemdll_shellcode.h → src/winmemdll_shellcode.h
diff --git a/...nexe_winmemdll/src/winmemdll_shellcode.py → src/winmemdll_shellcode.py b/...nexe_winmemdll/src/winmemdll_shellcode.py → src/winmemdll_shellcode.py
@@ -1,7 +1,7 @@
 import sys
 from keystone import *
 
-sys.path.append("../../depend/reversetool/src")
+sys.path.append("depend/winreverse/src")
 import wincoff as shellcode
 
 def gen_oepinit_code32():

diff --git a/...ect/winexe_winmemdll/src/winmemdll_test.c → src/winmemdll_test.c b/...ect/winexe_winmemdll/src/winmemdll_test.c → src/winmemdll_test.c
diff --git a/project/winexe_winmemdll/winmemdll.sln → winmemdll.sln b/project/winexe_winmemdll/winmemdll.sln → winmemdll.sln
diff --git a/project/winexe_winmemdll/winmemdll.vcxproj → winmemdll.vcxproj b/project/winexe_winmemdll/winmemdll.vcxproj → winmemdll.vcxproj
@@ -105,7 +105,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>../../depend/reversetool/src/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>depend/winreverse/src/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -122,7 +122,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>../../depend/reversetool/src/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>depend/winreverse/src/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -139,7 +139,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>../../depend/reversetool/src/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>depend/winreverse/src/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -156,7 +156,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>../../depend/reversetool/src/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>depend/winreverse/src/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

diff --git a/...t/winexe_winmemdll/winmemdll_test.vcxproj → winmemdll_test.vcxproj b/...t/winexe_winmemdll/winmemdll_test.vcxproj → winmemdll_test.vcxproj
@@ -105,7 +105,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>../../depend/reversetool/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>depend/winreverse/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -122,7 +122,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>../../depend/reversetool/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>depend/winreverse/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -139,7 +139,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>../../depend/reversetool/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>depend/winreverse/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -156,7 +156,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>../../depend/reversetool/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>depend/winreverse/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,4 +13,4 @@ @@
     .vscode
     __pycache__
-    project/**/build/*
+    build/*
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		msbuild winmemdll.sln -t:winmemdll:rebuild -p:configuration=release -p:Platform=x86
		msbuild winmemdll.sln -t:winmemdll:rebuild -p:configuration=release -p:Platform=x64