- Wine-Devel - list.winehq.org

[PATCH] winevulkan: Update to VK spec version 1.2.200.
by Georg Lehmann Nov. 23, 2021

Nov. 23, 2021

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 92dc71ab9d8..e5f8d1a46c6 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.199" +VK_XML_VERSION = "1.2.200" WINE_VK_VERSION = (1, 2) # Filenames to create. @@ -119,6 +119,9 @@ UNSUPPORTED_EXTENSIONS = [ # Deprecated extensions "VK_NV_external_memory_capabilities", "VK_NV_external_memory_win32", + + # Broken extensions + "VK_ARM_rasterization_order_attachment_access", # https://github.com/KhronosGroup/Vulkan-Docs/issues/1703 ] # Either internal extensions which aren't present on the win32 platform which -- 2.34.0

1 0

[PATCH 1/2] loader: always ensure that WINELOADER is defined
by Eric Pouech Nov. 23, 2021

Nov. 23, 2021

when: - Wine is installed in a (configure:d) directory - running wine directly from <confdir>/bin/wine(64) (without setting any WINE specific env variables) - dbghelp cannot find back the loader/wine(64) file consequences: - dbghelp cannot get back to the ELF information, hence (on a live target) doesn't report the already loaded ELF modules (only the PE ones are listed) dbghelp searches: - WINELOADER env var (but it isn't set in that case) - LD_LIBRARY_PATH (isn't changed, and even if it would, it would point to <confdir>/lib directory) - WINEDLLDIR<NN>, but again could point to <confdir>/lib directory, not the bin one wine-staging has a solution by forcing dbghelp to search @bindir@ as well this patch proposes an alternate approach: the wine loader sets WINELOADER if it isn't already set by the calling environment Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- loader/main.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/loader/main.c b/loader/main.c index 242ff15accd..c5e0fdf68b2 100644 --- a/loader/main.c +++ b/loader/main.c @@ -41,18 +41,12 @@ extern char **environ; /* the preloader will set this variable */ const struct wine_preload_info *wine_main_preload_info = NULL; -/* canonicalize path and return its directory name */ -static char *realpath_dirname( const char *name ) +/* remove filename from an (absolute) path */ +static void remove_filename( char *fullpath ) { - char *p, *fullpath = realpath( name, NULL ); - - if (fullpath) - { - p = strrchr( fullpath, '/' ); - if (p == fullpath) p++; - if (p) *p = 0; - } - return fullpath; + char *p = strrchr( fullpath, '/' ); + if (p == fullpath) p++; + if (p) *p = 0; } /* if string ends with tail, remove it */ @@ -141,8 +135,10 @@ static void *load_ntdll( char *argv0 ) char *path, *p; void *handle = NULL; - if (self && ((path = realpath_dirname( self )))) + if (self && (path = realpath( self, NULL ))) { + setenv( "WINELOADER", path, 0 ); + remove_filename( path ); if ((p = remove_tail( path, "/loader" ))) { handle = try_dlopen( p, "dlls/ntdll/ntdll.so" );

1 1

[PATCH 3/3 optional] kernel32/tests: Add GetQueuedCompletionPort race condition test
by Andrew Eikum Nov. 23, 2021

Nov. 23, 2021

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- This patch is optional. It demonstrates the race condition described in the first patch. Without the fixes applied, Wine always fails in fewer than 50 runs on my machine. Windows never fails. Since it's a race condition, it's always going to be flaky, so I'm not sure whether it's useful to add these tests (and the added test runtime). dlls/kernel32/tests/process.c | 80 ++++++++++++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 0d1a2f1a31d..cdcc564d006 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2776,12 +2776,43 @@ static void test_QueryInformationJobObject(void) CloseHandle(job); } +static struct completion_port_test_data { + HANDLE port; + HANDLE wait_evt; + BOOL quit; +} completion_port_test_data; + +static DWORD WINAPI completion_port_test_threadproc(void *user) +{ + while (!completion_port_test_data.quit) + { + WaitForSingleObject(completion_port_test_data.wait_evt, INFINITE); + if (completion_port_test_data.quit) + { + CloseHandle(completion_port_test_data.port); + break; + } + + Sleep(10); /* allow main thread to settle into GetQueued() */ + + PostQueuedCompletionStatus(completion_port_test_data.port, 1, 0, (OVERLAPPED*)&completion_port_test_data); + CloseHandle(completion_port_test_data.port); + + SetEvent(completion_port_test_data.wait_evt); + } + return 0; +} + static void test_CompletionPort(void) { JOBOBJECT_ASSOCIATE_COMPLETION_PORT port_info; PROCESS_INFORMATION pi, pi2; - HANDLE job, port; - BOOL ret; + HANDLE job, port, thread; + BOOL ret, failed; + int tries; + DWORD bytes_transferred; + ULONG_PTR key; + OVERLAPPED *overlapped; job = pCreateJobObjectW(NULL, NULL); ok(job != NULL, "CreateJobObject error %u\n", GetLastError()); @@ -2822,6 +2853,50 @@ static void test_CompletionPort(void) CloseHandle(pi.hThread); CloseHandle(job); CloseHandle(port); + + /* no race condition between blocked GetQueuedCompletionStatus and CloseHandle(port) */ + completion_port_test_data.quit = FALSE; + completion_port_test_data.wait_evt = CreateEventW(NULL, FALSE, FALSE, NULL); + thread = CreateThread(NULL, 0, &completion_port_test_threadproc, NULL, 0, NULL); + + failed = FALSE; + tries = 0; + while (tries < 100 && !failed) + { + completion_port_test_data.port = pCreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 1); + ok(completion_port_test_data.port != NULL, "%u: CreateIoCompletionPort error %u\n", tries, GetLastError()); + + SetEvent(completion_port_test_data.wait_evt); + + bytes_transferred = 0xdeadbeef; + key = 0xdeadbeee; + overlapped = (OVERLAPPED*)0xdeadbeed; + + ret = GetQueuedCompletionStatus(completion_port_test_data.port, &bytes_transferred, &key, + &overlapped, INFINITE); + ok(ret == TRUE, "%u: GetQueuedCompletionStatus failed: %u\n", tries, GetLastError()); + if (ret == TRUE) + { + ok(bytes_transferred == 1, "%u: got bt: 0x%x\n", tries, bytes_transferred); + ok(key == 0, "%u: got key: 0x%x\n", tries, key); + ok(overlapped == (OVERLAPPED*)&completion_port_test_data, "%u: got overlapped: %p\n", tries, overlapped); + } + else + failed = TRUE; + + ++tries; + + /* wait for other thread to be ready for next test */ + WaitForSingleObject(completion_port_test_data.wait_evt, INFINITE); + } + + completion_port_test_data.quit = TRUE; + SetEvent(completion_port_test_data.wait_evt); + + WaitForSingleObject(thread, INFINITE); + + CloseHandle(thread); + CloseHandle(completion_port_test_data.wait_evt); } static void test_KillOnJobClose(void) @@ -5055,6 +5130,7 @@ START_TEST(process) } else win_skip("PROCESS_QUERY_LIMITED_INFORMATION is not supported on this platform\n"); + test_process_info(GetCurrentProcess()); test_TerminateProcess(); test_Startup(); -- 2.34.0

1 0

[PATCH 2/3] ntdll: Skip needless wait for pending completion port if timeout is zero
by Andrew Eikum Nov. 23, 2021

Nov. 23, 2021

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/ntdll/unix/sync.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 7fad8250e43..c392eb172b2 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1824,7 +1824,7 @@ NTSTATUS WINAPI NtRemoveIoCompletion( HANDLE handle, ULONG_PTR *key, ULONG_PTR * SERVER_START_REQ( remove_completion ) { req->handle = wine_server_obj_handle( wait_handle ); - req->alloc_wait_handle = wait_handle == handle; + req->alloc_wait_handle = wait_handle == handle && (!timeout || timeout->QuadPart != 0); if (!(status = wine_server_call( req ))) { *key = reply->ckey; @@ -1839,7 +1839,10 @@ NTSTATUS WINAPI NtRemoveIoCompletion( HANDLE handle, ULONG_PTR *key, ULONG_PTR * } SERVER_END_REQ; if (status != STATUS_PENDING) goto exit; - status = NtWaitForSingleObject( wait_handle, FALSE, timeout ); + if (wait_handle != handle) + status = NtWaitForSingleObject( wait_handle, FALSE, timeout ); + else + status = STATUS_TIMEOUT; if (status != WAIT_OBJECT_0) goto exit; } @@ -1870,7 +1873,7 @@ NTSTATUS WINAPI NtRemoveIoCompletionEx( HANDLE handle, FILE_IO_COMPLETION_INFORM SERVER_START_REQ( remove_completion ) { req->handle = wine_server_obj_handle( wait_handle ); - req->alloc_wait_handle = wait_handle == handle; + req->alloc_wait_handle = wait_handle == handle && (!timeout || timeout->QuadPart != 0); if (!(status = wine_server_call( req ))) { info[i].CompletionKey = reply->ckey; @@ -1892,7 +1895,12 @@ NTSTATUS WINAPI NtRemoveIoCompletionEx( HANDLE handle, FILE_IO_COMPLETION_INFORM if (status == STATUS_PENDING) status = STATUS_SUCCESS; break; } - status = NtWaitForSingleObject( wait_handle, alertable, timeout ); + if (wait_handle != handle) + status = NtWaitForSingleObject( wait_handle, alertable, timeout ); + else if (alertable) + status = NtDelayExecution( TRUE, timeout ); /* query for APC */ + else + status = STATUS_TIMEOUT; if (status != WAIT_OBJECT_0) break; } *written = i ? i : 1; -- 2.34.0

1 0

[PATCH 1/3] ntdll: Use a separate wait handle for pending completion ports
by Andrew Eikum Nov. 23, 2021

Nov. 23, 2021

The problematic call sequence is: Thread A: GetQueuedCompletionPortStatus(port); -> blocks Thread B: PostQueuedCompletionPortStatus(port); CloseHandle(port); Thread A: unblocks -> INVALID_HANDLE_VALUE Tests on Windows show that the queued status is always returned to thread A in this scenario. In Wine, it would sometimes fail due to the CloseHandle being called before the queued status unblocked the thread, causing sporadic failures in Mount & Blade: Bannerlord. This patch works around this by returning a new handle in the would-block case, which allows the blocked thread to read the last queued status before destroying the object. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/ntdll/unix/sync.c | 32 ++++++++++++++++++++++++++------ server/completion.c | 7 +++++++ server/protocol.def | 2 ++ 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index d5d92145503..7fad8250e43 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1815,6 +1815,7 @@ NTSTATUS WINAPI NtRemoveIoCompletion( HANDLE handle, ULONG_PTR *key, ULONG_PTR * IO_STATUS_BLOCK *io, LARGE_INTEGER *timeout ) { NTSTATUS status; + HANDLE wait_handle = handle; TRACE( "(%p, %p, %p, %p, %p)\n", handle, key, value, io, timeout ); @@ -1822,7 +1823,8 @@ NTSTATUS WINAPI NtRemoveIoCompletion( HANDLE handle, ULONG_PTR *key, ULONG_PTR * { SERVER_START_REQ( remove_completion ) { - req->handle = wine_server_obj_handle( handle ); + req->handle = wine_server_obj_handle( wait_handle ); + req->alloc_wait_handle = wait_handle == handle; if (!(status = wine_server_call( req ))) { *key = reply->ckey; @@ -1830,12 +1832,22 @@ NTSTATUS WINAPI NtRemoveIoCompletion( HANDLE handle, ULONG_PTR *key, ULONG_PTR * io->Information = reply->information; io->u.Status = reply->status; } + else if (status == STATUS_PENDING) + { + wait_handle = wine_server_ptr_handle( reply->wait_handle ); + } } SERVER_END_REQ; - if (status != STATUS_PENDING) return status; - status = NtWaitForSingleObject( handle, FALSE, timeout ); - if (status != WAIT_OBJECT_0) return status; + if (status != STATUS_PENDING) goto exit; + status = NtWaitForSingleObject( wait_handle, FALSE, timeout ); + if (status != WAIT_OBJECT_0) goto exit; } + +exit: + if (wait_handle != handle) + NtClose( wait_handle ); + + return status; } @@ -1847,6 +1859,7 @@ NTSTATUS WINAPI NtRemoveIoCompletionEx( HANDLE handle, FILE_IO_COMPLETION_INFORM { NTSTATUS status; ULONG i = 0; + HANDLE wait_handle = handle; TRACE( "%p %p %u %p %p %u\n", handle, info, count, written, timeout, alertable ); @@ -1856,7 +1869,8 @@ NTSTATUS WINAPI NtRemoveIoCompletionEx( HANDLE handle, FILE_IO_COMPLETION_INFORM { SERVER_START_REQ( remove_completion ) { - req->handle = wine_server_obj_handle( handle ); + req->handle = wine_server_obj_handle( wait_handle ); + req->alloc_wait_handle = wait_handle == handle; if (!(status = wine_server_call( req ))) { info[i].CompletionKey = reply->ckey; @@ -1864,6 +1878,10 @@ NTSTATUS WINAPI NtRemoveIoCompletionEx( HANDLE handle, FILE_IO_COMPLETION_INFORM info[i].IoStatusBlock.Information = reply->information; info[i].IoStatusBlock.u.Status = reply->status; } + else if (status == STATUS_PENDING) + { + wait_handle = wine_server_ptr_handle( reply->wait_handle ); + } } SERVER_END_REQ; if (status != STATUS_SUCCESS) break; @@ -1874,10 +1892,12 @@ NTSTATUS WINAPI NtRemoveIoCompletionEx( HANDLE handle, FILE_IO_COMPLETION_INFORM if (status == STATUS_PENDING) status = STATUS_SUCCESS; break; } - status = NtWaitForSingleObject( handle, alertable, timeout ); + status = NtWaitForSingleObject( wait_handle, alertable, timeout ); if (status != WAIT_OBJECT_0) break; } *written = i ? i : 1; + if (wait_handle != handle) + NtClose( wait_handle ); return status; } diff --git a/server/completion.c b/server/completion.c index 6933195e72d..6e8a224e3fa 100644 --- a/server/completion.c +++ b/server/completion.c @@ -220,7 +220,14 @@ DECL_HANDLER(remove_completion) entry = list_head( &completion->queue ); if (!entry) + { + if (req->alloc_wait_handle) + reply->wait_handle = duplicate_handle( current->process, + req->handle, current->process, 0, 0, DUPLICATE_SAME_ACCESS ); + else + reply->wait_handle = req->handle; set_error( STATUS_PENDING ); + } else { list_remove( entry ); diff --git a/server/protocol.def b/server/protocol.def index ad6d2bb58d0..051a5dbe848 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3494,11 +3494,13 @@ struct handle_info /* get completion from completion port queue */ @REQ(remove_completion) obj_handle_t handle; /* port handle */ + unsigned int alloc_wait_handle; /* whether to duplicate handle on PENDING result */ @REPLY apc_param_t ckey; /* completion key */ apc_param_t cvalue; /* completion value */ apc_param_t information; /* IO_STATUS_BLOCK Information */ unsigned int status; /* completion result */ + obj_handle_t wait_handle; /* if alloc_wait_handle was non-zero, duplicate handle on PENDING result */ @END -- 2.34.0

1 0

[PATCH 2/2] kernelbase: Handle UNC path in UrlApplySchemeW.
by Daniel Lehman Nov. 23, 2021

Nov. 23, 2021

fixes loading xml from a unc path

1 0

[PATCH 1/2] shlwapi/tests: Add some UrlApplyScheme tests.
by Daniel Lehman Nov. 23, 2021

Nov. 23, 2021

1 0

[PATCH v7 0/7] winedbg(gdbproxy): don't misbehave on module names w/ special characters; modernise
by Jinoh Kang Nov. 23, 2021

Nov. 23, 2021

Changelog: v1 -> v2: address review comments so far v2 -> v3: - Change cover letter subject - Capitalise subject - Split qXfer cache patch into two v3 -> v4: - Fix pointer variable declaration style - Synchronize to prior modified patches. - Refactor the code a bit - Revert to scanf() when parsing Xfer packet lines - Fix indentation - s/buffer_realloc/realloc/g - s/vl_buffer/reply_buffer/g; s/vl_/reply_buffer_/g; s/vlbuf/reply/g - Rewrite reply_buffer_add_uinthex(): convert for loop into while loop - Rewrite reply_buffer_append_xmlstr(): convert for loop into while loop - Split packet_reply_add() into packet_reply_add_data() here - Rewrite packet_reply_add for clarity. - Update Wine version in comment. v4 -> v5: - Fix pointer variable declaration style. - Synchronize to prior modified patches. - Split out XML escaping in a separate patch - Don't realloc/free when emptying - Drop reply_buffer_resize(), merge into reply_buffer_grow() - Remove "more" variables for now - Don't empty the reply buffer twice - Use two sscanf for alternative patterns - Don't always zero-initialise qxfer_object_annex - Use strcpy (I just did what I was told to do) - Use strcmp (I just did what I was told to do) v5 -> v6: - Remove a gratuitous blank line - Edit commit messages v6 -> v7: - Change type of reply_buffer::base from void* to unsigned char* - s/reply_buffer_empty/reply_buffer_clear/g - Remove unused function reply_buffer_append_str - Add function reply_buffer_append_str here - packet_reply_xfer: Change type of `off` and `len` parameters to size_t - packet_reply_xfer: Remove data and datalen parameters Jinoh Kang (7): winedbg: Refactor gdb_context::out_{buf*,len} into reply_buffer. winedbg: Use exponential growth in gdbproxy reply_buffer_grow. winedbg: Buffer output of GDB qXfer commands for proper slicing. winedbg: Escape XML special characters in qXfer reply. winedbg: Define table for GDB qXfer command handlers. winedbg: Cache GDB qXfer command result for chunked fetching. winedbg: Implement GDB qXfer object exec-file. programs/winedbg/gdbproxy.c | 604 ++++++++++++++++++++++++------------ 1 file changed, 406 insertions(+), 198 deletions(-) -- 2.31.1

2 14

[PATCH 0/8] Setting dwarf4 as Wine default debug format
by Eric Pouech Nov. 23, 2021

Nov. 23, 2021

This series: + fixes all the bugs I'm aware of in all the recent dbghelp changes (dwarf4, but others too). + and let dwarf4 replace dwarf2 as default debug format (it's been almost 15 years <g>) full wine recompilation required to get all debug info upgraded in Wine libraries, DLLs... A+ --- Eric Pouech (8): dbghelp: fix potential crash when loading a builtin a PE module embedded in an ELF image dbghelp: protect against missing compiland when adding global function... dbghelp/dwarf: don't unmap twice the fmap of a DWZ module dbghelp: remove incorrect FIXME in SymEnumerateLoadedModules dbghelp: in SymEnumerateLoadedModules, don't limit the number of modules dbghelp: fix allocation error in image_load_debugaltlink dbghelp: simplify code for searching alternate debug info files configure.ac: let dwarf4 be Wine's default debug format configure.ac | 6 +-- dlls/dbghelp/dwarf.c | 1 - dlls/dbghelp/module.c | 87 +++++++++++++++++++++---------------------- dlls/dbghelp/symbol.c | 7 +++- 4 files changed, 49 insertions(+), 52 deletions(-)

2 9

[PATCH v6 0/6] winedbg(gdbproxy): don't misbehave on module names w/ special characters; modernise
by Jinoh Kang Nov. 23, 2021

Nov. 23, 2021

Changelog: v1 -> v2: address review comments so far v2 -> v3: - Change cover letter subject - Capitalise subject - Split qXfer cache patch into two v3 -> v4: - Fix pointer variable declaration style - Synchronize to prior modified patches. - Refactor the code a bit - Revert to scanf() when parsing Xfer packet lines - Fix indentation - s/buffer_realloc/realloc/g - s/vl_buffer/reply_buffer/g; s/vl_/reply_buffer_/g; s/vlbuf/reply/g - Rewrite reply_buffer_add_uinthex(): convert for loop into while loop - Rewrite reply_buffer_append_xmlstr(): convert for loop into while loop - Split packet_reply_add() into packet_reply_add_data() here - Rewrite packet_reply_add for clarity. - Update Wine version in comment. v4 -> v5: - Fix pointer variable declaration style. - Synchronize to prior modified patches. - Split out XML escaping in a separate patch - Don't realloc/free when emptying - Drop reply_buffer_resize(), merge into reply_buffer_grow() - Remove "more" variables for now - Don't empty the reply buffer twice - Use two sscanf for alternative patterns - Don't always zero-initialise qxfer_object_annex - Use strcpy (I just did what I was told to do) - Use strcmp (I just did what I was told to do) v5 -> v6: - Remove a gratuitous blank line - Edit commit messages Jinoh Kang (6): winedbg: Refactor gdb_context::out_{buf*,len} into reply_buffer. winedbg: Buffer output of GDB qXfer commands for proper slicing. winedbg: Escape XML special characters in qXfer reply. winedbg: Define table for GDB qXfer command handlers. winedbg: Cache GDB qXfer command result for chunked fetching. winedbg: Implement GDB qXfer object exec-file. programs/winedbg/gdbproxy.c | 602 ++++++++++++++++++++++++------------ 1 file changed, 404 insertions(+), 198 deletions(-) -- 2.31.1

2 11