Rémi Bernon : mf/tests: Always initialize sample data in create_sample helper.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 07cf1313c33c329c0b3201ee1be0e0c3fe0d20c3
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=07cf1313c33c329c0b3201ee1...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Tue Feb 22 16:47:20 2022 +0100

mf/tests: Always initialize sample data in create_sample helper.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/mf/tests/mf.c | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index be8505eb2d3..6dabae1deb0 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -5692,18 +5692,15 @@ static IMFSample *create_sample(const BYTE *data, ULONG size)
     ok(hr == S_OK, "MFCreateSample returned %#x\n", hr);
     hr = MFCreateMemoryBuffer(size, &media_buffer);
     ok(hr == S_OK, "MFCreateMemoryBuffer returned %#x\n", hr);
-    if (data)
-    {
-        hr = IMFMediaBuffer_SetCurrentLength(media_buffer, size);
-        ok(hr == S_OK, "SetCurrentLength returned %#x\n", hr);
-        hr = IMFMediaBuffer_Lock(media_buffer, &buffer, NULL, &length);
-        ok(hr == S_OK, "Lock returned %#x\n", hr);
-        ok(length == size, "got size %u\n", length);
-        if (!data) memset(buffer, 0xcd, length);
-        else memcpy(buffer, data, length);
-        hr = IMFMediaBuffer_Unlock(media_buffer);
-        ok(hr == S_OK, "Unlock returned %#x\n", hr);
-    }
+    hr = IMFMediaBuffer_Lock(media_buffer, &buffer, NULL, &length);
+    ok(hr == S_OK, "Lock returned %#x\n", hr);
+    ok(length == 0, "got length %u\n", length);
+    if (!data) memset(buffer, 0xcd, size);
+    else memcpy(buffer, data, size);
+    hr = IMFMediaBuffer_Unlock(media_buffer);
+    ok(hr == S_OK, "Unlock returned %#x\n", hr);
+    hr = IMFMediaBuffer_SetCurrentLength(media_buffer, data ? size : 0);
+    ok(hr == S_OK, "SetCurrentLength returned %#x\n", hr);
     hr = IMFSample_AddBuffer(sample, media_buffer);
     ok(hr == S_OK, "AddBuffer returned %#x\n", hr);
     ret = IMFMediaBuffer_Release(media_buffer);