Added feature to unload module

Author: ViniDalvino

LICENSE

@@ -0,0 +1,13 @@
+        DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE 
+                    Version 2, December 2004 
+
+ Copyright (C) 2004 Sam Hocevar <sam@hocevar.net> 
+
+ Everyone is permitted to copy and distribute verbatim or modified 
+ copies of this license document, and changing it is allowed as long 
+ as the name is changed. 
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE 
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 
+
+  0. You just DO WHAT THE FUCK YOU WANT TO.

README.md

@@ -1,3 +1,4 @@
+[![License: WTFPL](https://img.shields.io/badge/License-WTFPL-brightgreen.svg)](http://www.wtfpl.net/about/)
 # command-line-dll-injector
 An command line utility made for injecting Dll
 
@@ -17,14 +18,14 @@ The program fully respect  the CLI Guidelines which mean that the program will b
 
 # Command line argument
 
-|    **Argument**    | **Description**                                                                           | **Example**          |
-|:------------------:|-------------------------------------------------------------------------------------------|----------------------|
-|  `-h [ --help ]`   | Produce a help message                                                                    |                      |
-| `-d [ --dll ] arg` | Specify the dll to launch                                                                 | `--dll cheat.dll`    |
-| `-e [ --exe ] arg` | Specify the program name to inject                                                        | `--exe MGSV.exe` |
-|  `-w [ --watch ]`  | Wait for the specified to be opened before injecting                                      | `-w -p game.exe`     |
-|   `--delay arg`    | Wait a amount of time before injecting(in seconds)                                        | `--delay 1.5`        |
-| `-u [ --unload ]`  | Unload the dll that is going to be injected if it's already present in the process memory |                      |
+|    **Argument**    | **Description**                                                                                          | **Example**       |
+|:------------------:|-----------------------------------------------------------------------------------------------------------|-------------------|
+|  `-h [ --help ]`   | Produce a help message                                                                                    |                   |
+| `-d [ --dll ] arg` | Specify the dll to launch                                                                                 | `--dll cheat.dll` |
+| `-e [ --exe ] arg` | Specify the program name to inject                                                                        | `--exe MGSV.exe`  |
+|  `-w [ --watch ]`  | Wait for the specified to be opened before injecting                                                      | `-w -p game.exe`  |
+|   `--delay arg`    | Wait a amount of time before injecting(in seconds)                                                        | `--delay 1.5`     |
+| `-u [ --unload ]`  | Unload the dll that is going to be injected if it's already present in the process memory (not added yet) |                   |
 
 # Example:
 

include/spinner.h

@@ -1,3 +1,4 @@
+#pragma once
 #ifndef __SPINNERCPP__
 #define __SPINNERCPP__
 

src/main.cpp

@@ -20,14 +20,23 @@
 #include <BlackBone/Misc/Utils.h>
 #include <filesystem>
 #include <BlackBone/PE/PEImage.h>
-#include <spinner.h>
 #include <BlackBone/PE/ImageNET.h>
+#define NAKED __declspec( naked )
+
 
 using namespace std::chrono_literals;
 namespace po = boost::program_options;
 
+bool nt_error(NTSTATUS status);
+
+// #define WAIT_DEBUG_ATTACH
+
 int main(int argc, char const *argv[])
 {
+#ifdef WAIT_DEBUG_ATTACH
+  BOOL isDebuggerPresent;
+  while (!isDebuggerPresent) { CheckRemoteDebuggerPresent(GetModuleHandle(NULL), &isDebuggerPresent); };
+#endif
   SetConsoleTitleW(L"Command line dll injector");
   blackbone::InitializeOnce();
   po::options_description desc("Allowed options:");
@@ -133,12 +142,19 @@ if (vm.count("exe"))
     // attach the dll
     if (vm.count("unload-dll"))
     {
-      spinnercpp::spinner s(200ms, 63, "Unloaded dll!", "", "", "  Unloading " + vm["dll"].as<std::string>() + "...");
-      s.start();
-      auto isError = NT_ERROR(process.modules().Unload(process.modules().GetModule(utf8ToUtf16(vm["dll"].as<std::string>()))));
-      if (isError)
-        std::cerr << "There was a error unloading the dll on the process. Continuing execution of the program.";
-      s.stop();
+      std::cout << "Unloading dll. . ." << std::endl;
+      auto dll_ = process.modules().GetModule(utf8ToUtf16(vm["dll_"].as<std::string>()));
+      if (dll_->type != blackbone::eModType::mt_unknown || dll_->size == 0x0)
+      {
+        if (nt_error(process.modules().Unload(dll_)))
+          std::cerr << "There was a error unloading the dll on the process. Continuing execution of the program." << std::endl;
+        else
+        {
+          std::cout << "Unloaded dll!" << std::endl;
+        }
+      }
+      else
+        std::cerr << "Couldn't unload dll as it's not present in memory." << std::endl;
     }
 
     if (dll_peimage.pureIL())
@@ -175,4 +191,9 @@ if (vm.count("exe"))
 
   std::cout << desc << "\n";
   return 0;
+}
+
+bool nt_error(NTSTATUS status)
+{
+  return ((((ULONG)(status)) >> 30) == 3);
 }