September 2022 - Wine-Commits

Witold Baryluk : ntdll: Keep pagemap file open after first use of NtQueryVirtualMemory(MemoryWorkingSetExInformation).
by Alexandre Julliard Sept. 22, 2022

Sept. 22, 2022

Module: wine Branch: master Commit: b819b966171d6036f16164b2f1b7ad47b4c30ef3 URL: https://gitlab.winehq.org/wine/wine/-/commit/b819b966171d6036f16164b2f1b7ad… Author: Witold Baryluk <witold.baryluk(a)gmail.com> Date: Thu Sep 15 17:32:35 2022 +0000 ntdll: Keep pagemap file open after first use of NtQueryVirtualMemory(MemoryWorkingSetExInformation). --- dlls/ntdll/unix/virtual.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 58afc87375c..d8b888aa49e 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4203,7 +4203,9 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr, MEMORY_WORKING_SET_EX_INFORMATION *info, SIZE_T len, SIZE_T *res_len ) { - int pagemap_fd; +#if !defined(HAVE_LIBPROCSTAT) + static int pagemap_fd = -2; +#endif MEMORY_WORKING_SET_EX_INFORMATION *p; sigset_t sigset; @@ -4266,14 +4268,18 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr, procstat_close( pstat ); } #else - pagemap_fd = open( "/proc/self/pagemap", O_RDONLY, 0 ); - if (pagemap_fd == -1) + server_enter_uninterrupted_section( &virtual_mutex, &sigset ); + if (pagemap_fd == -2) { - static int once; - if (!once++) WARN( "unable to open /proc/self/pagemap\n" ); +#ifdef O_CLOEXEC + if ((pagemap_fd = open( "/proc/self/pagemap", O_RDONLY | O_CLOEXEC, 0 )) == -1 && errno == EINVAL) +#endif + pagemap_fd = open( "/proc/self/pagemap", O_RDONLY, 0 ); + + if (pagemap_fd == -1) WARN( "unable to open /proc/self/pagemap\n" ); + else fcntl(pagemap_fd, F_SETFD, FD_CLOEXEC); /* in case O_CLOEXEC isn't supported */ } - server_enter_uninterrupted_section( &virtual_mutex, &sigset ); for (p = info; (UINT_PTR)(p + 1) <= (UINT_PTR)info + len; p++) { BYTE vprot; @@ -4304,8 +4310,6 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr, server_leave_uninterrupted_section( &virtual_mutex, &sigset ); #endif - if (pagemap_fd != -1) - close( pagemap_fd ); if (res_len) *res_len = (UINT_PTR)p - (UINT_PTR)info; return STATUS_SUCCESS;

1 0

Witold Baryluk : ntdll: Use pread in NtQueryVirtualMemory(MemoryWorkingSetExInformation).
by Alexandre Julliard Sept. 22, 2022

Sept. 22, 2022

Module: wine Branch: master Commit: ffab9d974735e3ec775c1a77ededc37bfe2f30d8 URL: https://gitlab.winehq.org/wine/wine/-/commit/ffab9d974735e3ec775c1a77ededc3… Author: Witold Baryluk <witold.baryluk(a)gmail.com> Date: Thu Sep 15 17:21:36 2022 +0000 ntdll: Use pread in NtQueryVirtualMemory(MemoryWorkingSetExInformation). 1 syscall instead of 2 syscalls. Faster and simpler code. --- dlls/ntdll/unix/virtual.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 5c7370b6d94..58afc87375c 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4203,7 +4203,7 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr, MEMORY_WORKING_SET_EX_INFORMATION *info, SIZE_T len, SIZE_T *res_len ) { - FILE *f = NULL; + int pagemap_fd; MEMORY_WORKING_SET_EX_INFORMATION *p; sigset_t sigset; @@ -4266,8 +4266,8 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr, procstat_close( pstat ); } #else - f = fopen( "/proc/self/pagemap", "rb" ); - if (!f) + pagemap_fd = open( "/proc/self/pagemap", O_RDONLY, 0 ); + if (pagemap_fd == -1) { static int once; if (!once++) WARN( "unable to open /proc/self/pagemap\n" ); @@ -4286,8 +4286,8 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr, get_committed_size( view, p->VirtualAddress, &vprot, VPROT_COMMITTED ) && (vprot & VPROT_COMMITTED)) { - if (!f || fseek( f, ((UINT_PTR)p->VirtualAddress >> page_shift) * sizeof(pagemap), SEEK_SET ) == -1 || - fread( &pagemap, sizeof(pagemap), 1, f ) != 1) + if (pagemap_fd == -1 || + pread( pagemap_fd, &pagemap, sizeof(pagemap), ((UINT_PTR)p->VirtualAddress >> page_shift) * sizeof(pagemap) ) != sizeof(pagemap)) { /* If we don't have pagemap information, default to invalid. */ pagemap = 0; @@ -4304,8 +4304,8 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr, server_leave_uninterrupted_section( &virtual_mutex, &sigset ); #endif - if (f) - fclose( f ); + if (pagemap_fd != -1) + close( pagemap_fd ); if (res_len) *res_len = (UINT_PTR)p - (UINT_PTR)info; return STATUS_SUCCESS;

1 0

Witold Baryluk : ntdll: Do not use hardcoded page shift in NtQueryVirtualMemory(MemoryWorkingSetExInformation).
by Alexandre Julliard Sept. 22, 2022

Sept. 22, 2022

Module: wine Branch: master Commit: 96a4a2b4c4efeb8c3464c241a5d96b576b3afb13 URL: https://gitlab.winehq.org/wine/wine/-/commit/96a4a2b4c4efeb8c3464c241a5d96b… Author: Witold Baryluk <witold.baryluk(a)gmail.com> Date: Thu Sep 15 17:19:38 2022 +0000 ntdll: Do not use hardcoded page shift in NtQueryVirtualMemory(MemoryWorkingSetExInformation). --- dlls/ntdll/unix/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index bf9af40ffe6..5c7370b6d94 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4286,7 +4286,7 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr, get_committed_size( view, p->VirtualAddress, &vprot, VPROT_COMMITTED ) && (vprot & VPROT_COMMITTED)) { - if (!f || fseek( f, ((UINT_PTR)p->VirtualAddress >> 12) * sizeof(pagemap), SEEK_SET ) == -1 || + if (!f || fseek( f, ((UINT_PTR)p->VirtualAddress >> page_shift) * sizeof(pagemap), SEEK_SET ) == -1 || fread( &pagemap, sizeof(pagemap), 1, f ) != 1) { /* If we don't have pagemap information, default to invalid. */

1 0

Witold Baryluk : ntdll: Speed up NtQueryVirtualMemory(MemoryWorkingSetExInformation) by conditional page check.
by Alexandre Julliard Sept. 22, 2022

Sept. 22, 2022

Module: wine Branch: master Commit: ee706c3e25cd3a5f246184328007a4c11d59ad4a URL: https://gitlab.winehq.org/wine/wine/-/commit/ee706c3e25cd3a5f246184328007a4… Author: Witold Baryluk <witold.baryluk(a)gmail.com> Date: Thu Sep 15 17:16:14 2022 +0000 ntdll: Speed up NtQueryVirtualMemory(MemoryWorkingSetExInformation) by conditional page check. Legends game periodically (every 30 seconds) calls this function with up to 22k virtual addresses. All but 1 of them is valid. Due to amount of queries addresses, and cost of seek+read, this causes this function to take up to about 50ms. So framerate drops from ~150 FPS to 20FPS for about a second. As far as I can see, returning 0 entries from this function, still makes Apex Legend work. But keep code correct, and optimise it by only performing pagemap read when the address is valid. This change get_working_set_ex reduces peek wall clock runtime from 57ms to 0.29ms. Tested on Linux, but similar change done for the BSD part. Signed-off-by: Witold Baryluk <witold.baryluk(a)gmail.com> --- dlls/ntdll/unix/virtual.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index e0aa410373e..bf9af40ffe6 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4237,16 +4237,17 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr, BYTE vprot; struct file_view *view; - for (i = 0; i < vmentry_count && entry == NULL; i++) - { - if (vmentries[i].kve_start <= (ULONG_PTR)p->VirtualAddress && (ULONG_PTR)p->VirtualAddress <= vmentries[i].kve_end) - entry = &vmentries[i]; - } memset( &p->VirtualAttributes, 0, sizeof(p->VirtualAttributes) ); if ((view = find_view( p->VirtualAddress, 0 )) && get_committed_size( view, p->VirtualAddress, &vprot, VPROT_COMMITTED ) && (vprot & VPROT_COMMITTED)) { + for (i = 0; i < vmentry_count && entry == NULL; i++) + { + if (vmentries[i].kve_start <= (ULONG_PTR)p->VirtualAddress && (ULONG_PTR)p->VirtualAddress <= vmentries[i].kve_end) + entry = &vmentries[i]; + } + p->VirtualAttributes.Valid = !(vprot & VPROT_GUARD) && (vprot & 0x0f) && entry && entry->kve_type != KVME_TYPE_SWAP; p->VirtualAttributes.Shared = !is_view_valloc( view ); if (p->VirtualAttributes.Shared && p->VirtualAttributes.Valid) @@ -4281,17 +4282,17 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr, memset( &p->VirtualAttributes, 0, sizeof(p->VirtualAttributes) ); - /* If we don't have pagemap information, default to invalid. */ - if (!f || fseek( f, ((UINT_PTR)p->VirtualAddress >> 12) * sizeof(pagemap), SEEK_SET ) == -1 || - fread( &pagemap, sizeof(pagemap), 1, f ) != 1) - { - pagemap = 0; - } - if ((view = find_view( p->VirtualAddress, 0 )) && get_committed_size( view, p->VirtualAddress, &vprot, VPROT_COMMITTED ) && (vprot & VPROT_COMMITTED)) { + if (!f || fseek( f, ((UINT_PTR)p->VirtualAddress >> 12) * sizeof(pagemap), SEEK_SET ) == -1 || + fread( &pagemap, sizeof(pagemap), 1, f ) != 1) + { + /* If we don't have pagemap information, default to invalid. */ + pagemap = 0; + } + p->VirtualAttributes.Valid = !(vprot & VPROT_GUARD) && (vprot & 0x0f) && (pagemap >> 63); p->VirtualAttributes.Shared = !is_view_valloc( view ) && ((pagemap >> 61) & 1); if (p->VirtualAttributes.Shared && p->VirtualAttributes.Valid)

1 0

Tag vkd3d-1.5 : Alexandre Julliard : Release 1.5
by Alexandre Julliard Sept. 22, 2022

Sept. 22, 2022

Module: vkd3d Branch: refs/tags/vkd3d-1.5 Tag: 24e8c5355dd2e07c84f4e14113f210448091fdc8 URL: https://gitlab.winehq.org/wine/vkd3d/-/tags/24e8c5355dd2e07c84f4e14113f2104… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 22 17:51:06 2022 +0200 Release 1.5

1 0

Henri Verbeet : Release 1.5.
by Alexandre Julliard Sept. 22, 2022

Sept. 22, 2022

Module: vkd3d Branch: master Commit: 56b2f56b86313da5be8dd42468f9090b0e384889 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/56b2f56b86313da5be8dd42468f90… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 19 13:11:09 2022 +0200 Release 1.5. --- ANNOUNCE | 94 ++++++++++--------------------------- AUTHORS | 1 + Makefile.am | 6 +-- configure.ac | 2 +- demos/demo_xcb.h | 2 +- include/vkd3d.h | 1 + include/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-utils/vkd3d_utils_main.c | 4 +- libs/vkd3d/state.c | 4 +- programs/vkd3d-compiler/main.c | 2 +- 11 files changed, 38 insertions(+), 81 deletions(-)

1 0

Henri Verbeet : vkd3d-shader: Add version information to enum vkd3d_shader_compile_option_typed_uav.
by Alexandre Julliard Sept. 22, 2022

Sept. 22, 2022

Module: vkd3d Branch: master Commit: d484a08d10a1bce396ba769d10804dc514d3ee86 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d484a08d10a1bce396ba769d10804… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 19 14:09:50 2022 +0200 vkd3d-shader: Add version information to enum vkd3d_shader_compile_option_typed_uav. --- include/vkd3d_shader.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 58c5df23..b1c9e306 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -103,6 +103,7 @@ enum vkd3d_shader_compile_option_buffer_uav /** * Determines how typed UAVs are declared. + * \since 1.5 */ enum vkd3d_shader_compile_option_typed_uav {

1 0

Henri Verbeet : vkd3d: Add a VKD3D_FORCE_32_BIT_ENUM element to enum vkd3d_api_version.
by Alexandre Julliard Sept. 22, 2022

Sept. 22, 2022

Module: vkd3d Branch: master Commit: 1e559cd51d46d3c4d450b576c236ea78960ae75e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1e559cd51d46d3c4d450b576c236e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 21 11:16:02 2022 +0200 vkd3d: Add a VKD3D_FORCE_32_BIT_ENUM element to enum vkd3d_api_version. --- include/vkd3d.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/vkd3d.h b/include/vkd3d.h index 8aeb4c18..724d68c4 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -61,6 +61,8 @@ enum vkd3d_api_version VKD3D_API_VERSION_1_2, VKD3D_API_VERSION_1_3, VKD3D_API_VERSION_1_4, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_API_VERSION), }; typedef HRESULT (*PFN_vkd3d_signal_event)(HANDLE event);

1 0

Henri Verbeet : vkd3d-shader: Add a VKD3D_FORCE_32_BIT_ENUM element to enum vkd3d_shader_api_version.
by Alexandre Julliard Sept. 22, 2022

Sept. 22, 2022

Module: vkd3d Branch: master Commit: 6381bc4857ca50bb7a335855e51a7c4d67ad8036 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6381bc4857ca50bb7a335855e51a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 21 11:16:31 2022 +0200 vkd3d-shader: Add a VKD3D_FORCE_32_BIT_ENUM element to enum vkd3d_shader_api_version. --- include/vkd3d_shader.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index fc42fef4..58c5df23 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -46,6 +46,8 @@ enum vkd3d_shader_api_version VKD3D_SHADER_API_VERSION_1_2, VKD3D_SHADER_API_VERSION_1_3, VKD3D_SHADER_API_VERSION_1_4, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_API_VERSION), }; /** The type of a chained structure. */

1 0

Hans Leidekker : secur32/tests: Fix test failure caused by expired client certificate.
by Alexandre Julliard Sept. 21, 2022

Sept. 21, 2022

Module: wine Branch: master Commit: 7de69f49c63962f871b429268eeff43b35018096 URL: https://gitlab.winehq.org/wine/wine/-/commit/7de69f49c63962f871b429268eeff4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 21 16:22:39 2022 +0200 secur32/tests: Fix test failure caused by expired client certificate. --- dlls/secur32/tests/schannel.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index a531505648f..25ae197bca6 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -1506,26 +1506,7 @@ static void test_communication(void) ISC_REQ_USE_SUPPLIED_CREDS, 0, 0, &buffers[1], 0, &context2, &buffers[0], &attrs, NULL); buffers[1].pBuffers[0].cbBuffer = buf_size; } - ok (status == SEC_E_OK, "got %08lx\n", status); - - buf = &buffers[0].pBuffers[0]; - buf->cbBuffer = buf_size; - data_size = receive_data(sock, buf); - - buffers[0].pBuffers[0].cbBuffer = data_size; - buffers[0].pBuffers[0].BufferType = SECBUFFER_DATA; - buffers[0].pBuffers[1].BufferType = SECBUFFER_EMPTY; - status = DecryptMessage(&context, &buffers[0], 0, NULL); - ok(status == SEC_E_OK, "DecryptMessage failed: %08lx\n", status); - if (status == SEC_E_OK) - { - ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_STREAM_HEADER, "Expected first buffer to be SECBUFFER_STREAM_HEADER\n"); - ok(buffers[0].pBuffers[1].BufferType == SECBUFFER_DATA, "Expected second buffer to be SECBUFFER_DATA\n"); - ok(buffers[0].pBuffers[2].BufferType == SECBUFFER_STREAM_TRAILER, "Expected third buffer to be SECBUFFER_STREAM_TRAILER\n"); - - data = buffers[0].pBuffers[1].pvBuffer; - data[buffers[0].pBuffers[1].cbBuffer] = 0; - } + ok (status == SEC_E_CERT_EXPIRED, "got %08lx\n", status); done: DeleteSecurityContext(&context);

1 0