[PATCH 0/1] MR2602: mfplat: Fix returned buffer length in dxgi_surface_buffer_lock().
From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/mfplat/buffer.c | 2 +- dlls/mfplat/tests/mfplat.c | 32 +++++++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index a221c6d55b8..58eadffa502 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1045,7 +1045,7 @@ static HRESULT dxgi_surface_buffer_lock(struct buffer *buffer, MF2DBuffer_LockFl if (buffer_start) *buffer_start = *scanline0; if (buffer_length) - *buffer_length = buffer->dxgi_surface.map_desc.RowPitch * buffer->_2d.height; + *buffer_length = buffer->dxgi_surface.map_desc.DepthPitch; } return hr; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 1e5dc190944..db0dad54288 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -7046,14 +7046,15 @@ static ID3D12Device *create_d3d12_device(void) static void test_d3d11_surface_buffer(void) { DWORD max_length, cur_length, length, color; + BYTE *data, *data2, *buffer_start; IMFDXGIBuffer *dxgi_buffer; D3D11_TEXTURE2D_DESC desc; + IMF2DBuffer2 *_2d_buffer2; ID3D11Texture2D *texture; IMF2DBuffer *_2d_buffer; IMFMediaBuffer *buffer; ID3D11Device *device; BYTE buff[64 * 64 * 4]; - BYTE *data, *data2; LONG pitch, pitch2; UINT index, size; IUnknown *obj; @@ -7271,6 +7272,35 @@ static void test_d3d11_surface_buffer(void) ID3D11Texture2D_Release(texture); + memset(&desc, 0, sizeof(desc)); + desc.Width = 64; + desc.Height = 64; + desc.ArraySize = 1; + desc.MipLevels = 1; + desc.Format = DXGI_FORMAT_NV12; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = pMFCreateDXGISurfaceBuffer(&IID_ID3D11Texture2D, (IUnknown *)texture, 0, FALSE, &buffer); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer2, (void **)&_2d_buffer2); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = IMF2DBuffer2_Lock2DSize(_2d_buffer2, MF2DBuffer_LockFlags_Read, &data, &pitch, &buffer_start, &length); + ok(hr == S_OK, "got %#lx.\n", hr); + + ok(pitch >= desc.Width, "got %ld.\n", pitch); + ok(length == pitch * desc.Height * 3 / 2, "got %lu.\n", length); + + hr = IMF2DBuffer2_Unlock2D(_2d_buffer2); + ok(hr == S_OK, "got %#lx.\n", hr); + + IMF2DBuffer2_Release(_2d_buffer2); + IMFMediaBuffer_Release(buffer); + ID3D11Texture2D_Release(texture); + ID3D11Device_Release(device); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2602
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=131584 Your paranoid android. === w8 (32 bit report) === mfplat: mfplat.c:7285: Test failed: got 0x887a0005. mfplat.c:7287: Test failed: got 0x80004003. 0ad0:mfplat: unhandled exception c0000005 at 003880F0 === w8adm (32 bit report) === mfplat: mfplat.c:7285: Test failed: got 0x887a0005. mfplat.c:7287: Test failed: got 0x80004003. 09c8:mfplat: unhandled exception c0000005 at 006CEC80 === w864 (32 bit report) === mfplat: mfplat.c:7285: Test failed: got 0x887a0005. mfplat.c:7287: Test failed: got 0x80004003. 0bfc:mfplat: unhandled exception c0000005 at 0083D298 === w1064v1507 (32 bit report) === mfplat: mfplat.c:7285: Test failed: got 0x887a0005. mfplat.c:7287: Test failed: got 0x80004003. 0180:mfplat: unhandled exception c0000005 at 00699810 === w1064v1809 (32 bit report) === mfplat: mfplat.c:7285: Test failed: got 0x887a0005. mfplat.c:7287: Test failed: got 0x80004003. 1668:mfplat: unhandled exception c0000005 at 00B6E4C0 === w1064_tsign (32 bit report) === mfplat: mfplat.c:7285: Test failed: got 0x887a0005. mfplat.c:7287: Test failed: got 0x80004003. 1d6c:mfplat: unhandled exception c0000005 at 030A17D0 === w10pro64 (32 bit report) === mfplat: mfplat.c:7285: Test failed: got 0x887a0005. mfplat.c:7287: Test failed: got 0x80004003. 1f68:mfplat: unhandled exception c0000005 at 030C2340 === w11pro64 (32 bit report) === mfplat: mfplat.c:7285: Test failed: got 0x887a0005. mfplat.c:7287: Test failed: got 0x80004003. mfplat.c:7289: Test failed: got 0x80004002. 1f78:mfplat: unhandled exception c0000005 at 00414880 === w864 (64 bit report) === mfplat: mfplat.c:7285: Test failed: got 0x887a0005. mfplat.c:7287: Test failed: got 0x80004003. 0be0:mfplat: unhandled exception c0000005 at 0000000000957350 === w1064v1507 (64 bit report) === mfplat: mfplat.c:7285: Test failed: got 0x887a0005. mfplat.c:7287: Test failed: got 0x80004003. 09c4:mfplat: unhandled exception c0000005 at 000000000064B860 === w1064v1809 (64 bit report) === mfplat: mfplat.c:7285: Test failed: got 0x887a0005. mfplat.c:7287: Test failed: got 0x80004003. 1458:mfplat: unhandled exception c0000005 at 0000000000794FD0 === w1064_2qxl (64 bit report) === mfplat: mfplat.c:7285: Test failed: got 0x887a0005. mfplat.c:7287: Test failed: got 0x80004003. 058c:mfplat: unhandled exception c0000005 at 000000000301E2A0 === w1064_adm (64 bit report) === mfplat: mfplat.c:7285: Test failed: got 0x887a0005. mfplat.c:7287: Test failed: got 0x80004003. 1c3c:mfplat: unhandled exception c0000005 at 0000000002B07620 === w1064_tsign (64 bit report) === mfplat: mfplat.c:7285: Test failed: got 0x887a0005. mfplat.c:7287: Test failed: got 0x80004003. 1d84:mfplat: unhandled exception c0000005 at 00000000026CE1E0 === w10pro64 (64 bit report) === mfplat: mfplat.c:7285: Test failed: got 0x887a0005. mfplat.c:7287: Test failed: got 0x80004003. 1e6c:mfplat: unhandled exception c0000005 at 00000000004114A9 === w10pro64_en_AE_u8 (64 bit report) === mfplat: mfplat.c:7285: Test failed: got 0x887a0005. mfplat.c:7287: Test failed: got 0x80004003. 1730:mfplat: unhandled exception c0000005 at 0000000003252180 === w10pro64_ar (64 bit report) === mfplat: mfplat.c:7285: Test failed: got 0x887a0005. mfplat.c:7287: Test failed: got 0x80004003. 19a0:mfplat: unhandled exception c0000005 at 0000000002FA41B0 === w10pro64_ja (64 bit report) === mfplat: mfplat.c:7285: Test failed: got 0x887a0005. mfplat.c:7287: Test failed: got 0x80004003. 112c:mfplat: unhandled exception c0000005 at 00000000033920E0 === w10pro64_zh_CN (64 bit report) === mfplat: mfplat.c:7285: Test failed: got 0x887a0005. mfplat.c:7287: Test failed: got 0x80004003. 1650:mfplat: unhandled exception c0000005 at 0000000003256C10
This fails for me on Windows with software renderer: ``` 11 mfplat.c:7285: Test failed: got 0x887a0005. 12 mfplat.c:7287: Test failed: got 0x80004003. 13 mfplat.c:7289: Test failed: got 0x80004002. 14 mfplat.c:7289: this is the last test seen before the exception 15 mfplat: unhandled exception c0000005 at 001543E0 ``` -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2602#note_29201
participants (4)
-
Marvin -
Nikolay Sivov (＠nsivov) -
Paul Gofman
-
Paul Gofman (＠gofman)