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

[PATCH v2 0/1] MR296: nsiproxy.sys: Add static ARP entries which are always present on Windows.

by Paul Gofman (＠gofman)

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53175 Split off from MR https://gitlab.winehq.org/wine/wine/-/merge_requests/286. -- v2: nsiproxy.sys: Add static ARP entries which are always present on Windows. https://gitlab.winehq.org/wine/wine/-/merge_requests/296

June 23, 2022

Re: vkd3d release schedule

by Henri Verbeet

On Thu, 23 Jun 2022 at 12:15, Giovanni Mascellani <gmascellani(a)codeweavers.com> wrote: > Il 23/06/22 09:49, Henri Verbeet ha scritto: > > As you may have noticed, the time between the vkd3d 1.3 and 1.4 > > releases was a fair bit shorter than the time between the 1.2 and 1.3 > > releases. That was deliberate; at the start of the year the plan was > > made to aim for about 4 vkd3d releases per year. I think that has > > worked out well so far, so we'd like to continue along those lines. In > > practical terms, that puts the tentative release dates for vkd3d 1.5 > > and 1.6 at late September and late December this year. > > Shall we also define a freeze schedule, possibly a bit more in advance > than we did this time? > > For 1.4 we had a soft freeze (API and architecture) and a hard freeze > (only important bugfixes), both a week long. In practice during the soft > freeze there were two accepted patch sets (one by me with matrix > support, which was mostly discussed before freeze anyway, and another by > Biswapriyo with some IDL additions) and one during the hard freeze > (essentially doing the release itself, plus a small bugfix). > > I would propose to have a significantly longer soft freeze (at least a > month) so that API has to be frozen well in advance, and a slightly > longer hard freeze, but with a perhaps wider filter (e.g., two weeks, > during which only important bugfixes to the main code are accepted, but > it is still possible to commit pretty much everything to testing code, > tests and documentation). Ideally this would allow us to consolidate > work in tests and docs (not that the situation is terrible in vkd3d, but > it's not bad to have some time specifically dedicated to that). I think that broadly makes sense, yes. It would mean we'd need things to be ready to be committed during the first half of the release cycle, because we'd be in various levels of frozenness during the second half. Conceptually that's similar to the Linux "merge window" model; there's certainly something to be said for that model.

June 23, 2022

Re: [PATCH 0/4] MR271: win32u: Move rawinput APIs.

by Rémi Bernon

Rémi Bernon (@rbernon) commented about dlls/wow64win/user.c: > + return 0; > + } > + > + if (*data_size < sizeof(RAWINPUTHEADER)) > + { > + SetLastError( ERROR_INSUFFICIENT_BUFFER ); > + return ~0u; > + } > + > + ret = NtUserGetRawInputData( handle, command, &data64, &data_size64, sizeof(RAWINPUTHEADER) ); > + if (ret == ~0u) return ret; > + data32->dwType = data64.dwType; > + data32->dwSize = data64.dwSize - sizeof(RAWINPUTHEADER) + sizeof(RAWINPUTHEADER32); > + data32->hDevice = (UINT_PTR)data64.hDevice; > + data32->wParam = data64.wParam; > + return sizeof(RAWINPUTHEADER); I think this should set `*data_size` to, and return `sizeof(RAWINPUTHEADER32)` instead? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/271#note_2567

June 23, 2022

Re: [PATCH v2 5/6] winegstreamer: Check H264 ProcessOutput sample against actual image size.

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=117485 Your paranoid android. === w7u_2qxl (32 bit report) === mf: mf.c:7051: Test failed: out 0: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 0: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7051: Test failed: out 1: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 1: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7051: Test failed: out 2: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 2: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7051: Test failed: out 3: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 3: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7051: Test failed: out 4: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 4: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 59520 mf.c:7079: Test failed: SetOutputType returned 0. mf.c:7082: Test failed: SetOutputType returned 0xc00d36b4. mf.c:7100: Test failed: out 0: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 0: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7100: Test failed: out 1: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 1: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7100: Test failed: out 2: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 2: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7100: Test failed: out 3: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 3: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7100: Test failed: out 4: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 4: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 59520 mf.c:7226: Test failed: out 0: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 mf.c:7226: Test failed: out 1: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 mf.c:7226: Test failed: out 2: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 mf.c:7226: Test failed: out 3: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 mf.c:7226: Test failed: out 4: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 === w7u_adm (32 bit report) === mf: mf.c:7051: Test failed: out 0: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 0: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7051: Test failed: out 1: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 1: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7051: Test failed: out 2: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 2: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7051: Test failed: out 3: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 3: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7051: Test failed: out 4: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 4: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 59520 mf.c:7079: Test failed: SetOutputType returned 0. mf.c:7082: Test failed: SetOutputType returned 0xc00d36b4. mf.c:7100: Test failed: out 0: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 0: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7100: Test failed: out 1: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 1: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7100: Test failed: out 2: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 2: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7100: Test failed: out 3: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 3: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7100: Test failed: out 4: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 4: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 59520 mf.c:7226: Test failed: out 0: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 mf.c:7226: Test failed: out 1: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 mf.c:7226: Test failed: out 2: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 mf.c:7226: Test failed: out 3: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 mf.c:7226: Test failed: out 4: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 0858:mf: unhandled exception c0000005 at 7797227C === w7u_el (32 bit report) === mf: mf.c:7051: Test failed: out 0: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 0: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7051: Test failed: out 1: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 1: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7051: Test failed: out 2: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 2: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7051: Test failed: out 3: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 3: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7051: Test failed: out 4: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 4: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 59520 mf.c:7079: Test failed: SetOutputType returned 0. mf.c:7082: Test failed: SetOutputType returned 0xc00d36b4. mf.c:7100: Test failed: out 0: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 0: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7100: Test failed: out 1: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 1: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7100: Test failed: out 2: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 2: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7100: Test failed: out 3: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 3: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7100: Test failed: out 4: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 4: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 59520 mf.c:7226: Test failed: out 0: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 mf.c:7226: Test failed: out 1: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 mf.c:7226: Test failed: out 2: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 mf.c:7226: Test failed: out 3: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 mf.c:7226: Test failed: out 4: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 === w1064v1507 (64 bit report) === Report validation errors: mf:mf crashed (c0000374) === debian11 (32 bit report) === Report validation errors: mf:mf prints too much data (39732 bytes) === debian11 (32 bit WoW report) === Report validation errors: mf:mf prints too much data (39794 bytes)

June 23, 2022

Re: [PATCH 0/4] MR271: win32u: Move rawinput APIs.

by Rémi Bernon

Rémi Bernon (@rbernon) commented about dlls/wow64win/user.c: > POINT pt; > } MSG32; > > +typedef struct > +{ > + UINT dwType; > + UINT dwSize; > + UINT hDevice; > + UINT wParam; I don't know if it really matters but other structs here use the original types (`DWORD`, ...) when the member size doesn't change, and UINT32 wherever it does. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/271#note_2564

June 23, 2022

Re: [PATCH v2 4/6] winegstreamer: Use H264 input media type frame size when specified.

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=117484 Your paranoid android. === w7u_2qxl (32 bit report) === mf: mf.c:7051: Test failed: out 0: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 0: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7051: Test failed: out 1: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 1: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7051: Test failed: out 2: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 2: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7051: Test failed: out 3: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 3: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7051: Test failed: out 4: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 4: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 59520 mf.c:7079: Test failed: SetOutputType returned 0. mf.c:7082: Test failed: SetOutputType returned 0xc00d36b4. mf.c:7100: Test failed: out 0: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 0: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7100: Test failed: out 1: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 1: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7100: Test failed: out 2: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 2: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7100: Test failed: out 3: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 3: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7100: Test failed: out 4: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 4: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 59520 mf.c:7226: Test failed: out 0: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 mf.c:7226: Test failed: out 1: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 mf.c:7226: Test failed: out 2: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 mf.c:7226: Test failed: out 3: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 mf.c:7226: Test failed: out 4: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 === w7u_adm (32 bit report) === mf: mf.c:7051: Test failed: out 0: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 0: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7051: Test failed: out 1: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 1: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7051: Test failed: out 2: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 2: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7051: Test failed: out 3: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 3: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7051: Test failed: out 4: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 4: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 59520 mf.c:7079: Test failed: SetOutputType returned 0. mf.c:7082: Test failed: SetOutputType returned 0xc00d36b4. mf.c:7100: Test failed: out 0: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 0: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7100: Test failed: out 1: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 1: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7100: Test failed: out 2: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 2: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7100: Test failed: out 3: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 3: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7100: Test failed: out 4: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 4: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 59520 mf.c:7226: Test failed: out 0: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 mf.c:7226: Test failed: out 1: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 mf.c:7226: Test failed: out 2: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 mf.c:7226: Test failed: out 3: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 mf.c:7226: Test failed: out 4: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 === w7u_el (32 bit report) === mf: mf.c:7051: Test failed: out 0: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 0: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7051: Test failed: out 1: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 1: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7051: Test failed: out 2: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 2: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7051: Test failed: out 3: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 3: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7051: Test failed: out 4: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7051: Test failed: out 4: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 59520 mf.c:7079: Test failed: SetOutputType returned 0. mf.c:7082: Test failed: SetOutputType returned 0xc00d36b4. mf.c:7100: Test failed: out 0: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 0: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7100: Test failed: out 1: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 1: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7100: Test failed: out 2: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 2: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7100: Test failed: out 3: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 3: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 44640 mf.c:7100: Test failed: out 4: "MF_MT_FRAME_SIZE" mismatch, type 21, value 120:248 mf.c:7100: Test failed: out 4: "MF_MT_SAMPLE_SIZE" mismatch, type 19, value 59520 mf.c:7226: Test failed: out 0: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 mf.c:7226: Test failed: out 1: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 mf.c:7226: Test failed: out 2: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 mf.c:7226: Test failed: out 3: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 mf.c:7226: Test failed: out 4: "MF_MT_FRAME_RATE" mismatch, type 21, value 30000:1001 === debian11 (32 bit report) === Report validation errors: mf:mf prints too much data (39752 bytes) === debian11 (32 bit WoW report) === Report validation errors: mf:mf prints too much data (39740 bytes)

June 23, 2022

Re: [PATCH v2 3/6] winegstreamer: Implement H264 SetOutputType by reconfiguring the pipeline.

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=117483 Your paranoid android. === debian11 (32 bit report) === Report validation errors: mf:mf prints too much data (39708 bytes) === debian11 (32 bit WoW report) === Report validation errors: mf:mf prints too much data (39776 bytes)

June 23, 2022

Re: [PATCH v2 1/6] mf/tests: Add todo_wine for newer FFmpeg versions.

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=117481 Your paranoid android. === debian11 (32 bit report) === Report validation errors: mf:mf prints too much data (39704 bytes) === debian11 (32 bit WoW report) === Report validation errors: mf:mf prints too much data (44524 bytes)

June 23, 2022

Re: [PATCH v2 0/6] MR302: winegstreamer: Some wg_transform H264 fixes for Mortal Kombat 11 and Yakuza 4.

by Rémi Bernon

v2: Fix compilation by removing `static` qualifier. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/302#note_2560

June 23, 2022

[PATCH v2 6/6] winegstreamer: Use an atomic queue for wg_transform input buffers.

by Rémi Bernon

From: Rémi Bernon <rbernon(a)codeweavers.com> And push them one by one until an output buffer is generated, to avoid generating multiple output buffers without a backing wg_sample. This makes zero-copy more efficient for games which queue multiple input buffers before checking output, such as Yakuza 4. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/wg_transform.c | 40 +++++++++++++++---------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index b90fde70519..73bec6d35e4 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -51,10 +51,10 @@ struct wg_transform GstPad *my_src, *my_sink; GstPad *their_sink, *their_src; GstSegment segment; - GstBufferList *input; guint input_max_length; guint output_plane_align; struct wg_sample *output_wg_sample; + GstAtomicQueue *input_queue; GstAtomicQueue *output_queue; GstSample *output_sample; bool output_caps_changed; @@ -240,9 +240,11 @@ NTSTATUS wg_transform_destroy(void *args) { struct wg_transform *transform = args; GstSample *sample; + GstBuffer *buffer; - if (transform->input) - gst_buffer_list_unref(transform->input); + while ((buffer = gst_atomic_queue_pop(transform->input_queue))) + gst_buffer_unref(buffer); + gst_atomic_queue_unref(transform->input_queue); gst_element_set_state(transform->container, GST_STATE_NULL); @@ -371,7 +373,7 @@ NTSTATUS wg_transform_create(void *args) return STATUS_NO_MEMORY; if (!(transform->container = gst_bin_new("wg_transform"))) goto out; - if (!(transform->input = gst_buffer_list_new())) + if (!(transform->input_queue = gst_atomic_queue_new(8))) goto out; if (!(transform->output_queue = gst_atomic_queue_new(8))) goto out; @@ -538,8 +540,8 @@ out: wg_allocator_destroy(transform->allocator); if (transform->output_queue) gst_atomic_queue_unref(transform->output_queue); - if (transform->input) - gst_buffer_list_unref(transform->input); + if (transform->input_queue) + gst_atomic_queue_unref(transform->input_queue); if (transform->container) { gst_element_set_state(transform->container, GST_STATE_NULL); @@ -610,7 +612,7 @@ NTSTATUS wg_transform_push_data(void *args) GstBuffer *buffer; guint length; - length = gst_buffer_list_length(transform->input); + length = gst_atomic_queue_length(transform->input_queue); if (length >= transform->input_max_length) { GST_INFO("Refusing %u bytes, %u buffers already queued", sample->size, length); @@ -636,7 +638,7 @@ NTSTATUS wg_transform_push_data(void *args) GST_BUFFER_DURATION(buffer) = sample->duration * 100; if (!(sample->flags & WG_SAMPLE_FLAG_SYNC_POINT)) GST_BUFFER_FLAG_SET(buffer, GST_BUFFER_FLAG_DELTA_UNIT); - gst_buffer_list_insert(transform->input, -1, buffer); + gst_atomic_queue_push(transform->input_queue, buffer); params->result = S_OK; return STATUS_SUCCESS; @@ -791,9 +793,8 @@ NTSTATUS wg_transform_read_data(void *args) struct wg_transform *transform = params->transform; struct wg_sample *sample = params->sample; struct wg_format *format = params->format; + GstBuffer *output_buffer, *input_buffer; GstFlowReturn ret = GST_FLOW_OK; - GstBuffer *output_buffer; - GstBufferList *input; GstCaps *output_caps; bool discard_data; NTSTATUS status; @@ -802,17 +803,14 @@ NTSTATUS wg_transform_read_data(void *args) InterlockedIncrement(&sample->refcount); InterlockedExchangePointer((void **)&transform->output_wg_sample, sample); - if (!gst_buffer_list_length(transform->input)) - GST_DEBUG("Not input buffer queued"); - else if ((input = gst_buffer_list_new())) + while (!transform->output_sample && ret == GST_FLOW_OK) { - ret = gst_pad_push_list(transform->my_src, transform->input); - transform->input = input; - } - else - { - GST_ERROR("Failed to allocate new input queue"); - ret = GST_FLOW_ERROR; + if ((input_buffer = gst_atomic_queue_pop(transform->input_queue))) + ret = gst_pad_push(transform->my_src, input_buffer); + transform->output_sample = gst_atomic_queue_pop(transform->output_queue); + + if (!input_buffer) + break; } /* Remove the sample so transform_request_sample cannot use it */ @@ -826,7 +824,7 @@ NTSTATUS wg_transform_read_data(void *args) return STATUS_UNSUCCESSFUL; } - if (!transform->output_sample && !(transform->output_sample = gst_atomic_queue_pop(transform->output_queue))) + if (!transform->output_sample) { sample->size = 0; params->result = MF_E_TRANSFORM_NEED_MORE_INPUT; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/302

June 23, 2022