mirror of
https://github.com/wine-mirror/wine
synced 2024-07-09 04:16:08 +00:00
mfplat: Fix scanline pointer returned with Lock2D().
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
b9eb121eab
commit
bd3f27abda
|
@ -340,7 +340,7 @@ static HRESULT memory_2d_buffer_lock(struct memory_buffer *buffer, BYTE **scanli
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
++buffer->_2d.locks;
|
++buffer->_2d.locks;
|
||||||
*scanline0 = buffer->data;
|
*scanline0 = buffer->_2d.scanline0;
|
||||||
*pitch = buffer->_2d.pitch;
|
*pitch = buffer->_2d.pitch;
|
||||||
if (buffer_start)
|
if (buffer_start)
|
||||||
*buffer_start = buffer->data;
|
*buffer_start = buffer->data;
|
||||||
|
|
|
@ -4694,7 +4694,7 @@ static void test_MFCreate2DMediaBuffer(void)
|
||||||
IMF2DBuffer2 *_2dbuffer2;
|
IMF2DBuffer2 *_2dbuffer2;
|
||||||
IMF2DBuffer *_2dbuffer;
|
IMF2DBuffer *_2dbuffer;
|
||||||
IMFMediaBuffer *buffer;
|
IMFMediaBuffer *buffer;
|
||||||
int i, pitch;
|
int i, pitch, pitch2;
|
||||||
HRESULT hr;
|
HRESULT hr;
|
||||||
BOOL ret;
|
BOOL ret;
|
||||||
|
|
||||||
|
@ -4898,6 +4898,12 @@ static void test_MFCreate2DMediaBuffer(void)
|
||||||
|
|
||||||
hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch);
|
hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch);
|
||||||
ok(hr == S_OK, "Failed to lock buffer, hr %#x.\n", hr);
|
ok(hr == S_OK, "Failed to lock buffer, hr %#x.\n", hr);
|
||||||
|
|
||||||
|
hr = IMF2DBuffer_GetScanline0AndPitch(_2dbuffer, &data2, &pitch2);
|
||||||
|
ok(hr == S_OK, "Failed to get scanline, hr %#x.\n", hr);
|
||||||
|
ok(data2 == data, "Unexpected data pointer.\n");
|
||||||
|
ok(pitch == pitch2, "Unexpected pitch.\n");
|
||||||
|
|
||||||
hr = IMF2DBuffer_Unlock2D(_2dbuffer);
|
hr = IMF2DBuffer_Unlock2D(_2dbuffer);
|
||||||
ok(hr == S_OK, "Failed to unlock buffer, hr %#x.\n", hr);
|
ok(hr == S_OK, "Failed to unlock buffer, hr %#x.\n", hr);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user