Merge pull request DarthTon#334 from siilky/patch2

Fixes for error cases in remote dll loading

Author: DarthTon

src/BlackBone/Process/ProcessModules.cpp

@@ -498,11 +498,14 @@ call_result_t<ModuleDataPtr> ProcessModules::Inject( const std::wstring& path, T
     }
 
     // Retry with LoadLibrary if possible
-    if (!NT_SUCCESS( status ) && pLoadLibrary && sameArch)
-        status = _proc.remote().ExecDirect( pLoadLibrary->procAddress, modName->ptr() + ustrSize );
-
-    if (!NT_SUCCESS( status ))
-        return status;
+    if (!NT_SUCCESS(status) && pLoadLibrary && sameArch)
+    {
+        auto result = _proc.remote().ExecDirect( pLoadLibrary->procAddress, modName->ptr() + ustrSize );
+        if (result == 0)
+        {
+            return status;
+        }
+    }
 
     return GetModule( path, LdrList, img.mType() );
 }

src/BlackBone/Process/RPC/RemoteExec.cpp

@@ -82,7 +82,7 @@ NTSTATUS RemoteExec::ExecInNewThread(
 
     a->GenCall( _userCode.ptr(), { } );
     (*a)->mov( (*a)->zdx, _userData.ptr() + INTRET_OFFSET );
-    (*a)->mov( (*a)->zdx, (*a)->zax );
+    (*a)->mov( asmjit::host::dword_ptr( (*a)->zdx ), (*a)->zax );
     a->GenEpilogue( switchMode, 4 );
 
     // Execute code in newly created thread