Merge branch 'kernelwernel:main' into main

Author: NotRequiem

CONTRIBUTING.md

@@ -1,10 +1,7 @@
 # Contribution Guidelines
 
 
-Make sure to create your PR merge target to the `dev` branch and not the `main` branch. This is because all our prototype code is developed in `dev`, and we usually merge that branch to `main` at least once a week. it keeps our codebase organised and separated between a prototype that we cautiously don't think it's ready to be used by the public yet (especially if it's a new technique being introduced), and an upstream version that we've deemed to be practically ready.
-
-
-Also, please consider adding your name and github in the vmaware.hpp file and the README's credit sections. Your work is valuable to us, and we want to credit you for the improvements you've made. 
+Please consider adding your name and github in the vmaware.hpp file and the README's credit sections. Your work is valuable to us, and we want to credit you for the improvements you've made. 
 
 
 ## Translations
@@ -89,4 +86,4 @@ Depending on how big the change is, if the change is fairly small then just a si
 
 
 ## Notes 
-If you have any questions or inquiries, our contact details are in the README.
+If you have any questions or inquiries, our contact details are in the README.

README.md

@@ -11,7 +11,7 @@
    </a>
 
    <div align="center">
-      <b>VMAware</b> (VM + Aware) is a cross-platform C++ library for virtual machine detection.
+      <b>VMAware</b> (VM + Aware) is a cross-platform C++ framework for virtual machine detection.
       <br>
       <br>
       <a href="README_CN.md">中文 🇨🇳</a> | <a href="README_FR.md">Français 🇫🇷</a> | <a href="README_KR.md">한국어 🇰🇷</a>
@@ -39,7 +39,7 @@ The library is:
 <br>
 
 > [!NOTE]
-> We are looking for translators willing to translate this README into your native language if it isn't included. If you'd like to contribute, feel free to give us a PR! 
+> We are looking for translators willing to translate this README into your native language. If you'd like to contribute, feel free to give us a PR! 
 
 
 ## Example 🧪
@@ -260,7 +260,7 @@ If you want to learn about the architecture and design of the library, head over
 <br>
 
 ## Issues, discussions, pull requests, and inquiries 📬
-If you have any suggestions, ideas, or any sort of contribution, feel free to ask! I'll be more than happy to discuss either in the [issue](https://github.com/kernelwernel/VMAware/issues) or [discussion](https://github.com/kernelwernel/VMAware/discussions) sections. If you want to personally ask something in private, my discord is `kr.nl`.
+If you have any suggestions, ideas, or any sort of contribution, feel free to ask! I'll be more than happy to discuss either in the [issue](https://github.com/kernelwernel/VMAware/issues) or [discussion](https://github.com/kernelwernel/VMAware/discussions) sections. If you want to personally ask something in private, our discords are `kr.nl` and `shenzken`
 
 For email inquiries: `jeanruyv@gmail.com`
 

src/vmaware.hpp

@@ -24,6 +24,7 @@
  *      - Kyun-J (https://github.com/Kyun-J)
  *      - luukjp (https://github.com/luukjp)
  *      - Lorenzo Rizzotti (https://github.com/Dreaming-Codes) 
+ *      - virtfunc (https://github.com/virtfunc)
  *  - Repository: https://github.com/kernelwernel/VMAware
  *  - Docs: https://github.com/kernelwernel/VMAware/docs/documentation.md
  *  - Full credits: https://github.com/kernelwernel/VMAware#credits-and-contributors-%EF%B8%8F
@@ -12546,8 +12547,8 @@ struct VM {
         const u8 percent_tmp = percentage(flags);
         const bool has_hardener = is_hardened();
 
-        constexpr const char* very_unlikely = "Very unlikely a";
-        constexpr const char* unlikely = "Unlikely a";
+        constexpr const char* very_unlikely = "Very unlikely";
+        constexpr const char* unlikely = "Unlikely";
         constexpr const char* potentially = "Potentially";
         constexpr const char* might = "Might be";
         constexpr const char* likely = "Likely";
@@ -12571,9 +12572,9 @@ struct VM {
             // by either having "a" or "an" before the VM brand
             // name. It would look weird if the conclusion 
             // message was "an VirtualBox" or "a Anubis", so this
-            // condition fixes that issue.    
+            // condition fixes that issue.
             if (
-                !hardener && (
+                !has_hardener && (
                     (brand_tmp == brands::ACRN) ||
                     (brand_tmp == brands::ANUBIS) ||
                     (brand_tmp == brands::BSD_VMM) ||
@@ -12602,12 +12603,12 @@ struct VM {
             }
 
             // Hyper-V artifacts are an exception due to how unique the circumstance is
-            std::string result;
-            if (brand_tmp == brands::HYPERV_ARTIFACT) {
-                result = std::string(category) + addition + hardener + brand_tmp;
-            } else {
-                result = std::string(category) + addition + hardener + brand_tmp + " VM";
-            }
+            const std::string result = 
+                std::string(category) + 
+                addition + 
+                hardener + 
+                brand_tmp + 
+                (brand_tmp == brands::HYPERV_ARTIFACT ? "" : " VM");
 
             memo::conclusion::store(result.c_str());