October 2023 - Wine-commits

Ziqing Hui : winegstreamer: Use gst_element_get_compatible_pad.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: ebc8a45968e7e218010ce96a8c496a7ec34af45e URL: https://gitlab.winehq.org/wine/wine/-/commit/ebc8a45968e7e218010ce96a8c496a… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Oct 27 10:09:55 2023 +0800 winegstreamer: Use gst_element_get_compatible_pad. gst_element_get_compatible_pad supports request pad. --- dlls/winegstreamer/unixlib.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/unixlib.c b/dlls/winegstreamer/unixlib.c index 4a204478ade..d0d50b34004 100644 --- a/dlls/winegstreamer/unixlib.c +++ b/dlls/winegstreamer/unixlib.c @@ -181,11 +181,10 @@ bool link_src_to_element(GstPad *src_pad, GstElement *element) GstPadLinkReturn ret; GstPad *sink_pad; - if (!(sink_pad = gst_element_get_static_pad(element, "sink"))) + if (!(sink_pad = gst_element_get_compatible_pad(element, src_pad, NULL))) { - gchar *name = gst_element_get_name(element); - GST_ERROR("Failed to find sink pad on %s", name); - g_free(name); + GST_ERROR("Failed to find sink pad compatible to %"GST_PTR_FORMAT" on %"GST_PTR_FORMAT".", + src_pad, element); return false; } ret = link_src_to_sink(src_pad, sink_pad); @@ -198,11 +197,10 @@ bool link_element_to_sink(GstElement *element, GstPad *sink_pad) GstPadLinkReturn ret; GstPad *src_pad; - if (!(src_pad = gst_element_get_static_pad(element, "src"))) + if (!(src_pad = gst_element_get_compatible_pad(element, sink_pad, NULL))) { - gchar *name = gst_element_get_name(element); - GST_ERROR("Failed to find src pad on %s", name); - g_free(name); + GST_ERROR("Failed to find src pad compatible to %"GST_PTR_FORMAT" on %"GST_PTR_FORMAT".", + sink_pad, element); return false; } ret = link_src_to_sink(src_pad, sink_pad);

1 0

Alex Henrie : d3d9: Use CRT allocation functions.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: 9a5b854e2b0ef80eb9a5d269d2d9ecd6778f7f49 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a5b854e2b0ef80eb9a5d269d2d9ec… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 29 11:42:13 2023 -0600 d3d9: Use CRT allocation functions. --- dlls/d3d9/buffer.c | 4 +-- dlls/d3d9/d3d9_main.c | 8 ++--- dlls/d3d9/d3d9_private.h | 1 - dlls/d3d9/device.c | 80 ++++++++++++++++++------------------------- dlls/d3d9/directx.c | 14 ++++---- dlls/d3d9/query.c | 2 +- dlls/d3d9/shader.c | 4 +-- dlls/d3d9/stateblock.c | 2 +- dlls/d3d9/surface.c | 4 +-- dlls/d3d9/swapchain.c | 6 ++-- dlls/d3d9/texture.c | 2 +- dlls/d3d9/vertexdeclaration.c | 22 ++++++------ dlls/d3d9/volume.c | 2 +- 13 files changed, 68 insertions(+), 83 deletions(-)

1 0

Alex Henrie : d3d9/tests: Use CRT allocation functions.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: 042f9304cc8578a48c483f458061273e0d9b9f66 URL: https://gitlab.winehq.org/wine/wine/-/commit/042f9304cc8578a48c483f45806127… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 29 10:46:07 2023 -0600 d3d9/tests: Use CRT allocation functions. --- dlls/d3d9/tests/d3d9ex.c | 16 ++++++++-------- dlls/d3d9/tests/device.c | 27 +++++++++++++-------------- dlls/d3d9/tests/stateblock.c | 40 ++++++++++++++++++++-------------------- dlls/d3d9/tests/visual.c | 17 ++++++++--------- 4 files changed, 49 insertions(+), 51 deletions(-)

1 0

Alex Henrie : ddraw: Use CRT allocation functions.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: e3ac58558f7eaf6e8f20255584fc7e954b49ac45 URL: https://gitlab.winehq.org/wine/wine/-/commit/e3ac58558f7eaf6e8f20255584fc7e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 29 10:53:02 2023 -0600 ddraw: Use CRT allocation functions. --- dlls/ddraw/clipper.c | 2 +- dlls/ddraw/ddraw.c | 30 ++++++++-------- dlls/ddraw/ddraw_private.h | 1 - dlls/ddraw/device.c | 20 +++++------ dlls/ddraw/executebuffer.c | 6 ++-- dlls/ddraw/light.c | 2 +- dlls/ddraw/main.c | 14 ++++---- dlls/ddraw/material.c | 4 +-- dlls/ddraw/palette.c | 2 +- dlls/ddraw/surface.c | 90 +++++++++++++++++++++++----------------------- dlls/ddraw/vertexbuffer.c | 6 ++-- dlls/ddraw/viewport.c | 2 +- 12 files changed, 89 insertions(+), 90 deletions(-)

1 0

Alex Henrie : ddraw/tests: Use CRT allocation functions.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: 1b7b948a16cdd2b0e05a89f599b99c53d06de440 URL: https://gitlab.winehq.org/wine/wine/-/commit/1b7b948a16cdd2b0e05a89f599b99c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 29 11:09:46 2023 -0600 ddraw/tests: Use CRT allocation functions. --- dlls/ddraw/tests/ddraw1.c | 44 +++++++++++++++++------------------ dlls/ddraw/tests/ddraw2.c | 44 +++++++++++++++++------------------ dlls/ddraw/tests/ddraw4.c | 53 ++++++++++++++++++++----------------------- dlls/ddraw/tests/ddraw7.c | 53 ++++++++++++++++++++----------------------- dlls/ddraw/tests/ddrawmodes.c | 10 ++++---- 5 files changed, 97 insertions(+), 107 deletions(-)

1 0

Alex Henrie : dxgi: Use CRT allocation functions.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: 2369657333cb99d395f6852c07feddb05ee93ae5 URL: https://gitlab.winehq.org/wine/wine/-/commit/2369657333cb99d395f6852c07fedd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 29 11:28:10 2023 -0600 dxgi: Use CRT allocation functions. --- dlls/dxgi/adapter.c | 4 ++-- dlls/dxgi/device.c | 10 +++++----- dlls/dxgi/dxgi_main.c | 13 +++++-------- dlls/dxgi/dxgi_private.h | 1 - dlls/dxgi/factory.c | 6 +++--- dlls/dxgi/output.c | 4 ++-- dlls/dxgi/resource.c | 2 +- dlls/dxgi/swapchain.c | 26 +++++++++++++------------- 8 files changed, 31 insertions(+), 35 deletions(-)

1 0

Alex Henrie : dxgi/tests: Use CRT allocation functions.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: 3bc570e8ec1dcccdedd70f8da7b9c385869fede0 URL: https://gitlab.winehq.org/wine/wine/-/commit/3bc570e8ec1dcccdedd70f8da7b9c3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 29 11:35:00 2023 -0600 dxgi/tests: Use CRT allocation functions. --- dlls/dxgi/tests/dxgi.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 5b007d8a626..f929a571823 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -27,7 +27,6 @@ #include "d3d12sdklayers.h" #include "winternl.h" #include "ddk/d3dkmthk.h" -#include "wine/heap.h" #include "wine/test.h" enum frame_latency @@ -67,7 +66,7 @@ static void queue_test(void (*test)(void)) if (mt_test_count >= mt_tests_size) { mt_tests_size = max(16, mt_tests_size * 2); - mt_tests = heap_realloc(mt_tests, mt_tests_size * sizeof(*mt_tests)); + mt_tests = realloc(mt_tests, mt_tests_size * sizeof(*mt_tests)); } mt_tests[mt_test_count++].test = test; } @@ -105,7 +104,7 @@ static void run_queued_tests(void) GetSystemInfo(&si); thread_count = si.dwNumberOfProcessors; - threads = heap_calloc(thread_count, sizeof(*threads)); + threads = calloc(thread_count, sizeof(*threads)); for (i = 0, test_idx = 0; i < thread_count; ++i) { threads[i] = CreateThread(NULL, 0, thread_func, &test_idx, 0, NULL); @@ -116,7 +115,7 @@ static void run_queued_tests(void) { CloseHandle(threads[i]); } - heap_free(threads); + free(threads); } static ULONG get_refcount(void *iface) @@ -149,7 +148,7 @@ static BOOL save_display_modes(DEVMODEW **original_modes, unsigned int *display_ DISPLAY_DEVICEW display_device; DEVMODEW *modes, *tmp; - if (!(modes = heap_alloc(size * sizeof(*modes)))) + if (!(modes = malloc(size * sizeof(*modes)))) return FALSE; display_device.cb = sizeof(display_device); @@ -165,9 +164,9 @@ static BOOL save_display_modes(DEVMODEW **original_modes, unsigned int *display_ if (count >= size) { size *= 2; - if (!(tmp = heap_realloc(modes, size * sizeof(*modes)))) + if (!(tmp = realloc(modes, size * sizeof(*modes)))) { - heap_free(modes); + free(modes); return FALSE; } modes = tmp; @@ -177,7 +176,7 @@ static BOOL save_display_modes(DEVMODEW **original_modes, unsigned int *display_ modes[count].dmSize = sizeof(modes[count]); if (!EnumDisplaySettingsW(display_device.DeviceName, ENUM_CURRENT_SETTINGS, &modes[count])) { - heap_free(modes); + free(modes); return FALSE; } @@ -1440,7 +1439,7 @@ static void test_output(void) ok(mode_count >= mode_count_comp, "Got unexpected mode_count %u, expected >= %u.\n", mode_count, mode_count_comp); mode_count_comp = mode_count; - modes = heap_calloc(mode_count + 10, sizeof(*modes)); + modes = calloc(mode_count + 10, sizeof(*modes)); ok(!!modes, "Failed to allocate memory.\n"); hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, @@ -1514,7 +1513,7 @@ static void test_output(void) skip("Not enough modes for test.\n"); } - heap_free(modes); + free(modes); IDXGIOutput_Release(output); IDXGIAdapter_Release(adapter); refcount = IDXGIDevice_Release(device); @@ -1572,7 +1571,7 @@ static void test_find_closest_matching_mode(void) hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, NULL); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - modes = heap_calloc(mode_count, sizeof(*modes)); + modes = calloc(mode_count, sizeof(*modes)); ok(!!modes, "Failed to allocate memory.\n"); hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, modes); @@ -1703,7 +1702,7 @@ static void test_find_closest_matching_mode(void) } } - heap_free(modes); + free(modes); done: IDXGIOutput_Release(output); @@ -2623,7 +2622,7 @@ static void test_swapchain_fullscreen_state(IDXGISwapChain *swapchain, ++output_count; } - output_monitor_info = heap_calloc(output_count, sizeof(*output_monitor_info)); + output_monitor_info = calloc(output_count, sizeof(*output_monitor_info)); ok(!!output_monitor_info, "Failed to allocate memory.\n"); for (i = 0; i < output_count; ++i) { @@ -2724,7 +2723,7 @@ static void test_swapchain_fullscreen_state(IDXGISwapChain *swapchain, IDXGIOutput_Release(output); } - heap_free(output_monitor_info); + free(output_monitor_info); } static void test_set_fullscreen(IUnknown *device, BOOL is_d3d12) @@ -3159,7 +3158,7 @@ static void test_fullscreen_resize_target(IDXGISwapChain *swapchain, return; } - modes = heap_calloc(mode_count, sizeof(*modes)); + modes = calloc(mode_count, sizeof(*modes)); ok(!!modes, "Failed to allocate memory.\n"); hr = IDXGIOutput_GetDisplayModeList(target, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, modes); @@ -3196,7 +3195,7 @@ static void test_fullscreen_resize_target(IDXGISwapChain *swapchain, wine_dbgstr_rect(&expected_state.fullscreen_state.monitor_rect)); } - heap_free(modes); + free(modes); IDXGIOutput_Release(target); } @@ -6895,7 +6894,7 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12) continue; } - modes = heap_calloc(mode_count, sizeof(*modes)); + modes = calloc(mode_count, sizeof(*modes)); hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, modes); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -6926,7 +6925,7 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12) swapchain_desc.BufferDesc.ScanlineOrdering = modes[mode_idx].ScanlineOrdering; swapchain_desc.BufferDesc.Scaling = modes[mode_idx].Scaling; swapchain_desc.OutputWindow = create_window(); - heap_free(modes); + free(modes); hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -7715,7 +7714,7 @@ done: ok(refcount == !is_d3d12, "Got unexpected refcount %lu.\n", refcount); ret = restore_display_modes(original_modes, display_count); ok(ret, "Failed to restore display modes.\n"); - heap_free(original_modes); + free(original_modes); } static void test_swapchain_present_count(IUnknown *device, BOOL is_d3d12)

1 0

Paul Gofman : mfplat/buffer: Use absolute pitch in memory_1d_2d_buffer_[Un]Lock().
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: ffae0d818bc817eb623e6aaff672cabf6cb58b87 URL: https://gitlab.winehq.org/wine/wine/-/commit/ffae0d818bc817eb623e6aaff672ca… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 9 19:22:04 2023 -0600 mfplat/buffer: Use absolute pitch in memory_1d_2d_buffer_[Un]Lock(). --- dlls/mfplat/buffer.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 932b1147cb8..597767aa03d 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -313,8 +313,14 @@ static HRESULT WINAPI memory_1d_2d_buffer_Lock(IMFMediaBuffer *iface, BYTE **dat hr = E_OUTOFMEMORY; if (SUCCEEDED(hr)) - copy_image(buffer, buffer->_2d.linear_buffer, buffer->_2d.width, buffer->data, buffer->_2d.pitch, + { + int pitch = buffer->_2d.pitch; + + if (pitch < 0) + pitch = -pitch; + copy_image(buffer, buffer->_2d.linear_buffer, buffer->_2d.width, buffer->data, pitch, buffer->_2d.width, buffer->_2d.height); + } } if (SUCCEEDED(hr)) @@ -342,7 +348,11 @@ static HRESULT WINAPI memory_1d_2d_buffer_Unlock(IMFMediaBuffer *iface) if (buffer->_2d.linear_buffer && !--buffer->_2d.locks) { - copy_image(buffer, buffer->data, buffer->_2d.pitch, buffer->_2d.linear_buffer, buffer->_2d.width, + int pitch = buffer->_2d.pitch; + + if (pitch < 0) + pitch = -pitch; + copy_image(buffer, buffer->data, pitch, buffer->_2d.linear_buffer, buffer->_2d.width, buffer->_2d.width, buffer->_2d.height); free(buffer->_2d.linear_buffer);

1 0

Paul Gofman : mfplat/tests: Add more tests for copying 2d buffers.
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: 8487666e9c9bcca6cde2c203046d536a0abe61bd URL: https://gitlab.winehq.org/wine/wine/-/commit/8487666e9c9bcca6cde2c203046d53… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 9 13:28:48 2023 -0600 mfplat/tests: Add more tests for copying 2d buffers. --- dlls/mfplat/tests/mfplat.c | 187 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 187 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f7ae614a109..30fbf27fa3f 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -9506,6 +9506,192 @@ static void test_MFCreatePathFromURL(void) } } +#define check_reset_data(a, b, c, d, e, f) check_reset_data_(__LINE__, a, b, c, d, e, f) +static void check_reset_data_(unsigned int line, IMF2DBuffer2 *buffer2d, const BYTE *data, BOOL bottom_up, + DWORD width, DWORD height, BOOL todo) +{ + BYTE *scanline0, *buffer_start; + DWORD length, max_length; + IMFMediaBuffer *buffer; + LONG pitch; + BYTE *lock; + HRESULT hr; + int i; + + hr = IMF2DBuffer2_QueryInterface(buffer2d, &IID_IMFMediaBuffer, (void **)&buffer); + ok(hr == S_OK, "got hr %#lx.\n", hr); + + hr = IMF2DBuffer2_Lock2DSize(buffer2d, MF2DBuffer_LockFlags_Read, &scanline0, &pitch, &buffer_start, &length); + ok(hr == S_OK, "got hr %#lx.\n", hr); + if (bottom_up) + { + ok(pitch < 0, "got pitch %ld.\n", pitch); + ok(buffer_start == scanline0 + pitch * (LONG)(height - 1), "buffer start mismatch.\n"); + } + else + { + ok(pitch > 0, "got pitch %ld.\n", pitch); + ok(buffer_start == scanline0, "buffer start mismatch.\n"); + } + for (i = 0; i < height; ++i) + todo_wine_if(bottom_up && todo) ok_(__FILE__,line)(!memcmp(buffer_start + abs(pitch) * i, data + width * i * 4, width * 4), + "2D Data mismatch, scaline %d.\n", i); + hr = IMF2DBuffer2_Unlock2D(buffer2d); + ok(hr == S_OK, "got hr %#lx.\n", hr); + + hr = IMFMediaBuffer_Lock(buffer, &lock, &max_length, &length); + ok(hr == S_OK, "got hr %#lx.\n", hr); + ok_(__FILE__,line)(max_length == width * height * 4, "got max_length %lu.\n", max_length); + ok_(__FILE__,line)(length == width * height * 4, "got length %lu.\n", length); + todo_wine_if(bottom_up && todo) ok_(__FILE__,line)(!memcmp(lock, data, length), "contiguous data mismatch.\n"); + memset(lock, 0xcc, length); + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "got hr %#lx.\n", hr); + + IMFMediaBuffer_Release(buffer); +} + +static void test_2dbuffer_copy_(IMFMediaBuffer *buffer, BOOL bottom_up, DWORD width, DWORD height) +{ + static const unsigned int test_data[] = + { + 0x01010101, 0x01010101, + 0x02020202, 0x02020202, + }; + + BYTE data[sizeof(test_data)]; + IMFMediaBuffer *src_buffer; + DWORD length, max_length; + IMF2DBuffer2 *buffer2d; + IMFSample *sample; + BYTE *lock; + HRESULT hr; + ULONG ref; + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer2, (void **)&buffer2d); + ok(hr == S_OK, "got hr %#lx.\n", hr); + + hr = MFCreateSample(&sample); + ok(hr == S_OK, "got hr %#lx.\n", hr); + hr = MFCreateMemoryBuffer(sizeof(test_data) * 2, &src_buffer); + ok(hr == S_OK, "got hr %#lx.\n", hr); + hr = IMFSample_AddBuffer(sample, src_buffer); + ok(hr == S_OK, "got hr %#lx.\n", hr); + + hr = IMFMediaBuffer_Lock(src_buffer, &lock, &max_length, &length); + ok(hr == S_OK, "got hr %#lx.\n", hr); + ok(max_length == sizeof(test_data) * 2, "got %lu.\n", max_length); + memcpy(lock, test_data, sizeof(test_data)); + hr = IMFMediaBuffer_Unlock(src_buffer); + ok(hr == S_OK, "got hr %#lx.\n", hr); + + hr = IMFMediaBuffer_Lock(buffer, &lock, &max_length, &length); + ok(hr == S_OK, "got hr %#lx.\n", hr); + ok(max_length == 16, "got %lu.\n", max_length); + ok(length == 16, "got %lu.\n", length); + memset(lock, 0xcc, length); + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "got hr %#lx.\n", hr); + + hr = IMFMediaBuffer_SetCurrentLength(src_buffer, 1); + ok(hr == S_OK, "got hr %#lx.\n", hr); + hr = IMFSample_CopyToBuffer(sample, buffer); + ok(hr == S_OK, "got hr %#lx.\n", hr); + + memset(data, 0xcc, sizeof(data)); + data[0] = ((BYTE *)test_data)[0]; + check_reset_data(buffer2d, data, bottom_up, width, height, FALSE); + + hr = IMF2DBuffer2_ContiguousCopyFrom(buffer2d, (BYTE *)test_data, sizeof(test_data)); + ok(hr == S_OK, "got hr %#lx.\n", hr); + hr = IMF2DBuffer2_ContiguousCopyTo(buffer2d, data, sizeof(data)); + ok(hr == S_OK, "got hr %#lx.\n", hr); + ok(!memcmp(data, test_data, sizeof(data)), "data mismatch.\n"); + + check_reset_data(buffer2d, (const BYTE *)test_data, bottom_up, width, height, TRUE); + + hr = IMFMediaBuffer_SetCurrentLength(src_buffer, sizeof(test_data) + 1); + ok(hr == S_OK, "got hr %#lx.\n", hr); + hr = IMFSample_CopyToBuffer(sample, buffer); + ok(hr == MF_E_BUFFERTOOSMALL, "got hr %#lx.\n", hr); + + hr = IMFMediaBuffer_SetCurrentLength(src_buffer, sizeof(test_data)); + ok(hr == S_OK, "got hr %#lx.\n", hr); + hr = IMFSample_CopyToBuffer(sample, buffer); + ok(hr == S_OK, "got hr %#lx.\n", hr); + + check_reset_data(buffer2d, (const BYTE *)test_data, bottom_up, width, height, FALSE); + + IMF2DBuffer2_Release(buffer2d); + ref = IMFSample_Release(sample); + ok(!ref, "got %lu.\n", ref); + ref = IMFMediaBuffer_Release(src_buffer); + ok(!ref, "got %lu.\n", ref); +} + +static void test_2dbuffer_copy(void) +{ + D3D11_TEXTURE2D_DESC desc; + ID3D11Texture2D *texture; + IMFMediaBuffer *buffer; + ID3D11Device *device; + HRESULT hr; + ULONG ref; + + if (!pMFCreate2DMediaBuffer) + { + win_skip("MFCreate2DMediaBuffer() is not available.\n"); + return; + } + + winetest_push_context("top down"); + hr = pMFCreate2DMediaBuffer(2, 2, D3DFMT_A8R8G8B8, FALSE, &buffer); + ok(hr == S_OK, "got hr %#lx.\n", hr); + test_2dbuffer_copy_(buffer, FALSE, 2, 2); + ref = IMFMediaBuffer_Release(buffer); + ok(!ref, "got %lu.\n", ref); + winetest_pop_context(); + + winetest_push_context("bottom up"); + hr = pMFCreate2DMediaBuffer(2, 2, D3DFMT_A8R8G8B8, TRUE, &buffer); + ok(hr == S_OK, "got hr %#lx.\n", hr); + test_2dbuffer_copy_(buffer, TRUE, 2, 2); + ref = IMFMediaBuffer_Release(buffer); + ok(!ref, "got %lu.\n", ref); + winetest_pop_context(); + + if (!pMFCreateDXGISurfaceBuffer) + { + win_skip("MFCreateDXGISurfaceBuffer() is not available.\n"); + return; + } + + if (!(device = create_d3d11_device())) + { + skip("Failed to create a D3D11 device, skipping tests.\n"); + return; + } + + memset(&desc, 0, sizeof(desc)); + desc.Width = 2; + desc.Height = 2; + desc.ArraySize = 1; + desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(hr == S_OK, "Failed to create a texture, hr %#lx.\n", hr); + + hr = pMFCreateDXGISurfaceBuffer(&IID_ID3D11Texture2D, (IUnknown *)texture, 0, FALSE, &buffer); + ok(hr == S_OK, "Failed to create a buffer, hr %#lx.\n", hr); + test_2dbuffer_copy_(buffer, FALSE, 2, 2); + + ID3D11Texture2D_Release(texture); + ref = IMFMediaBuffer_Release(buffer); + ok(!ref, "got %lu.\n", ref); + ID3D11Device_Release(device); +} + START_TEST(mfplat) { char **argv; @@ -9590,6 +9776,7 @@ START_TEST(mfplat) test_MFInitMediaTypeFromVideoInfoHeader(); test_MFInitMediaTypeFromAMMediaType(); test_MFCreatePathFromURL(); + test_2dbuffer_copy(); CoUninitialize(); }

1 0

Paul Gofman : mfplat/buffer: Do not flip in memory_2d_buffer_ContiguousCopy{From|To}().
by Alexandre Julliard 31 Oct '23

31 Oct '23

Module: wine Branch: master Commit: b7fe6359c812803455c0775dab56d36ffd50c4a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/b7fe6359c812803455c0775dab56d3… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 9 19:24:23 2023 -0600 mfplat/buffer: Do not flip in memory_2d_buffer_ContiguousCopy{From|To}(). --- dlls/mfplat/buffer.c | 10 ++++++++-- dlls/mfplat/tests/mfplat.c | 14 +++++++------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 597767aa03d..b7f32f12cdc 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -626,7 +626,10 @@ static HRESULT WINAPI memory_2d_buffer_ContiguousCopyTo(IMF2DBuffer2 *iface, BYT if (SUCCEEDED(hr)) { - copy_image(buffer, dest_buffer, buffer->_2d.width, src_scanline0, src_pitch, buffer->_2d.width, buffer->_2d.height); + if (src_pitch < 0) + src_pitch = -src_pitch; + copy_image(buffer, dest_buffer, buffer->_2d.width, src_buffer_start, src_pitch, + buffer->_2d.width, buffer->_2d.height); if (FAILED(IMF2DBuffer2_Unlock2D(iface))) WARN("Couldn't unlock source buffer %p, hr %#lx.\n", iface, hr); @@ -652,7 +655,10 @@ static HRESULT WINAPI memory_2d_buffer_ContiguousCopyFrom(IMF2DBuffer2 *iface, c if (SUCCEEDED(hr)) { - copy_image(buffer, dst_scanline0, dst_pitch, src_buffer, buffer->_2d.width, buffer->_2d.width, buffer->_2d.height); + if (dst_pitch < 0) + dst_pitch = -dst_pitch; + copy_image(buffer, dst_buffer_start, dst_pitch, src_buffer, buffer->_2d.width, + buffer->_2d.width, buffer->_2d.height); if (FAILED(IMF2DBuffer2_Unlock2D(iface))) WARN("Couldn't unlock destination buffer %p, hr %#lx.\n", iface, hr); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 30fbf27fa3f..5f9460655ec 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -9506,9 +9506,9 @@ static void test_MFCreatePathFromURL(void) } } -#define check_reset_data(a, b, c, d, e, f) check_reset_data_(__LINE__, a, b, c, d, e, f) +#define check_reset_data(a, b, c, d, e) check_reset_data_(__LINE__, a, b, c, d, e) static void check_reset_data_(unsigned int line, IMF2DBuffer2 *buffer2d, const BYTE *data, BOOL bottom_up, - DWORD width, DWORD height, BOOL todo) + DWORD width, DWORD height) { BYTE *scanline0, *buffer_start; DWORD length, max_length; @@ -9534,7 +9534,7 @@ static void check_reset_data_(unsigned int line, IMF2DBuffer2 *buffer2d, const B ok(buffer_start == scanline0, "buffer start mismatch.\n"); } for (i = 0; i < height; ++i) - todo_wine_if(bottom_up && todo) ok_(__FILE__,line)(!memcmp(buffer_start + abs(pitch) * i, data + width * i * 4, width * 4), + ok_(__FILE__,line)(!memcmp(buffer_start + abs(pitch) * i, data + width * i * 4, width * 4), "2D Data mismatch, scaline %d.\n", i); hr = IMF2DBuffer2_Unlock2D(buffer2d); ok(hr == S_OK, "got hr %#lx.\n", hr); @@ -9543,7 +9543,7 @@ static void check_reset_data_(unsigned int line, IMF2DBuffer2 *buffer2d, const B ok(hr == S_OK, "got hr %#lx.\n", hr); ok_(__FILE__,line)(max_length == width * height * 4, "got max_length %lu.\n", max_length); ok_(__FILE__,line)(length == width * height * 4, "got length %lu.\n", length); - todo_wine_if(bottom_up && todo) ok_(__FILE__,line)(!memcmp(lock, data, length), "contiguous data mismatch.\n"); + ok_(__FILE__,line)(!memcmp(lock, data, length), "contiguous data mismatch.\n"); memset(lock, 0xcc, length); hr = IMFMediaBuffer_Unlock(buffer); ok(hr == S_OK, "got hr %#lx.\n", hr); @@ -9600,7 +9600,7 @@ static void test_2dbuffer_copy_(IMFMediaBuffer *buffer, BOOL bottom_up, DWORD wi memset(data, 0xcc, sizeof(data)); data[0] = ((BYTE *)test_data)[0]; - check_reset_data(buffer2d, data, bottom_up, width, height, FALSE); + check_reset_data(buffer2d, data, bottom_up, width, height); hr = IMF2DBuffer2_ContiguousCopyFrom(buffer2d, (BYTE *)test_data, sizeof(test_data)); ok(hr == S_OK, "got hr %#lx.\n", hr); @@ -9608,7 +9608,7 @@ static void test_2dbuffer_copy_(IMFMediaBuffer *buffer, BOOL bottom_up, DWORD wi ok(hr == S_OK, "got hr %#lx.\n", hr); ok(!memcmp(data, test_data, sizeof(data)), "data mismatch.\n"); - check_reset_data(buffer2d, (const BYTE *)test_data, bottom_up, width, height, TRUE); + check_reset_data(buffer2d, (const BYTE *)test_data, bottom_up, width, height); hr = IMFMediaBuffer_SetCurrentLength(src_buffer, sizeof(test_data) + 1); ok(hr == S_OK, "got hr %#lx.\n", hr); @@ -9620,7 +9620,7 @@ static void test_2dbuffer_copy_(IMFMediaBuffer *buffer, BOOL bottom_up, DWORD wi hr = IMFSample_CopyToBuffer(sample, buffer); ok(hr == S_OK, "got hr %#lx.\n", hr); - check_reset_data(buffer2d, (const BYTE *)test_data, bottom_up, width, height, FALSE); + check_reset_data(buffer2d, (const BYTE *)test_data, bottom_up, width, height); IMF2DBuffer2_Release(buffer2d); ref = IMFSample_Release(sample);

1 0