May 2021 - Wine-devel - list.winehq.org

[PATCH 1/9] msvcr120: Fix setting status word in fesetenv.
by Piotr Caban 13 May '21

13 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)

1 0

[PATCH] ws2_32: Add support for hints in GetAddrInfoExW.
by Hans Leidekker 13 May '21

13 May '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ws2_32/protocol.c | 18 +++++++++++++----- dlls/ws2_32/tests/protocol.c | 24 +++++++++++++++++++++++- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 64af105f0b9..15616fdaf34 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -568,6 +568,7 @@ struct getaddrinfo_args ADDRINFOEXW **result; char *nodename; char *servname; + struct WS_addrinfo *hints; }; static void WINAPI getaddrinfo_callback(TP_CALLBACK_INSTANCE *instance, void *context) @@ -579,7 +580,7 @@ static void WINAPI getaddrinfo_callback(TP_CALLBACK_INSTANCE *instance, void *co struct WS_addrinfo *res; int ret; - ret = WS_getaddrinfo( args->nodename, args->servname, NULL, &res ); + ret = WS_getaddrinfo( args->nodename, args->servname, args->hints, &res ); if (res) { *args->result = addrinfo_list_AtoW(res); @@ -660,12 +661,21 @@ static int WS_getaddrinfoW( const WCHAR *nodename, const WCHAR *servname, goto end; } - if (!(args = HeapAlloc( GetProcessHeap(), 0, sizeof(*args) ))) goto end; + if (!(args = HeapAlloc( GetProcessHeap(), 0, sizeof(*args) + sizeof(*args->hints) ))) goto end; args->overlapped = overlapped; args->completion_routine = completion_routine; args->result = res; args->nodename = nodenameA; args->servname = servnameA; + if (hints) + { + args->hints = (struct WS_addrinfo *)(args + 1); + args->hints->ai_flags = hints->ai_flags; + args->hints->ai_family = hints->ai_family; + args->hints->ai_socktype = hints->ai_socktype; + args->hints->ai_protocol = hints->ai_protocol; + } + else args->hints = NULL; overlapped->Internal = WSAEINPROGRESS; if (!TrySubmitThreadpoolCallback( getaddrinfo_callback, args, NULL )) @@ -714,14 +724,12 @@ int WINAPI GetAddrInfoExW( const WCHAR *name, const WCHAR *servname, DWORD names FIXME( "Unsupported namespace %u\n", namespace ); if (namespace_id) FIXME( "Unsupported namespace_id %s\n", debugstr_guid(namespace_id) ); - if (hints) - FIXME( "Unsupported hints\n" ); if (timeout) FIXME( "Unsupported timeout\n" ); if (handle) FIXME( "Unsupported cancel handle\n" ); - ret = WS_getaddrinfoW( name, servname, NULL, result, overlapped, completion_routine ); + ret = WS_getaddrinfoW( name, servname, (struct WS_addrinfo *)hints, result, overlapped, completion_routine ); if (ret) return ret; if (handle) *handle = (HANDLE)0xdeadbeef; return 0; diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 8937e84d63f..27ef6ff92aa 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -1599,7 +1599,7 @@ static void test_GetAddrInfoExW(void) static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; static const WCHAR winehq[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; static const WCHAR nxdomain[] = {'n','x','d','o','m','a','i','n','.','w','i','n','e','h','q','.','o','r','g',0}; - ADDRINFOEXW *result; + ADDRINFOEXW *result, hints; OVERLAPPED overlapped; HANDLE event; int ret; @@ -1666,6 +1666,28 @@ static void test_GetAddrInfoExW(void) ok(!result->ai_provider, "ai_provider = %s\n", wine_dbgstr_guid(result->ai_provider)); pFreeAddrInfoExW(result); + /* hints */ + result = (void *)0xdeadbeef; + memset(&overlapped, 0xcc, sizeof(overlapped)); + ResetEvent(event); + overlapped.hEvent = event; + WSASetLastError(0xdeadbeef); + memset(&hints, 0, sizeof(hints)); + hints.ai_flags = AI_ALL | AI_V4MAPPED; + hints.ai_family = AF_INET6; + hints.ai_socktype = SOCK_DGRAM; + hints.ai_protocol = IPPROTO_UDP; + ret = pGetAddrInfoExW(winehq, NULL, NS_ALL, NULL, &hints, &result, NULL, &overlapped, NULL, NULL); + ok(ret == ERROR_IO_PENDING, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); + ok(WSAGetLastError() == ERROR_IO_PENDING, "expected 11001, got %d\n", WSAGetLastError()); + ret = overlapped.Internal; + ok(ret == WSAEINPROGRESS || ret == ERROR_SUCCESS, "overlapped.Internal = %u\n", ret); + ok(WaitForSingleObject(event, 1000) == WAIT_OBJECT_0, "wait failed\n"); + ret = pGetAddrInfoExOverlappedResult(&overlapped); + ok(!ret, "overlapped result is %d\n", ret); + ok(result != NULL, "result == NULL\n"); + pFreeAddrInfoExW(result); + result = (void *)0xdeadbeef; memset(&overlapped, 0xcc, sizeof(overlapped)); ResetEvent(event); -- 2.30.2

2 1

[PATCH v3 1/2] server: Support nested jobs.
by Paul Gofman 13 May '21

13 May '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - remove a spurious line break. v3: - fix compiler warnings in test messages on 32 bit. dlls/kernel32/tests/process.c | 181 +++++++++++++++++++++++++++++++++- server/process.c | 148 ++++++++++++++++++++------- 2 files changed, 289 insertions(+), 40 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index f960efb05a8..5622a854608 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -71,6 +71,7 @@ static BOOL (WINAPI *pQueryFullProcessImageNameA)(HANDLE hProcess, DWORD dwFla 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 HANDLE (WINAPI *pOpenJobObjectA)(DWORD access, BOOL inherit, LPCSTR 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); @@ -257,6 +258,8 @@ static BOOL init(void) pQueryFullProcessImageNameW = (void *) GetProcAddress(hkernel32, "QueryFullProcessImageNameW"); pK32GetProcessImageFileNameA = (void *) GetProcAddress(hkernel32, "K32GetProcessImageFileNameA"); pCreateJobObjectW = (void *)GetProcAddress(hkernel32, "CreateJobObjectW"); + pOpenJobObjectA = (void *)GetProcAddress(hkernel32, "OpenJobObjectA"); + pAssignProcessToJobObject = (void *)GetProcAddress(hkernel32, "AssignProcessToJobObject"); pIsProcessInJob = (void *)GetProcAddress(hkernel32, "IsProcessInJob"); pTerminateJobObject = (void *)GetProcAddress(hkernel32, "TerminateJobObject"); @@ -2976,13 +2979,14 @@ static void test_jobInheritance(HANDLE job) wait_and_close_child_process(&pi); } -static void test_BreakawayOk(HANDLE job) +static void test_BreakawayOk(HANDLE parent_job) { JOBOBJECT_EXTENDED_LIMIT_INFORMATION limit_info; PROCESS_INFORMATION pi; STARTUPINFOA si = {0}; char buffer[MAX_PATH + 23]; - BOOL ret, out; + BOOL ret, out, nested_jobs; + HANDLE job; if (!pIsProcessInJob) { @@ -2990,6 +2994,16 @@ static void test_BreakawayOk(HANDLE job) return; } + job = pCreateJobObjectW(NULL, NULL); + ok(!!job, "CreateJobObjectW error %u\n", GetLastError()); + + ret = pAssignProcessToJobObject(job, GetCurrentProcess()); + ok(ret || broken(!ret && GetLastError() == ERROR_ACCESS_DENIED) /* before Win 8. */, + "AssignProcessToJobObject error %u\n", GetLastError()); + nested_jobs = ret; + if (!ret) + win_skip("Nested jobs are not supported.\n"); + sprintf(buffer, "\"%s\" process exit", selfname); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &pi); ok(!ret, "CreateProcessA expected failure\n"); @@ -3001,8 +3015,30 @@ static void test_BreakawayOk(HANDLE job) wait_and_close_child_process(&pi); } + if (nested_jobs) + { + 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()); + + sprintf(buffer, "\"%s\" process exit", selfname); + 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); + + ret = pIsProcessInJob(pi.hProcess, parent_job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + TerminateProcess(pi.hProcess, 0); + wait_and_close_child_process(&pi); + } + limit_info.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_BREAKAWAY_OK; - ret = pSetInformationJobObject(job, JobObjectExtendedLimitInformation, &limit_info, sizeof(limit_info)); + ret = pSetInformationJobObject(parent_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); @@ -3012,6 +3048,10 @@ static void test_BreakawayOk(HANDLE job) ok(ret, "IsProcessInJob error %u\n", GetLastError()); ok(!out, "IsProcessInJob returned out=%u\n", out); + ret = pIsProcessInJob(pi.hProcess, parent_job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(!out, "IsProcessInJob returned out=%u\n", out); + wait_and_close_child_process(&pi); limit_info.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK; @@ -4309,6 +4349,135 @@ static void test_dead_process(void) CloseHandle(pi.hThread); } +static void test_nested_jobs_child(unsigned int index) +{ + HANDLE job, job_parent, job_other; + PROCESS_INFORMATION pi; + char job_name[32]; + BOOL ret, out; + + sprintf(job_name, "test_nested_jobs_%u", index); + job = pOpenJobObjectA(JOB_OBJECT_ASSIGN_PROCESS | JOB_OBJECT_SET_ATTRIBUTES | JOB_OBJECT_QUERY + | JOB_OBJECT_TERMINATE, FALSE, job_name); + ok(!!job, "OpenJobObjectA error %u\n", GetLastError()); + + sprintf(job_name, "test_nested_jobs_%u", !index); + job_other = pOpenJobObjectA(JOB_OBJECT_ASSIGN_PROCESS | JOB_OBJECT_SET_ATTRIBUTES | JOB_OBJECT_QUERY + | JOB_OBJECT_TERMINATE, FALSE, job_name); + ok(!!job_other, "OpenJobObjectA error %u\n", GetLastError()); + + job_parent = pCreateJobObjectW(NULL, NULL); + ok(!!job_parent, "CreateJobObjectA error %u\n", GetLastError()); + + ret = pAssignProcessToJobObject(job_parent, GetCurrentProcess()); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + create_process("wait", &pi); + + ret = pAssignProcessToJobObject(job_parent, pi.hProcess); + ok(ret || broken(!ret && GetLastError() == ERROR_ACCESS_DENIED) /* Supported since Windows 8. */, + "AssignProcessToJobObject error %u\n", GetLastError()); + if (!ret) + { + win_skip("Nested jobs are not supported.\n"); + goto done; + } + ret = pAssignProcessToJobObject(job, pi.hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, NULL, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + out = TRUE; + ret = pIsProcessInJob(GetCurrentProcess(), job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(!out, "IsProcessInJob returned out=%u\n", out); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + ret = pAssignProcessToJobObject(job, GetCurrentProcess()); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + TerminateProcess(pi.hProcess, 0); + wait_child_process(pi.hProcess); + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + + create_process("wait", &pi); + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job_parent, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + if (index) + { + ret = pAssignProcessToJobObject(job_other, GetCurrentProcess()); + ok(!ret, "AssignProcessToJobObject succeded\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "Got unexpected error %u.\n", GetLastError()); + } +done: + TerminateProcess(pi.hProcess, 0); + wait_child_process(pi.hProcess); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(job_parent); + CloseHandle(job); + CloseHandle(job_other); +} + +static void test_nested_jobs(void) +{ + PROCESS_INFORMATION info[2]; + char buffer[MAX_PATH + 26]; + STARTUPINFOA si = {0}; + HANDLE job1, job2; + unsigned int i; + + if (!pIsProcessInJob) + { + win_skip("IsProcessInJob not available.\n"); + return; + } + + job1 = pCreateJobObjectW(NULL, L"test_nested_jobs_0"); + ok(!!job1, "CreateJobObjectW failed, error %u.\n", GetLastError()); + job2 = pCreateJobObjectW(NULL, L"test_nested_jobs_1"); + ok(!!job2, "CreateJobObjectW failed, error %u.\n", GetLastError()); + + sprintf(buffer, "\"%s\" process nested_jobs 0", selfname); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &info[0]), + "CreateProcess failed\n"); + wait_child_process(info[0].hProcess); + sprintf(buffer, "\"%s\" process nested_jobs 1", selfname); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &info[1]), + "CreateProcess failed\n"); + wait_child_process(info[1].hProcess); + for (i = 0; i < 2; ++i) + { + CloseHandle(info[i].hProcess); + CloseHandle(info[i].hThread); + } + + CloseHandle(job1); + CloseHandle(job2); +} + START_TEST(process) { HANDLE job, hproc, h, h2; @@ -4384,6 +4553,11 @@ START_TEST(process) test_handle_list_attribute(TRUE, h, h2); return; } + else if (!strcmp(myARGV[2], "nested_jobs") && myARGC >= 4) + { + test_nested_jobs_child(atoi(myARGV[3])); + return; + } ok(0, "Unexpected command %s\n", myARGV[2]); return; @@ -4452,6 +4626,7 @@ START_TEST(process) test_CompletionPort(); test_KillOnJobClose(); test_WaitForJobObject(); + test_nested_jobs(); job = test_AddSelfToJob(); test_jobInheritance(job); test_BreakawayOk(job); diff --git a/server/process.c b/server/process.c index 17abd9800d2..8ff4fc51558 100644 --- a/server/process.c +++ b/server/process.c @@ -30,6 +30,7 @@ #include <stdio.h> #include <stdlib.h> #include <sys/time.h> +#include <stdint.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif @@ -182,7 +183,7 @@ static void job_destroy( struct object *obj ); struct job { struct object obj; /* object header */ - struct list process_list; /* list of all processes */ + struct list process_list; /* list of processes */ int num_processes; /* count of running processes */ int total_processes; /* count of processes which have been assigned */ unsigned int limit_flags; /* limit flags */ @@ -190,6 +191,9 @@ struct job int signaled; /* job is signaled */ struct completion *completion_port; /* associated completion port */ apc_param_t completion_key; /* key to send with completion messages */ + struct job *parent; + struct list parent_job_entry; /* list entry for parent job */ + struct list child_job_list; /* list of child jobs */ }; static const struct object_ops job_ops = @@ -227,6 +231,7 @@ static struct job *create_job_object( struct object *root, const struct unicode_ { /* initialize it if it didn't already exist */ list_init( &job->process_list ); + list_init( &job->child_job_list ); job->num_processes = 0; job->total_processes = 0; job->limit_flags = 0; @@ -234,6 +239,7 @@ static struct job *create_job_object( struct object *root, const struct unicode_ job->signaled = 0; job->completion_port = NULL; job->completion_key = 0; + job->parent = NULL; } } return job; @@ -250,14 +256,68 @@ static void add_job_completion( struct job *job, apc_param_t msg, apc_param_t pi add_completion( job->completion_port, job->completion_key, pid, STATUS_SUCCESS, msg ); } +static int walk_job( struct job *job, void *param, int (*callback)( struct job *, void * )) +{ + struct job *j, *next; + + LIST_FOR_EACH_ENTRY_SAFE( j, next, &job->child_job_list, struct job, parent_job_entry ) + { + assert( j->parent == job ); + if (walk_job( j, param, callback )) return 1; + } + return callback( job, param ); +} + +static int process_in_job( struct job *job, void *param ) +{ + struct process *process = param; + + assert( process->obj.ops == &process_ops ); + return process->job == job; +} + static void add_job_process( struct job *job, struct process *process ) { + process_id_t pid; + struct job *j; + + if (job == process->job) return; + + if (process->job) + { + list_remove( &process->job_entry ); + if (job->parent) + { + j = job->parent; + while (j && j != process->job) + j = j->parent; + + if (!j) + { + set_error( STATUS_ACCESS_DENIED ); + return; + } + release_object( process->job ); + } + else + { + job->parent = process->job; + list_add_tail( &job->parent->child_job_list, &job->parent_job_entry ); + } + } + + pid = get_process_id( process ); + j = job; + while (j != process->job) + { + j->num_processes++; + j->total_processes++; + add_job_completion( j, JOB_OBJECT_MSG_NEW_PROCESS, pid ); + j = j->parent; + } + process->job = (struct job *)grab_object( job ); list_add_tail( &job->process_list, &process->job_entry ); - job->num_processes++; - job->total_processes++; - - add_job_completion( job, JOB_OBJECT_MSG_NEW_PROCESS, get_process_id(process) ); } /* called when a process has terminated, allow one additional process */ @@ -265,40 +325,42 @@ static void release_job_process( struct process *process ) { struct job *job = process->job; - if (!job) return; + while (job) + { + assert( job->num_processes ); + job->num_processes--; - assert( job->num_processes ); - job->num_processes--; + if (!job->terminating) + add_job_completion( job, JOB_OBJECT_MSG_EXIT_PROCESS, get_process_id(process) ); - if (!job->terminating) - add_job_completion( job, JOB_OBJECT_MSG_EXIT_PROCESS, get_process_id(process) ); + if (!job->num_processes) + add_job_completion( job, JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO, 0 ); - if (!job->num_processes) - add_job_completion( job, JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO, 0 ); + job = job->parent; + } } -static void terminate_job( struct job *job, int exit_code ) +static int terminate_job_processes( struct job *job, void *exit_code ) { + struct process *process, *next; + /* don't report completion events for terminated processes */ job->terminating = 1; - for (;;) /* restart from the beginning of the list every time */ + LIST_FOR_EACH_ENTRY_SAFE( process, next, &job->process_list, struct process, job_entry ) { - struct process *process; - - /* find the first process associated with this job and still running */ - LIST_FOR_EACH_ENTRY( process, &job->process_list, struct process, job_entry ) - { - if (process->running_threads) break; - } - if (&process->job_entry == &job->process_list) break; /* no process found */ assert( process->job == job ); - terminate_process( process, NULL, exit_code ); + if (process->running_threads) terminate_process( process, NULL, (uintptr_t)exit_code ); } - job->terminating = 0; job->signaled = 1; wake_up( &job->obj, 0 ); + return 0; +} + +static void terminate_job( struct job *job, int exit_code ) +{ + walk_job( job, (void *)(uintptr_t)exit_code, terminate_job_processes ); } static int job_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) @@ -320,16 +382,23 @@ static void job_destroy( struct object *obj ) assert( obj->ops == &job_ops ); assert( !job->num_processes ); - assert( list_empty(&job->process_list) ); + assert( list_empty( &job->process_list )); + assert( list_empty( &job->child_job_list )); if (job->completion_port) release_object( job->completion_port ); + if (job->parent) + { + list_remove( &job->parent_job_entry ); + release_object( job->parent ); + } } static void job_dump( struct object *obj, int verbose ) { struct job *job = (struct job *)obj; assert( obj->ops == &job_ops ); - fprintf( stderr, "Job processes=%d\n", list_count(&job->process_list) ); + fprintf( stderr, "Job processes=%d child_jobs=%d parent=%p\n", + list_count(&job->process_list), list_count(&job->child_job_list), job->parent ); } static int job_signaled( struct object *obj, struct wait_queue_entry *entry ) @@ -1021,6 +1090,7 @@ DECL_HANDLER(new_process) struct thread *parent_thread = current; int socket_fd = thread_get_inflight_fd( current, req->socket_fd ); const obj_handle_t *handles = NULL; + struct job *job; if (socket_fd == -1) { @@ -1057,6 +1127,8 @@ DECL_HANDLER(new_process) } else parent = (struct process *)grab_object( current->process ); + /* If a job further in the job chain does not permit breakaway process creation + * succeeds and the process which is trying to breakaway is assigned to that job. */ if (parent->job && (req->flags & PROCESS_CREATE_FLAGS_BREAKAWAY) && !(parent->job->limit_flags & (JOB_OBJECT_LIMIT_BREAKAWAY_OK | JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK))) { @@ -1147,11 +1219,17 @@ DECL_HANDLER(new_process) process->startup_info = (struct startup_info *)grab_object( info ); - if (parent->job - && !(req->flags & PROCESS_CREATE_FLAGS_BREAKAWAY) - && !(parent->job->limit_flags & JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK)) + job = parent->job; + while (job) { - add_job_process( parent->job, process ); + if (!(job->limit_flags & JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK) + && !(req->flags & PROCESS_CREATE_FLAGS_BREAKAWAY + && job->limit_flags & JOB_OBJECT_LIMIT_BREAKAWAY_OK)) + { + add_job_process( job, process ); + break; + } + job = job->parent; } /* connect to the window station */ @@ -1561,12 +1639,8 @@ DECL_HANDLER(assign_job) if ((process = get_process_from_handle( req->process, PROCESS_SET_QUOTA | PROCESS_TERMINATE ))) { - if (!process->running_threads) - set_error( STATUS_PROCESS_IS_TERMINATING ); - else if (process->job) - set_error( STATUS_ACCESS_DENIED ); - else - add_job_process( job, process ); + if (!process->running_threads) set_error( STATUS_PROCESS_IS_TERMINATING ); + else add_job_process( job, process ); release_object( process ); } release_object( job ); @@ -1588,7 +1662,7 @@ DECL_HANDLER(process_in_job) } else if ((job = get_job_obj( current->process, req->job, JOB_OBJECT_QUERY ))) { - set_error( process->job == job ? STATUS_PROCESS_IN_JOB : STATUS_PROCESS_NOT_IN_JOB ); + set_error( walk_job( job, process, process_in_job ) ? STATUS_PROCESS_IN_JOB : STATUS_PROCESS_NOT_IN_JOB ); release_object( job ); } release_object( process ); -- 2.31.1

2 4

[PATCH] reg/tests: Add data tests for the 'copy' command
by Hugh McMaster 13 May '21

13 May '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/copy.c | 136 ++++++++++++++++++++++++++++++++++ programs/reg/tests/export.c | 30 ++++---- programs/reg/tests/reg_test.h | 7 ++ 3 files changed, 158 insertions(+), 15 deletions(-) diff --git a/programs/reg/tests/copy.c b/programs/reg/tests/copy.c index 0d245dae4da..7126b00d50e 100644 --- a/programs/reg/tests/copy.c +++ b/programs/reg/tests/copy.c @@ -122,6 +122,140 @@ static void test_command_syntax(void) ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); } +static void test_copy_empty_key(void) +{ + DWORD r; + + delete_tree(HKEY_CURRENT_USER, COPY_SRC); + verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC); + + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + + add_key(HKEY_CURRENT_USER, COPY_SRC, NULL); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE " /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); + + todo_wine delete_key(HKEY_CURRENT_USER, KEY_BASE); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" KEY_BASE " /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); + + todo_wine delete_key(HKEY_CURRENT_USER, KEY_BASE); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE "\\ /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); + + todo_wine delete_key(HKEY_CURRENT_USER, KEY_BASE); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" KEY_BASE "\\ /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE " /s /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); +} + +static void test_copy_simple_data(void) +{ + HKEY hkey; + DWORD r, dword; + + delete_tree(HKEY_CURRENT_USER, COPY_SRC); + verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC); + + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + + add_key(HKEY_CURRENT_USER, COPY_SRC, &hkey); + + dword = 0x100; + add_value(hkey, "DWORD", REG_DWORD, &dword, sizeof(dword)); + add_value(hkey, "String", REG_SZ, "Your text here...", 18); + close_key(hkey); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE " /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", simple_data_test, 0), "compare_export() failed\n"); + + todo_wine delete_key(HKEY_CURRENT_USER, KEY_BASE); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" KEY_BASE " /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", simple_data_test, 0), "compare_export() failed\n"); + + todo_wine delete_key(HKEY_CURRENT_USER, KEY_BASE); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE "\\ /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", simple_data_test, 0), "compare_export() failed\n"); + + todo_wine delete_key(HKEY_CURRENT_USER, KEY_BASE); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" KEY_BASE "\\ /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", simple_data_test, 0), "compare_export() failed\n"); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE " /s /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", simple_data_test, 0), "compare_export() failed\n"); +} + START_TEST(copy) { DWORD r; @@ -132,4 +266,6 @@ START_TEST(copy) } test_command_syntax(); + test_copy_empty_key(); + test_copy_simple_data(); } diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index daf42f66e3e..27d70b6a663 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -18,9 +18,8 @@ #include "reg_test.h" -#define compare_export(f,e,todo) compare_export_(__FILE__,__LINE__,f,e,todo) -static BOOL compare_export_(const char *file, unsigned line, const char *filename, - const char *expected, DWORD todo) +BOOL compare_export_(const char *file, unsigned line, const char *filename, + const char *expected, DWORD todo) { FILE *fp; long file_size; @@ -64,6 +63,17 @@ error: return FALSE; } +const char *empty_key_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n\r\n"; + +const char *simple_data_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"DWORD\"=dword:00000100\r\n" + "\"String\"=\"Your text here...\"\r\n\r\n"; + + /* Unit tests */ static void test_export(void) @@ -73,16 +83,6 @@ static void test_export(void) HKEY hkey, subkey; BYTE hex[4], buffer[8]; - const char *empty_key_test = - "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n\r\n"; - - const char *simple_test = - "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" - "\"DWORD\"=dword:00000100\r\n" - "\"String\"=\"Your text here...\"\r\n\r\n"; - const char *complex_test = "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" @@ -243,12 +243,12 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - ok(compare_export("file.reg", simple_test, 0), "compare_export() failed\n"); + ok(compare_export("file.reg", simple_data_test, 0), "compare_export() failed\n"); /* Test whether a .reg file extension is required when exporting */ run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " foo /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - ok(compare_export("foo", simple_test, 0), "compare_export() failed\n"); + ok(compare_export("foo", simple_data_test, 0), "compare_export() failed\n"); /* Test registry export with a complex data structure */ add_key(hkey, "Subkey1", &subkey); diff --git a/programs/reg/tests/reg_test.h b/programs/reg/tests/reg_test.h index 6718e91096f..3f4677a7a69 100644 --- a/programs/reg/tests/reg_test.h +++ b/programs/reg/tests/reg_test.h @@ -74,6 +74,13 @@ void add_value_(const char *file, unsigned line, HKEY hkey, const char *name, #define delete_value(k,n) delete_value_(__FILE__,__LINE__,k,n) void delete_value_(const char *file, unsigned line, const HKEY hkey, const char *name); +/* export.c */ +#define compare_export(f,e,todo) compare_export_(__FILE__,__LINE__,f,e,todo) +BOOL compare_export_(const char *file, unsigned line, const char *filename, + const char *expected, DWORD todo); +extern const char *empty_key_test; +extern const char *simple_data_test; + /* import.c */ #define test_import_str(c,r) import_reg(__FILE__,__LINE__,c,FALSE,r) #define test_import_wstr(c,r) import_reg(__FILE__,__LINE__,c,TRUE,r) -- 2.31.1

1 0

Announcing OSPP Summer Code 2021
by litimetal＠gmail.com 13 May '21

13 May '21

Hi All, I'm glad to announce that OSPP Summer Code 2021 has selected Wine. I've created a wiki page for it: https://wiki.winehq.org/index.php?title=Ospp_Summer_Code We have a tight schedule[1]. Please don't hesitate to share your proposals. I also created a brainstorming section https://wiki.winehq.org/Ospp_Summer_Code#Brain_Storming Note, easy projects and doc-related proposals are acceptable in OSPP Summer. [1]: https://summer.iscas.ac.cn/help/en/timeline/ Sincerely,Zhenbo Li

2 1

[PATCH v2 1/2] server: Support nested jobs.
by Paul Gofman 13 May '21

13 May '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - remove a spurious line break. dlls/kernel32/tests/process.c | 181 +++++++++++++++++++++++++++++++++- server/process.c | 148 ++++++++++++++++++++------- 2 files changed, 289 insertions(+), 40 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index f960efb05a8..1063b153a3d 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -71,6 +71,7 @@ static BOOL (WINAPI *pQueryFullProcessImageNameA)(HANDLE hProcess, DWORD dwFla 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 HANDLE (WINAPI *pOpenJobObjectA)(DWORD access, BOOL inherit, LPCSTR 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); @@ -257,6 +258,8 @@ static BOOL init(void) pQueryFullProcessImageNameW = (void *) GetProcAddress(hkernel32, "QueryFullProcessImageNameW"); pK32GetProcessImageFileNameA = (void *) GetProcAddress(hkernel32, "K32GetProcessImageFileNameA"); pCreateJobObjectW = (void *)GetProcAddress(hkernel32, "CreateJobObjectW"); + pOpenJobObjectA = (void *)GetProcAddress(hkernel32, "OpenJobObjectA"); + pAssignProcessToJobObject = (void *)GetProcAddress(hkernel32, "AssignProcessToJobObject"); pIsProcessInJob = (void *)GetProcAddress(hkernel32, "IsProcessInJob"); pTerminateJobObject = (void *)GetProcAddress(hkernel32, "TerminateJobObject"); @@ -2976,13 +2979,14 @@ static void test_jobInheritance(HANDLE job) wait_and_close_child_process(&pi); } -static void test_BreakawayOk(HANDLE job) +static void test_BreakawayOk(HANDLE parent_job) { JOBOBJECT_EXTENDED_LIMIT_INFORMATION limit_info; PROCESS_INFORMATION pi; STARTUPINFOA si = {0}; char buffer[MAX_PATH + 23]; - BOOL ret, out; + BOOL ret, out, nested_jobs; + HANDLE job; if (!pIsProcessInJob) { @@ -2990,6 +2994,16 @@ static void test_BreakawayOk(HANDLE job) return; } + job = pCreateJobObjectW(NULL, NULL); + ok(!!job, "CreateJobObjectW error %u\n", GetLastError()); + + ret = pAssignProcessToJobObject(job, GetCurrentProcess()); + ok(ret || broken(!ret && GetLastError() == ERROR_ACCESS_DENIED) /* before Win 8. */, + "AssignProcessToJobObject error %u\n", GetLastError()); + nested_jobs = ret; + if (!ret) + win_skip("Nested jobs are not supported.\n"); + sprintf(buffer, "\"%s\" process exit", selfname); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &pi); ok(!ret, "CreateProcessA expected failure\n"); @@ -3001,8 +3015,30 @@ static void test_BreakawayOk(HANDLE job) wait_and_close_child_process(&pi); } + if (nested_jobs) + { + 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()); + + sprintf(buffer, "\"%s\" process exit", selfname); + 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); + + ret = pIsProcessInJob(pi.hProcess, parent_job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + TerminateProcess(pi.hProcess, 0); + wait_and_close_child_process(&pi); + } + limit_info.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_BREAKAWAY_OK; - ret = pSetInformationJobObject(job, JobObjectExtendedLimitInformation, &limit_info, sizeof(limit_info)); + ret = pSetInformationJobObject(parent_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); @@ -3012,6 +3048,10 @@ static void test_BreakawayOk(HANDLE job) ok(ret, "IsProcessInJob error %u\n", GetLastError()); ok(!out, "IsProcessInJob returned out=%u\n", out); + ret = pIsProcessInJob(pi.hProcess, parent_job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(!out, "IsProcessInJob returned out=%u\n", out); + wait_and_close_child_process(&pi); limit_info.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK; @@ -4309,6 +4349,135 @@ static void test_dead_process(void) CloseHandle(pi.hThread); } +static void test_nested_jobs_child(unsigned int index) +{ + HANDLE job, job_parent, job_other; + PROCESS_INFORMATION pi; + char job_name[32]; + BOOL ret, out; + + sprintf(job_name, "test_nested_jobs_%u", index); + job = pOpenJobObjectA(JOB_OBJECT_ASSIGN_PROCESS | JOB_OBJECT_SET_ATTRIBUTES | JOB_OBJECT_QUERY + | JOB_OBJECT_TERMINATE, FALSE, job_name); + ok(!!job, "OpenJobObjectA error %u\n", GetLastError()); + + sprintf(job_name, "test_nested_jobs_%u", !index); + job_other = pOpenJobObjectA(JOB_OBJECT_ASSIGN_PROCESS | JOB_OBJECT_SET_ATTRIBUTES | JOB_OBJECT_QUERY + | JOB_OBJECT_TERMINATE, FALSE, job_name); + ok(!!job_other, "OpenJobObjectA error %u\n", GetLastError()); + + job_parent = pCreateJobObjectW(NULL, NULL); + ok(!!job_parent, "CreateJobObjectA error %u\n", GetLastError()); + + ret = pAssignProcessToJobObject(job_parent, GetCurrentProcess()); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + create_process("wait", &pi); + + ret = pAssignProcessToJobObject(job_parent, pi.hProcess); + ok(ret || broken(!ret && GetLastError() == ERROR_ACCESS_DENIED) /* Supported since Windows 8. */, + "AssignProcessToJobObject error %u\n", GetLastError()); + if (!ret) + { + win_skip("Nested jobs are not supported.\n"); + goto done; + } + ret = pAssignProcessToJobObject(job, pi.hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, NULL, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + out = TRUE; + ret = pIsProcessInJob(GetCurrentProcess(), job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(!out, "IsProcessInJob returned out=%u\n", out); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + ret = pAssignProcessToJobObject(job, GetCurrentProcess()); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + TerminateProcess(pi.hProcess, 0); + wait_child_process(pi.hProcess); + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + + create_process("wait", &pi); + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job_parent, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + if (index) + { + ret = pAssignProcessToJobObject(job_other, GetCurrentProcess()); + ok(!ret, "AssignProcessToJobObject succeded\n", GetLastError()); + ok(GetLastError() == ERROR_ACCESS_DENIED, "Got unexpected error %u.\n", GetLastError()); + } +done: + TerminateProcess(pi.hProcess, 0); + wait_child_process(pi.hProcess); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(job_parent); + CloseHandle(job); + CloseHandle(job_other); +} + +static void test_nested_jobs(void) +{ + PROCESS_INFORMATION info[2]; + char buffer[MAX_PATH + 26]; + STARTUPINFOA si = {0}; + HANDLE job1, job2; + unsigned int i; + + if (!pIsProcessInJob) + { + win_skip("IsProcessInJob not available.\n"); + return; + } + + job1 = pCreateJobObjectW(NULL, L"test_nested_jobs_0"); + ok(!!job1, "CreateJobObjectW failed, error %u.\n", GetLastError()); + job2 = pCreateJobObjectW(NULL, L"test_nested_jobs_1"); + ok(!!job2, "CreateJobObjectW failed, error %u.\n", GetLastError()); + + sprintf(buffer, "\"%s\" process nested_jobs 0", selfname); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &info[0]), + "CreateProcess failed\n"); + wait_child_process(info[0].hProcess); + sprintf(buffer, "\"%s\" process nested_jobs 1", selfname); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &info[1]), + "CreateProcess failed\n"); + wait_child_process(info[1].hProcess); + for (i = 0; i < 2; ++i) + { + CloseHandle(info[i].hProcess); + CloseHandle(info[i].hThread); + } + + CloseHandle(job1); + CloseHandle(job2); +} + START_TEST(process) { HANDLE job, hproc, h, h2; @@ -4384,6 +4553,11 @@ START_TEST(process) test_handle_list_attribute(TRUE, h, h2); return; } + else if (!strcmp(myARGV[2], "nested_jobs") && myARGC >= 4) + { + test_nested_jobs_child(atoi(myARGV[3])); + return; + } ok(0, "Unexpected command %s\n", myARGV[2]); return; @@ -4452,6 +4626,7 @@ START_TEST(process) test_CompletionPort(); test_KillOnJobClose(); test_WaitForJobObject(); + test_nested_jobs(); job = test_AddSelfToJob(); test_jobInheritance(job); test_BreakawayOk(job); diff --git a/server/process.c b/server/process.c index 17abd9800d2..8ff4fc51558 100644 --- a/server/process.c +++ b/server/process.c @@ -30,6 +30,7 @@ #include <stdio.h> #include <stdlib.h> #include <sys/time.h> +#include <stdint.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif @@ -182,7 +183,7 @@ static void job_destroy( struct object *obj ); struct job { struct object obj; /* object header */ - struct list process_list; /* list of all processes */ + struct list process_list; /* list of processes */ int num_processes; /* count of running processes */ int total_processes; /* count of processes which have been assigned */ unsigned int limit_flags; /* limit flags */ @@ -190,6 +191,9 @@ struct job int signaled; /* job is signaled */ struct completion *completion_port; /* associated completion port */ apc_param_t completion_key; /* key to send with completion messages */ + struct job *parent; + struct list parent_job_entry; /* list entry for parent job */ + struct list child_job_list; /* list of child jobs */ }; static const struct object_ops job_ops = @@ -227,6 +231,7 @@ static struct job *create_job_object( struct object *root, const struct unicode_ { /* initialize it if it didn't already exist */ list_init( &job->process_list ); + list_init( &job->child_job_list ); job->num_processes = 0; job->total_processes = 0; job->limit_flags = 0; @@ -234,6 +239,7 @@ static struct job *create_job_object( struct object *root, const struct unicode_ job->signaled = 0; job->completion_port = NULL; job->completion_key = 0; + job->parent = NULL; } } return job; @@ -250,14 +256,68 @@ static void add_job_completion( struct job *job, apc_param_t msg, apc_param_t pi add_completion( job->completion_port, job->completion_key, pid, STATUS_SUCCESS, msg ); } +static int walk_job( struct job *job, void *param, int (*callback)( struct job *, void * )) +{ + struct job *j, *next; + + LIST_FOR_EACH_ENTRY_SAFE( j, next, &job->child_job_list, struct job, parent_job_entry ) + { + assert( j->parent == job ); + if (walk_job( j, param, callback )) return 1; + } + return callback( job, param ); +} + +static int process_in_job( struct job *job, void *param ) +{ + struct process *process = param; + + assert( process->obj.ops == &process_ops ); + return process->job == job; +} + static void add_job_process( struct job *job, struct process *process ) { + process_id_t pid; + struct job *j; + + if (job == process->job) return; + + if (process->job) + { + list_remove( &process->job_entry ); + if (job->parent) + { + j = job->parent; + while (j && j != process->job) + j = j->parent; + + if (!j) + { + set_error( STATUS_ACCESS_DENIED ); + return; + } + release_object( process->job ); + } + else + { + job->parent = process->job; + list_add_tail( &job->parent->child_job_list, &job->parent_job_entry ); + } + } + + pid = get_process_id( process ); + j = job; + while (j != process->job) + { + j->num_processes++; + j->total_processes++; + add_job_completion( j, JOB_OBJECT_MSG_NEW_PROCESS, pid ); + j = j->parent; + } + process->job = (struct job *)grab_object( job ); list_add_tail( &job->process_list, &process->job_entry ); - job->num_processes++; - job->total_processes++; - - add_job_completion( job, JOB_OBJECT_MSG_NEW_PROCESS, get_process_id(process) ); } /* called when a process has terminated, allow one additional process */ @@ -265,40 +325,42 @@ static void release_job_process( struct process *process ) { struct job *job = process->job; - if (!job) return; + while (job) + { + assert( job->num_processes ); + job->num_processes--; - assert( job->num_processes ); - job->num_processes--; + if (!job->terminating) + add_job_completion( job, JOB_OBJECT_MSG_EXIT_PROCESS, get_process_id(process) ); - if (!job->terminating) - add_job_completion( job, JOB_OBJECT_MSG_EXIT_PROCESS, get_process_id(process) ); + if (!job->num_processes) + add_job_completion( job, JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO, 0 ); - if (!job->num_processes) - add_job_completion( job, JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO, 0 ); + job = job->parent; + } } -static void terminate_job( struct job *job, int exit_code ) +static int terminate_job_processes( struct job *job, void *exit_code ) { + struct process *process, *next; + /* don't report completion events for terminated processes */ job->terminating = 1; - for (;;) /* restart from the beginning of the list every time */ + LIST_FOR_EACH_ENTRY_SAFE( process, next, &job->process_list, struct process, job_entry ) { - struct process *process; - - /* find the first process associated with this job and still running */ - LIST_FOR_EACH_ENTRY( process, &job->process_list, struct process, job_entry ) - { - if (process->running_threads) break; - } - if (&process->job_entry == &job->process_list) break; /* no process found */ assert( process->job == job ); - terminate_process( process, NULL, exit_code ); + if (process->running_threads) terminate_process( process, NULL, (uintptr_t)exit_code ); } - job->terminating = 0; job->signaled = 1; wake_up( &job->obj, 0 ); + return 0; +} + +static void terminate_job( struct job *job, int exit_code ) +{ + walk_job( job, (void *)(uintptr_t)exit_code, terminate_job_processes ); } static int job_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) @@ -320,16 +382,23 @@ static void job_destroy( struct object *obj ) assert( obj->ops == &job_ops ); assert( !job->num_processes ); - assert( list_empty(&job->process_list) ); + assert( list_empty( &job->process_list )); + assert( list_empty( &job->child_job_list )); if (job->completion_port) release_object( job->completion_port ); + if (job->parent) + { + list_remove( &job->parent_job_entry ); + release_object( job->parent ); + } } static void job_dump( struct object *obj, int verbose ) { struct job *job = (struct job *)obj; assert( obj->ops == &job_ops ); - fprintf( stderr, "Job processes=%d\n", list_count(&job->process_list) ); + fprintf( stderr, "Job processes=%d child_jobs=%d parent=%p\n", + list_count(&job->process_list), list_count(&job->child_job_list), job->parent ); } static int job_signaled( struct object *obj, struct wait_queue_entry *entry ) @@ -1021,6 +1090,7 @@ DECL_HANDLER(new_process) struct thread *parent_thread = current; int socket_fd = thread_get_inflight_fd( current, req->socket_fd ); const obj_handle_t *handles = NULL; + struct job *job; if (socket_fd == -1) { @@ -1057,6 +1127,8 @@ DECL_HANDLER(new_process) } else parent = (struct process *)grab_object( current->process ); + /* If a job further in the job chain does not permit breakaway process creation + * succeeds and the process which is trying to breakaway is assigned to that job. */ if (parent->job && (req->flags & PROCESS_CREATE_FLAGS_BREAKAWAY) && !(parent->job->limit_flags & (JOB_OBJECT_LIMIT_BREAKAWAY_OK | JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK))) { @@ -1147,11 +1219,17 @@ DECL_HANDLER(new_process) process->startup_info = (struct startup_info *)grab_object( info ); - if (parent->job - && !(req->flags & PROCESS_CREATE_FLAGS_BREAKAWAY) - && !(parent->job->limit_flags & JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK)) + job = parent->job; + while (job) { - add_job_process( parent->job, process ); + if (!(job->limit_flags & JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK) + && !(req->flags & PROCESS_CREATE_FLAGS_BREAKAWAY + && job->limit_flags & JOB_OBJECT_LIMIT_BREAKAWAY_OK)) + { + add_job_process( job, process ); + break; + } + job = job->parent; } /* connect to the window station */ @@ -1561,12 +1639,8 @@ DECL_HANDLER(assign_job) if ((process = get_process_from_handle( req->process, PROCESS_SET_QUOTA | PROCESS_TERMINATE ))) { - if (!process->running_threads) - set_error( STATUS_PROCESS_IS_TERMINATING ); - else if (process->job) - set_error( STATUS_ACCESS_DENIED ); - else - add_job_process( job, process ); + if (!process->running_threads) set_error( STATUS_PROCESS_IS_TERMINATING ); + else add_job_process( job, process ); release_object( process ); } release_object( job ); @@ -1588,7 +1662,7 @@ DECL_HANDLER(process_in_job) } else if ((job = get_job_obj( current->process, req->job, JOB_OBJECT_QUERY ))) { - set_error( process->job == job ? STATUS_PROCESS_IN_JOB : STATUS_PROCESS_NOT_IN_JOB ); + set_error( walk_job( job, process, process_in_job ) ? STATUS_PROCESS_IN_JOB : STATUS_PROCESS_NOT_IN_JOB ); release_object( job ); } release_object( process ); -- 2.31.1

2 3

[PATCH 2/5] user32: Use wait_graphics_driver_ready() in load_desktop_driver().
by Zhiyi Zhang 13 May '21

13 May '21

So that Wine doesn't have to send an extra WM_NULL message when wait_graphics_driver_ready() is later called in EnumDisplayDevicesW(). Also, it avoids a deadlock when wait_graphics_driver_ready() is used in later patches. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/driver.c | 2 +- dlls/user32/sysparams.c | 2 +- dlls/user32/user_private.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 1c3b62eff2b..87c8cd621b3 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -55,7 +55,7 @@ static BOOL load_desktop_driver( HWND hwnd, HMODULE *module ) USER_CheckNotLock(); strcpy( driver_load_error, "The explorer process failed to start." ); /* default error */ - SendMessageW( hwnd, WM_NULL, 0, 0 ); /* wait for the desktop process to be ready */ + wait_graphics_driver_ready(); guid_atom = HandleToULong( GetPropW( hwnd, L"__wine_display_device_guid" )); lstrcpyW( key, L"System\\CurrentControlSet\\Control\\Video\\{" ); diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 55d6d7e53a7..0b4dbfc2d78 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -583,7 +583,7 @@ static void release_display_device_init_mutex( HANDLE mutex ) } /* Wait until graphics driver is loaded by explorer */ -static void wait_graphics_driver_ready(void) +void wait_graphics_driver_ready(void) { static BOOL ready = FALSE; diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index db082462f1b..974d18be482 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -258,6 +258,7 @@ extern void move_window_bits( HWND hwnd, struct window_surface *old_surface, extern void move_window_bits_parent( HWND hwnd, HWND parent, const RECT *window_rect, const RECT *valid_rects ) DECLSPEC_HIDDEN; extern void update_window_state( HWND hwnd ) DECLSPEC_HIDDEN; +extern void wait_graphics_driver_ready(void) DECLSPEC_HIDDEN; extern void *get_hook_proc( void *proc, const WCHAR *module, HMODULE *free_module ) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; -- 2.30.2

2 1

[PATCH 1/5] user32/tests: Test only part of the available modes.
by Zhiyi Zhang 13 May '21

13 May '21

Test only 1/10 of the all modes and at most 10 modes because TestBots have a 2 minutes timeout. This reduce the time to run the monitor test from 6 minutes to 25 seconds. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50086 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 6b233970ace..c4416a47259 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -741,6 +741,12 @@ static void test_ChangeDisplaySettingsEx(void) dm.dmSize = sizeof(dm); for (mode = 0; EnumDisplaySettingsExA(devices[device].name, mode, &dm, 0); ++mode) { + /* Test 1/10 of all modes and at most 10 modes because TestBots have a 2 mins timeout */ + if (mode >= 10) + break; + if (mode && rand() % 10) + continue; + dm.dmPosition = position; dm.dmFields |= DM_POSITION; /* Reattach detached non-primary adapters, otherwise ChangeDisplaySettingsExA with only CDS_RESET fails */ -- 2.30.2

1 1

[PATCH] include: Add fUseStandardBidi field in SCRIPT_CONTROL.
by Zhiyi Zhang 13 May '21

13 May '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- include/usp10.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/usp10.h b/include/usp10.h index 09416aefe06..b1ff458b598 100644 --- a/include/usp10.h +++ b/include/usp10.h @@ -98,7 +98,8 @@ typedef struct tag_SCRIPT_CONTROL { DWORD fNumericOverride :1; DWORD fLegacyBidiClass :1; DWORD fMergeNeutralItems :1; - DWORD fReserved :7; + DWORD fUseStandardBidi :1; + DWORD fReserved :6; } SCRIPT_CONTROL; typedef struct { -- 2.30.2

1 0

[PATCH 5/5] gdi32: Return correct color depth for display DCs in GetDeviceCaps().
by Zhiyi Zhang 13 May '21

13 May '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=29184 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/driver.c | 19 ++++++++++++++++++- dlls/user32/tests/monitor.c | 1 - dlls/winex11.drv/init.c | 2 -- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index a2ebd018bca..2042701dd45 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -460,7 +460,24 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) return pGetSystemMetrics ? pGetSystemMetrics( SM_CYSCREEN ) : 480; } - case BITSPIXEL: return 32; + case BITSPIXEL: + { + DEVMODEW devmode; + WCHAR *display; + DC *dc; + + if (GetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY && pEnumDisplaySettingsW) + { + dc = get_nulldrv_dc( dev ); + display = dc->display[0] ? dc->display : NULL; + memset( &devmode, 0, sizeof(devmode) ); + devmode.dmSize = sizeof(devmode); + if (pEnumDisplaySettingsW( display, ENUM_CURRENT_SETTINGS, &devmode ) + && devmode.dmFields & DM_BITSPERPEL && devmode.dmBitsPerPel) + return devmode.dmBitsPerPel; + } + return 32; + } case PLANES: return 1; case NUMBRUSHES: return -1; case NUMPENS: return -1; diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index a232241a1fc..98c4033f762 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2037,7 +2037,6 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ dm->dmDisplayFrequency, value); value = GetDeviceCaps(hdc, BITSPIXEL); - todo_wine_if(dm->dmBitsPerPel != 32) ok_(__FILE__, line)(value == dm->dmBitsPerPel, "Expected BITSPIXEL %d, got %d.\n", dm->dmBitsPerPel, value); diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index d070c0f1171..ff3d5317697 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -162,8 +162,6 @@ static INT CDECL X11DRV_GetDeviceCaps( PHYSDEV dev, INT cap ) { switch(cap) { - case BITSPIXEL: - return screen_bpp; case SIZEPALETTE: return palette_size; default: -- 2.30.2

1 0