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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 071eb50ff08a8a73484830dbb37509a350f099ae
URL:    https://gitlab.winehq.org/wine/wine/-/commit/071eb50ff08a8a73484830dbb37509a...

Author: Giovanni Mascellani <gmascellani(a)codeweavers.com>
Date:   Mon Apr 17 15:45:38 2023 +0200

mfplat: Fix locking flags usage for DXGI buffers.

---

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

diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c
index 1c38e03c3e1..c8e797e6743 100644
--- a/dlls/mfplat/buffer.c
+++ b/dlls/mfplat/buffer.c
@@ -1041,9 +1041,13 @@ static HRESULT dxgi_surface_buffer_lock(struct buffer *buffer, MF2DBuffer_LockFl
         hr = MF_E_UNEXPECTED;
     else if (!buffer->_2d.locks)
         hr = dxgi_surface_buffer_map(buffer);
+    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->dxgi_surface.map_desc.pData;
         *pitch = buffer->dxgi_surface.map_desc.RowPitch;
@@ -1087,7 +1091,10 @@ static HRESULT WINAPI dxgi_surface_buffer_Unlock2D(IMF2DBuffer2 *iface)
     if (buffer->_2d.locks)
     {
         if (!--buffer->_2d.locks)
+        {
             dxgi_surface_buffer_unmap(buffer);
+            buffer->_2d.lock_flags = 0;
+        }
     }
     else
         hr = HRESULT_FROM_WIN32(ERROR_WAS_UNLOCKED);
diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c
index 9ea2014ed4b..635eebf30a5 100644
--- a/dlls/mfplat/tests/mfplat.c
+++ b/dlls/mfplat/tests/mfplat.c
@@ -7529,13 +7529,10 @@ static void test_d3d11_surface_buffer(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(_2d_buffer, &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);
@@ -7543,7 +7540,6 @@ static void test_d3d11_surface_buffer(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);