Giovanni Mascellani : mfplat: Fix locking flags usage for D3D9 buffers.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 91c0eda70972f1d6421d9dbb035b3ca50aef8d76
URL:    https://gitlab.winehq.org/wine/wine/-/commit/91c0eda70972f1d6421d9dbb035b3ca...

Author: Giovanni Mascellani 
Date:   Thu Apr 13 15:47:44 2023 +0200

mfplat: Fix locking flags usage for D3D9 buffers.

---

dlls/mfplat/buffer.c       | 8 ++++++--
 dlls/mfplat/tests/mfplat.c | 4 ----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c
index a221c6d55b8..df85af37126 100644
--- a/dlls/mfplat/buffer.c
+++ b/dlls/mfplat/buffer.c
@@ -56,6 +56,7 @@ struct buffer
         unsigned int height;
         int pitch;
         unsigned int locks;
+        MF2DBuffer_LockFlags lock_flags;
         p_copy_image_func copy_image;
     } _2d;
     struct
@@ -663,12 +664,14 @@ static HRESULT d3d9_surface_buffer_lock(struct buffer *buffer, MF2DBuffer_LockFl
     if (buffer->_2d.linear_buffer)
         hr = MF_E_UNEXPECTED;
     else if (!buffer->_2d.locks)
-    {
         hr = IDirect3DSurface9_LockRect(buffer->d3d9_surface.surface, &buffer->d3d9_surface.rect, NULL, 0);
-    }
+    else if (buffer->_2d.lock_flags == MF2DBuffer_LockFlags_Write && flags != MF2DBuffer_LockFlags_Write)
+        hr = HRESULT_FROM_WIN32(ERROR_WAS_LOCKED);

if (SUCCEEDED(hr))
     {
+        if (!buffer->_2d.locks)
+            buffer->_2d.lock_flags = flags;
         buffer->_2d.locks++;
         *scanline0 = buffer->d3d9_surface.rect.pBits;
         *pitch = buffer->d3d9_surface.rect.Pitch;
@@ -715,6 +718,7 @@ static HRESULT WINAPI d3d9_surface_buffer_Unlock2D(IMF2DBuffer2 *iface)
         {
             IDirect3DSurface9_UnlockRect(buffer->d3d9_surface.surface);
             memset(&buffer->d3d9_surface.rect, 0, sizeof(buffer->d3d9_surface.rect));
+            buffer->_2d.lock_flags = 0;
         }
     }
     else
diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c
index ff15ca4a712..29680cbb4d1 100644
--- a/dlls/mfplat/tests/mfplat.c
+++ b/dlls/mfplat/tests/mfplat.c
@@ -6826,13 +6826,10 @@ static void test_MFCreateDXSurfaceBuffer(void)
     hr = IMF2DBuffer2_Lock2DSize(_2dbuffer2, MF2DBuffer_LockFlags_Write, &data, &pitch, &data2, &length);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     hr = IMF2DBuffer2_Lock2DSize(_2dbuffer2, MF2DBuffer_LockFlags_ReadWrite, &data, &pitch, &data2, &length);
-    todo_wine
     ok(hr == HRESULT_FROM_WIN32(ERROR_WAS_LOCKED), "Unexpected hr %#lx.\n", hr);
     hr = IMF2DBuffer2_Lock2DSize(_2dbuffer2, MF2DBuffer_LockFlags_Read, &data, &pitch, &data2, &length);
-    todo_wine
     ok(hr == HRESULT_FROM_WIN32(ERROR_WAS_LOCKED), "Unexpected hr %#lx.\n", hr);
     hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch);
-    todo_wine
     ok(hr == HRESULT_FROM_WIN32(ERROR_WAS_LOCKED), "Unexpected hr %#lx.\n", hr);
     hr = IMF2DBuffer2_Unlock2D(_2dbuffer2);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
@@ -6840,7 +6837,6 @@ static void test_MFCreateDXSurfaceBuffer(void)
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

hr = IMF2DBuffer2_Unlock2D(_2dbuffer2);
-    todo_wine
     ok(hr == HRESULT_FROM_WIN32(ERROR_WAS_UNLOCKED), "Unexpected hr %#lx.\n", hr);

IMF2DBuffer2_Release(_2dbuffer2);