- Wine-Devel - list.winehq.org

[PATCH v2 1/5] winevulkan: Support prefixing function parameters.
by Jacek Caban Dec. 10, 2021

Dec. 10, 2021

To allow them being accessed from a struct. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: make remaining direct calls more similar to __wine_unix_call dlls/winevulkan/make_vulkan | 59 ++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 27 deletions(-)

7 26

[PATCH v3 4/4] winevulkan: Use __wine_unix_call interface for some Vulkan functions.
by Jacek Caban Dec. 10, 2021

Dec. 10, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/loader.c | 4 ++-- dlls/winevulkan/make_vulkan | 21 ++++++++++++++++++++- 2 files changed, 22 insertions(+), 3 deletions(-)

1 0

[PATCH v3 3/4] winevulkan: Make Vulkan direct Unix calls more similar to __wine_unix_call interface.
by Jacek Caban Dec. 10, 2021

Dec. 10, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/loader.c | 10 ++--- dlls/winevulkan/make_vulkan | 59 +++++++++++++-------------- dlls/winevulkan/vulkan.c | 70 ++++++++++++++++----------------- dlls/winevulkan/vulkan_loader.h | 7 ++++ 4 files changed, 74 insertions(+), 72 deletions(-)

1 0

[PATCH v3 2/4] winevulkan: Pass Unix call arguments as a struct.
by Jacek Caban Dec. 10, 2021

Dec. 10, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/loader.c | 31 +++- dlls/winevulkan/make_vulkan | 100 +++++++++---- dlls/winevulkan/vulkan.c | 285 +++++++++++++++++++++++++++--------- 3 files changed, 306 insertions(+), 110 deletions(-)

1 0

[PATCH v3 1/4] winevulkan: Support prefixing function parameters.
by Jacek Caban Dec. 10, 2021

Dec. 10, 2021

To allow them being accessed from a struct. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v3: Don't use syscalls for functions sensitive for performance. Also share even more between direct call code paths and syscalls. dlls/winevulkan/make_vulkan | 59 ++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 27 deletions(-)

1 0

[PATCH v2 01/11] ntdll: Do not fill the IOSB in NtDeviceIoControlFile() if the NT status denotes error.
by Zebediah Figura Dec. 10, 2021

Dec. 10, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/unix/file.c | 2 +- dlls/ws2_32/tests/afd.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index e459087af76..51c92df57e3 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -5735,7 +5735,7 @@ NTSTATUS WINAPI NtDeviceIoControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUT return server_ioctl_file( handle, event, apc, apc_context, io, code, in_buffer, in_size, out_buffer, out_size ); - if (status != STATUS_PENDING) io->u.Status = status; + if (status != STATUS_PENDING && !NT_ERROR(status)) io->u.Status = status; return status; } diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 9e888f1fcb9..55029bfd30d 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -688,7 +688,7 @@ static void test_poll(void) ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_POLL, in_params, params_size, out_params, params_size); ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); - todo_wine ok(!io.Status, "got %#x\n", io.Status); + ok(!io.Status, "got %#x\n", io.Status); ok(!io.Information, "got %#Ix\n", io.Information); /* Test passing the same handle twice. */ @@ -1201,7 +1201,7 @@ static void test_recv(void) memset(&io, 0, sizeof(io)); ret = NtDeviceIoControlFile((HANDLE)listener, event, NULL, NULL, &io, IOCTL_AFD_RECV, NULL, 0, NULL, 0); todo_wine ok(ret == STATUS_INVALID_CONNECTION, "got %#x\n", ret); - todo_wine ok(!io.Status, "got status %#x\n", io.Status); + ok(!io.Status, "got status %#x\n", io.Status); ok(!io.Information, "got information %#Ix\n", io.Information); client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); @@ -1213,7 +1213,7 @@ static void test_recv(void) memset(&io, 0, sizeof(io)); ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_RECV, NULL, 0, NULL, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); - todo_wine ok(!io.Status, "got status %#x\n", io.Status); + ok(!io.Status, "got status %#x\n", io.Status); ok(!io.Information, "got information %#Ix\n", io.Information); wsabufs[0].len = sizeof(buffer); @@ -1301,7 +1301,7 @@ static void test_recv(void) ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_RECV, &params, sizeof(params), NULL, 0); ok(ret == STATUS_DEVICE_NOT_READY, "got %#x\n", ret); - todo_wine ok(!io.Status, "got status %#x\n", io.Status); + ok(!io.Status, "got status %#x\n", io.Status); ok(!io.Information, "got information %#Ix\n", io.Information); ret = send(server, "data", 5, 0); @@ -1368,7 +1368,7 @@ static void test_recv(void) ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_RECV, &params, sizeof(params), NULL, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); - todo_wine ok(io.Status == 0xdeadbeef, "got %#x\n", io.Status); + ok(io.Status == 0xdeadbeef, "got %#x\n", io.Status); params.msg_flags = AFD_MSG_OOB | AFD_MSG_NOT_OOB; @@ -1376,7 +1376,7 @@ static void test_recv(void) ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_RECV, &params, sizeof(params), NULL, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); - todo_wine ok(io.Status == 0xdeadbeef, "got %#x\n", io.Status); + ok(io.Status == 0xdeadbeef, "got %#x\n", io.Status); params.msg_flags = AFD_MSG_OOB; -- 2.34.1

1 10

[PATCH] ntdll: Properly test for LLVM libunwind error codes.
by Jinoh Kang Dec. 10, 2021

Dec. 10, 2021

Commit f37b953e07f (ntdll: Support both HP-UX-like libunwind and LLVM libunwind error codes., 2021-12-10) made an unsuccessful attempt to fix UNW_ENOINFO detection on LLVM libunwind. It turns out that UNW_ENOINFO is actually negative in LLVM, so there's no need to flip the sign. Fix this by flipping the return value sign only when UNW_ENOINFO < 0 (LLVM libunwind), and then comparing it against the negated error code. Overall, all flavours of libunwind return a negative value on error. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: It turns out my last-minute patch change was based on a faulty assumption. I sincerely apologise for the extra hassle. I'll make sure to test this more extensively next time. dlls/ntdll/unix/signal_arm.c | 6 +++--- dlls/ntdll/unix/signal_arm64.c | 6 +++--- dlls/ntdll/unix/signal_x86_64.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index b65d6f2ddeb..eaa41d9e139 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -248,13 +248,13 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispa return STATUS_INVALID_DISPOSITION; } rc = unw_get_proc_info( &cursor, &info ); - if (rc < 0) rc = -rc; /* libunwind may return negative error codes */ - if (rc != UNW_ESUCCESS && rc != UNW_ENOINFO) + if (UNW_ENOINFO < 0) rc = -rc; /* LLVM libunwind has negative error codes */ + if (rc != UNW_ESUCCESS && rc != -UNW_ENOINFO) { WARN( "failed to get info: %d\n", rc ); return STATUS_INVALID_DISPOSITION; } - if (rc == UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) + if (rc == -UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) { NTSTATUS status = context->Pc != context->Lr ? STATUS_SUCCESS : STATUS_INVALID_DISPOSITION; diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 1a01bb13c85..26910173b81 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -212,13 +212,13 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON return STATUS_INVALID_DISPOSITION; } rc = unw_get_proc_info( &cursor, &info ); - if (rc < 0) rc = -rc; /* libunwind may return negative error codes */ - if (rc != UNW_ESUCCESS && rc != UNW_ENOINFO) + if (UNW_ENOINFO < 0) rc = -rc; /* LLVM libunwind has negative error codes */ + if (rc != UNW_ESUCCESS && rc != -UNW_ENOINFO) { WARN( "failed to get info: %d\n", rc ); return STATUS_INVALID_DISPOSITION; } - if (rc == UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) + if (rc == -UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) { TRACE( "no info found for %lx ip %lx-%lx, assuming leaf function\n", ip, info.start_ip, info.end_ip ); diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index fa73ebb5a10..90fa04f0309 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1415,13 +1415,13 @@ static NTSTATUS libunwind_virtual_unwind( ULONG64 ip, ULONG64 *frame, CONTEXT *c *frame = context->Rsp; rc = unw_get_proc_info(&cursor, &info); - if (rc < 0) rc = -rc; /* libunwind may return negative error codes */ - if (rc != UNW_ESUCCESS && rc != UNW_ENOINFO) + if (UNW_ENOINFO < 0) rc = -rc; /* LLVM libunwind has negative error codes */ + if (rc != UNW_ESUCCESS && rc != -UNW_ENOINFO) { WARN( "failed to get info: %d\n", rc ); return STATUS_INVALID_DISPOSITION; } - if (rc == UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip || info.end_ip == info.start_ip + 1) + if (rc == -UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip || info.end_ip == info.start_ip + 1) return STATUS_UNSUCCESSFUL; TRACE( "ip %#lx function %#lx-%#lx personality %#lx lsda %#lx fde %#lx\n", -- 2.31.1

1 0

[PATCH] advapi32/tests: Well known group names are not translated in Wine.
by Francois Gouget Dec. 10, 2021

Dec. 10, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52175 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> -- Alternatively we could consider that translating the group names is not important since Windows itself does not always translate them ('Everyone' is translated in French and German but not in Japanese). So this could be a skip instead. --- dlls/advapi32/tests/lsa.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index f8c822a7de2..8e1edd2326b 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -323,16 +323,17 @@ static void test_LsaLookupNames2(void) ok(status == STATUS_SUCCESS, "LsaClose() failed, returned 0x%08x\n", status); } -static void check_unicode_string_(int line, const LSA_UNICODE_STRING *string, const WCHAR *expect) +static void check_unicode_string_(int line, const LSA_UNICODE_STRING *string, const WCHAR *expect, BOOL todo) { ok_(__FILE__, line)(string->Length == wcslen(string->Buffer) * sizeof(WCHAR), "expected %u, got %u\n", wcslen(string->Buffer) * sizeof(WCHAR), string->Length); ok_(__FILE__, line)(string->MaximumLength == string->Length + sizeof(WCHAR), "expected %u, got %u\n", string->Length + sizeof(WCHAR), string->MaximumLength); - ok_(__FILE__, line)(!wcsicmp(string->Buffer, expect), "expected %s, got %s\n", + todo_if(todo) ok_(__FILE__, line)(!wcsicmp(string->Buffer, expect), + "expected %s, got %s\n", debugstr_w(expect), debugstr_w(string->Buffer)); } -#define check_unicode_string(a, b) check_unicode_string_(__LINE__, a, b) +#define check_unicode_string(a, b, c) check_unicode_string_(__LINE__, a, b, c) static void test_LsaLookupSids(void) { @@ -371,11 +372,11 @@ static void test_LsaLookupSids(void) ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); ok(list->Entries == 1, "got %d\n", list->Entries); - check_unicode_string(&list->Domains[0].Name, computer_name); + check_unicode_string(&list->Domains[0].Name, computer_name, FALSE); ok(names[0].Use == SidTypeUser, "got type %u\n", names[0].Use); ok(!names[0].DomainIndex, "got index %u\n", names[0].DomainIndex); - check_unicode_string(&names[0].Name, user_name); + check_unicode_string(&names[0].Name, user_name, FALSE); LsaFreeMemory(names); LsaFreeMemory(list); @@ -388,7 +389,7 @@ static void test_LsaLookupSids(void) ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); ok(list->Entries == 1, "got %d\n", list->Entries); - check_unicode_string(&list->Domains[0].Name, L""); + check_unicode_string(&list->Domains[0].Name, L"", FALSE); ok(names[0].Use == SidTypeWellKnownGroup, "got type %u\n", names[0].Use); ok(!names[0].DomainIndex, "got index %u\n", names[0].DomainIndex); @@ -400,11 +401,11 @@ static void test_LsaLookupSids(void) langW[0] = 0; if (wcscmp(langW, L"0409") == 0 || wcscmp(langW, L"0411") == 0) /* English and Japanese */ - check_unicode_string(&names[0].Name, L"Everyone"); + check_unicode_string(&names[0].Name, L"Everyone", FALSE); else if (wcscmp(langW, L"0407") == 0) /* German */ - check_unicode_string(&names[0].Name, L"Jeder"); + check_unicode_string(&names[0].Name, L"Jeder", TRUE); else if (wcscmp(langW, L"040C") == 0) /* French */ - check_unicode_string(&names[0].Name, L"Tout le monde"); + check_unicode_string(&names[0].Name, L"Tout le monde", TRUE); else trace("<Everyone-group>.Name=%s\n", debugstr_w(names[0].Name.Buffer)); @@ -422,7 +423,7 @@ static void test_LsaLookupSids(void) ok(names[0].Use == SidTypeUnknown, "got type %u\n", names[0].Use); ok(names[0].DomainIndex == -1, "got index %u\n", names[0].DomainIndex); - check_unicode_string(&names[0].Name, L"S-1-1234-5678-1234-5678"); + check_unicode_string(&names[0].Name, L"S-1-1234-5678-1234-5678", FALSE); LsaFreeMemory(names); LsaFreeMemory(list); @@ -495,14 +496,14 @@ static void test_LsaGetUserName(void) status = pLsaGetUserName(&lsa_user, NULL); ok(!status, "got %#x\n", status); - check_unicode_string(lsa_user, user); + check_unicode_string(lsa_user, user, FALSE); LsaFreeMemory(lsa_user); status = pLsaGetUserName(&lsa_user, &lsa_domain); ok(!status, "got %#x\n", status); ok(!lstrcmpW(user, lsa_user->Buffer), "%s != %s\n", wine_dbgstr_w(user), wine_dbgstr_wn(lsa_user->Buffer, lsa_user->Length/sizeof(WCHAR))); - check_unicode_string(lsa_user, user); - check_unicode_string(lsa_domain, computer); + check_unicode_string(lsa_user, user, FALSE); + check_unicode_string(lsa_domain, computer, FALSE); LsaFreeMemory(lsa_user); LsaFreeMemory(lsa_domain); } -- 2.30.2

1 0

[PATCH] ntdll/tests: Fix the spelling of a comment.
by Francois Gouget Dec. 10, 2021

Dec. 10, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ntdll/tests/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/thread.c b/dlls/ntdll/tests/thread.c index 09b9bcc8497..9ef3da6dd14 100644 --- a/dlls/ntdll/tests/thread.c +++ b/dlls/ntdll/tests/thread.c @@ -99,7 +99,7 @@ static void test_dbg_hidden_thread_creation(void) NULL, NULL, PROCESS_PARAMS_FLAG_NORMALIZED ); ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status ); - /* NtCreateUserProcess() may return STATUS_INVALID_PARAMATER with some unitialized data in create_info. */ + /* NtCreateUserProcess() may return STATUS_INVALID_PARAMETER with some unitialized data in create_info. */ memset( &create_info, 0, sizeof(create_info) ); create_info.Size = sizeof(create_info); -- 2.30.2

1 0

[PATCH] server: Fix the spelling of a comment.
by Francois Gouget Dec. 10, 2021

Dec. 10, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- server/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/thread.c b/server/thread.c index 296f7a5d265..467ccd1f0db 100644 --- a/server/thread.c +++ b/server/thread.c @@ -33,7 +33,7 @@ #include <time.h> #include <poll.h> #ifdef HAVE_SCHED_H -/* FreeBSD needs this for cpu_set_t intead of its cpuset_t */ +/* FreeBSD needs this for cpu_set_t instead of its cpuset_t */ #define _WITH_CPU_SET_T #include <sched.h> #endif -- 2.30.2

1 0