June 2022 - Wine-Devel - list.winehq.org

Re: [PATCH v3 4/8] mfplat/tests: Test interaction between Lock2D() and LockRect().

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

June 16, 2022

Re: [PATCH v3 3/8] mfplat/tests: Test interaction between Lock() and LockRect().

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

June 16, 2022

Re: [PATCH 0/2] MR258: win32u: Move menu tracking implementation from user32. - approved

by Huw Davies (＠huw)

This merge request was approved by Huw Davies. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/258

June 16, 2022

Re: [PATCH v3 2/8] mfplat/buffer: Fix image copy function for IMC2/IMC4 buffers with odd height.

by Nikolay Sivov

On 6/14/22 18:15, Giovanni Mascellani wrote: > Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> > --- > dlls/mfplat/buffer.c | 3 +-- > dlls/mfplat/tests/mfplat.c | 9 ++++----- > 2 files changed, 5 insertions(+), 7 deletions(-) > > diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c > index 39407ccc9e2..a7ba306223d 100644 > --- a/dlls/mfplat/buffer.c > +++ b/dlls/mfplat/buffer.c > @@ -100,8 +100,7 @@ static void copy_image_imc1(BYTE *dest, LONG dest_stride, const BYTE *src, LONG > > static void copy_image_imc2(BYTE *dest, LONG dest_stride, const BYTE *src, LONG src_stride, DWORD width, DWORD lines) > { > - MFCopyImage(dest, dest_stride, src, src_stride, width / 2, lines / 2); > - MFCopyImage(dest + dest_stride / 2, dest_stride, src + src_stride / 2, src_stride, width / 2, lines / 2); > + MFCopyImage(dest, dest_stride / 2, src, src_stride / 2, width / 2, lines); > } I don't understand this. Why would it use fractions of strides? And doing one copy instead of two related to odd heights? Or does the subject need adjusting? > > static inline struct buffer *impl_from_IMFMediaBuffer(IMFMediaBuffer *iface) > diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c > index 1b5e8cf7ed5..52608c05929 100644 > --- a/dlls/mfplat/tests/mfplat.c > +++ b/dlls/mfplat/tests/mfplat.c > @@ -6027,12 +6027,11 @@ static void test_MFCreate2DMediaBuffer(void) > > case MAKEFOURCC('I','M','C','2'): > case MAKEFOURCC('I','M','C','4'): > - for (j = ptr->height; j < length2 / stride; j++) > + for (j = 0; ptr->height * stride + j * (stride / 2) < length2; j++) > for (k = 0; k < ptr->width / 2; k++) > - ok(data[j * pitch + k] == 0xff, "Unexpected byte %02x at test %d row %d column %d.\n", data[j * pitch + k], i, j, k); > - for (j = ptr->height; j < length2 / stride; j++) > - for (k = pitch / 2; k < pitch / 2 + ptr->width / 2; k++) > - ok(data[j * pitch + k] == 0xff, "Unexpected byte %02x at test %d row %d column %d.\n", data[j * pitch + k], i, j, k); > + ok(data[ptr->height * pitch + j * (pitch / 2) + k] == 0xff, > + "Unexpected byte %02x at test %d row %d column %d.\n", > + data[ptr->height * pitch + j * (pitch / 2) + k], i, j, k); > break; It feels like this could be more readable. I see initial contents are set to 0xff, so I'm not even sure what we are testing. What else could it be if not 0xff? > > case MAKEFOURCC('N','V','1','2'):

June 16, 2022

Re: [PATCH vkd3d 2/2] include: Add ID3D12Device3 declaration in vkd3d_d3d12.idl.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 16, 2022

Re: [PATCH vkd3d 1/2] include: Add more D3D12_HEAP_FLAGS in vkd3d_d3d12.idl.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 16, 2022

Re: [PATCH 0/5] MR237: winegstreamer: Implement Resampler and ColorConvert MF transforms. - approved

by Nikolay Sivov (＠nsivov)

This merge request was approved by Nikolay Sivov. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/237

June 16, 2022

[PATCH 1/1] d3d11: Remove null dxgi object checks.

by Nikolay Sivov

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/texture.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 7be689d1f0f..64e78702fd7 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -32,6 +32,7 @@ static inline struct d3d_texture1d *impl_from_ID3D11Texture1D(ID3D11Texture1D *i static HRESULT STDMETHODCALLTYPE d3d11_texture1d_QueryInterface(ID3D11Texture1D *iface, REFIID iid, void **out) { struct d3d_texture1d *texture = impl_from_ID3D11Texture1D(iface); + HRESULT hr; TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); @@ -54,16 +55,15 @@ static HRESULT STDMETHODCALLTYPE d3d11_texture1d_QueryInterface(ID3D11Texture1D return S_OK; } - if (texture->dxgi_resource) + TRACE("Forwarding to dxgi resource.\n"); + + if (FAILED(hr = IUnknown_QueryInterface(texture->dxgi_resource, iid, out))) { - TRACE("Forwarding to dxgi resource.\n"); - return IUnknown_QueryInterface(texture->dxgi_resource, iid, out); + WARN("%s not implemented, returning %#lx.\n", debugstr_guid(iid), hr); + *out = NULL; } - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); - - *out = NULL; - return E_NOINTERFACE; + return hr; } static ULONG STDMETHODCALLTYPE d3d11_texture1d_AddRef(ID3D11Texture1D *iface) @@ -514,6 +514,7 @@ HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DE static HRESULT STDMETHODCALLTYPE d3d11_texture2d_QueryInterface(ID3D11Texture2D *iface, REFIID riid, void **object) { struct d3d_texture2d *texture = impl_from_ID3D11Texture2D(iface); + HRESULT hr; TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); @@ -535,16 +536,15 @@ static HRESULT STDMETHODCALLTYPE d3d11_texture2d_QueryInterface(ID3D11Texture2D return S_OK; } - if (texture->dxgi_resource) + TRACE("Forwarding to dxgi resource.\n"); + + if (FAILED(hr = IUnknown_QueryInterface(texture->dxgi_resource, riid, object))) { - TRACE("Forwarding to dxgi resource.\n"); - return IUnknown_QueryInterface(texture->dxgi_resource, riid, object); + WARN("%s not implemented, returning %#lx.\n", debugstr_guid(riid), hr); + *object = NULL; } - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - - *object = NULL; - return E_NOINTERFACE; + return hr; } static ULONG STDMETHODCALLTYPE d3d11_texture2d_AddRef(ID3D11Texture2D *iface) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/259

June 16, 2022

[PATCH 0/1] MR259: d3d11: Remove null dxgi object checks.

by Nikolay Sivov (＠nsivov)

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/259

June 16, 2022

Re: [PATCH 2/2] win32u: Move WM_CONTEXTMENU and WM_POPUPSYSTEMMENU implementation from user32.

by Marvin

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=117102 Your paranoid android. === debian11 (32 bit WoW report) === user32: win.c:11770: Test succeeded inside todo block: child should be topmost win.c:11773: Test failed: grandchild should be topmost win.c:11781: Test failed: child should NOT be topmost win.c:11784: Test succeeded inside todo block: grandchild should NOT be topmost win.c:11787: Test failed: 007200BA: expected NOT topmost win.c:11606: Test succeeded inside todo block: 5: hwnd 01580052 is still topmost

June 16, 2022