March 2015 - Wine-commits - list.winehq.org

Sebastian Lackner : kernel32/tests: Allow multiple subprocess commands in process tests.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 978597e8ab26302f442f601edff6b34073071442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=978597e8ab26302f442f601ed… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 26 05:18:09 2015 +0100 kernel32/tests: Allow multiple subprocess commands in process tests. --- dlls/kernel32/tests/process.c | 72 +++++++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=978597e8ab26302f442f6…

1 0

Andrew Cook : kernel32/tests: Add tests for IsProcessInJob.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: f40bffaf67735f0f2db61361140424c89cb9bcde URL: http://source.winehq.org/git/wine.git/?a=commit;h=f40bffaf67735f0f2db613611… Author: Andrew Cook <ariscop(a)gmail.com> Date: Sat Mar 28 13:25:45 2015 +1100 kernel32/tests: Add tests for IsProcessInJob. Cleanup and improvements by Sebastian Lackner. --- dlls/kernel32/tests/process.c | 86 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index b8323b4..a8c8654 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -66,6 +66,9 @@ static BOOL (WINAPI *pVirtualFreeEx)(HANDLE, LPVOID, SIZE_T, DWORD); static BOOL (WINAPI *pQueryFullProcessImageNameA)(HANDLE hProcess, DWORD dwFlags, LPSTR lpExeName, PDWORD lpdwSize); static BOOL (WINAPI *pQueryFullProcessImageNameW)(HANDLE hProcess, DWORD dwFlags, LPWSTR lpExeName, PDWORD lpdwSize); static DWORD (WINAPI *pK32GetProcessImageFileNameA)(HANDLE,LPSTR,DWORD); +static HANDLE (WINAPI *pCreateJobObjectW)(LPSECURITY_ATTRIBUTES sa, LPCWSTR name); +static BOOL (WINAPI *pAssignProcessToJobObject)(HANDLE job, HANDLE process); +static BOOL (WINAPI *pIsProcessInJob)(HANDLE process, HANDLE job, PBOOL result); /* ############################### */ static char base[MAX_PATH]; @@ -209,6 +212,9 @@ static BOOL init(void) pQueryFullProcessImageNameA = (void *) GetProcAddress(hkernel32, "QueryFullProcessImageNameA"); pQueryFullProcessImageNameW = (void *) GetProcAddress(hkernel32, "QueryFullProcessImageNameW"); pK32GetProcessImageFileNameA = (void *) GetProcAddress(hkernel32, "K32GetProcessImageFileNameA"); + pCreateJobObjectW = (void *)GetProcAddress(hkernel32, "CreateJobObjectW"); + pAssignProcessToJobObject = (void *)GetProcAddress(hkernel32, "AssignProcessToJobObject"); + pIsProcessInJob = (void *)GetProcAddress(hkernel32, "IsProcessInJob"); return TRUE; } @@ -2119,19 +2125,87 @@ static void test_DuplicateHandle(void) CloseHandle(out); } +#define create_process(cmd, pi) _create_process(__LINE__, cmd, pi) +static void _create_process(int line, const char *command, LPPROCESS_INFORMATION pi) +{ + BOOL ret; + char buffer[MAX_PATH]; + STARTUPINFOA si = {0}; + + snprintf(buffer, MAX_PATH, "\"%s\" tests/process.c %s", selfname, command); + + ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, pi); + ok_(__FILE__, line)(ret, "CreateProcess error %u\n", GetLastError()); +} + + +static void test_IsProcessInJob(void) +{ + HANDLE job; + PROCESS_INFORMATION pi; + BOOL ret, out; + DWORD dwret; + + if (!pIsProcessInJob) + { + win_skip("IsProcessInJob not available.\n"); + return; + } + + job = pCreateJobObjectW(NULL, NULL); + ok(job != NULL, "CreateJobObject error %u\n", GetLastError()); + + create_process("wait", &pi); + + out = TRUE; + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(!out, "IsProcessInJob returned out=%u\n", out); + + ret = pAssignProcessToJobObject(job, pi.hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + todo_wine + ok(out, "IsProcessInJob returned out=%u\n", out); + + TerminateProcess(pi.hProcess, 0); + + dwret = WaitForSingleObject(pi.hProcess, 1000); + ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + todo_wine + ok(out, "IsProcessInJob returned out=%u\n", out); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(job); +} + START_TEST(process) { BOOL b = init(); ok(b, "Basic init of CreateProcess test\n"); if (!b) return; - if (myARGC >= 4) + if (myARGC >= 3) { - if (!strcmp(myARGV[2], "dump")) + if (!strcmp(myARGV[2], "dump") && myARGC >= 4) { doChild(myARGV[3], (myARGC >= 5) ? myARGV[4] : NULL); return; } + else if (!strcmp(myARGV[2], "wait")) + { + Sleep(30000); + ok(0, "Child process not killed\n"); + return; + } ok(0, "Unexpected command %s\n", myARGV[2]); return; @@ -2160,4 +2234,12 @@ START_TEST(process) * handles: check the handle inheritance stuff (+sec options) * console: check if console creation parameters work */ + + if (!pCreateJobObjectW) + { + win_skip("No job object support\n"); + return; + } + + test_IsProcessInJob(); }

1 0

Andrew Cook : kernel32/tests: Add tests for TerminateJobObject.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: ad04b7305b308193ea936efc69a39ddaf8abd459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad04b7305b308193ea936efc6… Author: Andrew Cook <ariscop(a)gmail.com> Date: Sat Mar 28 13:23:28 2015 +1100 kernel32/tests: Add tests for TerminateJobObject. Cleanup and improvements by Sebastian Lackner. --- dlls/kernel32/tests/process.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index a8c8654..85de14a 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -69,6 +69,7 @@ static DWORD (WINAPI *pK32GetProcessImageFileNameA)(HANDLE,LPSTR,DWORD); static HANDLE (WINAPI *pCreateJobObjectW)(LPSECURITY_ATTRIBUTES sa, LPCWSTR name); static BOOL (WINAPI *pAssignProcessToJobObject)(HANDLE job, HANDLE process); static BOOL (WINAPI *pIsProcessInJob)(HANDLE process, HANDLE job, PBOOL result); +static BOOL (WINAPI *pTerminateJobObject)(HANDLE job, UINT exit_code); /* ############################### */ static char base[MAX_PATH]; @@ -215,6 +216,7 @@ static BOOL init(void) pCreateJobObjectW = (void *)GetProcAddress(hkernel32, "CreateJobObjectW"); pAssignProcessToJobObject = (void *)GetProcAddress(hkernel32, "AssignProcessToJobObject"); pIsProcessInJob = (void *)GetProcAddress(hkernel32, "IsProcessInJob"); + pTerminateJobObject = (void *)GetProcAddress(hkernel32, "TerminateJobObject"); return TRUE; } @@ -2187,6 +2189,40 @@ static void test_IsProcessInJob(void) CloseHandle(job); } +static void test_TerminateJobObject(void) +{ + HANDLE job; + PROCESS_INFORMATION pi; + BOOL ret; + DWORD dwret; + + job = pCreateJobObjectW(NULL, NULL); + ok(job != NULL, "CreateJobObject error %u\n", GetLastError()); + + create_process("wait", &pi); + + ret = pAssignProcessToJobObject(job, pi.hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + ret = pTerminateJobObject(job, 123); + ok(ret, "TerminateJobObject error %u\n", GetLastError()); + + dwret = WaitForSingleObject(pi.hProcess, 1000); + todo_wine + ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret); + if (dwret == WAIT_TIMEOUT) TerminateProcess(pi.hProcess, 0); + + ret = GetExitCodeProcess(pi.hProcess, &dwret); + ok(ret, "GetExitCodeProcess error %u\n", GetLastError()); + todo_wine + ok(dwret == 123 || broken(dwret == 0) /* randomly fails on Win 2000 / XP */, + "wrong exitcode %u\n", dwret); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(job); +} + START_TEST(process) { BOOL b = init(); @@ -2242,4 +2278,5 @@ START_TEST(process) } test_IsProcessInJob(); + test_TerminateJobObject(); }

1 0

Andrew Cook : kernel32/tests: Add tests for QueryInformationJobObject.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: d4fd3c899e0a8c10f0cc7f96e021ce53bb8671d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4fd3c899e0a8c10f0cc7f96e… Author: Andrew Cook <ariscop(a)gmail.com> Date: Sat Mar 28 13:23:51 2015 +1100 kernel32/tests: Add tests for QueryInformationJobObject. Cleanup and improvements by Sebastian Lackner. --- dlls/kernel32/tests/process.c | 93 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 85de14a..c420576 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -70,6 +70,7 @@ static HANDLE (WINAPI *pCreateJobObjectW)(LPSECURITY_ATTRIBUTES sa, LPCWSTR name static BOOL (WINAPI *pAssignProcessToJobObject)(HANDLE job, HANDLE process); static BOOL (WINAPI *pIsProcessInJob)(HANDLE process, HANDLE job, PBOOL result); static BOOL (WINAPI *pTerminateJobObject)(HANDLE job, UINT exit_code); +static BOOL (WINAPI *pQueryInformationJobObject)(HANDLE job, JOBOBJECTINFOCLASS class, LPVOID info, DWORD len, LPDWORD ret_len); /* ############################### */ static char base[MAX_PATH]; @@ -217,6 +218,7 @@ static BOOL init(void) pAssignProcessToJobObject = (void *)GetProcAddress(hkernel32, "AssignProcessToJobObject"); pIsProcessInJob = (void *)GetProcAddress(hkernel32, "IsProcessInJob"); pTerminateJobObject = (void *)GetProcAddress(hkernel32, "TerminateJobObject"); + pQueryInformationJobObject = (void *)GetProcAddress(hkernel32, "QueryInformationJobObject"); return TRUE; } @@ -2223,6 +2225,91 @@ static void test_TerminateJobObject(void) CloseHandle(job); } +static void test_QueryInformationJobObject(void) +{ + char buf[FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[5])]; + PJOBOBJECT_BASIC_PROCESS_ID_LIST pid_list = (JOBOBJECT_BASIC_PROCESS_ID_LIST *)buf; + DWORD dwret, ret_len; + PROCESS_INFORMATION pi[2]; + HANDLE job; + BOOL ret; + + job = pCreateJobObjectW(NULL, NULL); + ok(job != NULL, "CreateJobObject error %u\n", GetLastError()); + + /* Only active processes are returned */ + create_process("exit", &pi[0]); + ret = pAssignProcessToJobObject(job, pi[0].hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + dwret = WaitForSingleObject(pi[0].hProcess, 1000); + ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret); + + CloseHandle(pi[0].hProcess); + CloseHandle(pi[0].hThread); + + create_process("wait", &pi[0]); + ret = pAssignProcessToJobObject(job, pi[0].hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + create_process("wait", &pi[1]); + ret = pAssignProcessToJobObject(job, pi[1].hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = QueryInformationJobObject(job, JobObjectBasicProcessIdList, pid_list, + FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList), &ret_len); + ok(!ret, "QueryInformationJobObject expected failure\n"); + todo_wine + expect_eq_d(ERROR_BAD_LENGTH, GetLastError()); + + SetLastError(0xdeadbeef); + memset(buf, 0, sizeof(buf)); + pid_list->NumberOfAssignedProcesses = 42; + pid_list->NumberOfProcessIdsInList = 42; + ret = QueryInformationJobObject(job, JobObjectBasicProcessIdList, pid_list, + FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[1]), &ret_len); + ok(!ret, "QueryInformationJobObject expected failure\n"); + todo_wine + expect_eq_d(ERROR_MORE_DATA, GetLastError()); + if (ret) + { + expect_eq_d(42, pid_list->NumberOfAssignedProcesses); + expect_eq_d(42, pid_list->NumberOfProcessIdsInList); + } + + memset(buf, 0, sizeof(buf)); + ret = pQueryInformationJobObject(job, JobObjectBasicProcessIdList, pid_list, sizeof(buf), &ret_len); + todo_wine + ok(ret, "QueryInformationJobObject error %u\n", GetLastError()); + if(ret) + { + if (pid_list->NumberOfAssignedProcesses == 3) /* Win 8 */ + win_skip("Number of assigned processes broken on Win 8\n"); + else + { + ULONG_PTR *list = pid_list->ProcessIdList; + + ok(ret_len == FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[2]), + "QueryInformationJobObject returned ret_len=%u\n", ret_len); + + expect_eq_d(2, pid_list->NumberOfAssignedProcesses); + expect_eq_d(2, pid_list->NumberOfProcessIdsInList); + expect_eq_d(pi[0].dwProcessId, list[0]); + expect_eq_d(pi[1].dwProcessId, list[1]); + } + } + + TerminateProcess(pi[0].hProcess, 0); + CloseHandle(pi[0].hProcess); + CloseHandle(pi[0].hThread); + + TerminateProcess(pi[1].hProcess, 0); + CloseHandle(pi[1].hProcess); + CloseHandle(pi[1].hThread); + + CloseHandle(job); +} + START_TEST(process) { BOOL b = init(); @@ -2242,6 +2329,11 @@ START_TEST(process) ok(0, "Child process not killed\n"); return; } + else if (!strcmp(myARGV[2], "exit")) + { + Sleep(100); + return; + } ok(0, "Unexpected command %s\n", myARGV[2]); return; @@ -2279,4 +2371,5 @@ START_TEST(process) test_IsProcessInJob(); test_TerminateJobObject(); + test_QueryInformationJobObject(); }

1 0

Andrew Cook : kernel32/tests: Add tests for job object completion ports.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 6c2b0eb011488dc0b56fc4e264069e80966c625b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c2b0eb011488dc0b56fc4e26… Author: Andrew Cook <ariscop(a)gmail.com> Date: Sat Mar 28 13:24:12 2015 +1100 kernel32/tests: Add tests for job object completion ports. Cleanup and improvements by Sebastian Lackner. --- dlls/kernel32/tests/process.c | 66 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index c420576..7620410 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -71,6 +71,8 @@ static BOOL (WINAPI *pAssignProcessToJobObject)(HANDLE job, HANDLE process); static BOOL (WINAPI *pIsProcessInJob)(HANDLE process, HANDLE job, PBOOL result); static BOOL (WINAPI *pTerminateJobObject)(HANDLE job, UINT exit_code); static BOOL (WINAPI *pQueryInformationJobObject)(HANDLE job, JOBOBJECTINFOCLASS class, LPVOID info, DWORD len, LPDWORD ret_len); +static BOOL (WINAPI *pSetInformationJobObject)(HANDLE job, JOBOBJECTINFOCLASS class, LPVOID info, DWORD len); +static HANDLE (WINAPI *pCreateIoCompletionPort)(HANDLE file, HANDLE existing_port, ULONG_PTR key, DWORD threads); /* ############################### */ static char base[MAX_PATH]; @@ -219,6 +221,8 @@ static BOOL init(void) pIsProcessInJob = (void *)GetProcAddress(hkernel32, "IsProcessInJob"); pTerminateJobObject = (void *)GetProcAddress(hkernel32, "TerminateJobObject"); pQueryInformationJobObject = (void *)GetProcAddress(hkernel32, "QueryInformationJobObject"); + pSetInformationJobObject = (void *)GetProcAddress(hkernel32, "SetInformationJobObject"); + pCreateIoCompletionPort = (void *)GetProcAddress(hkernel32, "CreateIoCompletionPort"); return TRUE; } @@ -2129,6 +2133,25 @@ static void test_DuplicateHandle(void) CloseHandle(out); } +#define test_completion(a, b, c, d, e) _test_completion(__LINE__, a, b, c, d, e) +static void _test_completion(int line, HANDLE port, DWORD ekey, ULONG_PTR evalue, ULONG_PTR eoverlapped, DWORD wait) +{ + LPOVERLAPPED overlapped; + ULONG_PTR value; + DWORD key; + BOOL ret; + + ret = GetQueuedCompletionStatus(port, &key, &value, &overlapped, wait); + + ok_(__FILE__, line)(ret, "GetQueuedCompletionStatus: %x\n", GetLastError()); + if (ret) + { + ok_(__FILE__, line)(key == ekey, "unexpected key %x\n", key); + ok_(__FILE__, line)(value == evalue, "unexpected value %p\n", (void *)value); + ok_(__FILE__, line)(overlapped == (LPOVERLAPPED)eoverlapped, "unexpected overlapped %p\n", overlapped); + } +} + #define create_process(cmd, pi) _create_process(__LINE__, cmd, pi) static void _create_process(int line, const char *command, LPPROCESS_INFORMATION pi) { @@ -2310,6 +2333,48 @@ static void test_QueryInformationJobObject(void) CloseHandle(job); } +static void test_CompletionPort(void) +{ + JOBOBJECT_ASSOCIATE_COMPLETION_PORT port_info; + PROCESS_INFORMATION pi; + HANDLE job, port; + DWORD dwret; + BOOL ret; + + job = pCreateJobObjectW(NULL, NULL); + ok(job != NULL, "CreateJobObject error %u\n", GetLastError()); + + port = pCreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 1); + ok(port != NULL, "CreateIoCompletionPort error %u\n", GetLastError()); + + port_info.CompletionKey = job; + port_info.CompletionPort = port; + ret = pSetInformationJobObject(job, JobObjectAssociateCompletionPortInformation, &port_info, sizeof(port_info)); + ok(ret, "SetInformationJobObject error %u\n", GetLastError()); + + create_process("wait", &pi); + + ret = pAssignProcessToJobObject(job, pi.hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + todo_wine + test_completion(port, JOB_OBJECT_MSG_NEW_PROCESS, (DWORD_PTR)job, pi.dwProcessId, 0); + + TerminateProcess(pi.hProcess, 0); + dwret = WaitForSingleObject(pi.hProcess, 1000); + ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret); + + todo_wine + test_completion(port, JOB_OBJECT_MSG_EXIT_PROCESS, (DWORD_PTR)job, pi.dwProcessId, 0); + todo_wine + test_completion(port, JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO, (DWORD_PTR)job, 0, 100); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(job); + CloseHandle(port); +} + START_TEST(process) { BOOL b = init(); @@ -2372,4 +2437,5 @@ START_TEST(process) test_IsProcessInJob(); test_TerminateJobObject(); test_QueryInformationJobObject(); + test_CompletionPort(); }

1 0

Andrew Cook : kernel32/tests: Add tests for JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 3ca0282e5f189ffab0beafdb669b1f5088073a2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ca0282e5f189ffab0beafdb6… Author: Andrew Cook <ariscop(a)gmail.com> Date: Sat Mar 28 13:24:30 2015 +1100 kernel32/tests: Add tests for JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE. Cleanup and improvements by Sebastian Lackner. --- dlls/kernel32/tests/process.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 7620410..27961f4 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2375,6 +2375,42 @@ static void test_CompletionPort(void) CloseHandle(port); } +static void test_KillOnJobClose(void) +{ + JOBOBJECT_EXTENDED_LIMIT_INFORMATION limit_info; + PROCESS_INFORMATION pi; + DWORD dwret; + HANDLE job; + BOOL ret; + + job = pCreateJobObjectW(NULL, NULL); + ok(job != NULL, "CreateJobObject error %u\n", GetLastError()); + + limit_info.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE; + ret = pSetInformationJobObject(job, JobObjectExtendedLimitInformation, &limit_info, sizeof(limit_info)); + if (!ret && GetLastError() == ERROR_INVALID_PARAMETER) + { + win_skip("Kill on job close limit not available\n"); + return; + } + ok(ret, "SetInformationJobObject error %u\n", GetLastError()); + + create_process("wait", &pi); + + ret = pAssignProcessToJobObject(job, pi.hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + CloseHandle(job); + + dwret = WaitForSingleObject(pi.hProcess, 1000); + todo_wine + ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret); + if (dwret == WAIT_TIMEOUT) TerminateProcess(pi.hProcess, 0); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); +} + START_TEST(process) { BOOL b = init(); @@ -2438,4 +2474,5 @@ START_TEST(process) test_TerminateJobObject(); test_QueryInformationJobObject(); test_CompletionPort(); + test_KillOnJobClose(); }

1 0

Andrew Cook : kernel32/tests: Add tests for JOB_OBJECT_LIMIT_BREAKAWAY_OK.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: f0ef853d9df5d03a9cc3913436f1f87691006022 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0ef853d9df5d03a9cc391343… Author: Andrew Cook <ariscop(a)gmail.com> Date: Sat Mar 28 13:24:48 2015 +1100 kernel32/tests: Add tests for JOB_OBJECT_LIMIT_BREAKAWAY_OK. Cleanup and improvements by Sebastian Lackner. --- dlls/kernel32/tests/process.c | 92 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 27961f4..3395f0f 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2411,8 +2411,97 @@ static void test_KillOnJobClose(void) CloseHandle(pi.hThread); } +static HANDLE test_AddSelfToJob(void) +{ + HANDLE job; + BOOL ret; + + job = pCreateJobObjectW(NULL, NULL); + ok(job != NULL, "CreateJobObject error %u\n", GetLastError()); + + ret = pAssignProcessToJobObject(job, GetCurrentProcess()); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + return job; +} + +static void test_BreakawayOk(HANDLE job) +{ + JOBOBJECT_EXTENDED_LIMIT_INFORMATION limit_info; + PROCESS_INFORMATION pi; + STARTUPINFOA si = {0}; + char buffer[MAX_PATH]; + BOOL ret, out; + DWORD dwret; + + if (!pIsProcessInJob) + { + win_skip("IsProcessInJob not available.\n"); + return; + } + + snprintf(buffer, MAX_PATH, "\"%s\" tests/process.c %s", selfname, "exit"); + + ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &pi); + todo_wine + ok(!ret, "CreateProcessA expected failure\n"); + todo_wine + expect_eq_d(ERROR_ACCESS_DENIED, GetLastError()); + + if (ret) + { + TerminateProcess(pi.hProcess, 0); + + dwret = WaitForSingleObject(pi.hProcess, 1000); + ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + } + + limit_info.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_BREAKAWAY_OK; + ret = pSetInformationJobObject(job, JobObjectExtendedLimitInformation, &limit_info, sizeof(limit_info)); + ok(ret, "SetInformationJobObject error %u\n", GetLastError()); + + ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &pi); + ok(ret, "CreateProcessA error %u\n", GetLastError()); + + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(!out, "IsProcessInJob returned out=%u\n", out); + + dwret = WaitForSingleObject(pi.hProcess, 1000); + ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + + limit_info.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK; + ret = pSetInformationJobObject(job, JobObjectExtendedLimitInformation, &limit_info, sizeof(limit_info)); + ok(ret, "SetInformationJobObject error %u\n", GetLastError()); + + ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess error %u\n", GetLastError()); + + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(!out, "IsProcessInJob returned out=%u\n", out); + + dwret = WaitForSingleObject(pi.hProcess, 1000); + ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + + /* unset breakaway ok */ + limit_info.BasicLimitInformation.LimitFlags = 0; + ret = pSetInformationJobObject(job, JobObjectExtendedLimitInformation, &limit_info, sizeof(limit_info)); + ok(ret, "SetInformationJobObject error %u\n", GetLastError()); +} + START_TEST(process) { + HANDLE job; BOOL b = init(); ok(b, "Basic init of CreateProcess test\n"); if (!b) return; @@ -2475,4 +2564,7 @@ START_TEST(process) test_QueryInformationJobObject(); test_CompletionPort(); test_KillOnJobClose(); + job = test_AddSelfToJob(); + test_BreakawayOk(job); + CloseHandle(job); }

1 0

Sebastian Lackner : kernel32/tests: Add tests for adding a terminated process to a job object.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: ddd3d1689cc44fe925d26671b706bbe937260236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddd3d1689cc44fe925d26671b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 28 06:34:24 2015 +0100 kernel32/tests: Add tests for adding a terminated process to a job object. --- dlls/kernel32/tests/process.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index b8413f6..fd3ce7f 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2245,6 +2245,23 @@ static void test_TerminateJobObject(void) CloseHandle(pi.hProcess); CloseHandle(pi.hThread); + + /* Test adding an already terminated process to a job object */ + create_process("exit", &pi); + + dwret = WaitForSingleObject(pi.hProcess, 1000); + ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret); + + SetLastError(0xdeadbeef); + ret = pAssignProcessToJobObject(job, pi.hProcess); + todo_wine + ok(!ret, "AssignProcessToJobObject unexpectedly succeeded\n"); + todo_wine + expect_eq_d(ERROR_ACCESS_DENIED, GetLastError()); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(job); }

1 0

Andrew Cook : kernel32/tests: Add tests for job inheritance.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 6cd34c900262f7636b484476da182daad7a60a65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cd34c900262f7636b484476d… Author: Andrew Cook <ariscop(a)gmail.com> Date: Sat Mar 28 13:26:30 2015 +1100 kernel32/tests: Add tests for job inheritance. Cleanup and improvements by Sebastian Lackner. --- dlls/kernel32/tests/process.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 3395f0f..b8413f6 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2425,6 +2425,38 @@ static HANDLE test_AddSelfToJob(void) return job; } +static void test_jobInheritance(HANDLE job) +{ + char buffer[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOA si = {0}; + DWORD dwret; + BOOL ret, out; + + if (!pIsProcessInJob) + { + win_skip("IsProcessInJob not available.\n"); + return; + } + + snprintf(buffer, MAX_PATH, "\"%s\" tests/process.c %s", selfname, "exit"); + + ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "CreateProcessA error %u\n", GetLastError()); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + todo_wine + ok(out, "IsProcessInJob returned out=%u\n", out); + + dwret = WaitForSingleObject(pi.hProcess, 1000); + ok(dwret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", dwret); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); +} + static void test_BreakawayOk(HANDLE job) { JOBOBJECT_EXTENDED_LIMIT_INFORMATION limit_info; @@ -2565,6 +2597,7 @@ START_TEST(process) test_CompletionPort(); test_KillOnJobClose(); job = test_AddSelfToJob(); + test_jobInheritance(job); test_BreakawayOk(job); CloseHandle(job); }

1 0

Andrey Gusev : d3dx9_36: Assorted spelling and typos fixes.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 07630a9eae94fc2d2a713c68a70652bfca6c1353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07630a9eae94fc2d2a713c68a… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun Mar 29 13:51:20 2015 +0300 d3dx9_36: Assorted spelling and typos fixes. --- dlls/d3dx9_36/mesh.c | 14 +++++++------- dlls/d3dx9_36/surface.c | 4 ++-- dlls/d3dx9_36/texture.c | 8 ++++---- dlls/d3dx9_36/volume.c | 2 +- dlls/d3dx9_36/xfile.c | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index b1a1a76..746b479 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -3180,7 +3180,7 @@ static HRESULT parse_mesh(ID3DXFileData *filedata, struct mesh_data *mesh_data, ID3DXFileData *child = NULL; DWORD i; SIZE_T nb_children; - DWORD nb_skin_weigths_info = 0; + DWORD nb_skin_weights_info = 0; /* * template Mesh { @@ -3310,14 +3310,14 @@ static HRESULT parse_mesh(ID3DXFileData *filedata, struct mesh_data *mesh_data, goto end; } else if (IsEqualGUID(&type, &DXFILEOBJ_SkinWeights)) { if (!mesh_data->skin_info) { - WARN("Skin weigths found but skin mesh header not encountered yet\n"); + WARN("Skin weights found but skin mesh header not encountered yet\n"); hr = E_FAIL; goto end; } - hr = parse_skin_mesh_info(child, mesh_data, nb_skin_weigths_info); + hr = parse_skin_mesh_info(child, mesh_data, nb_skin_weights_info); if (FAILED(hr)) goto end; - nb_skin_weigths_info++; + nb_skin_weights_info++; } } if (FAILED(hr)) @@ -3327,9 +3327,9 @@ static HRESULT parse_mesh(ID3DXFileData *filedata, struct mesh_data *mesh_data, child = NULL; } - if (mesh_data->skin_info && (nb_skin_weigths_info != mesh_data->nb_bones)) { + if (mesh_data->skin_info && (nb_skin_weights_info != mesh_data->nb_bones)) { WARN("Mismatch between nb skin weights info %u encountered and nb bones %u from skin mesh header\n", - nb_skin_weigths_info, mesh_data->nb_bones); + nb_skin_weights_info, mesh_data->nb_bones); hr = E_FAIL; goto end; } @@ -7005,7 +7005,7 @@ HRESULT WINAPI D3DXWeldVertices(ID3DXMesh *mesh, DWORD flags, const D3DXWELDEPSI if (flags == 0) { - WARN("No flags is undefined. Using D3DXWELDEPSILONS_WELDPARTIALMATCHES instead.\n"); + WARN("No flags are undefined. Using D3DXWELDEPSILONS_WELDPARTIALMATCHES instead.\n"); flags = D3DXWELDEPSILONS_WELDPARTIALMATCHES; } diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index f187031..295ef63 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1758,7 +1758,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, D3DLOCKED_RECT lockrect; struct volume src_size, dst_size; - TRACE("(%p, %p, %s, %p, %#x, %u, %p, %s %#x, 0x%08x)\n", + TRACE("(%p, %p, %s, %p, %#x, %u, %p, %s, %#x, 0x%08x)\n", dst_surface, dst_palette, wine_dbgstr_rect(dst_rect), src_memory, src_format, src_pitch, src_palette, wine_dbgstr_rect(src_rect), filter, color_key); @@ -2006,7 +2006,7 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE if (src_palette) { - FIXME("Saving surfaces with palettized pixel formats not implemented yet\n"); + FIXME("Saving surfaces with palettized pixel formats is not implemented yet\n"); return D3DERR_INVALIDCALL; } diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index de42307..38349e2 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -269,7 +269,7 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN unsigned int channels; const struct pixel_format_desc *curfmt, *bestfmt = NULL; - TRACE("Requested format not supported, looking for a fallback.\n"); + TRACE("Requested format is not supported, looking for a fallback.\n"); if (!fmt) { @@ -661,7 +661,7 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi if (imginfo.MipLevels < miplevels && (D3DFMT_DXT1 <= imginfo.Format && imginfo.Format <= D3DFMT_DXT5)) { - FIXME("Generation of mipmaps for compressed pixel formats is not implemented yet\n"); + FIXME("Generation of mipmaps for compressed pixel formats is not implemented yet.\n"); miplevels = imginfo.MipLevels; } if (imginfo.ResourceType == D3DRTYPE_VOLUMETEXTURE @@ -1219,7 +1219,7 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic if (mip_levels > image_info.MipLevels) { - FIXME("Generation of mipmaps for volume textures is not implemented yet\n"); + FIXME("Generation of mipmaps for volume textures is not implemented yet.\n"); mip_levels = image_info.MipLevels; } @@ -1460,7 +1460,7 @@ HRESULT WINAPI D3DXCreateCubeTextureFromFileInMemoryEx(IDirect3DDevice9 *device, if (mip_levels > img_info.MipLevels && (D3DFMT_DXT1 <= img_info.Format && img_info.Format <= D3DFMT_DXT5)) { - FIXME("Generation of mipmaps for compressed pixel formats not supported yet\n"); + FIXME("Generation of mipmaps for compressed pixel formats is not supported yet.\n"); mip_levels = img_info.MipLevels; } diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c index 52683da..fae8542 100644 --- a/dlls/d3dx9_36/volume.c +++ b/dlls/d3dx9_36/volume.c @@ -189,7 +189,7 @@ HRESULT WINAPI D3DXLoadVolumeFromMemory(IDirect3DVolume9 *dst_volume, if (((src_format_desc->type != FORMAT_ARGB) && (src_format_desc->type != FORMAT_INDEX)) || (dst_format_desc->type != FORMAT_ARGB)) { - FIXME("Pixel format conversion not implemented %#x -> %#x\n", + FIXME("Pixel format conversion is not implemented %#x -> %#x\n", src_format_desc->format, dst_format_desc->format); return E_NOTIMPL; } diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index 7386ec9..eda0d7e 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -331,7 +331,7 @@ static HRESULT d3dx9_file_data_create(IDirectXFileObject *dxfile_object, ID3DXFi } else { - FIXME("Don't known what to do with binary object\n"); + FIXME("Don't know what to do with binary object\n"); HeapFree(GetProcessHeap(), 0, object); return E_FAIL; }

1 0