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

Re: [PATCH 1/2] xmllite/tests: Test depth for MoveToAttributeByName().

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=115979 Your paranoid android. === build (build log) === WineRunBuild.pl:error: The build timed out

June 2, 2022

Re: [PATCH v2 0/5] MR139: winegstreamer: Implement video plane alignment for the H264 decoder.

by Rémi Bernon

On Wed Jun 1 23:20:21 2022 +0000, **** wrote: > Zebediah Figura replied on the mailing list: > ``` > On 5/30/22 03:20, Rémi Bernon wrote: > > dlls/mf/tests/mf.c | 3 - > > dlls/winegstreamer/wg_transform.c | 123 +++++++++++++++++++++++++++--- > > 2 files changed, 114 insertions(+), 12 deletions(-) > Looks clear and correct, just a couple of nitpicks... > > + if (!(dst_info = gst_video_info_copy(&src_info))) > > + return false; > Any reason not to allocate dst_info on stack? > > + if (!(is_caps_video(caps) ? copy_video_buffer(buffer, caps, > plane_align, sample, &total_size) > > + : copy_buffer(buffer, caps, sample, &total_size))) > This is a little hard to read. Would you mind either using a "ret" > variable, or perhaps putting the copy_video_buffer() call inside of > copy_buffer()? > ``` > Any reason not to allocate dst_info on stack? No real reason I guess, I was worried about the `finfo` pointer but looks like it can just be copied as is. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/139#note_1498

June 2, 2022

Re: [PATCH 2/2] xmllite: Increase depth in MoveToAttributeByName().

by Nikolay Sivov

On 6/2/22 09:15, Ziqing Hui wrote: > @@ -3071,6 +3071,8 @@ static HRESULT WINAPI xmlreader_MoveToAttributeByName(IXmlReader* iface, > if (name_len == target_name_len && uri_len == target_uri_len && > !wcscmp(name, local_name) && !wcscmp(uri, namespace_uri)) > { > + if (!This->attr) > + reader_inc_depth(This); > reader_set_current_attribute(This, attr); > return S_OK; > } > I think this call could be moved in reader_set_current_attribute(), and removed from reader_move_to_first_attribute().

June 2, 2022

[PATCH 2/2] xmllite: Increase depth in MoveToAttributeByName().

by Ziqing Hui

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/xmllite/reader.c | 2 ++ dlls/xmllite/tests/reader.c | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 03bb6c409b7..17f2a264f2a 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -3071,6 +3071,8 @@ static HRESULT WINAPI xmlreader_MoveToAttributeByName(IXmlReader* iface, if (name_len == target_name_len && uri_len == target_uri_len && !wcscmp(name, local_name) && !wcscmp(uri, namespace_uri)) { + if (!This->attr) + reader_inc_depth(This); reader_set_current_attribute(This, attr); return S_OK; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 7b68365ac48..2ea781ce992 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2592,17 +2592,17 @@ static void test_attribute_by_name(void) hr = IXmlReader_MoveToAttributeByName(reader, L"xmlns", xmlns_uriW); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine TEST_DEPTH(reader, 2); + TEST_DEPTH(reader, 2); reader_value(reader, L"myns"); hr = IXmlReader_MoveToAttributeByName(reader, L"a", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine TEST_DEPTH(reader, 2); + TEST_DEPTH(reader, 2); reader_value(reader, L"value a"); hr = IXmlReader_MoveToAttributeByName(reader, L"b", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine TEST_DEPTH(reader, 2); + TEST_DEPTH(reader, 2); reader_value(reader, L"value b"); hr = IXmlReader_MoveToAttributeByName(reader, L"a", L"myns"); @@ -2613,22 +2613,22 @@ static void test_attribute_by_name(void) hr = IXmlReader_MoveToAttributeByName(reader, L"ns", xmlns_uriW); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine TEST_DEPTH(reader, 2); + TEST_DEPTH(reader, 2); reader_value(reader, L"ns uri"); hr = IXmlReader_MoveToAttributeByName(reader, L"b", L""); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine TEST_DEPTH(reader, 2); + TEST_DEPTH(reader, 2); reader_value(reader, L"value b"); hr = IXmlReader_MoveToAttributeByName(reader, L"c", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine TEST_DEPTH(reader, 2); + TEST_DEPTH(reader, 2); reader_value(reader, L"value c2"); hr = IXmlReader_MoveToAttributeByName(reader, L"c", L"ns uri"); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine TEST_DEPTH(reader, 2); + TEST_DEPTH(reader, 2); reader_value(reader, L"value c"); IXmlReader_Release(reader); -- 2.25.1

June 2, 2022

[PATCH 1/2] xmllite/tests: Test depth for MoveToAttributeByName().

by Ziqing Hui

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/xmllite/tests/reader.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index c1778a9764e..7b68365ac48 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2570,11 +2570,13 @@ static void test_attribute_by_name(void) ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); read_node(reader, XmlNodeType_Element); + TEST_DEPTH(reader, 0); hr = IXmlReader_MoveToAttributeByName(reader, L"", NULL); ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); read_node(reader, XmlNodeType_Element); + TEST_DEPTH(reader, 1); hr = IXmlReader_MoveToAttributeByName(reader, NULL, NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); @@ -2590,14 +2592,17 @@ static void test_attribute_by_name(void) hr = IXmlReader_MoveToAttributeByName(reader, L"xmlns", xmlns_uriW); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"myns"); hr = IXmlReader_MoveToAttributeByName(reader, L"a", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"value a"); hr = IXmlReader_MoveToAttributeByName(reader, L"b", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"value b"); hr = IXmlReader_MoveToAttributeByName(reader, L"a", L"myns"); @@ -2608,18 +2613,22 @@ static void test_attribute_by_name(void) hr = IXmlReader_MoveToAttributeByName(reader, L"ns", xmlns_uriW); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"ns uri"); hr = IXmlReader_MoveToAttributeByName(reader, L"b", L""); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"value b"); hr = IXmlReader_MoveToAttributeByName(reader, L"c", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"value c2"); hr = IXmlReader_MoveToAttributeByName(reader, L"c", L"ns uri"); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"value c"); IXmlReader_Release(reader); -- 2.25.1

June 2, 2022

Re: [PATCH v2 0/5] MR139: winegstreamer: Implement video plane alignment for the H264 decoder.

by Rémi Bernon

On Wed Jun 1 23:20:29 2022 +0000, **** wrote: > Zebediah Figura replied on the mailing list: > ``` > On 5/30/22 03:20, Rémi Bernon wrote: > > + if (gst_query_get_n_allocation_pools(query) > 0) > > + gst_query_set_nth_allocation_pool(query, 0, pool, > info.size, 0, 0); > > + else > > + gst_query_add_allocation_pool(query, pool, info.size, > 0, 0); > GStreamer documentation isn't exactly clear about this, but my > understanding is that, as the sink, we are supposed to be the first > element to add things to this query, and as such there shouldn't be any > pools already. Have you encountered cases where that wasn't true? Or > were you modeling this after some GStreamer code I didn't find? > FWIW, the above seems to be a common pattern for filters or source > elements *after* receiving a query response from the sink, but that's > not the case here. > ``` Yes, it's not clear how it is supposed to be used, and I just wanted to make sure our pool would be prioritized in all cases. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/139#note_1497

June 2, 2022

Re: [PATCH v3 0/6] MR130: user32: Progress toward PE conversion of raw input APIs. - approved

by Rémi Bernon

This merge request was approved by Rémi Bernon. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/130

June 2, 2022

[PATCH v3 1/1] d3drm: IDirect3DRMMeshBuilder3 Load support loading from resource

by Alistair Leslie-Hughes

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/d3drm/meshbuilder.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 1f783baf1fe..460cc0d3388 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1463,7 +1463,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_Load(IDirect3DRMMeshBuilder3 *iface, v void *name, D3DRMLOADOPTIONS loadflags, D3DRMLOADTEXTURE3CALLBACK cb, void *arg) { struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface); - DXFILELOADOPTIONS load_options; + DXFILELOADOPTIONS load_options = loadflags & 0x0F; IDirectXFile *dxfile = NULL; IDirectXFileEnumObject *enum_object = NULL; IDirectXFileData *data = NULL; @@ -1478,21 +1478,6 @@ static HRESULT WINAPI d3drm_mesh_builder3_Load(IDirect3DRMMeshBuilder3 *iface, v clean_mesh_builder_data(mesh_builder); - if (loadflags == D3DRMLOAD_FROMMEMORY) - { - load_options = DXFILELOAD_FROMMEMORY; - } - else if (loadflags == D3DRMLOAD_FROMFILE) - { - load_options = DXFILELOAD_FROMFILE; - TRACE("Loading from file %s\n", debugstr_a(filename)); - } - else - { - FIXME("Load options %ld not supported yet\n", loadflags); - return E_NOTIMPL; - } - hr = DirectXFileCreate(&dxfile); if (hr != DXFILE_OK) goto end; @@ -1503,7 +1488,10 @@ static HRESULT WINAPI d3drm_mesh_builder3_Load(IDirect3DRMMeshBuilder3 *iface, v hr = IDirectXFile_CreateEnumObject(dxfile, filename, load_options, &enum_object); if (hr != DXFILE_OK) + { + FIXME("Failed to Enum object for type %#lx\n", loadflags); goto end; + } hr = IDirectXFileEnumObject_GetNextDataObject(enum_object, &data); if (hr != DXFILE_OK) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/167

June 2, 2022

[PATCH v3 0/1] MR167: d3drm: IDirect3DRMMeshBuilder3::Load support loading from resource

by Alistair Leslie-Hughes (＠alesliehughes)

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- v3: d3drm: IDirect3DRMMeshBuilder3 Load support loading from resource https://gitlab.winehq.org/wine/wine/-/merge_requests/167

June 2, 2022

Re: [PATCH] d3d9/tests: Do not test the alpha channel in test_multisample_get_front_buffer_data().

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=115971 Your paranoid android. === build (build log) === WineRunBuild.pl:error: The build timed out

June 2, 2022