ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Refine NtSetInformationThread ThreadHideFromDebugger stubs. 

CoD: Black Ops 3 and CoD: WWII do each one of these calls and terminate
if they return unexpected results.

Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Rémi Bernon 2020-06-22 23:27:47 +02:00 committed by Alexandre Julliard
parent 0bec5dfeec
commit 537bb7a8ae
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2346,6 +2346,7 @@ static void test_affinity(void)
DWORD_PTR proc_affinity, thread_affinity; DWORD_PTR proc_affinity, thread_affinity;
THREAD_BASIC_INFORMATION tbi; THREAD_BASIC_INFORMATION tbi;
SYSTEM_INFO si; SYSTEM_INFO si;
ULONG dummy;
GetSystemInfo(&si); GetSystemInfo(&si);
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL ); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL );
@ -2450,6 +2451,32 @@ static void test_affinity(void)
ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
ok( tbi.AffinityMask == (1 << si.dwNumberOfProcessors) - 1, ok( tbi.AffinityMask == (1 << si.dwNumberOfProcessors) - 1,
"Unexpected thread affinity\n" ); "Unexpected thread affinity\n" );
dummy = 0;
status = pNtSetInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, sizeof(ULONG) );
ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status );
dummy = 0;
status = pNtSetInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, 1 );
ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status );
status = pNtSetInformationThread( (HANDLE)0xdeadbeef, ThreadHideFromDebugger, NULL, 0 );
ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status );
status = pNtSetInformationThread( GetCurrentThread(), ThreadHideFromDebugger, NULL, 0 );
ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status );
dummy = 0;
status = NtQueryInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, sizeof(ULONG), NULL );
if (status == STATUS_INVALID_INFO_CLASS)
win_skip("ThreadHideFromDebugger not available\n");
else
{
ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status );
dummy = 0;
status = NtQueryInformationThread( (HANDLE)0xdeadbeef, ThreadHideFromDebugger, &dummy, sizeof(ULONG), NULL );
ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status );
dummy = 0;
status = NtQueryInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, 1, NULL );
ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status );
if (status == STATUS_SUCCESS) ok( dummy == 1, "Expected dummy == 1, got %08x\n", dummy );
}
} }
static void test_NtGetCurrentProcessorNumber(void) static void test_NtGetCurrentProcessorNumber(void)

14
dlls/ntdll/unix/thread.c
View File

@ -831,6 +831,8 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class,
{ {
NTSTATUS status; NTSTATUS status;
TRACE("(%p,%d,%p,%x,%p)\n", handle, class, data, length, ret_len);
switch (class) switch (class)
{ {
case ThreadBasicInformation: case ThreadBasicInformation:
@ -1063,6 +1065,14 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class,
#endif #endif
} }
case ThreadHideFromDebugger:
if (length != sizeof(BOOLEAN)) return STATUS_INFO_LENGTH_MISMATCH;
if (!data) return STATUS_ACCESS_VIOLATION;
if (handle != GetCurrentThread()) return STATUS_ACCESS_DENIED;
*(BOOLEAN*)data = TRUE;
if (ret_len) *ret_len = sizeof(BOOLEAN);
return STATUS_SUCCESS;
case ThreadPriority: case ThreadPriority:
case ThreadBasePriority: case ThreadBasePriority:
case ThreadImpersonationToken: case ThreadImpersonationToken:
@ -1088,6 +1098,8 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class,
{ {
NTSTATUS status; NTSTATUS status;
TRACE("(%p,%d,%p,%x)\n", handle, class, data, length);
switch (class) switch (class)
{ {
case ThreadZeroTlsCell: case ThreadZeroTlsCell:
@ -1152,6 +1164,8 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class,
} }
case ThreadHideFromDebugger: case ThreadHideFromDebugger:
if (length) return STATUS_INFO_LENGTH_MISMATCH;
if (handle != GetCurrentThread()) return STATUS_INVALID_HANDLE;
/* pretend the call succeeded to satisfy some code protectors */ /* pretend the call succeeded to satisfy some code protectors */
return STATUS_SUCCESS; return STATUS_SUCCESS;