July 2023 - Wine-commits - list.winehq.org

Alexandre Julliard : ntoskrnl.exe/tests: Avoid sizeof() in traces.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: 08cfcb71bdd755814de2c0986b85a154822ebc4e URL: https://gitlab.winehq.org/wine/wine/-/commit/08cfcb71bdd755814de2c0986b85a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 6 18:13:51 2023 +0200 ntoskrnl.exe/tests: Avoid sizeof() in traces. --- dlls/ntoskrnl.exe/tests/driver.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index a80bef78fab..bd388a6ec9e 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1241,8 +1241,7 @@ static void test_lookaside_list(void) ok(list.L.Type == (NonPagedPool|POOL_NX_ALLOCATION), "Expected NonPagedPool|POOL_NX_ALLOCATION got %u\n", list.L.Type); ok(list.L.Tag == tag, "Expected %lx got %lx\n", tag, list.L.Tag); - ok(list.L.Size == LOOKASIDE_MINIMUM_BLOCK_SIZE, - "Expected %Iu got %lu\n", LOOKASIDE_MINIMUM_BLOCK_SIZE, list.L.Size); + ok(list.L.Size == LOOKASIDE_MINIMUM_BLOCK_SIZE, "got %lu\n", list.L.Size); ok(list.L.LastTotalAllocates == 0,"Expected 0 got %lu\n", list.L.LastTotalAllocates); ok(list.L.LastAllocateMisses == 0,"Expected 0 got %lu\n", list.L.LastAllocateMisses); ExDeleteNPagedLookasideList(&list); @@ -1264,8 +1263,7 @@ static void test_lookaside_list(void) ok(paged_list.L.Type == (PagedPool|POOL_NX_ALLOCATION), "Expected PagedPool|POOL_NX_ALLOCATION got %u\n", paged_list.L.Type); ok(paged_list.L.Tag == tag, "Expected %lx got %lx\n", tag, paged_list.L.Tag); - ok(paged_list.L.Size == LOOKASIDE_MINIMUM_BLOCK_SIZE, - "Expected %Iu got %lu\n", LOOKASIDE_MINIMUM_BLOCK_SIZE, paged_list.L.Size); + ok(paged_list.L.Size == LOOKASIDE_MINIMUM_BLOCK_SIZE, "got %lu\n", paged_list.L.Size); ok(paged_list.L.LastTotalAllocates == 0,"Expected 0 got %lu\n", paged_list.L.LastTotalAllocates); ok(paged_list.L.LastAllocateMisses == 0,"Expected 0 got %lu\n", paged_list.L.LastAllocateMisses); ExDeletePagedLookasideList(&paged_list);

1 0

Alexandre Julliard : wmvcore/tests: Avoid sizeof() in traces.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: 9974960f0cbc942e410485661b81afbd9eeabc77 URL: https://gitlab.winehq.org/wine/wine/-/commit/9974960f0cbc942e410485661b81af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 6 18:14:31 2023 +0200 wmvcore/tests: Avoid sizeof() in traces. --- dlls/wmvcore/tests/wmvcore.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 6071ac25ad7..f40ae37c0ce 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1481,8 +1481,7 @@ static void test_stream_media_props(IWMStreamConfig *config, hr = IWMMediaProps_GetMediaType(props, mt, &ret_size); ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(ret_size == size, "Expected size %lu, got %lu.\n", size, ret_size); - ok(size == sizeof(WM_MEDIA_TYPE) + mt->cbFormat, "Expected size %Iu, got %lu.\n", - sizeof(WM_MEDIA_TYPE) + mt->cbFormat, size); + ok(size == sizeof(WM_MEDIA_TYPE) + mt->cbFormat, "got %lu.\n", size); ok(IsEqualGUID(&mt->majortype, majortype), "Expected major type %s, got %s.\n", debugstr_guid(majortype), debugstr_guid(&mt->majortype)); todo_wine_if(todo_subtype) @@ -1687,8 +1686,7 @@ static void test_sync_reader_types(void) hr = IWMOutputMediaProps_GetMediaType(output_props, mt, &ret_size); ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(ret_size == size, "Expected size %lu, got %lu.\n", size, ret_size); - ok(size == sizeof(WM_MEDIA_TYPE) + mt->cbFormat, "Expected size %Iu, got %lu.\n", - sizeof(WM_MEDIA_TYPE) + mt->cbFormat, size); + ok(size == sizeof(WM_MEDIA_TYPE) + mt->cbFormat, "got %lu.\n", size); ok(IsEqualGUID(&mt->majortype, &majortype), "Got major type %s.\n", debugstr_guid(&mt->majortype)); @@ -3587,8 +3585,7 @@ static void test_async_reader_types(void) hr = IWMOutputMediaProps_GetMediaType(output_props, mt, &ret_size); ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(ret_size == size, "Expected size %lu, got %lu.\n", size, ret_size); - ok(size == sizeof(WM_MEDIA_TYPE) + mt->cbFormat, "Expected size %Iu, got %lu.\n", - sizeof(WM_MEDIA_TYPE) + mt->cbFormat, size); + ok(size == sizeof(WM_MEDIA_TYPE) + mt->cbFormat, "got %lu.\n", size); ok(IsEqualGUID(&mt->majortype, &majortype), "Got major type %s.\n", debugstr_guid(&mt->majortype));

1 0

Alexandre Julliard : wtsapi32/tests: Avoid sizeof() in traces.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: 4aac5089f3c423fe7afb8e4ef152b36bf55505f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/4aac5089f3c423fe7afb8e4ef152b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 6 18:15:03 2023 +0200 wtsapi32/tests: Avoid sizeof() in traces. --- dlls/wtsapi32/tests/wtsapi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index 396a3f4b1e7..6e8de7b232d 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -224,7 +224,7 @@ static void test_WTSQuerySessionInformation(void) GetUserNameW(usernameW, &tempsize); /* Windows Vista, 7 and 8 return uppercase username, while the rest return lowercase. */ ok(!wcsicmp(buf1, usernameW), "expected %s, got %s\n", wine_dbgstr_w(usernameW), wine_dbgstr_w(buf1)); - ok(count == tempsize * sizeof(WCHAR), "expected %Iu, got %lu\n", tempsize * sizeof(WCHAR), count); + ok(count == tempsize * sizeof(WCHAR), "got %lu\n", count); WTSFreeMemory(buf1); count = 0; @@ -237,7 +237,7 @@ static void test_WTSQuerySessionInformation(void) GetComputerNameW(computernameW, &tempsize); /* Windows Vista, 7 and 8 return uppercase computername, while the rest return lowercase. */ ok(!wcsicmp(buf1, computernameW), "expected %s, got %s\n", wine_dbgstr_w(computernameW), wine_dbgstr_w(buf1)); - ok(count == (tempsize + 1) * sizeof(WCHAR), "expected %Iu, got %lu\n", (tempsize + 1) * sizeof(WCHAR), count); + ok(count == (tempsize + 1) * sizeof(WCHAR), "got %lu\n", count); WTSFreeMemory(buf1); SetLastError(0xdeadbeef);

1 0

Gabriel Ivăncescu : win32u: Don't clip fullscreen windows while capturing mouse pointer.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: 6bf3b5539a3be40ed60cada89204685566c141a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/6bf3b5539a3be40ed60cada8920468… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jul 5 20:58:35 2023 +0300 win32u: Don't clip fullscreen windows while capturing mouse pointer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53831 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/win32u/input.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 1dcc439e560..0c462f42675 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -2486,6 +2486,7 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) if (!NtUserGetWindowRect( hwnd, &rect )) return FALSE; if (!NtUserIsWindowRectFullScreen( &rect )) return FALSE; + if (get_capture()) return FALSE; if (NtGetTickCount() - thread_info->clipping_reset < 1000) return FALSE; if (!reset && clipping_cursor && thread_info->clipping_cursor) return FALSE; /* already clipping */

1 0

Hans Leidekker : secur32: Fix a couple of return values.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: 4d7c36ddb026aa93c39b4721f0bd33e146e787dd URL: https://gitlab.winehq.org/wine/wine/-/commit/4d7c36ddb026aa93c39b4721f0bd33… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 23 14:17:36 2023 +0200 secur32: Fix a couple of return values. --- dlls/secur32/schannel.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 8d446af8fe1..7b5c79f3764 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -312,7 +312,7 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryCredentialsAttributesA( { case SECPKG_CRED_ATTR_NAMES: FIXME("SECPKG_CRED_ATTR_NAMES: stub\n"); - ret = SEC_E_UNSUPPORTED_FUNCTION; + ret = SEC_E_NO_CREDENTIALS; break; default: ret = schan_QueryCredentialsAttributes(phCredential, ulAttribute, @@ -394,7 +394,7 @@ static SECURITY_STATUS get_cert(const void *credentials, CERT_CONTEXT const **ce default: FIXME("unhandled version %lu\n", cred->dwVersion); - return SEC_E_INTERNAL_ERROR; + return SEC_E_UNKNOWN_CREDENTIALS; } if (!cert_count) status = SEC_E_NO_CREDENTIALS; @@ -570,7 +570,7 @@ static SECURITY_STATUS acquire_credentials_handle(ULONG fCredentialUse, status = SEC_E_OK; } - else if (fCredentialUse & SECPKG_CRED_INBOUND) + else if (!fCredentialUse || (fCredentialUse & SECPKG_CRED_INBOUND)) { return SEC_E_NO_CREDENTIALS; }

1 0

Hans Leidekker : secur32/tests: Get rid of workarounds for old Windows versions.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: 472150bf2ed73aab2c0a6e9b168c4e36683ec73f URL: https://gitlab.winehq.org/wine/wine/-/commit/472150bf2ed73aab2c0a6e9b168c4e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 23 14:54:44 2023 +0200 secur32/tests: Get rid of workarounds for old Windows versions. --- dlls/secur32/tests/schannel.c | 378 ++++++++++++++++++------------------------ 1 file changed, 160 insertions(+), 218 deletions(-)

1 0

Hans Leidekker : secur32: Reduce indentation level in schan_QueryContextAttributesA/W().
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: b605d822da83667067c63374a9c4a7b5945b052b URL: https://gitlab.winehq.org/wine/wine/-/commit/b605d822da83667067c63374a9c4a7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 23 16:07:23 2023 +0200 secur32: Reduce indentation level in schan_QueryContextAttributesA/W(). --- dlls/secur32/schannel.c | 313 +++++++++++++++++++++++------------------------- 1 file changed, 147 insertions(+), 166 deletions(-)

1 0

Hans Leidekker : secur32/tests: Fix a test failure.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: 9a56d5ff1f1724a332eba62129ded569c28a1649 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a56d5ff1f1724a332eba62129ded5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 23 14:57:22 2023 +0200 secur32/tests: Fix a test failure. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55114 --- dlls/secur32/tests/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 9be79cd3805..fc5d501ff39 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -2018,6 +2018,7 @@ static void test_connection_shutdown(void) ok( status == SEC_E_OK, "got %08lx.\n", status ); ok( buf->cbBuffer == sizeof(message), "got cbBuffer %#lx.\n", buf->cbBuffer ); ok( !memcmp( buf->pvBuffer, message, sizeof(message) ), "message data mismatch.\n" ); + free_buffers( &buffers[0] ); alert.dwTokenType = SCHANNEL_ALERT; alert.dwAlertType = TLS1_ALERT_FATAL; @@ -2031,7 +2032,6 @@ static void test_connection_shutdown(void) NULL, 0, NULL, &buffers[1], &attrs, NULL ); ok( status == SEC_E_OK, "got %08lx.\n", status ); - free_buffers( &buffers[0] ); free_buffers( &buffers[1] ); DeleteSecurityContext( &context ); FreeCredentialsHandle( &cred_handle );

1 0

Evan Tang : vkd3d: Make CopyResource use a temp buffer for depth <-> color copies.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: vkd3d Branch: master Commit: 574239e3e32b4e5e7bc349d464c8c185a4317e97 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/574239e3e32b4e5e7bc349d464c8c… Author: Evan Tang <etang(a)codeweavers.com> Date: Mon Jul 3 16:43:39 2023 -0500 vkd3d: Make CopyResource use a temp buffer for depth <-> color copies. depth <-> color copies aren't allowed in Vulkan --- libs/vkd3d/command.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index de355ccd..53cb5d95 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3625,7 +3625,7 @@ static HRESULT d3d12_command_list_allocate_transfer_buffer(struct d3d12_command_ static void d3d12_command_list_copy_incompatible_texture_region(struct d3d12_command_list *list, struct d3d12_resource *dst_resource, unsigned int dst_sub_resource_idx, const struct vkd3d_format *dst_format, struct d3d12_resource *src_resource, - unsigned int src_sub_resource_idx, const struct vkd3d_format *src_format) + unsigned int src_sub_resource_idx, const struct vkd3d_format *src_format, unsigned int layer_count) { const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; const D3D12_RESOURCE_DESC *dst_desc = &dst_resource->desc; @@ -3652,6 +3652,7 @@ static void d3d12_command_list_copy_incompatible_texture_region(struct d3d12_com buffer_image_copy.bufferImageHeight = 0; vk_image_subresource_layers_from_d3d12(&buffer_image_copy.imageSubresource, src_format, src_sub_resource_idx, src_desc->MipLevels); + buffer_image_copy.imageSubresource.layerCount = layer_count; src_miplevel_idx = buffer_image_copy.imageSubresource.mipLevel; buffer_image_copy.imageOffset.x = 0; buffer_image_copy.imageOffset.y = 0; @@ -3659,7 +3660,7 @@ static void d3d12_command_list_copy_incompatible_texture_region(struct d3d12_com vk_extent_3d_from_d3d12_miplevel(&buffer_image_copy.imageExtent, src_desc, src_miplevel_idx); buffer_size = src_format->byte_count * buffer_image_copy.imageExtent.width * - buffer_image_copy.imageExtent.height * buffer_image_copy.imageExtent.depth; + buffer_image_copy.imageExtent.height * buffer_image_copy.imageExtent.depth * layer_count; if (FAILED(hr = d3d12_command_list_allocate_transfer_buffer(list, buffer_size, &transfer_buffer))) { ERR("Failed to allocate transfer buffer, hr %#x.\n", hr); @@ -3685,6 +3686,7 @@ static void d3d12_command_list_copy_incompatible_texture_region(struct d3d12_com vk_image_subresource_layers_from_d3d12(&buffer_image_copy.imageSubresource, dst_format, dst_sub_resource_idx, dst_desc->MipLevels); + buffer_image_copy.imageSubresource.layerCount = layer_count; dst_miplevel_idx = buffer_image_copy.imageSubresource.mipLevel; assert(d3d12_resource_desc_get_width(src_desc, src_miplevel_idx) == @@ -3814,7 +3816,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic { d3d12_command_list_copy_incompatible_texture_region(list, dst_resource, dst->u.SubresourceIndex, dst_format, - src_resource, src->u.SubresourceIndex, src_format); + src_resource, src->u.SubresourceIndex, src_format, 1); return; } @@ -3836,6 +3838,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsComm { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface); struct d3d12_resource *dst_resource, *src_resource; + const struct vkd3d_format *dst_format, *src_format; const struct vkd3d_vk_device_procs *vk_procs; VkBufferCopy vk_buffer_copy; VkImageCopy vk_image_copy; @@ -3868,16 +3871,29 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsComm else { layer_count = d3d12_resource_desc_get_layer_count(&dst_resource->desc); + dst_format = dst_resource->format; + src_format = src_resource->format; assert(d3d12_resource_is_texture(dst_resource)); assert(d3d12_resource_is_texture(src_resource)); assert(dst_resource->desc.MipLevels == src_resource->desc.MipLevels); assert(layer_count == d3d12_resource_desc_get_layer_count(&src_resource->desc)); + if (src_format->vk_aspect_mask != dst_format->vk_aspect_mask) + { + for (i = 0; i < dst_resource->desc.MipLevels; ++i) + { + d3d12_command_list_copy_incompatible_texture_region(list, + dst_resource, i, dst_format, + src_resource, i, src_format, layer_count); + } + return; + } + for (i = 0; i < dst_resource->desc.MipLevels; ++i) { vk_image_copy_from_d3d12(&vk_image_copy, i, i, &src_resource->desc, &dst_resource->desc, - src_resource->format, dst_resource->format, NULL, 0, 0, 0); + src_format, dst_format, NULL, 0, 0, 0); vk_image_copy.dstSubresource.layerCount = layer_count; vk_image_copy.srcSubresource.layerCount = layer_count; VK_CALL(vkCmdCopyImage(list->vk_command_buffer, src_resource->u.vk_image,

1 0

Alex Henrie : cmd: Allow numbered redirects at the beginning of a line.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: wine Branch: master Commit: eba7092f0aba75b71175f0426ad05a4d880250a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/eba7092f0aba75b71175f0426ad05a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jun 30 23:24:45 2023 -0600 cmd: Allow numbered redirects at the beginning of a line. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55124 --- programs/cmd/tests/test_builtins.cmd | 9 +++++++++ programs/cmd/tests/test_builtins.cmd.exp | 6 ++++++ programs/cmd/wcmdmain.c | 6 +++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index eaee2900bc9..0cb05041fa9 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -176,6 +176,15 @@ del foo echo foo> foo echo foo7 7>> foo || (echo not supported & del foo) if exist foo (type foo) else echo not supported +echo --- redirect at beginning of line +>foo (echo foo) +type foo +1>foo (echo foo1) +type foo +2>foo (echo foo2 >&2) +type foo +>>foo (echo fooA) +type foo echo --- redirections within IF statements if 1==1 echo foo1>bar type bar & del bar diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 411eae303ac..16f9d647b8a 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -204,6 +204,12 @@ food2 food21 @todo_wine(a)foo7@space@@space@@or_broken(a)not supported(a)space@ @todo_wine(a)foo@or_broken(a)not supported +--- redirect at beginning of line +foo +foo1 +foo2(a)space@ +foo2(a)space@ +fooA --- redirections within IF statements foo1 foo2 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index de6e721b26a..298606f6caa 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2070,9 +2070,9 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* See if 1>, 2> etc, in which case we have some patching up to do (provided there's a preceding whitespace, and enough chars read so far) */ - if (curStringLen > 2 - && (*(curPos-1)>='1') && (*(curPos-1)<='9') - && ((*(curPos-2)==' ') || (*(curPos-2)=='\t'))) { + if (curPos[-1] >= '1' && curPos[-1] <= '9' + && (curStringLen == 1 || + curPos[-2] == ' ' || curPos[-2] == '\t')) { curStringLen--; curString[curStringLen] = 0x00; curCopyTo[(*curLen)++] = *(curPos-1);

1 0