Merge pull request #632 from NotRequiem/main

fix: fixed functions being called twice in some cases due to core logic

Author: NotRequiem

src/vmaware.hpp

@@ -5054,7 +5054,7 @@ struct VM {
                 ProcessorInformation = 11
             };
 
-            const HMODULE hPowr = GetModuleHandleA("powrprof.dll");
+            const HMODULE hPowr = LoadLibraryA("powrprof.dll");
             if (!hPowr) return 0;
 
             const char* names[] = { "CallNtPowerInformation" };
@@ -11777,22 +11777,21 @@ struct VM {
         if (flag_bit < technique_end) {
             const core::technique& pair = core::technique_table[flag_bit];
 
-            if (auto run_fn = pair.run) {  
+            if (auto run_fn = pair.run) {
                 core::last_detected_brand = nullptr;
-                core::last_detected_score = 0; 
+                core::last_detected_score = 0;
+
+                const bool result = run_fn();
+
+                const u8 points_to_add = (core::last_detected_score > 0) ? core::last_detected_score : pair.points;
+                const char* detected_brand = (core::last_detected_brand) ? core::last_detected_brand : brands::NULL_BRAND;
 
-                bool result = run_fn();           
                 if (result) {
-                    #ifdef __VMAWARE_DEBUG__
-                        total_points += pair.points;
-                    #endif
                     detected_count_num++;
-                    u8 points_to_add = (core::last_detected_score > 0) ? core::last_detected_score : pair.points;
-                    const char* detected_brand = (core::last_detected_brand) ? core::last_detected_brand : brands::NULL_BRAND;
-
-                    memo::cache_store(flag_bit, result, points_to_add, detected_brand);
-                    return result;
                 }
+
+                memo::cache_store(flag_bit, result, result ? points_to_add : 0, detected_brand);
+                return result;
             }
             else {
                 throw_error("Flag is not known or not implemented");
@@ -11819,9 +11818,6 @@ struct VM {
         // is the multiple setting flag enabled?
         const bool is_multiple = core::is_enabled(flags, MULTIPLE);
 
-        // run all the techniques
-        const u16 score = core::run_all(flags);
-
         // check if the result is already cached and return that instead
         if (is_multiple) {
             if (memo::multi_brand::is_cached()) {
@@ -11836,6 +11832,9 @@ struct VM {
             }
         }
 
+        // run all the techniques
+        const u16 score = core::run_all(flags);
+
     #if (VMA_CPP <= 14)
         constexpr const char* TMP_QEMU = "QEMU";
         constexpr const char* TMP_KVM = "KVM";