gametechdev / hybriddetect Goto Github PK

--- HybridDetect.h.orig 2023-10-06 16:01:25.711716800 +0200
+++ HybridDetect.h      2023-10-06 14:29:08.265495000 +0200
@@ -32,12 +32,23 @@
 #endif

 #ifdef HYBRIDDETECT_OS_WIN
-#include <windows.h>
-#include <Powrprof.h>
+#include <Windows.h>
+#include <powrprof.h>
 #include <VersionHelpers.h>
 #include <intrin.h>
 #include <malloc.h>

+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
+#pragma clang diagnostic ignored "-Wsign-conversion"
+#pragma clang diagnostic ignored "-Wsign-compare"
+#pragma clang diagnostic ignored "-Wimplicit-int-conversion"
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wshorten-64-to-32"
+#endif
+
 #pragma comment(lib, "Powrprof.lib")
 #else
 typedef unsigned long ULONG;
@@ -81,7 +92,7 @@
 //#define ENABLE_SOFTWARE_PROXY

 // Enables/Disables Run On API
-//#define ENABLE_RUNON
+#define ENABLE_RUNON

 // Enables/Disables ThreadPriority Based on Core-Type
 //#define ENABLE_RUNON_PRIORITY
@@ -313,13 +324,13 @@
        //unsigned                                                      osMajorVersion;
        //unsigned                                                      osMinorVersion;
        //unsigned                                                      osBuildNumber;
-       const bool IsIntel()    const { return !strcmp("GenuineIntel", vendorID); }
-       const bool IsAMD()      const { return !strcmp("AuthenticAMD", vendorID); }
+       bool IsIntel()    const { return !strcmp("GenuineIntel", vendorID); }
+       bool IsAMD()      const { return !strcmp("AuthenticAMD", vendorID); }

        inline int GetCoreTypeCount(CoreTypes coreType)
        {
 #ifdef ENABLE_CPU_SETS
-               return (int)cpuSets[coreType].size();
+               return (int)cpuSets[(UINT)coreType].size();
 #else
                std::bitset<64> bits = coreMasks[coreType];

@@ -375,7 +386,7 @@
 {
        HYBRID_DETECT_TRACE(10, ">>> (0x%.8x)", function);
        if (function > CPUIDFunctionMax) return false;
-       CPUIDEX(registers.data(), function, extFunction);
+       CPUIDEX(registers.data(), function, extFunction)
        HYBRID_DETECT_TRACE(10, "<<<");
        return true;
 }
@@ -1164,16 +1175,16 @@

 #ifdef _DEBUG
        // Where are we starting? [Inferno]
-       int startedOn = GetCurrentProcessorNumber();
+       //int startedOn = GetCurrentProcessorNumber();
 #endif
        if (coreID < procInfo.numLogicalCores)
        {
                std::vector<ULONG> coreSet = { procInfo.cores[coreID].id };
-               short succeeded = RunOnCPUSet(procInfo, threadHandle, coreSet, fallbackSet);
+               succeeded = RunOnCPUSet(procInfo, threadHandle, coreSet, fallbackSet);

 #ifdef _DEBUG
                // Check to see if the core is masked
-               int iterations = 0;
+               //int iterations = 0;
                int runningOn = -1;
                do {
                        // Surrender time-slice
@@ -1181,7 +1192,7 @@
                        // Where Are We?
                        runningOn = GetCurrentProcessorNumber();
                        // Count Loop Iterations
-                       iterations++;
+                       //iterations++;
                        // Loop while the current thread is not scheduled on a logical processor matching the affinity mask.
                } while (runningOn != coreID);
                // Assert In Debug