wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

Eric Pouech : user32/tests: Enable compilation with long types.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: 05e617aee2fd3e833de84e1a8e6e64633b332018 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05e617aee2fd3e833de84e1a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 17 08:43:59 2022 +0100 user32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/winstation.c | 159 +++++++++++++++++++++-------------------- 1 file changed, 80 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=05e617aee2fd3e833de8…

1 0

Eric Pouech : user32/tests: Enable compilation with long types.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: ee022787e5da962a7b6caa2cdc1149857dcbbc7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee022787e5da962a7b6caa2c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 17 08:43:55 2022 +0100 user32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 1499 ++++++++++++++++++++++++----------------------- 1 file changed, 750 insertions(+), 749 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ee022787e5da962a7b6c…

1 0

Giovanni Mascellani : mfplat: Do not allocate more memory than requested.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: 52b5caa48884d4798e02d7cedba596da6a757aec URL: https://source.winehq.org/git/wine.git/?a=commit;h=52b5caa48884d4798e02d7ce… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Mar 15 14:29:22 2022 +0100 mfplat: Do not allocate more memory than requested. It is totally fine (though maybe a little strange) to allocate 10 bytes requesting an alignment to a megabyte boundary or more, and this shouldn't result in wasting an (nearly) entire megabyte of memory. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 18c77c87ec2..8ea2283e24b 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1262,8 +1262,6 @@ static const IMFDXGIBufferVtbl dxgi_buffer_vtbl = static HRESULT memory_buffer_init(struct buffer *buffer, DWORD max_length, DWORD alignment, const IMFMediaBufferVtbl *vtbl) { - size_t size; - if (alignment < MF_16_BYTE_ALIGNMENT) alignment = MF_16_BYTE_ALIGNMENT; alignment++; @@ -1279,10 +1277,9 @@ static HRESULT memory_buffer_init(struct buffer *buffer, DWORD max_length, DWORD alignment++; } - size = ALIGN_SIZE(max_length, alignment - 1); - if (!(buffer->data = _aligned_malloc(size, alignment))) + if (!(buffer->data = _aligned_malloc(max_length, alignment))) return E_OUTOFMEMORY; - memset(buffer->data, 0, size); + memset(buffer->data, 0, max_length); buffer->IMFMediaBuffer_iface.lpVtbl = vtbl; buffer->refcount = 1;

1 0

Giovanni Mascellani : mfplat: Align buffers at no less than 16 bytes boundaries.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: 20c4896b125c7926e57091aa3dbd82a6af1d2be4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20c4896b125c7926e57091aa… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Mar 15 14:29:21 2022 +0100 mfplat: Align buffers at no less than 16 bytes boundaries. This is what seems to be happening on Windows 10. On the other hand, I am not seeing on native the current behavior of interpreting a zero alignment parameter as a request to align to 64 bytes boundaries. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index e3f863c6345..18c77c87ec2 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1264,7 +1264,8 @@ static HRESULT memory_buffer_init(struct buffer *buffer, DWORD max_length, DWORD { size_t size; - if (!alignment) alignment = MF_64_BYTE_ALIGNMENT; + if (alignment < MF_16_BYTE_ALIGNMENT) + alignment = MF_16_BYTE_ALIGNMENT; alignment++; if (alignment & (alignment - 1))

1 0

Giovanni Mascellani : mfplat: Do not mark the buffer as locked if Lock2D() fails.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: 44c9ea50432771258e9eed012967a16c6f132fe9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44c9ea50432771258e9eed01… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Mar 15 14:29:20 2022 +0100 mfplat: Do not mark the buffer as locked if Lock2D() fails. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 19a7ad33bba..e3f863c6345 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -670,13 +670,14 @@ static HRESULT WINAPI d3d9_surface_buffer_Lock2D(IMF2DBuffer2 *iface, BYTE **sca if (buffer->_2d.linear_buffer) hr = MF_E_UNEXPECTED; - else if (!buffer->_2d.locks++) + else if (!buffer->_2d.locks) { hr = IDirect3DSurface9_LockRect(buffer->d3d9_surface.surface, &buffer->d3d9_surface.rect, NULL, 0); } if (SUCCEEDED(hr)) { + buffer->_2d.locks++; *scanline0 = buffer->d3d9_surface.rect.pBits; *pitch = buffer->d3d9_surface.rect.Pitch; } @@ -755,13 +756,14 @@ static HRESULT WINAPI d3d9_surface_buffer_Lock2DSize(IMF2DBuffer2 *iface, MF2DBu if (buffer->_2d.linear_buffer) hr = MF_E_UNEXPECTED; - else if (!buffer->_2d.locks++) + else if (!buffer->_2d.locks) { hr = IDirect3DSurface9_LockRect(buffer->d3d9_surface.surface, &buffer->d3d9_surface.rect, NULL, 0); } if (SUCCEEDED(hr)) { + buffer->_2d.locks++; *scanline0 = buffer->d3d9_surface.rect.pBits; *pitch = buffer->d3d9_surface.rect.Pitch; if (buffer_start)

1 0

Giovanni Mascellani : mfplat: Do not allocate more memory than required.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: cc9722e4e03f33ded23ac74acc7756f26b115bce URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc9722e4e03f33ded23ac74a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Mar 15 14:29:19 2022 +0100 mfplat: Do not allocate more memory than required. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 133af2af470..19a7ad33bba 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -309,7 +309,7 @@ static HRESULT WINAPI memory_1d_2d_buffer_Lock(IMFMediaBuffer *iface, BYTE **dat hr = MF_E_INVALIDREQUEST; else if (!buffer->_2d.linear_buffer) { - if (!(buffer->_2d.linear_buffer = malloc(ALIGN_SIZE(buffer->_2d.plane_size, MF_64_BYTE_ALIGNMENT)))) + if (!(buffer->_2d.linear_buffer = malloc(buffer->_2d.plane_size))) hr = E_OUTOFMEMORY; if (SUCCEEDED(hr)) @@ -384,7 +384,7 @@ static HRESULT WINAPI d3d9_surface_buffer_Lock(IMFMediaBuffer *iface, BYTE **dat { D3DLOCKED_RECT rect; - if (!(buffer->_2d.linear_buffer = malloc(ALIGN_SIZE(buffer->_2d.plane_size, MF_64_BYTE_ALIGNMENT)))) + if (!(buffer->_2d.linear_buffer = malloc(buffer->_2d.plane_size))) hr = E_OUTOFMEMORY; if (SUCCEEDED(hr)) @@ -963,7 +963,7 @@ static HRESULT WINAPI dxgi_surface_buffer_Lock(IMFMediaBuffer *iface, BYTE **dat hr = MF_E_INVALIDREQUEST; else if (!buffer->_2d.linear_buffer) { - if (!(buffer->_2d.linear_buffer = malloc(ALIGN_SIZE(buffer->_2d.plane_size, MF_64_BYTE_ALIGNMENT)))) + if (!(buffer->_2d.linear_buffer = malloc(buffer->_2d.plane_size))) hr = E_OUTOFMEMORY; if (SUCCEEDED(hr))

1 0

Giovanni Mascellani : mfplat: Fix buffer reading with IMF2DBuffer::Lock().
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: 135bdc21e8f8f2a3513f9bce6390f5f386bdc861 URL: https://source.winehq.org/git/wine.git/?a=commit;h=135bdc21e8f8f2a3513f9bce… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Mar 15 14:29:18 2022 +0100 mfplat: Fix buffer reading with IMF2DBuffer::Lock(). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 4 ++++ dlls/mfplat/tests/mfplat.c | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 2ec714c1419..133af2af470 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -311,6 +311,10 @@ static HRESULT WINAPI memory_1d_2d_buffer_Lock(IMFMediaBuffer *iface, BYTE **dat { if (!(buffer->_2d.linear_buffer = malloc(ALIGN_SIZE(buffer->_2d.plane_size, MF_64_BYTE_ALIGNMENT)))) hr = E_OUTOFMEMORY; + + if (SUCCEEDED(hr)) + copy_image(buffer, buffer->_2d.linear_buffer, buffer->_2d.width, buffer->data, buffer->_2d.pitch, + buffer->_2d.width, buffer->_2d.height); } if (SUCCEEDED(hr)) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 7e72abbde22..16d24bbff51 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5872,7 +5872,6 @@ static void test_MFCreate2DMediaBuffer(void) hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr); - todo_wine ok(memcmp(data, eight_bbs, sizeof(eight_bbs)) == 0, "Invalid data instead of 0xbb.\n"); hr = IMFMediaBuffer_Unlock(buffer);

1 0

Giovanni Mascellani : mfplat/tests: Check that Lock() and Lock2D() see the same content.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: 8adb6d80d595d8aea52762fd9802385e31a5a2cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=8adb6d80d595d8aea52762fd… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Mar 15 14:29:17 2022 +0100 mfplat/tests: Check that Lock() and Lock2D() see the same content. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 83877041694..7e72abbde22 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5725,6 +5725,8 @@ static void test_MFCreate2DMediaBuffer(void) { 1, 4, D3DFMT_A8R8G8B8, 16, 64 }, { 4, 1, D3DFMT_A8R8G8B8, 16, 64 }, }; + static const char two_aas[] = { 0xaa, 0xaa }; + static const char eight_bbs[] = { 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb }; DWORD max_length, length, length2; BYTE *buffer_start, *data, *data2; LONG pitch, pitch2, stride; @@ -5783,6 +5785,8 @@ static void test_MFCreate2DMediaBuffer(void) ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr); ok(max_length == length, "Unexpected length.\n"); + memset(data, 0xaa, length); + length = 0; pMFGetPlaneSize(MAKEFOURCC('N','V','1','2'), 2, 3, &length); ok(max_length == length && length == 9, "Unexpected length %lu.\n", length); @@ -5835,6 +5839,10 @@ static void test_MFCreate2DMediaBuffer(void) ok(!!data, "Expected data pointer.\n"); ok(pitch == 64, "Unexpected pitch %ld.\n", pitch); + for (i = 0; i < 4; i++) + ok(memcmp(&data[64 * i], two_aas, sizeof(two_aas)) == 0, "Invalid data instead of 0xaa.\n"); + memset(data, 0xbb, 194); + hr = IMF2DBuffer_Lock2D(_2dbuffer, &data2, &pitch); ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr); ok(data == data2, "Expected data pointer.\n"); @@ -5861,6 +5869,15 @@ static void test_MFCreate2DMediaBuffer(void) hr = IMF2DBuffer_Unlock2D(_2dbuffer); ok(hr == HRESULT_FROM_WIN32(ERROR_WAS_UNLOCKED), "Unexpected hr %#lx.\n", hr); + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); + ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr); + + todo_wine + ok(memcmp(data, eight_bbs, sizeof(eight_bbs)) == 0, "Invalid data instead of 0xbb.\n"); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Failed to unlock buffer, hr %#lx.\n", hr); + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer2, (void **)&_2dbuffer2); ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Failed to get interface, hr %#lx.\n", hr);

1 0

Giovanni Mascellani : tests: Mark atomic operations as done on AMD.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: vkd3d Branch: master Commit: 500ce146c377a01d4ba39ad27b1cca9313ad54c9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=500ce146c377a01d4ba39ad… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Mar 17 14:35:52 2022 +0100 tests: Mark atomic operations as done on AMD. They seem to work with mesa 21.3.7. Since some developers are using older releases where the bug is not yet fixed, I am leaving it marked as a bug. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index bfdc256d..997b544f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -23057,7 +23057,6 @@ static void test_atomic_instructions(void) ID3D12CommandQueue *queue; ID3D12Device *device; unsigned int i, j; - bool is_todo; HRESULT hr; static const DWORD ps_atomics_code[] = @@ -23267,12 +23266,13 @@ static void test_atomic_instructions(void) { unsigned int value = get_readback_uint(&rb, j, 0, 0); unsigned int expected = test->expected_result[j]; + bool is_bug; - is_todo = test->i.x < 0 + is_bug = test->i.x < 0 && (!strcmp(instructions[j], "atomic_imax") || !strcmp(instructions[j], "atomic_imin")); - bug_if(is_todo && is_nvidia_device(device)) - todo_if(is_todo) + /* Fixed at least on radv with mesa >= 21.3.7. */ + bug_if(is_bug) ok(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' " "with inputs (%u, %u), (%d), %#x (%d).\n", i, value, value, expected, expected, instructions[j], @@ -23286,13 +23286,13 @@ static void test_atomic_instructions(void) get_buffer_readback_with_command_list(cs_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); for (j = 0; j < ARRAY_SIZE(instructions); ++j) { - bool todo_instruction = !strcmp(imm_instructions[j], "imm_atomic_imax") + bool bug_instruction = !strcmp(imm_instructions[j], "imm_atomic_imax") || !strcmp(imm_instructions[j], "imm_atomic_imin"); unsigned int value = get_readback_uint(&rb, j, 0, 0); unsigned int expected = test->expected_result[j]; - bug_if(test->i.x < 0 && todo_instruction && is_nvidia_device(device)) - todo_if(test->i.x < 0 && todo_instruction) + /* Fixed at least on radv with mesa >= 21.3.7. */ + bug_if(test->i.x < 0 && bug_instruction) ok(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' " "with inputs (%u, %u), (%d), %#x (%d).\n", i, value, value, expected, expected, imm_instructions[j],

1 0

Giovanni Mascellani : tests: Mark NaN conversion as todo on NVIDIA.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: vkd3d Branch: master Commit: 90827313f5a84987d26f88691b4f3a1f8ca2d552 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=90827313f5a84987d26f886… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Mar 17 14:35:51 2022 +0100 tests: Mark NaN conversion as todo on NVIDIA. D3D mandates that NaN becomes zero when converted to unsigned[1], while it doesn't look like that SPIR-V's OpConvertFToU has a similar provision[2]. In practice, this seems to work on AMD and fails on NVIDIA, where 0x80000000 is produced instead. [1] https://microsoft.github.io/DirectX-Specs/d3d/archive/D3D11_3_FunctionalSpe… [2] https://www.khronos.org/registry/SPIR-V/specs/unified1/SPIRV.html#Conversion Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index d17a1c32..bfdc256d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9939,6 +9939,7 @@ static void test_shader_instructions(void) bool is_float64; bool is_todo; bool skip_on_warp; + bool todo_on_nvidia; } uint_tests[] = { @@ -10187,8 +10188,8 @@ static void test_shader_instructions(void) {&ps_dge, {.d = {{1.5, 1.0}}}, {{0xffffffff}}, true}, {&ps_dlt, {.d = {{0.0, 1.0}}}, {{0xffffffff}}, true}, {&ps_dlt, {.d = {{1.0, 1.0}}}, {{0x00000000}}, true}, - {&ps_dtou, {.d = {{ -NAN}}}, {{ 0, 0 }}, true}, - {&ps_dtou, {.d = {{ NAN}}}, {{ 0, 0 }}, true}, + {&ps_dtou, {.d = {{ -NAN}}}, {{ 0, 0 }}, true, false, false, true}, + {&ps_dtou, {.d = {{ NAN}}}, {{ 0, 0 }}, true, false, false, true}, {&ps_dtou, {.d = {{-INFINITY}}}, {{ 0, ~0u}}, true}, {&ps_dtou, {.d = {{ INFINITY}}}, {{~0u, 0 }}, true}, {&ps_dtou, {.d = {{ -1.0}}}, {{ 0, 1 }}, true}, @@ -10605,6 +10606,7 @@ static void test_shader_instructions(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + todo_if(uint_tests[i].todo_on_nvidia && is_nvidia_device(context.device)) check_sub_resource_uvec4(context.render_target, 0, queue, command_list, &uint_tests[i].output.u); reset_command_list(command_list, context.allocator);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2022