[PATCH v3 0/1] MR2602: mfplat: Fix returned buffer length in dxgi_surface_buffer_lock().

[Paul Gofman (＠gofman)]

--
  v3: mfplat: Fix returned buffer length in dxgi_surface_buffer_lock().

https://gitlab.winehq.org/wine/wine/-/merge_requests/2602

[PATCH v3 1/1] mfplat: Fix returned buffer length in dxgi_surface_buffer_lock().

[Paul Gofman]

From: Paul Gofman

---
 dlls/mfplat/buffer.c       |  2 +-
 dlls/mfplat/tests/mfplat.c | 53 +++++++++++++++++++++++++++++++++++---
 2 files changed, 51 insertions(+), 4 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..64dd5ac3c4d 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;
@@ -7243,7 +7244,54 @@ static void test_d3d11_surface_buffer(void)

ID3D11Texture2D_Release(texture);

-    /* Subresource index 1. */
+    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);
+    if (SUCCEEDED(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);
+    }
+    else
+    {
+        win_skip("Failed to create NV12 texture, hr %#lx, skipping test.\n", hr);
+        ID3D11Device_Release(device);
+        return;
+    }
+
+    /* Subresource index 1.
+     * When WARP d3d11 device is used, this test leaves the device in a broken state, so it should
+     * be kept last. */
+    memset(&desc, 0, sizeof(desc));
+    desc.Width = 64;
+    desc.Height = 64;
+    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);

@@ -7268,7 +7316,6 @@ static void test_d3d11_surface_buffer(void)

IMF2DBuffer_Release(_2d_buffer);
     IMFMediaBuffer_Release(buffer);
-
     ID3D11Texture2D_Release(texture);

ID3D11Device_Release(device);

[Paul Gofman (＠gofman)]

v3:
 - move the test before 'subresource 1' test. This way it works with WARP driver (looks like subresource 1 test just brings WARP device into broken state). The texture creation still fails with reference device, and now it looks indeed format related. I tried a couple of other chroma formats but they don't seem to work with reference device, so probably the test still has to be skipped in this case.

[PATCH v3 0/1] MR2602: mfplat: Fix returned buffer length in dxgi_surface_buffer_lock(). - approved

[Nikolay Sivov (＠nsivov)]

This merge request was approved by Nikolay Sivov.