Skip to content

Commit

Permalink
removed STATUS_UNSUCCESSFUL return codes
Browse files Browse the repository at this point in the history
  • Loading branch information
DarthTon committed Oct 25, 2017
1 parent 737cfcd commit 561f93c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion ext/blackbone
Submodule blackbone updated 70 files
+1 −1 BlackBone.sln
+11 −2 contrib/VersionHelpers.h
+3 −1 src/BlackBone/Asm/AsmStack.hpp
+59 −82 src/BlackBone/Asm/AsmVariant.hpp
+21 −10 src/BlackBone/BlackBone.vcxproj
+4 −0 src/BlackBone/BlackBone.vcxproj.filters
+3 −2 src/BlackBone/CMakeLists.txt
+3 −1 src/BlackBone/Config.h
+16 −0 src/BlackBone/DllMain.cpp
+15 −18 src/BlackBone/DriverControl/DriverControl.cpp
+2 −1 src/BlackBone/DriverControl/DriverControl.h
+6 −3 src/BlackBone/Include/ApiSet.h
+54 −0 src/BlackBone/Include/CallResult.h
+90 −0 src/BlackBone/Include/HandleGuard.h
+1 −1 src/BlackBone/Include/Macro.h
+3 −1 src/BlackBone/Include/WinXPSpecific.h
+2 −1 src/BlackBone/Include/Winheaders.h
+6 −6 src/BlackBone/LocalHook/TraceHook.cpp
+2 −2 src/BlackBone/LocalHook/VTableHook.hpp
+1 −1 src/BlackBone/ManualMap/MExcept.cpp
+27 −43 src/BlackBone/ManualMap/MMap.cpp
+45 −66 src/BlackBone/ManualMap/MMap.h
+50 −89 src/BlackBone/ManualMap/Native/NtLoader.cpp
+12 −12 src/BlackBone/ManualMap/Native/NtLoader.h
+4 −1 src/BlackBone/Misc/DynImport.h
+29 −26 src/BlackBone/Misc/InitOnce.cpp
+3 −1 src/BlackBone/Misc/InitOnce.h
+19 −29 src/BlackBone/Misc/NameResolve.cpp
+3 −3 src/BlackBone/Misc/NameResolve.h
+32 −2 src/BlackBone/Misc/PatternLoader.cpp
+3 −2 src/BlackBone/Misc/Trace.hpp
+5 −7 src/BlackBone/Misc/Utils.cpp
+1 −1 src/BlackBone/Misc/Utils.h
+2 −1 src/BlackBone/PE/ImageNET.h
+12 −27 src/BlackBone/PE/PEImage.cpp
+5 −4 src/BlackBone/PE/PEImage.h
+5 −2 src/BlackBone/Process/MemBlock.cpp
+16 −38 src/BlackBone/Process/Process.cpp
+7 −17 src/BlackBone/Process/ProcessCore.cpp
+6 −5 src/BlackBone/Process/ProcessCore.h
+9 −0 src/BlackBone/Process/ProcessMemory.cpp
+6 −6 src/BlackBone/Process/ProcessMemory.h
+35 −22 src/BlackBone/Process/ProcessModules.cpp
+10 −1 src/BlackBone/Process/ProcessModules.h
+27 −32 src/BlackBone/Process/RPC/RemoteExec.cpp
+5 −7 src/BlackBone/Process/RPC/RemoteExec.h
+9 −15 src/BlackBone/Process/RPC/RemoteFunction.hpp
+18 −13 src/BlackBone/Process/RPC/RemoteHook.cpp
+1 −1 src/BlackBone/Process/RPC/RemoteLocalHook.cpp
+4 −8 src/BlackBone/Process/RPC/RemoteMemory.cpp
+1 −1 src/BlackBone/Process/RPC/RemoteMemory.h
+7 −11 src/BlackBone/Process/Threads/Thread.cpp
+11 −7 src/BlackBone/Process/Threads/Thread.h
+17 −19 src/BlackBone/Process/Threads/Threads.cpp
+31 −6 src/BlackBoneDrv/BlackBoneDrv.c
+0 −1 src/BlackBoneDrv/BlackBoneDrv.vcxproj
+3 −2 src/BlackBoneDrv/Loader.c
+1 −1 src/BlackBoneDrv/MMap.c
+37 −40 src/BlackBoneDrv/NativeStructs.h
+36 −0 src/BlackBoneDrv/PEStructs.h
+11 −3 src/BlackBoneDrv/Private.c
+5 −4 src/BlackBoneDrv/Private.h
+11 −2 src/BlackBoneDrv/Routines.c
+ src/BlackBoneDrv/bin/x64/Win10Release/BlackBoneDrv10.sys
+ src/BlackBoneDrv/bin/x64/Win7Release/BlackBoneDrv7.sys
+ src/BlackBoneDrv/bin/x64/Win8.1Release/BlackBoneDrv81.sys
+ src/BlackBoneDrv/bin/x64/Win8Release/BlackBoneDrv8.sys
+132 −0 src/TestApp/AsmTest.cpp
+3 −2 src/TestApp/TestApp.vcxproj
+1 −0 src/TestApp/TestApp.vcxproj.filters
16 changes: 7 additions & 9 deletions src/InjectionCore.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@ NTSTATUS InjectionCore::InjectSingle( InjectContext& context, blackbone::pe::PEI
if (!img.pureIL() && mod == nullptr && context.cfg.injectMode < Kernel_Thread && NT_SUCCESS( status ))
{
xlog::Error( "Invalid failure status: 0x%X", status );
status = STATUS_UNSUCCESSFUL;
status = STATUS_DLL_NOT_FOUND;
}

// Initialize routine
Expand Down Expand Up @@ -652,6 +652,8 @@ blackbone::call_result_t<blackbone::ModuleDataPtr> InjectionCore::InjectDefault(
blackbone::ThreadPtr pThread /*= nullptr*/
)
{
using namespace blackbone;

NTSTATUS status = STATUS_SUCCESS;

// Pure IL image
Expand All @@ -662,25 +664,21 @@ blackbone::call_result_t<blackbone::ModuleDataPtr> InjectionCore::InjectDefault(
xlog::Normal( "Image '%ls' is pure IL", img.path().c_str() );

if (!_process.modules().InjectPureIL(
blackbone::ImageNET::GetImageRuntimeVer( img.path().c_str() ),
ImageNET::GetImageRuntimeVer( img.path().c_str() ),
img.path(),
context.cfg.initRoutine,
context.cfg.initArgs,
code ))
{
if (code == ERROR_SUCCESS)
code = STATUS_UNSUCCESSFUL;

xlog::Error( "Failed to inject pure IL image, status: %d", code );
if (NT_SUCCESS( code ))
code = STATUS_UNSUCCESSFUL;
code = STATUS_DLL_NOT_FOUND;

return code;
}

auto mod = _process.modules().GetModule( img.name(), blackbone::Sections );
return mod ? blackbone::call_result_t<blackbone::ModuleDataPtr>( mod )
: blackbone::call_result_t<blackbone::ModuleDataPtr>( STATUS_NOT_FOUND );
auto mod = _process.modules().GetModule( img.name(), Sections );
return mod ? call_result_t<ModuleDataPtr>( mod ) : call_result_t<ModuleDataPtr>( STATUS_NOT_FOUND );
}
else
{
Expand Down

0 comments on commit 561f93c

Please sign in to comment.