April 2023 - Wine-commits - list.winehq.org

Giovanni Mascellani : mfplat/tests: Independently test that locking flags are ignored for D3D9 buffers.
by Alexandre Julliard 26 Apr '23

26 Apr '23

Module: wine Branch: master Commit: d24f8dbbc7243466967b6196937f756337712d80 URL: https://gitlab.winehq.org/wine/wine/-/commit/d24f8dbbc7243466967b6196937f75… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Apr 14 16:09:58 2023 +0200 mfplat/tests: Independently test that locking flags are ignored for D3D9 buffers. In the previous test the same address was always returned for data, hinting that the tests might have been succeding just because of some aliasing reason. The new tests show that this is not the case: even when transferring data through another throw-away surface, changes are seen and recorded independently of the locking flags. --- dlls/mfplat/tests/mfplat.c | 122 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 116 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 0487a7db5ce..ff15ca4a712 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -123,6 +123,111 @@ static void check_service_interface_(unsigned int line, void *iface_ptr, REFGUID IUnknown_Release(unk); } +struct d3d9_surface_readback +{ + IDirect3DSurface9 *surface, *readback_surface; + D3DLOCKED_RECT map_desc; + D3DSURFACE_DESC surf_desc; +}; + +static void get_d3d9_surface_readback(IDirect3DSurface9 *surface, struct d3d9_surface_readback *rb) +{ + IDirect3DDevice9 *device; + HRESULT hr; + + rb->surface = surface; + + hr = IDirect3DSurface9_GetDevice(surface, &device); + ok(hr == D3D_OK, "Failed to get device, hr %#lx.\n", hr); + + hr = IDirect3DSurface9_GetDesc(surface, &rb->surf_desc); + ok(hr == D3D_OK, "Failed to get surface desc, hr %#lx.\n", hr); + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, rb->surf_desc.Width, rb->surf_desc.Height, + rb->surf_desc.Format, D3DPOOL_SYSTEMMEM, &rb->readback_surface, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#lx.\n", hr); + + hr = IDirect3DDevice9Ex_GetRenderTargetData(device, surface, rb->readback_surface); + ok(hr == D3D_OK, "Failed to get render target data, hr %#lx.\n", hr); + + hr = IDirect3DSurface9_LockRect(rb->readback_surface, &rb->map_desc, NULL, 0); + ok(hr == D3D_OK, "Failed to lock surface, hr %#lx.\n", hr); + + IDirect3DDevice9_Release(device); +} + +static void release_d3d9_surface_readback(struct d3d9_surface_readback *rb, BOOL upload) +{ + ULONG refcount; + HRESULT hr; + + hr = IDirect3DSurface9_UnlockRect(rb->readback_surface); + ok(hr == D3D_OK, "Failed to unlock surface, hr %#lx.\n", hr); + + if (upload) + { + IDirect3DDevice9 *device; + + IDirect3DSurface9_GetDevice(rb->surface, &device); + ok(hr == D3D_OK, "Failed to get device, hr %#lx.\n", hr); + + hr = IDirect3DDevice9_UpdateSurface(device, rb->readback_surface, NULL, rb->surface, NULL); + ok(hr == D3D_OK, "Failed to update surface, hr %#lx.\n", hr); + + IDirect3DDevice9_Release(device); + } + + refcount = IDirect3DSurface9_Release(rb->readback_surface); + ok(refcount == 0, "Readback surface still has references.\n"); +} + +static void *get_d3d9_readback_data(struct d3d9_surface_readback *rb, + unsigned int x, unsigned int y, unsigned byte_width) +{ + return (BYTE *)rb->map_desc.pBits + y * rb->map_desc.Pitch + x * byte_width; +} + +static DWORD get_d3d9_readback_u32(struct d3d9_surface_readback *rb, unsigned int x, unsigned int y) +{ + return *(DWORD *)get_d3d9_readback_data(rb, x, y, sizeof(DWORD)); +} + +static DWORD get_d3d9_readback_color(struct d3d9_surface_readback *rb, unsigned int x, unsigned int y) +{ + return get_d3d9_readback_u32(rb, x, y); +} + +static DWORD get_d3d9_surface_color(IDirect3DSurface9 *surface, unsigned int x, unsigned int y) +{ + struct d3d9_surface_readback rb; + DWORD color; + + get_d3d9_surface_readback(surface, &rb); + color = get_d3d9_readback_color(&rb, x, y); + release_d3d9_surface_readback(&rb, FALSE); + + return color; +} + +static void put_d3d9_readback_u32(struct d3d9_surface_readback *rb, unsigned int x, unsigned int y, DWORD color) +{ + *(DWORD *)get_d3d9_readback_data(rb, x, y, sizeof(DWORD)) = color; +} + +static void put_d3d9_readback_color(struct d3d9_surface_readback *rb, unsigned int x, unsigned int y, DWORD color) +{ + put_d3d9_readback_u32(rb, x, y, color); +} + +static void put_d3d9_surface_color(IDirect3DSurface9 *surface, + unsigned int x, unsigned int y, DWORD color) +{ + struct d3d9_surface_readback rb; + + get_d3d9_surface_readback(surface, &rb); + put_d3d9_readback_color(&rb, x, y, color); + release_d3d9_surface_readback(&rb, TRUE); +} + struct d3d11_resource_readback { ID3D11Resource *resource; @@ -6468,6 +6573,7 @@ static void test_MFCreateDXSurfaceBuffer(void) BYTE *data, *data2; IMFGetService *gs; IDirect3D9 *d3d; + DWORD color; HWND window; HRESULT hr; LONG pitch; @@ -6649,22 +6755,26 @@ static void test_MFCreateDXSurfaceBuffer(void) /* Lock flags are ignored, so writing is allowed when locking for * reading and viceversa. */ + put_d3d9_surface_color(backbuffer, 0, 0, 0xcdcdcdcd); hr = IMF2DBuffer2_Lock2DSize(_2dbuffer2, MF2DBuffer_LockFlags_Read, &data, &pitch, &data2, &length); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(data == data2, "Unexpected scanline pointer.\n"); + ok(data[0] == 0xcd, "Unexpected leading byte.\n"); memset(data, 0xab, 4); IMF2DBuffer2_Unlock2D(_2dbuffer2); + color = get_d3d9_surface_color(backbuffer, 0, 0); + ok(color == 0xabababab, "Unexpected leading dword.\n"); + put_d3d9_surface_color(backbuffer, 0, 0, 0xefefefef); + hr = IMF2DBuffer2_Lock2DSize(_2dbuffer2, MF2DBuffer_LockFlags_Write, &data, &pitch, &data2, &length); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(data[0] == 0xab, "Unexpected leading byte.\n"); + ok(data[0] == 0xef, "Unexpected leading byte.\n"); + memset(data, 0x89, 4); IMF2DBuffer2_Unlock2D(_2dbuffer2); - hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(data[0] == 0xab || broken(broken_test), "Unexpected leading byte.\n"); - hr = IMFMediaBuffer_Unlock(buffer); - ok(hr == S_OK || broken(broken_test), "Unexpected hr %#lx.\n", hr); + color = get_d3d9_surface_color(backbuffer, 0, 0); + ok(color == 0x89898989, "Unexpected leading dword.\n"); /* Also, flags incompatibilities are not taken into account even * if a buffer is already locked. */

1 0

Giovanni Mascellani : mfplat: Fix locking flags usage for D3D9 buffers.
by Alexandre Julliard 26 Apr '23

26 Apr '23

Module: wine Branch: master Commit: 91c0eda70972f1d6421d9dbb035b3ca50aef8d76 URL: https://gitlab.winehq.org/wine/wine/-/commit/91c0eda70972f1d6421d9dbb035b3c… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> 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);

1 0

Giovanni Mascellani : mfplat/tests: Test Lock2D() on a locked DXGI surface buffer.
by Alexandre Julliard 26 Apr '23

26 Apr '23

Module: wine Branch: master Commit: c1eee92bd2bbe005d4035a05a5477e1b0d4161c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/c1eee92bd2bbe005d4035a05a5477e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Apr 17 15:38:19 2023 +0200 mfplat/tests: Test Lock2D() on a locked DXGI surface buffer. --- dlls/mfplat/tests/mfplat.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 29680cbb4d1..9b5e71e276a 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -7398,6 +7398,15 @@ static void test_d3d11_surface_buffer(void) hr = IMF2DBuffer_Unlock2D(_2d_buffer); ok(hr == HRESULT_FROM_WIN32(ERROR_WAS_UNLOCKED), "Unexpected hr %#lx.\n", hr); + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMF2DBuffer_Lock2D(_2d_buffer, &data, &pitch); + ok(hr == MF_E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IMF2DBuffer_Release(_2d_buffer); IMFMediaBuffer_Release(buffer);

1 0

Giovanni Mascellani : mfplat/tests: Test locking flags for DXGI buffers.
by Alexandre Julliard 26 Apr '23

26 Apr '23

Module: wine Branch: master Commit: f40e5fcb38adebdbe4cdc378a723ba6283707065 URL: https://gitlab.winehq.org/wine/wine/-/commit/f40e5fcb38adebdbe4cdc378a723ba… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Apr 13 14:58:30 2023 +0200 mfplat/tests: Test locking flags for DXGI buffers. --- dlls/mfplat/tests/mfplat.c | 149 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 144 insertions(+), 5 deletions(-)

1 0

Giovanni Mascellani : mfplat: Do not mark a DXGI buffer as locked if surface mapping fails.
by Alexandre Julliard 26 Apr '23

26 Apr '23

Module: wine Branch: master Commit: df660e80f07fd129a9fbbd3c01c153c6a2ebb558 URL: https://gitlab.winehq.org/wine/wine/-/commit/df660e80f07fd129a9fbbd3c01c153… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Apr 17 15:24:08 2023 +0200 mfplat: Do not mark a DXGI buffer as locked if surface mapping fails. Analogous to 44c9ea50432771258e9eed012967a16c6f132fe9. --- dlls/mfplat/buffer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index df85af37126..1c38e03c3e1 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1039,11 +1039,12 @@ static HRESULT dxgi_surface_buffer_lock(struct buffer *buffer, MF2DBuffer_LockFl if (buffer->_2d.linear_buffer) hr = MF_E_UNEXPECTED; - else if (!buffer->_2d.locks++) + else if (!buffer->_2d.locks) hr = dxgi_surface_buffer_map(buffer); if (SUCCEEDED(hr)) { + buffer->_2d.locks++; *scanline0 = buffer->dxgi_surface.map_desc.pData; *pitch = buffer->dxgi_surface.map_desc.RowPitch; if (buffer_start)

1 0

Giovanni Mascellani : mfplat: Fix locking flags usage for DXGI buffers.
by Alexandre Julliard 26 Apr '23

26 Apr '23

Module: wine Branch: master Commit: 071eb50ff08a8a73484830dbb37509a350f099ae URL: https://gitlab.winehq.org/wine/wine/-/commit/071eb50ff08a8a73484830dbb37509… 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);

1 0

Giovanni Mascellani : mfplat: Only download surface data from GPU for DXGI buffers when reading.
by Alexandre Julliard 26 Apr '23

26 Apr '23

Module: wine Branch: master Commit: 49b8e55b3c086754418ecec015c2e30ea72160c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/49b8e55b3c086754418ecec015c2e3… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Apr 17 15:52:17 2023 +0200 mfplat: Only download surface data from GPU for DXGI buffers when reading. --- dlls/mfplat/buffer.c | 14 +++++++++----- dlls/mfplat/tests/mfplat.c | 1 - 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index c8e797e6743..c0874faa23d 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -905,7 +905,7 @@ static HRESULT dxgi_surface_buffer_create_readback_texture(struct buffer *buffer return hr; } -static HRESULT dxgi_surface_buffer_map(struct buffer *buffer) +static HRESULT dxgi_surface_buffer_map(struct buffer *buffer, MF2DBuffer_LockFlags flags) { ID3D11DeviceContext *immediate_context; ID3D11Device *device; @@ -916,8 +916,12 @@ static HRESULT dxgi_surface_buffer_map(struct buffer *buffer) ID3D11Texture2D_GetDevice(buffer->dxgi_surface.texture, &device); ID3D11Device_GetImmediateContext(device, &immediate_context); - ID3D11DeviceContext_CopySubresourceRegion(immediate_context, (ID3D11Resource *)buffer->dxgi_surface.rb_texture, - 0, 0, 0, 0, (ID3D11Resource *)buffer->dxgi_surface.texture, buffer->dxgi_surface.sub_resource_idx, NULL); + + if (flags == MF2DBuffer_LockFlags_Read || flags == MF2DBuffer_LockFlags_ReadWrite) + { + ID3D11DeviceContext_CopySubresourceRegion(immediate_context, (ID3D11Resource *)buffer->dxgi_surface.rb_texture, + 0, 0, 0, 0, (ID3D11Resource *)buffer->dxgi_surface.texture, buffer->dxgi_surface.sub_resource_idx, NULL); + } memset(&buffer->dxgi_surface.map_desc, 0, sizeof(buffer->dxgi_surface.map_desc)); if (FAILED(hr = ID3D11DeviceContext_Map(immediate_context, (ID3D11Resource *)buffer->dxgi_surface.rb_texture, @@ -971,7 +975,7 @@ static HRESULT WINAPI dxgi_surface_buffer_Lock(IMFMediaBuffer *iface, BYTE **dat if (SUCCEEDED(hr)) { - hr = dxgi_surface_buffer_map(buffer); + hr = dxgi_surface_buffer_map(buffer, MF2DBuffer_LockFlags_ReadWrite); if (SUCCEEDED(hr)) { copy_image(buffer, buffer->_2d.linear_buffer, buffer->_2d.width, buffer->dxgi_surface.map_desc.pData, @@ -1040,7 +1044,7 @@ static HRESULT dxgi_surface_buffer_lock(struct buffer *buffer, MF2DBuffer_LockFl if (buffer->_2d.linear_buffer) hr = MF_E_UNEXPECTED; else if (!buffer->_2d.locks) - hr = dxgi_surface_buffer_map(buffer); + hr = dxgi_surface_buffer_map(buffer, flags); else if (buffer->_2d.lock_flags == MF2DBuffer_LockFlags_Write && flags != MF2DBuffer_LockFlags_Write) hr = HRESULT_FROM_WIN32(ERROR_WAS_LOCKED); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 635eebf30a5..ccb29a8709d 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -7458,7 +7458,6 @@ 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); - todo_wine ok(*(DWORD *)data != 0xefefefef, "Unexpected leading dword.\n"); memset(data, 0x89, 4); IMF2DBuffer2_Unlock2D(_2dbuffer2);

1 0

Giovanni Mascellani : mfplat: Only upload surface data to GPU for DXGI buffers when writing.
by Alexandre Julliard 26 Apr '23

26 Apr '23

Module: wine Branch: master Commit: d073d3ea18d32d35a1d324d5567f7d743372a25c URL: https://gitlab.winehq.org/wine/wine/-/commit/d073d3ea18d32d35a1d324d5567f7d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Apr 17 16:02:10 2023 +0200 mfplat: Only upload surface data to GPU for DXGI buffers when writing. --- dlls/mfplat/buffer.c | 15 ++++++++++----- dlls/mfplat/tests/mfplat.c | 1 - 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index c0874faa23d..d8de06fb23a 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -936,7 +936,7 @@ static HRESULT dxgi_surface_buffer_map(struct buffer *buffer, MF2DBuffer_LockFla return hr; } -static void dxgi_surface_buffer_unmap(struct buffer *buffer) +static void dxgi_surface_buffer_unmap(struct buffer *buffer, MF2DBuffer_LockFlags flags) { ID3D11DeviceContext *immediate_context; ID3D11Device *device; @@ -946,8 +946,11 @@ static void dxgi_surface_buffer_unmap(struct buffer *buffer) ID3D11DeviceContext_Unmap(immediate_context, (ID3D11Resource *)buffer->dxgi_surface.rb_texture, 0); memset(&buffer->dxgi_surface.map_desc, 0, sizeof(buffer->dxgi_surface.map_desc)); - ID3D11DeviceContext_CopySubresourceRegion(immediate_context, (ID3D11Resource *)buffer->dxgi_surface.texture, - buffer->dxgi_surface.sub_resource_idx, 0, 0, 0, (ID3D11Resource *)buffer->dxgi_surface.rb_texture, 0, NULL); + if (flags == MF2DBuffer_LockFlags_Write || flags == MF2DBuffer_LockFlags_ReadWrite) + { + ID3D11DeviceContext_CopySubresourceRegion(immediate_context, (ID3D11Resource *)buffer->dxgi_surface.texture, + buffer->dxgi_surface.sub_resource_idx, 0, 0, 0, (ID3D11Resource *)buffer->dxgi_surface.rb_texture, 0, NULL); + } ID3D11DeviceContext_Release(immediate_context); ID3D11Device_Release(device); @@ -1014,7 +1017,7 @@ static HRESULT WINAPI dxgi_surface_buffer_Unlock(IMFMediaBuffer *iface) { copy_image(buffer, buffer->dxgi_surface.map_desc.pData, buffer->dxgi_surface.map_desc.RowPitch, buffer->_2d.linear_buffer, buffer->_2d.width, buffer->_2d.width, buffer->_2d.height); - dxgi_surface_buffer_unmap(buffer); + dxgi_surface_buffer_unmap(buffer, MF2DBuffer_LockFlags_ReadWrite); free(buffer->_2d.linear_buffer); buffer->_2d.linear_buffer = NULL; @@ -1052,6 +1055,8 @@ static HRESULT dxgi_surface_buffer_lock(struct buffer *buffer, MF2DBuffer_LockFl { if (!buffer->_2d.locks) buffer->_2d.lock_flags = flags; + else + buffer->_2d.lock_flags |= flags; buffer->_2d.locks++; *scanline0 = buffer->dxgi_surface.map_desc.pData; *pitch = buffer->dxgi_surface.map_desc.RowPitch; @@ -1096,7 +1101,7 @@ static HRESULT WINAPI dxgi_surface_buffer_Unlock2D(IMF2DBuffer2 *iface) { if (!--buffer->_2d.locks) { - dxgi_surface_buffer_unmap(buffer); + dxgi_surface_buffer_unmap(buffer, buffer->_2d.lock_flags); buffer->_2d.lock_flags = 0; } } diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index ccb29a8709d..f5fdfd0be3d 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -7452,7 +7452,6 @@ static void test_d3d11_surface_buffer(void) IMF2DBuffer2_Unlock2D(_2dbuffer2); color = get_d3d11_texture_color(texture, 0, 0); - todo_wine ok(color == 0xcdcdcdcd, "Unexpected leading dword %#lx.\n", color); put_d3d11_texture_color(texture, 0, 0, 0xefefefef);

1 0

Giovanni Mascellani : mfplat/tests: Test that the content of DXGI buffers is discarded when locking for writing.
by Alexandre Julliard 26 Apr '23

26 Apr '23

Module: wine Branch: master Commit: f443b9e042c5c4116321303bcb069a0657705b1b URL: https://gitlab.winehq.org/wine/wine/-/commit/f443b9e042c5c4116321303bcb069a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Apr 17 16:21:41 2023 +0200 mfplat/tests: Test that the content of DXGI buffers is discarded when locking for writing. --- dlls/mfplat/tests/mfplat.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f5fdfd0be3d..77b7b26ba9c 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -7442,7 +7442,8 @@ static void test_d3d11_surface_buffer(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* Lock flags are honored, so reads and writes are discarded if - * the flags are not correct. */ + * the flags are not correct. Also, previous content is discarded + * when locking for writing and not for reading. */ put_d3d11_texture_color(texture, 0, 0, 0xcdcdcdcd); hr = IMF2DBuffer2_Lock2DSize(_2dbuffer2, MF2DBuffer_LockFlags_Read, &data, &pitch, &data2, &length); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -7455,6 +7456,14 @@ static void test_d3d11_surface_buffer(void) ok(color == 0xcdcdcdcd, "Unexpected leading dword %#lx.\n", color); put_d3d11_texture_color(texture, 0, 0, 0xefefefef); + hr = IMF2DBuffer2_Lock2DSize(_2dbuffer2, MF2DBuffer_LockFlags_Write, &data, &pitch, &data2, &length); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(*(DWORD *)data != 0xefefefef, "Unexpected leading dword.\n"); + IMF2DBuffer2_Unlock2D(_2dbuffer2); + + color = get_d3d11_texture_color(texture, 0, 0); + ok(color != 0xefefefef, "Unexpected leading dword.\n"); + hr = IMF2DBuffer2_Lock2DSize(_2dbuffer2, MF2DBuffer_LockFlags_Write, &data, &pitch, &data2, &length); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(*(DWORD *)data != 0xefefefef, "Unexpected leading dword.\n");

1 0

Mohamad Al-Jaf : shell32: Implement SHBindToFolderIDListParent().
by Alexandre Julliard 26 Apr '23

26 Apr '23

Module: wine Branch: master Commit: c12ccd6f80344e22619d1f26566d3ccb755d7671 URL: https://gitlab.winehq.org/wine/wine/-/commit/c12ccd6f80344e22619d1f26566d3c… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Nov 16 01:43:37 2022 -0500 shell32: Implement SHBindToFolderIDListParent(). Called by IE11. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- dlls/shell32/pidl.c | 35 ++++++++++++++++++++++++----------- dlls/shell32/shell32.spec | 1 + include/shlobj.h | 3 +++ 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index f9c91a79132..a95e4c5f295 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1290,12 +1290,20 @@ BOOL WINAPI SHGetPathFromIDListEx(LPCITEMIDLIST pidl, WCHAR *path, DWORD path_si */ HRESULT WINAPI SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCITEMIDLIST *ppidlLast) { - IShellFolder * psfDesktop; - HRESULT hr=E_FAIL; + return SHBindToFolderIDListParent(NULL, pidl, riid, ppv, ppidlLast); +} + +/************************************************************************* + * SHBindToFolderIDListParent [SHELL32.@] + */ +HRESULT WINAPI SHBindToFolderIDListParent(IShellFolder *psf, LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCITEMIDLIST *ppidlLast) +{ + IShellFolder *psfDesktop = NULL; + HRESULT hr; - TRACE_(shell)("pidl=%p\n", pidl); + TRACE_(shell)("%p,%p,%s\n", psf, pidl, debugstr_guid(riid)); pdump(pidl); - + if (!pidl || !ppv) return E_INVALIDARG; @@ -1303,29 +1311,34 @@ HRESULT WINAPI SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCI if (ppidlLast) *ppidlLast = NULL; - hr = SHGetDesktopFolder(&psfDesktop); - if (FAILED(hr)) - return hr; + if (!psf) + { + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED(hr)) + return hr; + psf = psfDesktop; + } if (_ILIsPidlSimple(pidl)) { /* we are on desktop level */ - hr = IShellFolder_QueryInterface(psfDesktop, riid, ppv); + hr = IShellFolder_QueryInterface(psf, riid, ppv); } else { LPITEMIDLIST pidlParent = ILClone(pidl); ILRemoveLastID(pidlParent); - hr = IShellFolder_BindToObject(psfDesktop, pidlParent, NULL, riid, ppv); + hr = IShellFolder_BindToObject(psf, pidlParent, NULL, riid, ppv); SHFree (pidlParent); } - IShellFolder_Release(psfDesktop); + if (psfDesktop) + IShellFolder_Release(psfDesktop); if (SUCCEEDED(hr) && ppidlLast) *ppidlLast = ILFindLastID(pidl); - TRACE_(shell)("-- psf=%p pidl=%p ret=0x%08lx\n", *ppv, (ppidlLast)?*ppidlLast:NULL, hr); + TRACE_(shell)("-- ppv=%p pidl=%p ret=0x%08lx\n", *ppv, (ppidlLast)?*ppidlLast:NULL, hr); return hr; } diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 4a64b80ddd9..2c969869722 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -332,6 +332,7 @@ @ stdcall SHAddToRecentDocs (long ptr) @ stdcall SHAppBarMessage(long ptr) @ stdcall SHAssocEnumHandlers(wstr long ptr) +@ stdcall SHBindToFolderIDListParent(ptr ptr ptr ptr ptr) @ stdcall SHBindToObject(ptr ptr ptr ptr ptr) @ stdcall SHBindToParent(ptr ptr ptr ptr) @ stdcall SHBrowseForFolder(ptr) SHBrowseForFolderA diff --git a/include/shlobj.h b/include/shlobj.h index c7452cf5f0a..c00687e84d8 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1748,6 +1748,9 @@ WINSHELLAPI HRESULT WINAPI SHGetFolderPathW(HWND hwnd, int nFolder, HANDLE hToke */ WINSHELLAPI HRESULT WINAPI SHGetDesktopFolder(IShellFolder * *); +WINSHELLAPI HRESULT WINAPI SHBindToFolderIDListParent(IShellFolder *psf, LPCITEMIDLIST pidl, REFIID riid, + LPVOID *ppv, LPCITEMIDLIST *ppidlLast); + /**************************************************************************** * SHBindToParent API */

1 0