[PATCH 5/7] mfplat: Properly align memory allocated by IMF2DBuffer.

[Giovanni Mascellani]

Signed-off-by: Giovanni Mascellani <gmascellani at codeweavers.com>
---
 dlls/mfplat/buffer.c       | 2 +-
 dlls/mfplat/tests/mfplat.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c
index 25b71cf79de..9f060de5f20 100644
--- a/dlls/mfplat/buffer.c
+++ b/dlls/mfplat/buffer.c
@@ -1370,7 +1370,7 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo
             max_length = pitch * height;
     }
 
-    if (FAILED(hr = memory_buffer_init(object, max_length, MF_1_BYTE_ALIGNMENT, &memory_1d_2d_buffer_vtbl)))
+    if (FAILED(hr = memory_buffer_init(object, max_length, row_alignment, &memory_1d_2d_buffer_vtbl)))
     {
         free(object);
         return hr;
diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c
index d391c833a7f..52470ad577b 100644
--- a/dlls/mfplat/tests/mfplat.c
+++ b/dlls/mfplat/tests/mfplat.c
@@ -5712,7 +5712,6 @@ static void test_MFCreate2DMediaBuffer(void)
     hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch);
     ok(hr == S_OK, "Failed to lock buffer, hr %#x.\n", hr);
     ok(!!data, "Expected data pointer.\n");
-    todo_wine
     ok(((uintptr_t)data & MF_64_BYTE_ALIGNMENT) == 0, "Data at %p is insufficiently aligned.\n", data);
     ok(pitch == 64, "Unexpected pitch %d.\n", pitch);
 
@@ -5826,7 +5825,6 @@ static void test_MFCreate2DMediaBuffer(void)
                 length2, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4));
 
         hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch);
-        todo_wine
         ok(((uintptr_t)data & MF_64_BYTE_ALIGNMENT) == 0, "Data at %p is insufficiently aligned.\n", data);
         ok(hr == S_OK, "Failed to lock buffer, hr %#x.\n", hr);
 
-- 
2.34.1