reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-12 23:58:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ntdll: Allow 'all processors' flag used in Vista and newer.

Browse Source
This commit is contained in:
Erich Hoover 2010-02-19 19:07:41 -07:00 committed by Alexandre Julliard
parent 10789142fc
commit fda39b207c
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/ntdll/tests/info.c
View File

@ -927,11 +927,28 @@ static void test_affinity(void)
status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL );
ok( tbi.AffinityMask == 1, "Unexpected thread affinity\n" );
/* NOTE: Pre-Vista does not recognize the "all processors" flag (all bits set) */
thread_affinity = ~0UL;
status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) );
ok( broken(status == STATUS_INVALID_PARAMETER) || status == STATUS_SUCCESS,
"Expected STATUS_SUCCESS, got %08x\n", status);
if (si.dwNumberOfProcessors <= 1)
{
skip("only one processor, skipping affinity testing\n");
return;
}
/* Test thread affinity mask resulting from "all processors" flag */
if (status == STATUS_SUCCESS)
{
status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL );
ok( broken(tbi.AffinityMask == 1) || tbi.AffinityMask == (1 << si.dwNumberOfProcessors) - 1,
"Unexpected thread affinity\n" );
}
else
skip("Cannot test thread affinity mask for 'all processors' flag\n");
proc_affinity = 2;
status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) );
ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);

11
dlls/ntdll/thread.c
View File

@ -1134,14 +1134,17 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class,
case ThreadAffinityMask:
{
const ULONG_PTR affinity_mask = ((ULONG_PTR)1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1;
const ULONG_PTR *paff = data;
ULONG_PTR req_aff;
if (length != sizeof(ULONG_PTR)) return STATUS_INVALID_PARAMETER;
if (*paff & ~affinity_mask) return STATUS_INVALID_PARAMETER;
if (!*paff) return STATUS_INVALID_PARAMETER;
req_aff = *(const ULONG_PTR *)data;
if (req_aff == ~0UL) req_aff = affinity_mask;
else if (req_aff & ~affinity_mask) return STATUS_INVALID_PARAMETER;
else if (!req_aff) return STATUS_INVALID_PARAMETER;
SERVER_START_REQ( set_thread_info )
{
req->handle = wine_server_obj_handle( handle );
req->affinity = *paff;
req->affinity = req_aff;
req->mask = SET_THREAD_INFO_AFFINITY;
status = wine_server_call( req );
}