Skip to content

Commit

Permalink
sync with blackbone upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
@DarthTon
DarthTon committed Aug 3, 2019
1 parent 70a33e7 commit 4bd7399
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 18 deletions.
2 changes: 1 addition & 1 deletion ext/blackbone
Submodule blackbone updated 71 files
+9 −1 README.md
+1 −1 appveyor.yml
+1 −1 appveyor_drv.yml
+4,093 −0 src/3rd_party/DIA/cvconst.h
+10,646 −0 src/3rd_party/DIA/dia2.h
+42 −0 src/3rd_party/DIA/diacreate.h
+ − src/3rd_party/DIA/lib/amd64/diaguids.lib
+ − src/3rd_party/DIA/lib/diaguids.lib
+26 −6 src/3rd_party/VersionApi.h
+1 −1 src/BlackBone/Asm/AsmHelper32.cpp
+1 −1 src/BlackBone/Asm/AsmHelper32.h
+1 −1 src/BlackBone/Asm/AsmHelper64.cpp
+1 −1 src/BlackBone/Asm/AsmHelper64.h
+33 −33 src/BlackBone/BlackBone.vcxproj
+96 −61 src/BlackBone/CMakeLists.txt
+5 −24 src/BlackBone/DriverControl/DriverControl.cpp
+2 −2 src/BlackBone/DriverControl/DriverControl.h
+60 −17 src/BlackBone/Include/HandleGuard.h
+1 −1 src/BlackBone/LocalHook/LocalHook.hpp
+14 −12 src/BlackBone/LocalHook/LocalHookBase.cpp
+1 −0 src/BlackBone/LocalHook/LocalHookBase.h
+33 −11 src/BlackBone/ManualMap/MMap.cpp
+8 −7 src/BlackBone/ManualMap/MMap.h
+2 −6 src/BlackBone/Misc/NameResolve.cpp
+5 −1 src/BlackBone/PE/ImageNET.h
+16 −22 src/BlackBone/PE/PEImage.cpp
+5 −3 src/BlackBone/PE/PEImage.h
+2 −3 src/BlackBone/Process/Process.cpp
+4 −4 src/BlackBone/Process/ProcessCore.h
+37 −14 src/BlackBone/Process/ProcessModules.cpp
+9 −1 src/BlackBone/Process/ProcessModules.h
+2 −2 src/BlackBone/Process/RPC/RemoteContext.hpp
+33 −87 src/BlackBone/Process/RPC/RemoteExec.cpp
+89 −70 src/BlackBone/Process/RPC/RemoteFunction.hpp
+1 −1 src/BlackBone/Process/RPC/RemoteHook.cpp
+4 −4 src/BlackBone/Process/Threads/Thread.cpp
+7 −7 src/BlackBone/Process/Threads/Thread.h
+33 −42 src/BlackBone/Process/Threads/Threads.cpp
+15 −20 src/BlackBone/Process/Threads/Threads.h
+9 −4 src/BlackBone/Subsystem/NativeSubsystem.cpp
+2 −2 src/BlackBone/Symbols/PDBHelper.cpp
+1 −1 src/BlackBone/Symbols/PDBHelper.h
+22 −4 src/BlackBone/Symbols/PatternLoader.cpp
+61 −22 src/BlackBone/Symbols/SymbolLoader.cpp
+31 −2 src/BlackBone/Symbols/SymbolLoader.h
+1 −0 src/BlackBoneDrv/BlackBoneDef.h
+60 −96 src/BlackBoneDrv/BlackBoneDrv.c
+1 −0 src/BlackBoneDrv/Loader.h
+41 −8 src/BlackBoneDrv/MMap.c
+393 −1 src/BlackBoneDrv/NativeStructs.h
+0 −28 src/BlackBoneDrv/NativeStructs10.h
+0 −25 src/BlackBoneDrv/NativeStructs7.h
+0 −25 src/BlackBoneDrv/NativeStructs8.h
+0 −28 src/BlackBoneDrv/NativeStructs81.h
+19 −0 src/BlackBoneDrv/Private.c
+36 −0 src/BlackBoneDrv/Private.h
+2 −2 src/BlackBoneDrv/Utils.c
+2 −2 src/BlackBoneDrv/Utils.h
+12 −10 src/BlackBoneTest/BlackBoneTest.vcxproj
+6 −0 src/BlackBoneTest/BlackBoneTest.vcxproj.filters
+25 −4 src/BlackBoneTest/Common.h
+1 −5 src/BlackBoneTest/TestAsmJit.cpp
+177 −0 src/BlackBoneTest/TestGuard.cpp
+51 −34 src/BlackBoneTest/TestManualMap.cpp
+1 −1 src/BlackBoneTest/TestRemoteCall.cpp
+42 −2 src/BlackBoneTest/TestRemoteHook.cpp
+39 −0 src/BlackBoneTest/TestSymbols.cpp
+4 −3 src/CMakeLists.txt
+13 −14 src/Samples/CMakeLists.txt
+1 −0 src/Samples/Main.cpp
+17 −27 src/Samples/Samples.vcxproj
22 changes: 9 additions & 13 deletions src/Xenos.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,29 +24,29 @@
<RootNamespace>
</RootNamespace>
<Keyword>Win32Proj</Keyword>
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
Expand Down Expand Up @@ -247,14 +247,10 @@
<Image Include="alien.ico" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\BlackBone\src\BlackBoneDrv\bin\x64\Win10Release\BlackBoneDrv10.sys" />
<None Include="..\..\BlackBone\src\BlackBoneDrv\bin\x64\Win7Release\BlackBoneDrv7.sys" />
<None Include="..\..\BlackBone\src\BlackBoneDrv\bin\x64\Win8.1Release\BlackBoneDrv81.sys" />
<None Include="..\..\BlackBone\src\BlackBoneDrv\bin\x64\Win8Release\BlackBoneDrv8.sys" />
<None Include="..\ext\BlackBone\src\BlackBoneDrv\bin\x64\Win10Release\BlackBoneDrv10.sys" />
<None Include="..\ext\BlackBone\src\BlackBoneDrv\bin\x64\Win7Release\BlackBoneDrv7.sys" />
<None Include="..\ext\BlackBone\src\BlackBoneDrv\bin\x64\Win8.1Release\BlackBoneDrv81.sys" />
<None Include="..\ext\BlackBone\src\BlackBoneDrv\bin\x64\Win8Release\BlackBoneDrv8.sys" />
<None Include="..\ext\blackbone\src\BlackBoneDrv\bin\x64\Win10Release\BlackBoneDrv10.sys" />
<None Include="..\ext\blackbone\src\BlackBoneDrv\bin\x64\Win7Release\BlackBoneDrv7.sys" />
<None Include="..\ext\blackbone\src\BlackBoneDrv\bin\x64\Win8.1Release\BlackBoneDrv81.sys" />
<None Include="..\ext\blackbone\src\BlackBoneDrv\bin\x64\Win8Release\BlackBoneDrv8.sys" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ext\BlackBone\src\BlackBone\BlackBone.vcxproj">
Expand Down
8 changes: 4 additions & 4 deletions src/Xenos.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,16 +165,16 @@
</Image>
</ItemGroup>
<ItemGroup>
<None Include="..\..\BlackBone\src\BlackBoneDrv\bin\x64\Win8.1Release\BlackBoneDrv81.sys">
<None Include="..\ext\blackbone\src\BlackBoneDrv\bin\x64\Win7Release\BlackBoneDrv7.sys">
<Filter>Resources</Filter>
</None>
<None Include="..\..\BlackBone\src\BlackBoneDrv\bin\x64\Win7Release\BlackBoneDrv7.sys">
<None Include="..\ext\blackbone\src\BlackBoneDrv\bin\x64\Win8Release\BlackBoneDrv8.sys">
<Filter>Resources</Filter>
</None>
<None Include="..\..\BlackBone\src\BlackBoneDrv\bin\x64\Win8Release\BlackBoneDrv8.sys">
<None Include="..\ext\blackbone\src\BlackBoneDrv\bin\x64\Win10Release\BlackBoneDrv10.sys">
<Filter>Resources</Filter>
</None>
<None Include="..\..\BlackBone\src\BlackBoneDrv\bin\x64\Win10Release\BlackBoneDrv10.sys">
<None Include="..\ext\blackbone\src\BlackBoneDrv\bin\x64\Win8.1Release\BlackBoneDrv81.sys">
<Filter>Resources</Filter>
</None>
</ItemGroup>
Expand Down

2 comments on commit 4bd7399

@mirh
Copy link

@mirh mirh commented on 4bd7399 Aug 24, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should also update CI to vs2019 probably then

@SylveonDeko
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is no longer fully updated

Please sign in to comment.