- Wine-Commits - list.winehq.org

Giovanni Mascellani : mfplat: Do not mark a DXGI buffer as locked if surface mapping fails.
by Alexandre Julliard April 26, 2023

April 26, 2023

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: Only upload surface data to GPU for DXGI buffers when writing.
by Alexandre Julliard April 26, 2023

April 26, 2023

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 locking flags for DXGI buffers.
by Alexandre Julliard April 26, 2023

April 26, 2023

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

Michael Stefaniuc : win32u: Use ARRAY_SIZE() instead of open coding it.
by Alexandre Julliard April 26, 2023

April 26, 2023

Module: wine Branch: master Commit: 5cae9680f44eee6a97cb76fdf5c56d35d5b2ee14 URL: https://gitlab.winehq.org/wine/wine/-/commit/5cae9680f44eee6a97cb76fdf5c56d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Apr 19 19:28:53 2023 +0200 win32u: Use ARRAY_SIZE() instead of open coding it. --- dlls/win32u/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index f806294cb20..fb9824759b2 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -398,7 +398,7 @@ static const KBDTABLES kbdus_tables = .pKeyNames = (VSC_LPWSTR *)key_names, .pKeyNamesExt = (VSC_LPWSTR *)key_names_ext, .pusVSCtoVK = (USHORT *)vsc_to_vk, - .bMaxVSCtoVK = sizeof(vsc_to_vk) / sizeof(vsc_to_vk[0]), + .bMaxVSCtoVK = ARRAY_SIZE(vsc_to_vk), .pVSCtoVK_E0 = (VSC_VK *)vsc_to_vk_e0, .pVSCtoVK_E1 = (VSC_VK *)vsc_to_vk_e1, .fLocaleFlags = MAKELONG(0, KBD_VERSION),

1 0

Michael Stefaniuc : threadpoolwinrt: Forward a Release() to a Release() method.
by Alexandre Julliard April 26, 2023

April 26, 2023

Module: wine Branch: master Commit: 572a9f6a68c3ab4ac2dad54f279d8d239492b685 URL: https://gitlab.winehq.org/wine/wine/-/commit/572a9f6a68c3ab4ac2dad54f279d8d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Apr 25 18:59:16 2023 +0200 threadpoolwinrt: Forward a Release() to a Release() method. --- dlls/threadpoolwinrt/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/threadpoolwinrt/main.c b/dlls/threadpoolwinrt/main.c index 9fa475487ca..fb59a777e30 100644 --- a/dlls/threadpoolwinrt/main.c +++ b/dlls/threadpoolwinrt/main.c @@ -202,7 +202,7 @@ static ULONG STDMETHODCALLTYPE async_info_AddRef(IAsyncInfo *iface) static ULONG STDMETHODCALLTYPE async_info_Release(IAsyncInfo *iface) { struct async_action *action = impl_from_IAsyncInfo(iface); - return IAsyncAction_AddRef(&action->IAsyncAction_iface); + return IAsyncAction_Release(&action->IAsyncAction_iface); } static HRESULT STDMETHODCALLTYPE async_info_GetIids(IAsyncInfo *iface, ULONG *iid_count, IID **iids)

1 0

Giovanni Mascellani : mfplat/tests: Test locking flags for D3D9 buffers.
by Alexandre Julliard April 26, 2023

April 26, 2023

Module: wine Branch: master Commit: ee16e7145e24e5fbafee25d547d07846e22d9420 URL: https://gitlab.winehq.org/wine/wine/-/commit/ee16e7145e24e5fbafee25d547d078… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Apr 7 11:49:10 2023 +0200 mfplat/tests: Test locking flags for D3D9 buffers. --- dlls/mfplat/tests/mfplat.c | 67 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 5b3bcf80fe1..0487a7db5ce 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6647,6 +6647,8 @@ static void test_MFCreateDXSurfaceBuffer(void) hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer2, (void **)&_2dbuffer2); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + /* Lock flags are ignored, so writing is allowed when locking for + * reading and viceversa. */ 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"); @@ -6664,9 +6666,72 @@ static void test_MFCreateDXSurfaceBuffer(void) hr = IMFMediaBuffer_Unlock(buffer); ok(hr == S_OK || broken(broken_test), "Unexpected hr %#lx.\n", hr); + /* Also, flags incompatibilities are not taken into account even + * if a buffer is already locked. */ hr = IMF2DBuffer2_Lock2DSize(_2dbuffer2, MF2DBuffer_LockFlags_ReadWrite, &data, &pitch, &data2, &length); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - IMF2DBuffer2_Unlock2D(_2dbuffer2); + hr = IMF2DBuffer2_Lock2DSize(_2dbuffer2, MF2DBuffer_LockFlags_ReadWrite, &data, &pitch, &data2, &length); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMF2DBuffer2_Lock2DSize(_2dbuffer2, MF2DBuffer_LockFlags_Read, &data, &pitch, &data2, &length); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMF2DBuffer2_Lock2DSize(_2dbuffer2, MF2DBuffer_LockFlags_Write, &data, &pitch, &data2, &length); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMF2DBuffer2_Unlock2D(_2dbuffer2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMF2DBuffer2_Unlock2D(_2dbuffer2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMF2DBuffer2_Unlock2D(_2dbuffer2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMF2DBuffer2_Unlock2D(_2dbuffer2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMF2DBuffer2_Unlock2D(_2dbuffer2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMF2DBuffer2_Lock2DSize(_2dbuffer2, MF2DBuffer_LockFlags_Read, &data, &pitch, &data2, &length); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMF2DBuffer2_Lock2DSize(_2dbuffer2, MF2DBuffer_LockFlags_Read, &data, &pitch, &data2, &length); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMF2DBuffer2_Lock2DSize(_2dbuffer2, MF2DBuffer_LockFlags_ReadWrite, &data, &pitch, &data2, &length); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMF2DBuffer2_Lock2DSize(_2dbuffer2, MF2DBuffer_LockFlags_Write, &data, &pitch, &data2, &length); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMF2DBuffer2_Unlock2D(_2dbuffer2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMF2DBuffer2_Unlock2D(_2dbuffer2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMF2DBuffer2_Unlock2D(_2dbuffer2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMF2DBuffer2_Unlock2D(_2dbuffer2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMF2DBuffer2_Unlock2D(_2dbuffer2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + /* Except when originally locking for writing. */ + 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_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); + hr = IMF2DBuffer2_Unlock2D(_2dbuffer2); + 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

Michael Stefaniuc : uiautomationcore: Drop superfluous TRUE : FALSE conditional expression.
by Alexandre Julliard April 26, 2023

April 26, 2023

Module: wine Branch: master Commit: b0dd4177d5ad20de20aba06965dfb51b50edf6e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/b0dd4177d5ad20de20aba06965dfb5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Apr 19 19:28:09 2023 +0200 uiautomationcore: Drop superfluous TRUE : FALSE conditional expression. --- dlls/uiautomationcore/uia_provider.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index 76b5c03537a..ffab31d9953 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -1251,7 +1251,7 @@ static HRESULT uia_send_message_timeout(HWND hwnd, UINT msg, WPARAM wparam, LPAR static BOOL is_top_level_hwnd(HWND hwnd) { - return (GetAncestor(hwnd, GA_PARENT) == GetDesktopWindow()) ? TRUE : FALSE; + return GetAncestor(hwnd, GA_PARENT) == GetDesktopWindow(); } static HRESULT get_uia_control_type_for_hwnd(HWND hwnd, int *control_type)

1 0

Giovanni Mascellani : mfplat/tests: Independently test that locking flags are ignored for D3D9 buffers.
by Alexandre Julliard April 26, 2023

April 26, 2023

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/tests: Test Lock2D() on a locked D3D9 surface buffer.
by Alexandre Julliard April 26, 2023

April 26, 2023

Module: wine Branch: master Commit: ef4441a26381a59639aee84d24f7386cca78a423 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef4441a26381a59639aee84d24f738… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Apr 17 15:35:40 2023 +0200 mfplat/tests: Test Lock2D() on a locked D3D9 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 58321672cea..5b3bcf80fe1 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6623,6 +6623,15 @@ static void test_MFCreateDXSurfaceBuffer(void) hr = IMF2DBuffer_Unlock2D(_2dbuffer); 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(_2dbuffer, &data, &pitch); + ok(hr == MF_E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK || broken(broken_test), "Unexpected hr %#lx.\n", hr); + hr = IMF2DBuffer_IsContiguousFormat(_2dbuffer, &value); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!value, "Unexpected return value %d.\n", value);

1 0

Giovanni Mascellani : mfplat: Fix locking flags usage for D3D9 buffers.
by Alexandre Julliard April 26, 2023

April 26, 2023

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