ntoskrnl.exe: Add KeQueryActiveProcessorCountEx() function.

Signed-off-by: Paul Gofman <pgofman@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Paul Gofman 2020-05-22 20:37:43 +03:00 committed by Alexandre Julliard
parent e3c0474b74
commit 2716e215df
5 changed files with 41 additions and 0 deletions

View File

@ -2385,6 +2385,12 @@ KAFFINITY WINAPI KeQueryActiveProcessors( void )
return AffinityMask;
}
ULONG WINAPI KeQueryActiveProcessorCountEx(USHORT group_number)
{
TRACE("group_number %u.\n", group_number);
return GetActiveProcessorCount(group_number);
}
/**********************************************************************
* KeQueryInterruptTime (NTOSKRNL.EXE.@)

View File

@ -587,6 +587,7 @@
@ stub KeProfileInterruptWithSource
@ stub KePulseEvent
@ stdcall KeQueryActiveProcessors()
@ stdcall KeQueryActiveProcessorCountEx(long)
@ stdcall KeQueryInterruptTime()
@ stub KeQueryPriorityThread
@ stub KeQueryRuntimeThread

View File

@ -1710,6 +1710,36 @@ static void test_executable_pool(void)
}
#endif
static void test_affinity(void)
{
ULONG (WINAPI *pKeQueryActiveProcessorCountEx)(USHORT);
KAFFINITY (WINAPI *pKeQueryActiveProcessors)(void);
ULONG cpu_count, count;
KAFFINITY mask;
pKeQueryActiveProcessorCountEx = get_proc_address("KeQueryActiveProcessorCountEx");
if (!pKeQueryActiveProcessorCountEx)
{
win_skip("KeQueryActiveProcessorCountEx is not available.\n");
return;
}
pKeQueryActiveProcessors = get_proc_address("KeQueryActiveProcessors");
ok(!!pKeQueryActiveProcessors, "KeQueryActiveProcessors is not available.\n");
count = pKeQueryActiveProcessorCountEx(1);
todo_wine ok(!count, "Got unexpected count %u.\n", count);
cpu_count = pKeQueryActiveProcessorCountEx(0);
ok(cpu_count, "Got unexpected cpu_count %u.\n", cpu_count);
count = pKeQueryActiveProcessorCountEx(ALL_PROCESSOR_GROUPS);
ok(count == cpu_count, "Got unexpected count %u.\n", count);
mask = pKeQueryActiveProcessors();
ok(mask == ~((~0u) << cpu_count), "Got unexpected mask %#lx.\n", mask);
}
static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack)
{
ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength;
@ -1763,6 +1793,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st
#if defined(__i386__) || defined(__x86_64__)
test_executable_pool();
#endif
test_affinity();
if (main_test_work_item) return STATUS_UNEXPECTED_IO_ERROR;

View File

@ -1696,6 +1696,7 @@ void WINAPI KeInitializeSpinLock(KSPIN_LOCK*);
void WINAPI KeInitializeTimerEx(PKTIMER,TIMER_TYPE);
void WINAPI KeInitializeTimer(KTIMER*);
void WINAPI KeLeaveCriticalRegion(void);
ULONG WINAPI KeQueryActiveProcessorCountEx(USHORT);
KAFFINITY WINAPI KeQueryActiveProcessors(void);
void WINAPI KeQuerySystemTime(LARGE_INTEGER*);
void WINAPI KeQueryTickCount(LARGE_INTEGER*);

View File

@ -6501,6 +6501,8 @@ typedef struct _GROUP_AFFINITY
WORD Reserved[3];
} GROUP_AFFINITY, *PGROUP_AFFINITY;
#define ALL_PROCESSOR_GROUPS 0xffff
typedef struct _PROCESSOR_NUMBER
{
WORD Group;