March 2020 - Wine-Devel - list.winehq.org

[PATCH 1/3] ntdll/tests: Separate invalid name tests for RtlDosPathNameToNtPathName_U().
by Zebediah Figura March 5, 2020

March 5, 2020

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/tests/path.c | 210 +++++++++++++++++++++------------------- 1 file changed, 111 insertions(+), 99 deletions(-) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 195dea37e88..2dc1ccd9910 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -402,7 +402,7 @@ static void test_RtlDosPathNameToNtPathName_U(void) UNICODE_STRING nameW; WCHAR *file_part; NTSTATUS status; - BOOL ret, expect; + BOOL ret; int i; static const struct @@ -410,123 +410,135 @@ static void test_RtlDosPathNameToNtPathName_U(void) const char *dos; const char *nt; int file_offset; /* offset to file part */ - NTSTATUS status; - NTSTATUS alt_status; - int broken; } tests[] = { - { "c:\\", "\\??\\c:\\", -1, STATUS_SUCCESS }, - { "c:/", "\\??\\c:\\", -1, STATUS_SUCCESS }, - { "c:/foo", "\\??\\c:\\foo", 7, STATUS_SUCCESS }, - { "c:/foo.", "\\??\\c:\\foo", 7, STATUS_SUCCESS }, - { "c:/foo/", "\\??\\c:\\foo\\", -1, STATUS_SUCCESS }, - { "c:/foo//", "\\??\\c:\\foo\\", -1, STATUS_SUCCESS }, - { "C:/foo", "\\??\\C:\\foo", 7, STATUS_SUCCESS }, - { "C:/foo/bar", "\\??\\C:\\foo\\bar", 11, STATUS_SUCCESS }, - { "C:/foo/bar", "\\??\\C:\\foo\\bar", 11, STATUS_SUCCESS }, - { "c:.", "\\??\\C:\\windows", 7, STATUS_SUCCESS }, - { "c:foo", "\\??\\C:\\windows\\foo", 15, STATUS_SUCCESS }, - { "c:foo/bar", "\\??\\C:\\windows\\foo\\bar", 19, STATUS_SUCCESS }, - { "c:./foo", "\\??\\C:\\windows\\foo", 15, STATUS_SUCCESS }, - { "c:/./foo", "\\??\\c:\\foo", 7, STATUS_SUCCESS }, - { "c:/foo/.", "\\??\\c:\\foo", 7, STATUS_SUCCESS }, - { "c:/foo/./bar", "\\??\\c:\\foo\\bar", 11, STATUS_SUCCESS }, - { "c:/foo/../bar", "\\??\\c:\\bar", 7, STATUS_SUCCESS }, - { "\\foo", "\\??\\C:\\foo", 7, STATUS_SUCCESS }, - { "foo", "\\??\\C:\\windows\\foo", 15, STATUS_SUCCESS }, - { ".", "\\??\\C:\\windows", 7, STATUS_SUCCESS }, - { "./", "\\??\\C:\\windows\\", -1, STATUS_SUCCESS }, - { "..", "\\??\\C:\\", -1, STATUS_SUCCESS }, - { "...", "\\??\\C:\\windows\\", -1, STATUS_SUCCESS }, - { "./foo", "\\??\\C:\\windows\\foo", 15, STATUS_SUCCESS }, - { "foo/..", "\\??\\C:\\windows", 7, STATUS_SUCCESS }, - { "AUX" , "\\??\\AUX", -1, STATUS_SUCCESS }, - { "COM1" , "\\??\\COM1", -1, STATUS_SUCCESS }, - { "?<>*\"|:", "\\??\\C:\\windows\\?<>*\"|:", 15, STATUS_SUCCESS }, - - { "", NULL, -1, STATUS_OBJECT_NAME_INVALID, STATUS_OBJECT_PATH_NOT_FOUND }, - { NULL, NULL, -1, STATUS_OBJECT_NAME_INVALID, STATUS_OBJECT_PATH_NOT_FOUND }, - { " ", NULL, -1, STATUS_OBJECT_NAME_INVALID, STATUS_OBJECT_PATH_NOT_FOUND }, - - { "\\\\foo", "\\??\\UNC\\foo", -1, STATUS_SUCCESS }, - { "//foo", "\\??\\UNC\\foo", -1, STATUS_SUCCESS }, - { "\\/foo", "\\??\\UNC\\foo", -1, STATUS_SUCCESS }, - { "//", "\\??\\UNC\\", -1, STATUS_SUCCESS }, - { "//foo/", "\\??\\UNC\\foo\\", -1, STATUS_SUCCESS }, - - { "//.", "\\??\\", -1, STATUS_SUCCESS }, - { "//./", "\\??\\", -1, STATUS_SUCCESS }, - { "//.//", "\\??\\", -1, STATUS_SUCCESS }, - { "//./foo", "\\??\\foo", 4, STATUS_SUCCESS }, - { "//./foo/", "\\??\\foo\\", -1, STATUS_SUCCESS }, - { "//./foo/bar", "\\??\\foo\\bar", 8, STATUS_SUCCESS }, - { "//./foo/.", "\\??\\foo", 4, STATUS_SUCCESS }, - { "//./foo/..", "\\??\\", -1, STATUS_SUCCESS }, - - { "//?", "\\??\\", -1, STATUS_SUCCESS }, - { "//?/", "\\??\\", -1, STATUS_SUCCESS }, - { "//?//", "\\??\\", -1, STATUS_SUCCESS }, - { "//?/foo", "\\??\\foo", 4, STATUS_SUCCESS }, - { "//?/foo/", "\\??\\foo\\", -1, STATUS_SUCCESS }, - { "//?/foo/bar", "\\??\\foo\\bar", 8, STATUS_SUCCESS }, - { "//?/foo/.", "\\??\\foo", 4, STATUS_SUCCESS }, - { "//?/foo/..", "\\??\\", -1, STATUS_SUCCESS }, - - { "\\\\?", "\\??\\", -1, STATUS_SUCCESS }, - { "\\\\?\\", "\\??\\", -1, STATUS_SUCCESS }, - - { "\\\\?\\/", "\\??\\/", 4, STATUS_SUCCESS }, - { "\\\\?\\foo", "\\??\\foo", 4, STATUS_SUCCESS }, - { "\\\\?\\foo/", "\\??\\foo/", 4, STATUS_SUCCESS }, - { "\\\\?\\foo/bar", "\\??\\foo/bar", 4, STATUS_SUCCESS }, - { "\\\\?\\foo/.", "\\??\\foo/.", 4, STATUS_SUCCESS }, - { "\\\\?\\foo/..", "\\??\\foo/..", 4, STATUS_SUCCESS }, - { "\\\\?\\\\", "\\??\\\\", -1, STATUS_SUCCESS }, - { "\\\\?\\\\\\", "\\??\\\\\\", -1, STATUS_SUCCESS }, - { "\\\\?\\foo\\", "\\??\\foo\\", -1, STATUS_SUCCESS }, - { "\\\\?\\foo\\bar", "\\??\\foo\\bar", 8, STATUS_SUCCESS }, - { "\\\\?\\foo\\.", "\\??\\foo\\.", 8, STATUS_SUCCESS }, - { "\\\\?\\foo\\..", "\\??\\foo\\..", 8, STATUS_SUCCESS }, - - { "\\??", "\\??\\C:\\??", 7, STATUS_SUCCESS }, - { "\\??\\", "\\??\\C:\\??\\", -1, STATUS_SUCCESS }, - - { "\\??\\/", "\\??\\/", 4, STATUS_SUCCESS }, - { "\\??\\foo", "\\??\\foo", 4, STATUS_SUCCESS }, - { "\\??\\foo/", "\\??\\foo/", 4, STATUS_SUCCESS }, - { "\\??\\foo/bar", "\\??\\foo/bar", 4, STATUS_SUCCESS }, - { "\\??\\foo/.", "\\??\\foo/.", 4, STATUS_SUCCESS }, - { "\\??\\foo/..", "\\??\\foo/..", 4, STATUS_SUCCESS }, - { "\\??\\\\", "\\??\\\\", -1, STATUS_SUCCESS }, - { "\\??\\\\\\", "\\??\\\\\\", -1, STATUS_SUCCESS }, - { "\\??\\foo\\", "\\??\\foo\\", -1, STATUS_SUCCESS }, - { "\\??\\foo\\bar", "\\??\\foo\\bar", 8, STATUS_SUCCESS }, - { "\\??\\foo\\.", "\\??\\foo\\.", 8, STATUS_SUCCESS }, - { "\\??\\foo\\..", "\\??\\foo\\..", 8, STATUS_SUCCESS }, + { "c:\\", "\\??\\c:\\", -1 }, + { "c:/", "\\??\\c:\\", -1 }, + { "c:/foo", "\\??\\c:\\foo", 7 }, + { "c:/foo.", "\\??\\c:\\foo", 7 }, + { "c:/foo/", "\\??\\c:\\foo\\", -1 }, + { "c:/foo//", "\\??\\c:\\foo\\", -1 }, + { "C:/foo", "\\??\\C:\\foo", 7 }, + { "C:/foo/bar", "\\??\\C:\\foo\\bar", 11 }, + { "C:/foo/bar", "\\??\\C:\\foo\\bar", 11 }, + { "c:.", "\\??\\C:\\windows", 7 }, + { "c:foo", "\\??\\C:\\windows\\foo", 15 }, + { "c:foo/bar", "\\??\\C:\\windows\\foo\\bar", 19 }, + { "c:./foo", "\\??\\C:\\windows\\foo", 15 }, + { "c:/./foo", "\\??\\c:\\foo", 7 }, + { "c:/foo/.", "\\??\\c:\\foo", 7 }, + { "c:/foo/./bar", "\\??\\c:\\foo\\bar", 11 }, + { "c:/foo/../bar", "\\??\\c:\\bar", 7 }, + { "\\foo", "\\??\\C:\\foo", 7 }, + { "foo", "\\??\\C:\\windows\\foo", 15 }, + { ".", "\\??\\C:\\windows", 7 }, + { "./", "\\??\\C:\\windows\\", -1 }, + { "..", "\\??\\C:\\", -1 }, + { "...", "\\??\\C:\\windows\\", -1 }, + { "./foo", "\\??\\C:\\windows\\foo", 15 }, + { "foo/..", "\\??\\C:\\windows", 7 }, + { "AUX" , "\\??\\AUX", -1 }, + { "COM1" , "\\??\\COM1", -1 }, + { "?<>*\"|:", "\\??\\C:\\windows\\?<>*\"|:", 15 }, + + { "\\\\foo", "\\??\\UNC\\foo", -1 }, + { "//foo", "\\??\\UNC\\foo", -1 }, + { "\\/foo", "\\??\\UNC\\foo", -1 }, + { "//", "\\??\\UNC\\", -1 }, + { "//foo/", "\\??\\UNC\\foo\\", -1 }, + + { "//.", "\\??\\", -1 }, + { "//./", "\\??\\", -1 }, + { "//.//", "\\??\\", -1 }, + { "//./foo", "\\??\\foo", 4 }, + { "//./foo/", "\\??\\foo\\", -1 }, + { "//./foo/bar", "\\??\\foo\\bar", 8 }, + { "//./foo/.", "\\??\\foo", 4 }, + { "//./foo/..", "\\??\\", -1 }, + + { "//?", "\\??\\", -1 }, + { "//?/", "\\??\\", -1 }, + { "//?//", "\\??\\", -1 }, + { "//?/foo", "\\??\\foo", 4 }, + { "//?/foo/", "\\??\\foo\\", -1 }, + { "//?/foo/bar", "\\??\\foo\\bar", 8 }, + { "//?/foo/.", "\\??\\foo", 4 }, + { "//?/foo/..", "\\??\\", -1 }, + + { "\\\\?", "\\??\\", -1 }, + { "\\\\?\\", "\\??\\", -1 }, + + { "\\\\?\\/", "\\??\\/", 4 }, + { "\\\\?\\foo", "\\??\\foo", 4 }, + { "\\\\?\\foo/", "\\??\\foo/", 4 }, + { "\\\\?\\foo/bar", "\\??\\foo/bar", 4 }, + { "\\\\?\\foo/.", "\\??\\foo/.", 4 }, + { "\\\\?\\foo/..", "\\??\\foo/..", 4 }, + { "\\\\?\\\\", "\\??\\\\", -1 }, + { "\\\\?\\\\\\", "\\??\\\\\\", -1 }, + { "\\\\?\\foo\\", "\\??\\foo\\", -1 }, + { "\\\\?\\foo\\bar", "\\??\\foo\\bar", 8 }, + { "\\\\?\\foo\\.", "\\??\\foo\\.", 8 }, + { "\\\\?\\foo\\..", "\\??\\foo\\..", 8 }, + + { "\\??", "\\??\\C:\\??", 7 }, + { "\\??\\", "\\??\\C:\\??\\", -1 }, + + { "\\??\\/", "\\??\\/", 4 }, + { "\\??\\foo", "\\??\\foo", 4 }, + { "\\??\\foo/", "\\??\\foo/", 4 }, + { "\\??\\foo/bar", "\\??\\foo/bar", 4 }, + { "\\??\\foo/.", "\\??\\foo/.", 4 }, + { "\\??\\foo/..", "\\??\\foo/..", 4 }, + { "\\??\\\\", "\\??\\\\", -1 }, + { "\\??\\\\\\", "\\??\\\\\\", -1 }, + { "\\??\\foo\\", "\\??\\foo\\", -1 }, + { "\\??\\foo\\bar", "\\??\\foo\\bar", 8 }, + { "\\??\\foo\\.", "\\??\\foo\\.", 8 }, + { "\\??\\foo\\..", "\\??\\foo\\..", 8 }, }; GetCurrentDirectoryA(sizeof(curdir), curdir); SetCurrentDirectoryA("C:\\windows\\"); + ret = pRtlDosPathNameToNtPathName_U(NULL, &nameW, &file_part, NULL); + ok(!ret, "Got %d.\n", ret); + + ret = pRtlDosPathNameToNtPathName_U(L"", &nameW, &file_part, NULL); + ok(!ret, "Got %d.\n", ret); + + ret = pRtlDosPathNameToNtPathName_U(L" ", &nameW, &file_part, NULL); + ok(!ret, "Got %d.\n", ret); + + if (pRtlDosPathNameToNtPathName_U_WithStatus) + { + status = pRtlDosPathNameToNtPathName_U_WithStatus(NULL, &nameW, &file_part, NULL); + ok(status == STATUS_OBJECT_NAME_INVALID || status == STATUS_OBJECT_PATH_NOT_FOUND /* 2003 */, + "Got status %#x.\n", status); + + status = pRtlDosPathNameToNtPathName_U_WithStatus(L"", &nameW, &file_part, NULL); + ok(status == STATUS_OBJECT_NAME_INVALID || status == STATUS_OBJECT_PATH_NOT_FOUND /* 2003 */, + "Got status %#x.\n", status); + + status = pRtlDosPathNameToNtPathName_U_WithStatus(L" ", &nameW, &file_part, NULL); + ok(status == STATUS_OBJECT_NAME_INVALID || status == STATUS_OBJECT_PATH_NOT_FOUND /* 2003 */, + "Got status %#x.\n", status); + } + for (i = 0; i < ARRAY_SIZE(tests); ++i) { MultiByteToWideChar(CP_ACP, 0, tests[i].dos, -1, path, ARRAY_SIZE(path)); ret = pRtlDosPathNameToNtPathName_U(path, &nameW, &file_part, NULL); + ok(ret == TRUE, "%s: Got %d.\n", tests[i].dos, ret); if (pRtlDosPathNameToNtPathName_U_WithStatus) { RtlFreeUnicodeString(&nameW); status = pRtlDosPathNameToNtPathName_U_WithStatus(path, &nameW, &file_part, NULL); - ok(status == tests[i].status || status == tests[i].alt_status, - "%s: Expected status %#x, got %#x.\n", tests[i].dos, tests[i].status, status); + ok(status == STATUS_SUCCESS, "%s: Got status %#x.\n", tests[i].dos, status); } - expect = (tests[i].status == STATUS_SUCCESS); - ok(ret == expect, "%s: Expected %#x, got %#x.\n", tests[i].dos, expect, ret); - - if (ret != TRUE) continue; - if (!strncmp(tests[i].dos, "\\??\\", 4) && tests[i].dos[4] && broken(!memcmp(nameW.Buffer, broken_global_prefix, sizeof(broken_global_prefix)))) { -- 2.25.1

2 4

[PATCH v4 1/4] jscript: Use struct list for named items.
by Gabriel Ivăncescu March 5, 2020

March 5, 2020

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- We need to append them at the end for next patches to pass the tests. It will also be needed when implementing the SCRIPTITEM_ISPERSISTENT flag. dlls/jscript/engine.c | 2 +- dlls/jscript/jscript.c | 26 +++++++++----------------- dlls/jscript/jscript.h | 4 ++-- 3 files changed, 12 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 4e28b63..7da8f70 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -591,7 +591,7 @@ static BOOL lookup_global_members(script_ctx_t *ctx, BSTR identifier, exprval_t DISPID id; HRESULT hres; - for(item = ctx->named_items; item; item = item->next) { + LIST_FOR_EACH_ENTRY(item, &ctx->named_items, named_item_t, entry) { if(item->flags & SCRIPTITEM_GLOBALMEMBERS) { hres = disp_get_id(ctx, item->disp, identifier, identifier, 0, &id); if(SUCCEEDED(hres)) { diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 5e9b153..b878aa5 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -113,7 +113,7 @@ named_item_t *lookup_named_item(script_ctx_t *ctx, const WCHAR *item_name, unsig named_item_t *item; HRESULT hr; - for(item = ctx->named_items; item; item = item->next) { + LIST_FOR_EACH_ENTRY(item, &ctx->named_items, named_item_t, entry) { if((item->flags & flags) == flags && !wcscmp(item->name, item_name)) { if(!item->disp && (flags || !(item->flags & SCRIPTITEM_CODEONLY))) { IUnknown *unk; @@ -414,20 +414,13 @@ static void decrease_state(JScript *This, SCRIPTSTATE state) This->ctx->host_global = NULL; } - if(This->ctx->named_items) { - named_item_t *iter, *iter2; + while(!list_empty(&This->ctx->named_items)) { + named_item_t *iter = LIST_ENTRY(list_head(&This->ctx->named_items), named_item_t, entry); - iter = This->ctx->named_items; - while(iter) { - iter2 = iter->next; - - if(iter->disp) - IDispatch_Release(iter->disp); - release_named_item(iter); - iter = iter2; - } - - This->ctx->named_items = NULL; + list_remove(&iter->entry); + if(iter->disp) + IDispatch_Release(iter->disp); + release_named_item(iter); } if(This->ctx->secmgr) { @@ -681,6 +674,7 @@ static HRESULT WINAPI JScript_SetScriptSite(IActiveScript *iface, ctx->version = This->version; ctx->html_mode = This->html_mode; ctx->acc = jsval_undefined(); + list_init(&ctx->named_items); heap_pool_init(&ctx->tmp_heap); hres = create_jscaller(ctx); @@ -851,9 +845,7 @@ static HRESULT WINAPI JScript_AddNamedItem(IActiveScript *iface, return E_OUTOFMEMORY; } - item->next = This->ctx->named_items; - This->ctx->named_items = item; - + list_add_tail(&This->ctx->named_items, &item->entry); return S_OK; } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index efd5a54..7f34b55 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -210,7 +210,7 @@ typedef struct named_item_t { DWORD flags; LPWSTR name; - struct named_item_t *next; + struct list entry; } named_item_t; named_item_t *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN; @@ -409,7 +409,7 @@ struct _script_ctx_t { IActiveScript *active_script; struct _call_frame_t *call_ctx; - named_item_t *named_items; + struct list named_items; IActiveScriptSite *site; IInternetHostSecurityManager *secmgr; DWORD safeopt; -- 2.21.0

2 8

[PATCH 2/2] gdiplus: Fix leak in SOFTWARE_GdipDrawDriverString.
by Piotr Caban March 5, 2020

March 5, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/gdiplus/graphics.c | 5 +++++ 1 file changed, 5 insertions(+)

2 1

[PATCH 1/2] gdiplus: Fix gdi handles leak in GdipMeasureCharacterRanges.
by Piotr Caban March 5, 2020

March 5, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/gdiplus/graphics.c | 6 ++++++ 1 file changed, 6 insertions(+)

2 1

[PATCH 2/2] jscript/tests: Add tests for named items.
by Jacek Caban March 5, 2020

March 5, 2020

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/tests/jscript.c | 713 ++++++++++++++++++++++++++++++++++- 1 file changed, 700 insertions(+), 13 deletions(-)

2 2

[PATCH v2 2/2] jscript/tests: Add tests for named items.
by Jacek Caban March 5, 2020

March 5, 2020

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/tests/jscript.c | 715 ++++++++++++++++++++++++++++++++++- 1 file changed, 702 insertions(+), 13 deletions(-)

1 0

[PATCH v2 1/2] jscript: Use struct list for named items.
by Jacek Caban March 5, 2020

March 5, 2020

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/engine.c | 2 +- dlls/jscript/jscript.c | 26 +++++++++----------------- dlls/jscript/jscript.h | 4 ++-- 3 files changed, 12 insertions(+), 20 deletions(-)

1 0

[PATCH 1/2] jscript: Use struct list for named items.
by Jacek Caban March 5, 2020

March 5, 2020

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/engine.c | 2 +- dlls/jscript/jscript.c | 26 +++++++++----------------- dlls/jscript/jscript.h | 4 ++-- 3 files changed, 12 insertions(+), 20 deletions(-)

1 0

[PATCH] ntdll: Implement JobObjectBasicProcessIdList for NtQueryInformationJobObject.
by Gabriel Ivăncescu March 5, 2020

March 5, 2020

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/kernel32/tests/process.c | 9 --------- dlls/ntdll/sync.c | 34 +++++++++++++++++++++++++++++++--- server/process.c | 23 +++++++++++++++++++++++ server/protocol.def | 9 +++++++++ 4 files changed, 63 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index b5ed990..6c29db3 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2606,15 +2606,11 @@ static void test_QueryInformationJobObject(void) pid_list->NumberOfProcessIdsInList = 42; ret = QueryInformationJobObject(job, JobObjectBasicProcessIdList, pid_list, FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[1]), &ret_len); - todo_wine ok(!ret, "QueryInformationJobObject expected failure\n"); - todo_wine expect_eq_d(ERROR_MORE_DATA, GetLastError()); if (ret) { - todo_wine expect_eq_d(42, pid_list->NumberOfAssignedProcesses); - todo_wine expect_eq_d(42, pid_list->NumberOfProcessIdsInList); } @@ -2629,17 +2625,12 @@ static void test_QueryInformationJobObject(void) { ULONG_PTR *list = pid_list->ProcessIdList; - todo_wine ok(ret_len == FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[2]), "QueryInformationJobObject returned ret_len=%u\n", ret_len); - todo_wine expect_eq_d(2, pid_list->NumberOfAssignedProcesses); - todo_wine expect_eq_d(2, pid_list->NumberOfProcessIdsInList); - todo_wine expect_eq_d(pi[0].dwProcessId, list[0]); - todo_wine expect_eq_d(pi[1].dwProcessId, list[1]); } } diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 2b5b6ce..4a889eb 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -694,7 +694,9 @@ NTSTATUS WINAPI NtTerminateJobObject( HANDLE handle, NTSTATUS status ) NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS class, PVOID info, ULONG len, PULONG ret_len ) { - FIXME( "stub: %p %u %p %u %p\n", handle, class, info, len, ret_len ); + NTSTATUS ret; + + TRACE( "%p %u %p %u %p\n", handle, class, info, len, ret_len ); if (class >= MaxJobObjectInfoClass) return STATUS_INVALID_PARAMETER; @@ -707,6 +709,7 @@ NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS c if (len < sizeof(*accounting)) return STATUS_INFO_LENGTH_MISMATCH; + FIXME( "stub: %p %u %p %u %p\n", handle, class, info, len, ret_len ); accounting = (JOBOBJECT_BASIC_ACCOUNTING_INFORMATION *)info; memset(accounting, 0, sizeof(*accounting)); if (ret_len) *ret_len = sizeof(*accounting); @@ -716,12 +719,34 @@ NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS c case JobObjectBasicProcessIdList: { JOBOBJECT_BASIC_PROCESS_ID_LIST *process; + DWORD count, i; + if (len < sizeof(*process)) return STATUS_INFO_LENGTH_MISMATCH; process = (JOBOBJECT_BASIC_PROCESS_ID_LIST *)info; - memset(process, 0, sizeof(*process)); - if (ret_len) *ret_len = sizeof(*process); + count = len - FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList); + count /= sizeof(process->ProcessIdList[0]); + + SERVER_START_REQ( query_job_pids ) + { + req->job = wine_server_user_handle(handle); + wine_server_set_reply(req, process, count * sizeof(process_id_t)); + if ((ret = wine_server_call(req)) != STATUS_SUCCESS) + return ret; + if (count < reply->count) + return STATUS_MORE_ENTRIES; + count = reply->count; + } + SERVER_END_REQ; + + /* start from the end to not overwrite */ + for (i = count; i--;) + process->ProcessIdList[i] = ((process_id_t*)process)[i]; + process->NumberOfAssignedProcesses = count; + process->NumberOfProcessIdsInList = count; + + if (ret_len) *ret_len = (char*)(&process->ProcessIdList[count]) - (char*)process; return STATUS_SUCCESS; } @@ -731,6 +756,7 @@ NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS c if (len < sizeof(*extended_limit)) return STATUS_INFO_LENGTH_MISMATCH; + FIXME( "stub: %p %u %p %u %p\n", handle, class, info, len, ret_len ); extended_limit = (JOBOBJECT_EXTENDED_LIMIT_INFORMATION *)info; memset(extended_limit, 0, sizeof(*extended_limit)); if (ret_len) *ret_len = sizeof(*extended_limit); @@ -743,6 +769,7 @@ NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS c if (len < sizeof(*basic_limit)) return STATUS_INFO_LENGTH_MISMATCH; + FIXME( "stub: %p %u %p %u %p\n", handle, class, info, len, ret_len ); basic_limit = (JOBOBJECT_BASIC_LIMIT_INFORMATION *)info; memset(basic_limit, 0, sizeof(*basic_limit)); if (ret_len) *ret_len = sizeof(*basic_limit); @@ -750,6 +777,7 @@ NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS c } default: + FIXME( "stub: %p %u %p %u %p\n", handle, class, info, len, ret_len ); return STATUS_NOT_IMPLEMENTED; } } diff --git a/server/process.c b/server/process.c index 73984f3..46a61d0 100644 --- a/server/process.c +++ b/server/process.c @@ -1715,6 +1715,29 @@ DECL_HANDLER(process_in_job) release_object( process ); } +/* get a list of the pids associated with the job */ +DECL_HANDLER(query_job_pids) +{ + struct job *job = get_job_obj( current->process, req->job, JOB_OBJECT_QUERY ); + struct process *process; + process_id_t *data; + data_size_t len; + + if (!job) return; + + reply->count = job->num_processes; + len = min( get_reply_max_size(), job->num_processes * sizeof(*data) ); + if (len && ((data = set_reply_data_size( len )))) + { + process_id_t *end = data + len; + LIST_FOR_EACH_ENTRY( process, &job->process_list, struct process, job_entry ) + { + if (data >= end) break; + *data++ = process->id; + } + } +} + /* terminate all processes associated with the job */ DECL_HANDLER(terminate_job) { diff --git a/server/protocol.def b/server/protocol.def index 6c44b2b..8beda28 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3924,6 +3924,15 @@ struct handle_info @END +/* Query a list of pids associated with the job */ +(a)REQ(query_job_pids) + obj_handle_t job; /* handle to the job */ +(a)REPLY + data_size_t count; /* number of processes associated with the job */ + VARARG(pids,uints); /* list of pids */ +(a)END + + /* Set limit flags on a job */ @REQ(set_job_limits) obj_handle_t handle; /* handle to the job */ -- 2.21.0

1 0

[PATCH] configure: Get rid of an unused powl check.
by Hans Leidekker March 5, 2020

March 5, 2020

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac index e411c2eb0e..f74d539f4e 100644 --- a/configure.ac +++ b/configure.ac @@ -2712,7 +2712,6 @@ AC_CHECK_FUNCS(\ nearbyintf \ nexttoward \ nexttowardf \ - powl \ remainder \ remainderf \ remquo \ -- 2.20.1

1 0