wine-commits March 2015

wine-commits@winehq.org

2 participants
775 discussions

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 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 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 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 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

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

Thomas Faber : gdi32: Avoid uninitialized variable use in EnumEnhMetaFile (MSVC).
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 8a390c8661ad3975d13aeae1f9953822d4c42461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a390c8661ad3975d13aeae1f… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Mar 28 13:29:06 2015 +0100 gdi32: Avoid uninitialized variable use in EnumEnhMetaFile (MSVC). --- dlls/gdi32/enhmetafile.c | 123 +++++++++++++++++++++++------------------------ 1 file changed, 61 insertions(+), 62 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 61f541f..7fb0b34 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2288,6 +2288,7 @@ BOOL WINAPI EnumEnhMetaFile( SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } + info->state.mode = MM_TEXT; info->state.wndOrgX = 0; info->state.wndOrgY = 0; info->state.wndExtX = 1; @@ -2338,71 +2339,69 @@ BOOL WINAPI EnumEnhMetaFile( old_arcdir = SetArcDirection(hdc, AD_COUNTERCLOCKWISE); old_polyfill = SetPolyFillMode(hdc, ALTERNATE); old_stretchblt = SetStretchBltMode(hdc, BLACKONWHITE); - } - - info->state.mode = MM_TEXT; - if ( IS_WIN9X() ) - { - /* Win95 leaves the vp/win ext/org info alone */ - info->init_transform.eM11 = 1.0; - info->init_transform.eM12 = 0.0; - info->init_transform.eM21 = 0.0; - info->init_transform.eM22 = 1.0; - info->init_transform.eDx = 0.0; - info->init_transform.eDy = 0.0; - } - else - { - /* WinNT combines the vp/win ext/org info into a transform */ - double xscale, yscale; - xscale = (double)vp_size.cx / (double)win_size.cx; - yscale = (double)vp_size.cy / (double)win_size.cy; - info->init_transform.eM11 = xscale; - info->init_transform.eM12 = 0.0; - info->init_transform.eM21 = 0.0; - info->init_transform.eM22 = yscale; - info->init_transform.eDx = (double)vp_org.x - xscale * (double)win_org.x; - info->init_transform.eDy = (double)vp_org.y - yscale * (double)win_org.y; - - CombineTransform(&info->init_transform, &savedXform, &info->init_transform); - } + if ( IS_WIN9X() ) + { + /* Win95 leaves the vp/win ext/org info alone */ + info->init_transform.eM11 = 1.0; + info->init_transform.eM12 = 0.0; + info->init_transform.eM21 = 0.0; + info->init_transform.eM22 = 1.0; + info->init_transform.eDx = 0.0; + info->init_transform.eDy = 0.0; + } + else + { + /* WinNT combines the vp/win ext/org info into a transform */ + double xscale, yscale; + xscale = (double)vp_size.cx / (double)win_size.cx; + yscale = (double)vp_size.cy / (double)win_size.cy; + info->init_transform.eM11 = xscale; + info->init_transform.eM12 = 0.0; + info->init_transform.eM21 = 0.0; + info->init_transform.eM22 = yscale; + info->init_transform.eDx = (double)vp_org.x - xscale * (double)win_org.x; + info->init_transform.eDy = (double)vp_org.y - yscale * (double)win_org.y; + + CombineTransform(&info->init_transform, &savedXform, &info->init_transform); + } - if ( lpRect && WIDTH(emh->rclFrame) && HEIGHT(emh->rclFrame) ) - { - double xSrcPixSize, ySrcPixSize, xscale, yscale; - XFORM xform; - - TRACE("rect: %d,%d - %d,%d. rclFrame: %d,%d - %d,%d\n", - lpRect->left, lpRect->top, lpRect->right, lpRect->bottom, - emh->rclFrame.left, emh->rclFrame.top, emh->rclFrame.right, - emh->rclFrame.bottom); - - xSrcPixSize = (double) emh->szlMillimeters.cx / emh->szlDevice.cx; - ySrcPixSize = (double) emh->szlMillimeters.cy / emh->szlDevice.cy; - xscale = (double) WIDTH(*lpRect) * 100.0 / - WIDTH(emh->rclFrame) * xSrcPixSize; - yscale = (double) HEIGHT(*lpRect) * 100.0 / - HEIGHT(emh->rclFrame) * ySrcPixSize; - TRACE("xscale = %f, yscale = %f\n", xscale, yscale); - - xform.eM11 = xscale; - xform.eM12 = 0; - xform.eM21 = 0; - xform.eM22 = yscale; - xform.eDx = (double) lpRect->left - (double) WIDTH(*lpRect) / WIDTH(emh->rclFrame) * emh->rclFrame.left; - xform.eDy = (double) lpRect->top - (double) HEIGHT(*lpRect) / HEIGHT(emh->rclFrame) * emh->rclFrame.top; - - CombineTransform(&info->init_transform, &xform, &info->init_transform); - } + if ( lpRect && WIDTH(emh->rclFrame) && HEIGHT(emh->rclFrame) ) + { + double xSrcPixSize, ySrcPixSize, xscale, yscale; + XFORM xform; + + TRACE("rect: %d,%d - %d,%d. rclFrame: %d,%d - %d,%d\n", + lpRect->left, lpRect->top, lpRect->right, lpRect->bottom, + emh->rclFrame.left, emh->rclFrame.top, emh->rclFrame.right, + emh->rclFrame.bottom); + + xSrcPixSize = (double) emh->szlMillimeters.cx / emh->szlDevice.cx; + ySrcPixSize = (double) emh->szlMillimeters.cy / emh->szlDevice.cy; + xscale = (double) WIDTH(*lpRect) * 100.0 / + WIDTH(emh->rclFrame) * xSrcPixSize; + yscale = (double) HEIGHT(*lpRect) * 100.0 / + HEIGHT(emh->rclFrame) * ySrcPixSize; + TRACE("xscale = %f, yscale = %f\n", xscale, yscale); + + xform.eM11 = xscale; + xform.eM12 = 0; + xform.eM21 = 0; + xform.eM22 = yscale; + xform.eDx = (double) lpRect->left - (double) WIDTH(*lpRect) / WIDTH(emh->rclFrame) * emh->rclFrame.left; + xform.eDy = (double) lpRect->top - (double) HEIGHT(*lpRect) / HEIGHT(emh->rclFrame) * emh->rclFrame.top; + + CombineTransform(&info->init_transform, &xform, &info->init_transform); + } - /* WinNT resets the current vp/win org/ext */ - if ( !IS_WIN9X() && hdc ) - { - SetMapMode(hdc, MM_TEXT); - SetWindowOrgEx(hdc, 0, 0, NULL); - SetViewportOrgEx(hdc, 0, 0, NULL); - EMF_Update_MF_Xform(hdc, info); + /* WinNT resets the current vp/win org/ext */ + if ( !IS_WIN9X() ) + { + SetMapMode(hdc, MM_TEXT); + SetWindowOrgEx(hdc, 0, 0, NULL); + SetViewportOrgEx(hdc, 0, 0, NULL); + EMF_Update_MF_Xform(hdc, info); + } } ret = TRUE;

1 0

Piotr Caban : ntdll: Improve parameter validation in RtlAddAce.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 966c5dffed3e8f089a0648e2e94d300620869bbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=966c5dffed3e8f089a0648e2e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 28 15:26:37 2015 +0100 ntdll: Improve parameter validation in RtlAddAce. --- dlls/advapi32/tests/security.c | 46 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/sec.c | 4 +++- 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 15c3b1d..0e9cf8c 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5568,6 +5568,51 @@ static void test_AdjustTokenPrivileges(void) CloseHandle(token); } +static void test_AddAce(void) +{ + static SID const sidWorld = { SID_REVISION, 1, { SECURITY_WORLD_SID_AUTHORITY} , { SECURITY_WORLD_RID } }; + + char acl_buf[1024], ace_buf[256]; + ACCESS_ALLOWED_ACE *ace = (ACCESS_ALLOWED_ACE*)ace_buf; + PACL acl = (PACL)acl_buf; + BOOL ret; + + memset(ace, 0, sizeof(ace_buf)); + ace->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; + ace->Header.AceSize = sizeof(ACCESS_ALLOWED_ACE)-sizeof(DWORD)+sizeof(SID); + memcpy(&ace->SidStart, &sidWorld, sizeof(sidWorld)); + + ret = InitializeAcl(acl, sizeof(acl_buf), ACL_REVISION2); + ok(ret, "InitializeAcl failed: %d\n", GetLastError()); + + ret = AddAce(acl, ACL_REVISION1, MAXDWORD, ace, ace->Header.AceSize); + ok(ret, "AddAce failed: %d\n", GetLastError()); + ret = AddAce(acl, ACL_REVISION2, MAXDWORD, ace, ace->Header.AceSize); + ok(ret, "AddAce failed: %d\n", GetLastError()); + ret = AddAce(acl, ACL_REVISION3, MAXDWORD, ace, ace->Header.AceSize); + ok(ret, "AddAce failed: %d\n", GetLastError()); + ok(acl->AclRevision == ACL_REVISION3, "acl->AclRevision = %d\n", acl->AclRevision); + ret = AddAce(acl, ACL_REVISION4, MAXDWORD, ace, ace->Header.AceSize); + ok(ret, "AddAce failed: %d\n", GetLastError()); + ok(acl->AclRevision == ACL_REVISION4, "acl->AclRevision = %d\n", acl->AclRevision); + ret = AddAce(acl, ACL_REVISION1, MAXDWORD, ace, ace->Header.AceSize); + ok(ret, "AddAce failed: %d\n", GetLastError()); + ok(acl->AclRevision == ACL_REVISION4, "acl->AclRevision = %d\n", acl->AclRevision); + ret = AddAce(acl, ACL_REVISION2, MAXDWORD, ace, ace->Header.AceSize); + ok(ret, "AddAce failed: %d\n", GetLastError()); + + ret = AddAce(acl, MIN_ACL_REVISION-1, MAXDWORD, ace, ace->Header.AceSize); + ok(ret, "AddAce failed: %d\n", GetLastError()); + /* next test succeededs but corrupts ACL */ + ret = AddAce(acl, MAX_ACL_REVISION+1, MAXDWORD, ace, ace->Header.AceSize); + ok(ret, "AddAce failed: %d\n", GetLastError()); + ok(acl->AclRevision == MAX_ACL_REVISION+1, "acl->AclRevision = %d\n", acl->AclRevision); + SetLastError(0xdeadbeef); + ret = AddAce(acl, ACL_REVISION1, MAXDWORD, ace, ace->Header.AceSize); + ok(!ret, "AddAce succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() = %d\n", GetLastError()); +} + START_TEST(security) { init(); @@ -5609,4 +5654,5 @@ START_TEST(security) test_TokenIntegrityLevel(); test_default_dacl_owner_sid(); test_AdjustTokenPrivileges(); + test_AddAce(); } diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index b733f77..0917780 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1167,7 +1167,7 @@ NTSTATUS WINAPI RtlAddAce( PACE_HEADER ace,targetace; int nrofaces; - if (acl->AclRevision != ACL_REVISION) + if (!RtlValidAcl(acl)) return STATUS_INVALID_PARAMETER; if (!RtlFirstFreeAce(acl,&targetace)) return STATUS_INVALID_PARAMETER; @@ -1180,6 +1180,8 @@ NTSTATUS WINAPI RtlAddAce( return STATUS_INVALID_PARAMETER; memcpy(targetace,acestart,acelen); acl->AceCount+=nrofaces; + if (rev > acl->AclRevision) + acl->AclRevision = rev; return STATUS_SUCCESS; }

1 0

Alexandre Julliard : winmm: Print full flag values in traces.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 6c3aac3e4af280746e45b8269ded2dce2ac5f80e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c3aac3e4af280746e45b8269… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 19:48:31 2015 +0900 winmm: Print full flag values in traces. --- dlls/winmm/mci.c | 2 +- dlls/winmm/waveform.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index a77514c..b3c1882 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1731,7 +1731,7 @@ static DWORD MCI_Open(DWORD dwParam, LPMCI_OPEN_PARMSW lpParms) MCI_OPEN_ALIAS|MCI_OPEN_TYPE|MCI_OPEN_TYPE_ID| \ MCI_NOTIFY|MCI_WAIT) if ((dwParam & ~WINE_MCIDRIVER_SUPP) != 0) - FIXME("Unsupported yet dwFlags=%08X\n", dwParam & ~WINE_MCIDRIVER_SUPP); + FIXME("Unsupported yet dwFlags=%08X\n", dwParam); #undef WINE_MCIDRIVER_SUPP strDevTyp[0] = 0; diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index ba74e02..c010c39 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -4314,7 +4314,7 @@ UINT WINAPI mixerGetLineInfoW(HMIXEROBJ hmix, LPMIXERLINEW lpmliW, DWORD fdwInfo return MIXERR_INVALLINE; } - TRACE("Returning INVALFLAG on these flags: %x\n", fdwInfo & MIXER_GETLINEINFOF_QUERYMASK); + TRACE("Returning INVALFLAG on these flags: %x\n", fdwInfo); return MMSYSERR_INVALFLAG; }

1 0

Alexandre Julliard : user32/tests: Print full flag values in traces.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 13700585b1267ec94cb907f2e592635bba4d961f URL: http://source.winehq.org/git/wine.git/?a=commit;h=13700585b1267ec94cb907f2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 19:48:20 2015 +0900 user32/tests: Print full flag values in traces. --- dlls/user32/tests/win.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d71e92a..6869a20 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3797,7 +3797,7 @@ static LRESULT WINAPI StyleCheckProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM ok((lpss->styleOld & ~WS_EX_WINDOWEDGE) == (lpcs->dwExStyle & ~WS_EX_WINDOWEDGE), "Ex style (0x%08x) should match what the caller passed to CreateWindowEx (0x%08x)\n", - (lpss->styleOld & ~WS_EX_WINDOWEDGE), (lpcs->dwExStyle & ~WS_EX_WINDOWEDGE)); + lpss->styleOld, lpcs->dwExStyle); ok(lpss->styleNew == lpcs->style, "Style (0x%08x) should match what the caller passed to CreateWindowEx (0x%08x)\n", @@ -3985,14 +3985,14 @@ static void check_dialog_style(DWORD style_in, DWORD ex_style_in, DWORD style_ou style = GetWindowLongA(hwnd, GWL_STYLE); ex_style = GetWindowLongA(hwnd, GWL_EXSTYLE); - ok(style == (style_out | DS_3DLOOK), "expected style %#x, got %#x\n", style_out | DS_3DLOOK, style); + ok(style == (style_out | DS_3DLOOK), "got %#x\n", style); ok(ex_style == ex_style_out, "expected ex_style %#x, got %#x\n", ex_style_out, ex_style); /* try setting the styles explicitly */ SetWindowLongA(hwnd, GWL_EXSTYLE, ex_style_in); style = GetWindowLongA(hwnd, GWL_STYLE); ex_style = GetWindowLongA(hwnd, GWL_EXSTYLE); - ok(style == (style_out | DS_3DLOOK), "expected style %#x, got %#x\n", style_out|DS_3DLOOK, style); + ok(style == (style_out | DS_3DLOOK), "got %#x\n", style); /* WS_EX_WINDOWEDGE can't always be changed */ if (ex_style_in & WS_EX_DLGMODALFRAME) ex_style_out = ex_style_in | WS_EX_WINDOWEDGE;

1 0

← Newer
1
2
3
4
5
6
7
8
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2015