Merge pull request #83 from kernelwernel/dev

pre-1.4 release

Author: kernelwernel

CMakeLists.txt

@@ -15,7 +15,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 if (MSVC)
     set(CMAKE_CXX_FLAGS "/Wall /W4 /std:c++20 /EHsc")
 else()
-    set(CMAKE_CXX_FLAGS "-Wextra -Wall -Wextra -Wconversion -Wdouble-promotion -Wno-unused-parameter -Wno-unused-function -Wno-sign-conversion")
+    set(CMAKE_CXX_FLAGS "-Wextra -Wall -Wextra -Wconversion -Wdouble-promotion -Wno-unused-parameter -Wno-unused-function -Wno-sign-conversion -fmax-errors=20")
 endif()
 
 if(CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "GNU")

TODO.md

@@ -33,6 +33,7 @@
 - [ ] implement smbios version technique [here](https://github.com/Print3M/Anti-VM/blob/eb524ed89e783b36c149acc450b2350d4198b06b/detectors.cpp#L88)
 - [ ] implement a display size technique for linux with EDID 
 - [ ] implement a technique that matches the CPU product name and match it with a database of core counts for that specific CPU product
+- [ ] add usage example in the .hpp file directly below the banner
 
 # Distant plans
 - add the library to conan.io when released

docs/documentation.md

@@ -346,4 +346,5 @@ VMAware provides a convenient way to not only check for VMs, but also have the f
 | `VM::NO_MEMO` | This will disable memoization, meaning the result will not be fetched through a previous computation of the `VM::detect()` function. Use this if you're only using a single function from the `VM` struct for a performance boost. |
 | `VM::EXTREME` | This will disregard the weights/biases and its scoring system. It will essentially treat any technique that found a hit as a VM detection no matter how low that technique's certainty is, so if a single technique is positive then it will return true. | 
 | `VM::DEFAULT` | This represents a range of flags which are enabled if no default argument is provided. The reason why this exists is to easily disable any bits manually (shown in the is_vm6 example in the `VM::detect()` section)
-| `VM::WIN_HYPERV_DEFAULT` | Windows 11 (and sometimes 10) may have Hyper-V as a default virtualisation software for any program even if the OS is running as host, which is one of the main hurdles of the library to overcome between host virtualisation and actual virtualisation. The library will discard any Hyper-V brand suspicions as "not running in a VM". This flag will basically mean "I'm aware this program is running in a default virtualised environment even when the user is only using host, "but i'll still count this as running in a VM" |
+| `VM::WIN_HYPERV_DEFAULT` | Windows 11 (and sometimes 10) may have Hyper-V as a default virtualisation software for any program even if the OS is running as host, which is one of the main hurdles of the library to overcome between host virtualisation and actual virtualisation. The library will discard any Hyper-V brand suspicions as "not running in a VM". This flag will basically mean "I'm aware this program is running in a default virtualised environment even when the user is only using host, "but i'll still count this as running in a VM" |
+| `VM::MULTIPLE` | This is specific to `VM::brand()`. This will basically return a `std::string` message of what brands could be involved. For example, it could return "`VMware or VirtualBox`" instead of having a single brand string output. |   

src/cli.cpp

@@ -113,7 +113,7 @@ std::string message(const std::uint8_t score, const std::string &brand) {
         inside_vm = "Running inside a " + brand + " VM";
     }
 
-    if (score == 0)        { return baremetal; } 
+    if      (score == 0)   { return baremetal; } 
     else if (score <= 12)  { return very_unlikely; } 
     else if (score <= 25)  { return unlikely; } 
     else if (score < 50)   { return potentially; } 
@@ -237,6 +237,7 @@ int main(int argc, char* argv[]) {
         checker(VM::MUTEX, "mutex strings");
         checker(VM::UPTIME, "uptime");
         checker(VM::ODD_CPU_THREADS, "unusual thread count");
+        checker(VM::INTEL_THREAD_MISMATCH, "Intel thread count mismatch");
 
         std::printf("\n");
 
@@ -266,7 +267,7 @@ int main(int argc, char* argv[]) {
             brand == "Virtual PC" ||
             brand == "Microsoft Virtual PC/Hyper-V"
         ) {
-            std::cout << note << " If you know you are running on host, Hyper-V virtualises all applications by default within host system, see here https://github.com/kernelwernel/VMAware/issues/75\n";
+            std::cout << note << " If you know you are running on host, Hyper-V virtualises all applications by default within the host system, see here https://github.com/kernelwernel/VMAware/issues/75\n";
         }
 
         const char* conclusion_color = color(percent);