Merge branch 'main' into dependabot/submodules/external/FindWDK-6aaaaf4

microsoft · Nov 2, 2024 · 8c5904c · 8c5904c
2 parents 5ab7439 + 88a336d
commit 8c5904c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/external/Catch2 b/external/Catch2
diff --git a/inc/usersim/ke.h b/inc/usersim/ke.h
@@ -141,8 +141,13 @@ USERSIM_API
 ULONG
 KeQueryMaximumProcessorCountEx(_In_ USHORT group_number);
 
-#define KeQueryActiveProcessorCount KeQueryMaximumProcessorCount
-#define KeQueryActiveProcessorCountEx KeQueryMaximumProcessorCountEx
+USERSIM_API
+ULONG
+KeQueryActiveProcessorCount();
+
+USERSIM_API
+ULONG
+KeQueryActiveProcessorCountEx(_In_ USHORT group_number);
 
 USERSIM_API
 KAFFINITY

diff --git a/src/ke.cpp b/src/ke.cpp
@@ -279,6 +279,18 @@ KeQueryMaximumProcessorCount() { return GetMaximumProcessorCount(ALL_PROCESSOR_G
 ULONG
 KeQueryMaximumProcessorCountEx(_In_ USHORT group_number) { return GetMaximumProcessorCount(group_number); }
 
+ULONG
+KeQueryActiveProcessorCount()
+{
+    return KeQueryMaximumProcessorCount();
+}
+
+ULONG
+KeQueryActiveProcessorCountEx(_In_ USHORT group_number)
+{
+    return KeQueryMaximumProcessorCountEx(group_number);
+}
+
 KAFFINITY
 KeSetSystemAffinityThreadEx(KAFFINITY affinity)
 {
@@ -312,7 +324,11 @@ void KeSetSystemGroupAffinityThread(
 {
     if (!SetThreadGroupAffinity(GetCurrentThread(), Affinity, PreviousAffinity)) {
         DWORD error = GetLastError();
+        #if defined(NDEBUG)
+        UNREFERENCED_PARAMETER(error);
+        #else
         assert(error == 0);
+        #endif
     }
 }
+1 −1		.github/workflows/mac-builds-m1.yml
+6 −2		.github/workflows/mac-builds.yml
+1 −1		src/catch2/internal/catch_console_colour.cpp