From ef2241150b81fb42c2f583951a787fc920386283 Mon Sep 17 00:00:00 2001
From: devseed <>
Date: Sat, 6 Apr 2024 21:39:43 +0900
Subject: [PATCH] update reversetool

---
 depend/reversetool                              |  2 +-
 project/winexe_winmemdll/Makefile               |  2 +-
 project/winexe_winmemdll/src/winmemdll.c        |  5 -----
 project/winexe_winmemdll/winmemdll.vcxproj      | 14 ++++++++------
 project/winexe_winmemdll/winmemdll_test.vcxproj | 14 ++++++++------
 5 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/depend/reversetool b/depend/reversetool
index 72c9906..95cf68c 160000
--- a/depend/reversetool
+++ b/depend/reversetool
@@ -1 +1 @@
-Subproject commit 72c9906325874a9dff81caefaf768660c939545c
+Subproject commit 95cf68cd22bed4780da259a9def6986f6c2a4063
diff --git a/project/winexe_winmemdll/Makefile b/project/winexe_winmemdll/Makefile
index 02b5171..ce15f80 100644
--- a/project/winexe_winmemdll/Makefile
+++ b/project/winexe_winmemdll/Makefile
@@ -1,4 +1,4 @@
-# build example
+# build example, tested in linux 10.0.0-3, gcc 12, wine-9.0
 # make winmemdll_shellcode CC=x86_64-w64-mingw32-gcc
 # 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
diff --git a/project/winexe_winmemdll/src/winmemdll.c b/project/winexe_winmemdll/src/winmemdll.c
index f58a649..78777c3 100644
--- a/project/winexe_winmemdll/src/winmemdll.c
+++ b/project/winexe_winmemdll/src/winmemdll.c
@@ -9,11 +9,6 @@
 #include "winpe.h"
 #include <assert.h>
 
-#define DUMP(path, addr, size)\
-   FILE *_fp = fopen(path, "wb");\
-   fwrite(addr, 1, size, _fp);\
-   fclose(_fp)
-
 // these functions are stub function, will be filled by python
 #include "winmemdll_shellcode.h"
 #define FUNC_SIZE 0x400
diff --git a/project/winexe_winmemdll/winmemdll.vcxproj b/project/winexe_winmemdll/winmemdll.vcxproj
index 855a90c..b562d7a 100644
--- a/project/winexe_winmemdll/winmemdll.vcxproj
+++ b/project/winexe_winmemdll/winmemdll.vcxproj
@@ -78,25 +78,25 @@
     <LinkIncremental>false</LinkIncremental>
     <TargetName>$(ProjectName)32d</TargetName>
     <OutDir>build</OutDir>
-    <IntDir>build/obj/debug/i686</IntDir>
+    <IntDir>build/obj/$(ProjectName)32d</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <TargetName>$(ProjectName)32</TargetName>
     <OutDir>build</OutDir>
-    <IntDir>build/obj/release/i686</IntDir>
+    <IntDir>build/obj/$(ProjectName)32</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>build</OutDir>
     <TargetName>$(ProjectName)64d</TargetName>
-    <IntDir>build/obj/debug/x86_64</IntDir>
+    <IntDir>build/obj/$(ProjectName)64d</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <TargetName>$(ProjectName)64</TargetName>
     <OutDir>build</OutDir>
-    <IntDir>build/obj/release/x86_64</IntDir>
+    <IntDir>build/obj/$(ProjectName)64</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -110,6 +110,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <MinimumRequiredVersion>5.1</MinimumRequiredVersion>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -128,6 +129,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <MinimumRequiredVersion>5.1</MinimumRequiredVersion>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -142,7 +144,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
+      <MinimumRequiredVersion>5.1</MinimumRequiredVersion>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -161,7 +163,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
+      <MinimumRequiredVersion>5.1</MinimumRequiredVersion>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/project/winexe_winmemdll/winmemdll_test.vcxproj b/project/winexe_winmemdll/winmemdll_test.vcxproj
index 9b7bed0..5c1012f 100644
--- a/project/winexe_winmemdll/winmemdll_test.vcxproj
+++ b/project/winexe_winmemdll/winmemdll_test.vcxproj
@@ -78,25 +78,25 @@
     <LinkIncremental>false</LinkIncremental>
     <TargetName>$(ProjectName)32d</TargetName>
     <OutDir>build</OutDir>
-    <IntDir>build/obj/debug/i686</IntDir>
+    <IntDir>build/obj/$(ProjectName)32d</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <TargetName>$(ProjectName)32</TargetName>
     <OutDir>build</OutDir>
-    <IntDir>build/obj/release/i686</IntDir>
+    <IntDir>build/obj/$(ProjectName)32</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>build</OutDir>
     <TargetName>$(ProjectName)64d</TargetName>
-    <IntDir>build/obj/debug/x86_64</IntDir>
+    <IntDir>build/obj/$(ProjectName)64d</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <TargetName>$(ProjectName)64</TargetName>
     <OutDir>build</OutDir>
-    <IntDir>build/obj/release/x86_64</IntDir>
+    <IntDir>build/obj/$(ProjectName)64</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -110,6 +110,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <MinimumRequiredVersion>5.1</MinimumRequiredVersion>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -128,6 +129,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <MinimumRequiredVersion>5.1</MinimumRequiredVersion>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -142,7 +144,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
+      <MinimumRequiredVersion>5.1</MinimumRequiredVersion>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -161,7 +163,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
+      <MinimumRequiredVersion>5.1</MinimumRequiredVersion>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />