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

kernel32: Add a test to show that CreateThread is supposed to fail after the NtTerminateProcess call.

This commit is contained in:
Dmitry Timoshkov 2013-04-24 20:39:07 +09:00 committed by Alexandre Julliard
parent b885ce8f55
commit cd55afec8a
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
dlls/kernel32/tests/loader.c
View File

@ -1042,7 +1042,6 @@ nt4_is_broken:
#define MAX_COUNT 10 #define MAX_COUNT 10
static HANDLE attached_thread[MAX_COUNT], stop_event, event, mutex, semaphore; static HANDLE attached_thread[MAX_COUNT], stop_event, event, mutex, semaphore;
static DWORD attached_thread_count; static DWORD attached_thread_count;
static LONG noop_thread_started;
static int test_dll_phase; static int test_dll_phase;
static DWORD WINAPI mutex_thread_proc(void *param) static DWORD WINAPI mutex_thread_proc(void *param)
@ -1085,14 +1084,19 @@ static DWORD WINAPI semaphore_thread_proc(void *param)
static DWORD WINAPI noop_thread_proc(void *param) static DWORD WINAPI noop_thread_proc(void *param)
{ {
InterlockedIncrement(&noop_thread_started); if (param)
{
LONG *noop_thread_started = param;
InterlockedIncrement(noop_thread_started);
}
trace("%04u: noop_thread_proc: exiting\n", GetCurrentThreadId()); trace("%04u: noop_thread_proc: exiting\n", GetCurrentThreadId());
return 196; return 195;
} }
static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param)
{ {
static LONG noop_thread_started;
DWORD ret; DWORD ret;
switch (reason) switch (reason)
@ -1136,7 +1140,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param)
ok(!ret || broken(ret) /* before Vista */, "RtlDllShutdownInProgress returned %d\n", ret); ok(!ret || broken(ret) /* before Vista */, "RtlDllShutdownInProgress returned %d\n", ret);
} }
ok(attached_thread_count == 2, "attached thread count should be 2\n"); ok(attached_thread_count >= 2, "attached thread count should be >= 2\n");
for (i = 0; i < attached_thread_count; i++) for (i = 0; i < attached_thread_count; i++)
{ {
@ -1179,7 +1183,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param)
*/ */
noop_thread_started = 0; noop_thread_started = 0;
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
handle = CreateThread(NULL, 0, noop_thread_proc, NULL, 0, &ret); handle = CreateThread(NULL, 0, noop_thread_proc, &noop_thread_started, 0, &ret);
/* manual call to LdrShutdownProcess doesn't prevent thread creation */ /* manual call to LdrShutdownProcess doesn't prevent thread creation */
if (param && test_dll_phase != 4) if (param && test_dll_phase != 4)
{ {
@ -1187,7 +1191,11 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param)
if (!handle) if (!handle)
ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError());
else else
{
ret = WaitForSingleObject(handle, 1000);
ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret);
CloseHandle(handle); CloseHandle(handle);
}
} }
else else
{ {
@ -1212,7 +1220,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param)
noop_thread_started = 0; noop_thread_started = 0;
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
handle = CreateRemoteThread(process, NULL, 0, noop_thread_proc, NULL, 0, &ret); handle = CreateRemoteThread(process, NULL, 0, noop_thread_proc, &noop_thread_started, 0, &ret);
/* manual call to LdrShutdownProcess doesn't prevent thread creation */ /* manual call to LdrShutdownProcess doesn't prevent thread creation */
if (param && test_dll_phase != 4) if (param && test_dll_phase != 4)
{ {
@ -1220,7 +1228,11 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param)
if (!handle) if (!handle)
ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError());
else else
{
ret = WaitForSingleObject(handle, 1000);
ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret);
CloseHandle(handle); CloseHandle(handle);
}
} }
else else
{ {
@ -1438,6 +1450,19 @@ static void child_process(const char *dll_name, DWORD target_offset)
ret = pRtlDllShutdownInProgress(); ret = pRtlDllShutdownInProgress();
ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret);
SetLastError(0xdeadbeef);
thread = CreateThread(NULL, 0, noop_thread_proc, &dummy, 0, &ret);
todo_wine
ok(!thread || broken(thread != 0) /* before win7 */, "CreateThread should fail\n");
if (!thread)
ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError());
else
{
ret = WaitForSingleObject(thread, 1000);
ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret);
CloseHandle(thread);
}
break; break;
case 1: case 1: