March 2022 - Wine-devel - list.winehq.org

[PATCH 8/9] win32u: Move NtUserRedrawWindow implementation from user32.
by Jacek Caban 14 Mar '22

14 Mar '22

2 1

[PATCH 5/9] win32u: Move NtUserReleaseDC implementation from user32.
by Jacek Caban 14 Mar '22

14 Mar '22

3 2

[PATCH 7/9] win32u: Move NtUserEndPaint implementation from user32.
by Jacek Caban 14 Mar '22

14 Mar '22

2 1

[PATCH 6/9] win32u: Move NtUserBeginPaint implementation from user32.
by Jacek Caban 14 Mar '22

14 Mar '22

2 1

[PATCH 4/9] win32u: Move NtUserGetDCEx implementation from user32.
by Jacek Caban 14 Mar '22

14 Mar '22

2 1

[PATCH 3/9] win32u: Mmove dummy surface implementation from user32.
by Jacek Caban 14 Mar '22

14 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/painting.c | 4 +- dlls/user32/win.c | 68 ---------------------- dlls/user32/win.h | 1 - dlls/user32/winpos.c | 7 ++- dlls/win32u/dce.c | 110 +++++++++++++++++++++++++++++++++++ dlls/win32u/win32u_private.h | 9 ++- dlls/win32u/window.c | 43 +------------- include/ntuser.h | 1 + 8 files changed, 126 insertions(+), 117 deletions(-)

2 1

[PATCH 2/9] win32u: Move NtUserWindowFromDC implementation from user32.
by Jacek Caban 14 Mar '22

14 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/painting.c | 27 ----------------------- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 1 - dlls/win32u/Makefile.in | 1 + dlls/win32u/dce.c | 42 ++++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 13 ++++++++++- dlls/win32u/palette.c | 9 +++----- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 3 ++- dlls/wow64win/user.c | 7 ++++++ include/ntuser.h | 1 + 12 files changed, 71 insertions(+), 38 deletions(-) create mode 100644 dlls/win32u/dce.c

2 1

[PATCH 1/9] user32: Fix nameA pointer in alloc_menu_nameW.
by Jacek Caban 14 Mar '22

14 Mar '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52651 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/class.c | 1 + dlls/user32/tests/class.c | 48 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+)

2 1

[PATCH] mfplat: Properly align memory allocated by IMF2DBuffer.
by Nikolay Sivov 14 Mar '22

14 Mar '22

From: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Contains changes from 228247 and 228249. dlls/mfplat/buffer.c | 2 +- dlls/mfplat/tests/mfplat.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 1cb84cba944..2ec714c1419 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1385,7 +1385,7 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo max_length = pitch * height; } - if (FAILED(hr = memory_buffer_init(object, max_length, MF_1_BYTE_ALIGNMENT, &memory_1d_2d_buffer_vtbl))) + if (FAILED(hr = memory_buffer_init(object, max_length, row_alignment, &memory_1d_2d_buffer_vtbl))) { free(object); return hr; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index d9c25edaa72..dcb064daf85 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6005,6 +6005,31 @@ static void test_MFCreate2DMediaBuffer(void) IMFMediaBuffer_Release(buffer); } + + /* Alignment tests */ + for (i = 0; i < ARRAY_SIZE(_2d_buffer_tests); ++i) + { + const struct _2d_buffer_test *ptr = &_2d_buffer_tests[i]; + + hr = pMFCreate2DMediaBuffer(ptr->width, ptr->height, ptr->fourcc, FALSE, &buffer); + ok(hr == S_OK, "Failed to create a buffer, hr %#lx.\n", hr); + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&_2dbuffer); + ok(hr == S_OK, "Failed to get interface, hr %#lx.\n", hr); + + hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch); + ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr); + ok(((uintptr_t)data & (pitch - 1)) == 0, "Misaligned data at %p.\n", data); + + ok(pitch == ptr->pitch, "%d: unexpected pitch %ld, expected %d, %u x %u, format %s.\n", i, pitch, ptr->pitch, + ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4)); + + hr = IMF2DBuffer_Unlock2D(_2dbuffer); + ok(hr == S_OK, "Failed to unlock buffer, hr %#lx.\n", hr); + + IMF2DBuffer_Release(_2dbuffer); + IMFMediaBuffer_Release(buffer); + } } static void test_MFCreateMediaBufferFromMediaType(void) -- 2.35.1

2 3

[v3 PATCH] mfplat: Properly align system memory buffers.
by Nikolay Sivov 14 Mar '22

14 Mar '22

From: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- This covers both 228248 and 228239. dlls/mfplat/buffer.c | 24 +++++++++++++++++++++-- dlls/mfplat/tests/mfplat.c | 39 +++++++++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index a912c61a3ac..1cb84cba944 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -18,6 +18,8 @@ #define COBJMACROS +#include <malloc.h> + #include "mfplat_private.h" #include "rtworkq.h" @@ -171,7 +173,7 @@ static ULONG WINAPI memory_buffer_Release(IMFMediaBuffer *iface) } DeleteCriticalSection(&buffer->cs); free(buffer->_2d.linear_buffer); - free(buffer->data); + _aligned_free(buffer->data); free(buffer); } @@ -1254,8 +1256,26 @@ static const IMFDXGIBufferVtbl dxgi_buffer_vtbl = static HRESULT memory_buffer_init(struct buffer *buffer, DWORD max_length, DWORD alignment, const IMFMediaBufferVtbl *vtbl) { - if (!(buffer->data = calloc(1, ALIGN_SIZE(max_length, alignment)))) + size_t size; + + if (!alignment) alignment = MF_64_BYTE_ALIGNMENT; + alignment++; + + if (alignment & (alignment - 1)) + { + alignment--; + alignment |= alignment >> 1; + alignment |= alignment >> 2; + alignment |= alignment >> 4; + alignment |= alignment >> 8; + alignment |= alignment >> 16; + alignment++; + } + + size = ALIGN_SIZE(max_length, alignment - 1); + if (!(buffer->data = _aligned_malloc(size, alignment))) return E_OUTOFMEMORY; + memset(buffer->data, 0, size); buffer->IMFMediaBuffer_iface.lpVtbl = vtbl; buffer->refcount = 1; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f61dbad7ab9..d9c25edaa72 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -2287,8 +2287,25 @@ static void test_system_memory_buffer(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFMediaBuffer_Release(buffer); +} + +static void test_system_memory_aligned_buffer(void) +{ + static const DWORD alignments[] = + { + MF_16_BYTE_ALIGNMENT, + MF_32_BYTE_ALIGNMENT, + MF_64_BYTE_ALIGNMENT, + MF_128_BYTE_ALIGNMENT, + MF_256_BYTE_ALIGNMENT, + MF_512_BYTE_ALIGNMENT, + }; + IMFMediaBuffer *buffer; + DWORD length, max; + unsigned int i; + BYTE *data; + HRESULT hr; - /* Aligned buffer. */ hr = MFCreateAlignedMemoryBuffer(16, MF_8_BYTE_ALIGNMENT, NULL); ok(FAILED(hr), "Unexpected hr %#lx.\n", hr); @@ -2324,6 +2341,25 @@ static void test_system_memory_buffer(void) ok(hr == S_OK, "Failed to unlock, hr %#lx.\n", hr); IMFMediaBuffer_Release(buffer); + + for (i = 0; i < ARRAY_SIZE(alignments); ++i) + { + hr = MFCreateAlignedMemoryBuffer(200, alignments[i], &buffer); + ok(hr == S_OK, "Failed to create memory buffer, hr %#lx.\n", hr); + + hr = IMFMediaBuffer_Lock(buffer, &data, &max, &length); + ok(hr == S_OK, "Failed to lock, hr %#lx.\n", hr); + ok(max == 200 && !length, "Unexpected length.\n"); + ok(!((uintptr_t)data & alignments[i]), "Data at %p is misaligned.\n", data); + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Failed to unlock, hr %#lx.\n", hr); + + IMFMediaBuffer_Release(buffer); + } + + hr = MFCreateAlignedMemoryBuffer(200, 0, &buffer); + ok(hr == S_OK, "Failed to create memory buffer, hr %#lx.\n", hr); + IMFMediaBuffer_Release(buffer); } static void test_sample(void) @@ -7980,6 +8016,7 @@ START_TEST(mfplat) test_file_stream(); test_MFCreateMFByteStreamOnStream(); test_system_memory_buffer(); + test_system_memory_aligned_buffer(); test_source_resolver(); test_MFCreateAsyncResult(); test_allocate_queue(); -- 2.34.1

3 3