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

[RFC PATCH v3 0/5] Fix sock_recv reordering issue (#52401): unknown_status + wineserver call approach

by Jinoh Kang

<preamble> This is my forth attempt to tackle the issue #52401 [1]: "Improper synchronization in sock_recv/sock_send leads to arbitrary reordering of completion of I/O requests", which was initially reported (outside Bugzilla) by Dongwan Kim [2]. Basically, the old process of sock_recv is: 1. Perform the I/O synchronously. 2. Report the result back to the server, or queue up the request in the server. 3. If blocking, wait for I/O to complete. The new process of sock_recv would be: 1. Queue up the request in the server. 2. Perform the I/O synchronously. 3. Report the result back to the server, 4. If blocking, wait for I/O to complete. Everything except the actual I/O requires communicating with wineserver. My goal here is to fix the issue without introducing extra calls to wineserver. (However, if it turns out that this goal is not of utmost significance, then this patch serie can be easily modified so that it issues separate server calls.) The previous approaches are listed here: - Add a new select type called SELECT_SIGNAL_WAIT_ASYNC [3]. Zebediah has pointed out [4] that it is not very elegant to (ab-)use the synchronization machinery for communicating the async result. - Use APC_ASYNC_IO to perform the synchronous I/O [5]. This ended up with a total of 11 patches, and turned out to be rather too complicated for a simple task. - Add a new wineserver call, and use "add_queue" hook to save a round trip to the server [6]. </preamble> Each of the above turned out to be either too intrusive, complicated, or hard to verify. Per suggestion by Zebediah [7], this is my (hopefully) last approach: keep the new wineserver call, but keep out the implicit STATUS_PENDING transition from "add_queue"; also, (re-)use the "unknown_status" field. Changelog: - v1 -> v2: fix async queue hang on synchronous failure - v2 -> v3: rewrite handling of pending/failed asyncs. [1] https://bugs.winehq.org/show_bug.cgi?id=52401 [2] https://www.winehq.org/pipermail/wine-devel/2021-May/186454.html [3] https://www.winehq.org/pipermail/wine-devel/2022-January/204695.html [4] https://www.winehq.org/pipermail/wine-devel/2022-January/204710.html [5] https://www.winehq.org/pipermail/wine-devel/2022-January/205168.html [6] https://www.winehq.org/pipermail/wine-devel/2022-January/205193.html [7] https://www.winehq.org/pipermail/wine-devel/2022-January/205738.html Jinoh Kang (5): server: Allow calling async_handoff() with status code STATUS_ALERTED. server: Add a new server request "notify_async_direct_result." server: Attempt to complete I/O request immediately in recv_socket. ntdll: Don't call try_recv before server call in sock_recv. server: Replace redundant recv_socket status fields with force_async boolean field. dlls/ntdll/unix/socket.c | 37 ++++++++------- dlls/ntdll/unix/sync.c | 22 +++++++++ dlls/ntdll/unix/unix_private.h | 1 + dlls/ws2_32/tests/sock.c | 8 ++-- server/async.c | 85 ++++++++++++++++++++++++++++++++++ server/protocol.def | 14 +++++- server/sock.c | 40 +++++++++++----- 7 files changed, 172 insertions(+), 35 deletions(-) -- 2.34.1

Jan. 28, 2022

Re: [RFC PATCH v2 2/5] server: Add a new server request "notify_async_direct_result."

by Jinoh Kang

On 1/28/22 08:32, Zebediah Figura (she/her) wrote: > On 1/27/22 13:22, Jinoh Kang wrote: >> On 1/28/22 04:13, Jinoh Kang wrote: >>> On 1/28/22 04:05, Jinoh Kang wrote: >>>> + >>>> +/* Notify direct completion of async and close the wait handle */ >>>> +DECL_HANDLER(notify_async_direct_result) >>>> +{ >>>> + struct async *async = (struct async *)get_handle_obj( current->process, req->handle, 0, &async_ops ); >>>> + >>>> + if (!async) return; >>>> + >>>> + if (async->iosb && async->unknown_status && !async->pending && async->terminated) >>>> + { >>>> + /* Reactivate async. We call async_reselect() later. */ >>>> + async->terminated = 0; >>>> + >>>> + /* Set result for async_handoff(). */ >>>> + set_error( req->status ); >>>> + async->iosb->result = req->information; >>>> + >>>> + /* The async_handoff() call prior to the current server request was >>>> + * effectively a no-op since async->unknown_status is 1. Calling it >>>> + * again with async->unknown_status = 0 will do the remaining steps. >>>> + */ >>>> + async->unknown_status = 0; >>>> + async_handoff( async, NULL, 0 ); >>>> + >>>> + if (get_error() == STATUS_PENDING) >>>> + { >>>> + async_reselect( async ); >>>> + } >>>> + else if (NT_ERROR( get_error() )) >>>> + { >>>> + /* synchronous I/O failure: don't invoke callbacks, only dequeue it. */ >>>> + async_dequeue( async ); >>> >>> Note: we can't use async_set_result() here. async_handoff() leaves async->terminated as 0, and async_set_result() has "assert( async->terminated )". >>> >>> Thus, reusing async_set_result() here requires either: >>> >>> 1. Setting async->pending to 0 so that async_handoff() will call async_terminate(). >>> This is obviously incorrect since unwanted IOCP packets and APCs will fire on synchronous failure. >>> >>> 2. Not using async_handoff(). We have to copy a lot of code (particulary setting pending and direct_result flags) out of async_handoff() to do this. >> >> Maybe just merge both branches (error/success) and force async_terminate() before calling async_set_result()? > > Actually, I believe the right thing to do is just to set async->terminated = 1. In fact, I believe you should set async->terminated = 1 in the recv_socket request, Yes, it's already done in async_handoff(). Note the precondition above: > + if (async->iosb && async->unknown_status && !async->pending && async->terminated) > + { > + /* Reactivate async. We call async_reselect() later. */ > + async->terminated = 0; > otherwise async_waiting() will return 1 and the server will end up spinning and/or trying to wake the async. (Granted, that could be protected against by checking unknown_status, but...) > > There are a few different ways to look at this, but one way (and what I think makes the most sense to me) is that we're completing the async as if it had been alerted, much as we would from a kernel APC, except that we're also setting the initial status, which wasn't known yet. Hence we want to go through async_set_result(). > > Along these lines, if you also set async->alerted = 1, you get the STATUS_PENDING "restart the wait" behaviour for free. Which makes conceptual sense as well. I'm honestly split off as to which side should take the responsibility of setting "async->alerted = 1", async_handoff() or notify_async_direct_result. I suppose I'm going with the former, since that's where STATUS_ALERTED is received. But then, shall the latter have "assert( async->alerted );"...? > > I suppose this is why you mentioned direct_result in [1]—i.e. we could just async_terminate(STATUS_ALERTED) in recv_socket. I can see both approaches working, but I think that open-coding the relevant parts of async_terminate would be better than trying to get direct_result manipulation exactly right. I agree. I hope we don't also have to also open code "async_handoff()", though. > Of course, I also haven't tried... > > [1] https://www.winehq.org/pipermail/wine-devel/2022-January/205774.html That said, the more I work with the async code, the more I learn to hate all those status bitfields... I think it's much better off merging as many states as possible into a single enum, so that the lifecycle is explicit (e.g. ASYNC_INITIAL -> ASYNC_QUEUED -> ASYNC_ALERTED -> ...) (I'm aware it was much worse before that, making the status field serve the dual role of async state and I/O status.) -- Sincerely, Jinoh Kang

Jan. 28, 2022

Re: [PATCH 24/24] opcservices/tests: Avoid "misleading indentation" warnings.

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=106275 Your paranoid android. === build (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 error: patch failed: dlls/ntdll/tests/file.c:1113 error: patch failed: dlls/ntdll/tests/info.c:2251 error: patch failed: dlls/ntdll/tests/reg.c:374 error: patch failed: dlls/ntoskrnl.exe/tests/driver.c:280 error: patch failed: dlls/ole32/tests/compobj.c:3817 error: patch failed: dlls/ole32/tests/defaulthandler.c:286 error: patch failed: dlls/ole32/tests/marshal.c:1344 error: patch failed: dlls/ole32/tests/moniker.c:96 error: patch failed: dlls/ole32/tests/ole2.c:3209 error: patch failed: dlls/ole32/tests/ole_server.c:472 error: patch failed: dlls/ole32/tests/stg_prop.c:650 error: patch failed: dlls/ole32/tests/usrmarshal.c:720 error: patch failed: dlls/oleaut32/tests/olefont.c:1140 error: patch failed: dlls/oleaut32/tests/olepicture.c:1178 error: patch failed: dlls/oleaut32/tests/safearray.c:1996 error: patch failed: dlls/oleaut32/tests/tmarshal.c:2329 error: patch failed: dlls/oleaut32/tests/typelib.c:2933 error: patch failed: dlls/oleaut32/tests/usrmarshal.c:568 error: patch failed: dlls/oleaut32/vartype.c:149 error: patch failed: dlls/oledb32/tests/convert.c:358 error: patch failed: dlls/opcservices/tests/opcservices.c:635 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 error: patch failed: dlls/ntdll/tests/file.c:1113 error: patch failed: dlls/ntdll/tests/info.c:2251 error: patch failed: dlls/ntdll/tests/reg.c:374 error: patch failed: dlls/ntoskrnl.exe/tests/driver.c:280 error: patch failed: dlls/ole32/tests/compobj.c:3817 error: patch failed: dlls/ole32/tests/defaulthandler.c:286 error: patch failed: dlls/ole32/tests/marshal.c:1344 error: patch failed: dlls/ole32/tests/moniker.c:96 error: patch failed: dlls/ole32/tests/ole2.c:3209 error: patch failed: dlls/ole32/tests/ole_server.c:472 error: patch failed: dlls/ole32/tests/stg_prop.c:650 error: patch failed: dlls/ole32/tests/usrmarshal.c:720 error: patch failed: dlls/oleaut32/tests/olefont.c:1140 error: patch failed: dlls/oleaut32/tests/olepicture.c:1178 error: patch failed: dlls/oleaut32/tests/safearray.c:1996 error: patch failed: dlls/oleaut32/tests/tmarshal.c:2329 error: patch failed: dlls/oleaut32/tests/typelib.c:2933 error: patch failed: dlls/oleaut32/tests/usrmarshal.c:568 error: patch failed: dlls/oleaut32/vartype.c:149 error: patch failed: dlls/oledb32/tests/convert.c:358 error: patch failed: dlls/opcservices/tests/opcservices.c:635 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 error: patch failed: dlls/ntdll/tests/file.c:1113 error: patch failed: dlls/ntdll/tests/info.c:2251 error: patch failed: dlls/ntdll/tests/reg.c:374 error: patch failed: dlls/ntoskrnl.exe/tests/driver.c:280 error: patch failed: dlls/ole32/tests/compobj.c:3817 error: patch failed: dlls/ole32/tests/defaulthandler.c:286 error: patch failed: dlls/ole32/tests/marshal.c:1344 error: patch failed: dlls/ole32/tests/moniker.c:96 error: patch failed: dlls/ole32/tests/ole2.c:3209 error: patch failed: dlls/ole32/tests/ole_server.c:472 error: patch failed: dlls/ole32/tests/stg_prop.c:650 error: patch failed: dlls/ole32/tests/usrmarshal.c:720 error: patch failed: dlls/oleaut32/tests/olefont.c:1140 error: patch failed: dlls/oleaut32/tests/olepicture.c:1178 error: patch failed: dlls/oleaut32/tests/safearray.c:1996 error: patch failed: dlls/oleaut32/tests/tmarshal.c:2329 error: patch failed: dlls/oleaut32/tests/typelib.c:2933 error: patch failed: dlls/oleaut32/tests/usrmarshal.c:568 error: patch failed: dlls/oleaut32/vartype.c:149 error: patch failed: dlls/oledb32/tests/convert.c:358 error: patch failed: dlls/opcservices/tests/opcservices.c:635 Task: Patch failed to apply

Jan. 28, 2022

Re: [PATCH 23/24] oledb32/tests: Avoid "misleading indentation" warnings.

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=106274 Your paranoid android. === build (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 error: patch failed: dlls/ntdll/tests/file.c:1113 error: patch failed: dlls/ntdll/tests/info.c:2251 error: patch failed: dlls/ntdll/tests/reg.c:374 error: patch failed: dlls/ntoskrnl.exe/tests/driver.c:280 error: patch failed: dlls/ole32/tests/compobj.c:3817 error: patch failed: dlls/ole32/tests/defaulthandler.c:286 error: patch failed: dlls/ole32/tests/marshal.c:1344 error: patch failed: dlls/ole32/tests/moniker.c:96 error: patch failed: dlls/ole32/tests/ole2.c:3209 error: patch failed: dlls/ole32/tests/ole_server.c:472 error: patch failed: dlls/ole32/tests/stg_prop.c:650 error: patch failed: dlls/ole32/tests/usrmarshal.c:720 error: patch failed: dlls/oleaut32/tests/olefont.c:1140 error: patch failed: dlls/oleaut32/tests/olepicture.c:1178 error: patch failed: dlls/oleaut32/tests/safearray.c:1996 error: patch failed: dlls/oleaut32/tests/tmarshal.c:2329 error: patch failed: dlls/oleaut32/tests/typelib.c:2933 error: patch failed: dlls/oleaut32/tests/usrmarshal.c:568 error: patch failed: dlls/oleaut32/vartype.c:149 error: patch failed: dlls/oledb32/tests/convert.c:358 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 error: patch failed: dlls/ntdll/tests/file.c:1113 error: patch failed: dlls/ntdll/tests/info.c:2251 error: patch failed: dlls/ntdll/tests/reg.c:374 error: patch failed: dlls/ntoskrnl.exe/tests/driver.c:280 error: patch failed: dlls/ole32/tests/compobj.c:3817 error: patch failed: dlls/ole32/tests/defaulthandler.c:286 error: patch failed: dlls/ole32/tests/marshal.c:1344 error: patch failed: dlls/ole32/tests/moniker.c:96 error: patch failed: dlls/ole32/tests/ole2.c:3209 error: patch failed: dlls/ole32/tests/ole_server.c:472 error: patch failed: dlls/ole32/tests/stg_prop.c:650 error: patch failed: dlls/ole32/tests/usrmarshal.c:720 error: patch failed: dlls/oleaut32/tests/olefont.c:1140 error: patch failed: dlls/oleaut32/tests/olepicture.c:1178 error: patch failed: dlls/oleaut32/tests/safearray.c:1996 error: patch failed: dlls/oleaut32/tests/tmarshal.c:2329 error: patch failed: dlls/oleaut32/tests/typelib.c:2933 error: patch failed: dlls/oleaut32/tests/usrmarshal.c:568 error: patch failed: dlls/oleaut32/vartype.c:149 error: patch failed: dlls/oledb32/tests/convert.c:358 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 error: patch failed: dlls/ntdll/tests/file.c:1113 error: patch failed: dlls/ntdll/tests/info.c:2251 error: patch failed: dlls/ntdll/tests/reg.c:374 error: patch failed: dlls/ntoskrnl.exe/tests/driver.c:280 error: patch failed: dlls/ole32/tests/compobj.c:3817 error: patch failed: dlls/ole32/tests/defaulthandler.c:286 error: patch failed: dlls/ole32/tests/marshal.c:1344 error: patch failed: dlls/ole32/tests/moniker.c:96 error: patch failed: dlls/ole32/tests/ole2.c:3209 error: patch failed: dlls/ole32/tests/ole_server.c:472 error: patch failed: dlls/ole32/tests/stg_prop.c:650 error: patch failed: dlls/ole32/tests/usrmarshal.c:720 error: patch failed: dlls/oleaut32/tests/olefont.c:1140 error: patch failed: dlls/oleaut32/tests/olepicture.c:1178 error: patch failed: dlls/oleaut32/tests/safearray.c:1996 error: patch failed: dlls/oleaut32/tests/tmarshal.c:2329 error: patch failed: dlls/oleaut32/tests/typelib.c:2933 error: patch failed: dlls/oleaut32/tests/usrmarshal.c:568 error: patch failed: dlls/oleaut32/vartype.c:149 error: patch failed: dlls/oledb32/tests/convert.c:358 Task: Patch failed to apply

Jan. 28, 2022

Re: [PATCH 22/24] oleaut32/tests: Avoid "misleading indentation" warnings.

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=106273 Your paranoid android. === build (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 error: patch failed: dlls/ntdll/tests/file.c:1113 error: patch failed: dlls/ntdll/tests/info.c:2251 error: patch failed: dlls/ntdll/tests/reg.c:374 error: patch failed: dlls/ntoskrnl.exe/tests/driver.c:280 error: patch failed: dlls/ole32/tests/compobj.c:3817 error: patch failed: dlls/ole32/tests/defaulthandler.c:286 error: patch failed: dlls/ole32/tests/marshal.c:1344 error: patch failed: dlls/ole32/tests/moniker.c:96 error: patch failed: dlls/ole32/tests/ole2.c:3209 error: patch failed: dlls/ole32/tests/ole_server.c:472 error: patch failed: dlls/ole32/tests/stg_prop.c:650 error: patch failed: dlls/ole32/tests/usrmarshal.c:720 error: patch failed: dlls/oleaut32/tests/olefont.c:1140 error: patch failed: dlls/oleaut32/tests/olepicture.c:1178 error: patch failed: dlls/oleaut32/tests/safearray.c:1996 error: patch failed: dlls/oleaut32/tests/tmarshal.c:2329 error: patch failed: dlls/oleaut32/tests/typelib.c:2933 error: patch failed: dlls/oleaut32/tests/usrmarshal.c:568 error: patch failed: dlls/oleaut32/vartype.c:149 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 error: patch failed: dlls/ntdll/tests/file.c:1113 error: patch failed: dlls/ntdll/tests/info.c:2251 error: patch failed: dlls/ntdll/tests/reg.c:374 error: patch failed: dlls/ntoskrnl.exe/tests/driver.c:280 error: patch failed: dlls/ole32/tests/compobj.c:3817 error: patch failed: dlls/ole32/tests/defaulthandler.c:286 error: patch failed: dlls/ole32/tests/marshal.c:1344 error: patch failed: dlls/ole32/tests/moniker.c:96 error: patch failed: dlls/ole32/tests/ole2.c:3209 error: patch failed: dlls/ole32/tests/ole_server.c:472 error: patch failed: dlls/ole32/tests/stg_prop.c:650 error: patch failed: dlls/ole32/tests/usrmarshal.c:720 error: patch failed: dlls/oleaut32/tests/olefont.c:1140 error: patch failed: dlls/oleaut32/tests/olepicture.c:1178 error: patch failed: dlls/oleaut32/tests/safearray.c:1996 error: patch failed: dlls/oleaut32/tests/tmarshal.c:2329 error: patch failed: dlls/oleaut32/tests/typelib.c:2933 error: patch failed: dlls/oleaut32/tests/usrmarshal.c:568 error: patch failed: dlls/oleaut32/vartype.c:149 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 error: patch failed: dlls/ntdll/tests/file.c:1113 error: patch failed: dlls/ntdll/tests/info.c:2251 error: patch failed: dlls/ntdll/tests/reg.c:374 error: patch failed: dlls/ntoskrnl.exe/tests/driver.c:280 error: patch failed: dlls/ole32/tests/compobj.c:3817 error: patch failed: dlls/ole32/tests/defaulthandler.c:286 error: patch failed: dlls/ole32/tests/marshal.c:1344 error: patch failed: dlls/ole32/tests/moniker.c:96 error: patch failed: dlls/ole32/tests/ole2.c:3209 error: patch failed: dlls/ole32/tests/ole_server.c:472 error: patch failed: dlls/ole32/tests/stg_prop.c:650 error: patch failed: dlls/ole32/tests/usrmarshal.c:720 error: patch failed: dlls/oleaut32/tests/olefont.c:1140 error: patch failed: dlls/oleaut32/tests/olepicture.c:1178 error: patch failed: dlls/oleaut32/tests/safearray.c:1996 error: patch failed: dlls/oleaut32/tests/tmarshal.c:2329 error: patch failed: dlls/oleaut32/tests/typelib.c:2933 error: patch failed: dlls/oleaut32/tests/usrmarshal.c:568 error: patch failed: dlls/oleaut32/vartype.c:149 Task: Patch failed to apply

Jan. 28, 2022

Re: [PATCH 21/24] ole32/tests: Avoid "misleading indentation" warnings.

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=106272 Your paranoid android. === build (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 error: patch failed: dlls/ntdll/tests/file.c:1113 error: patch failed: dlls/ntdll/tests/info.c:2251 error: patch failed: dlls/ntdll/tests/reg.c:374 error: patch failed: dlls/ntoskrnl.exe/tests/driver.c:280 error: patch failed: dlls/ole32/tests/compobj.c:3817 error: patch failed: dlls/ole32/tests/defaulthandler.c:286 error: patch failed: dlls/ole32/tests/marshal.c:1344 error: patch failed: dlls/ole32/tests/moniker.c:96 error: patch failed: dlls/ole32/tests/ole2.c:3209 error: patch failed: dlls/ole32/tests/ole_server.c:472 error: patch failed: dlls/ole32/tests/stg_prop.c:650 error: patch failed: dlls/ole32/tests/usrmarshal.c:720 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 error: patch failed: dlls/ntdll/tests/file.c:1113 error: patch failed: dlls/ntdll/tests/info.c:2251 error: patch failed: dlls/ntdll/tests/reg.c:374 error: patch failed: dlls/ntoskrnl.exe/tests/driver.c:280 error: patch failed: dlls/ole32/tests/compobj.c:3817 error: patch failed: dlls/ole32/tests/defaulthandler.c:286 error: patch failed: dlls/ole32/tests/marshal.c:1344 error: patch failed: dlls/ole32/tests/moniker.c:96 error: patch failed: dlls/ole32/tests/ole2.c:3209 error: patch failed: dlls/ole32/tests/ole_server.c:472 error: patch failed: dlls/ole32/tests/stg_prop.c:650 error: patch failed: dlls/ole32/tests/usrmarshal.c:720 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 error: patch failed: dlls/ntdll/tests/file.c:1113 error: patch failed: dlls/ntdll/tests/info.c:2251 error: patch failed: dlls/ntdll/tests/reg.c:374 error: patch failed: dlls/ntoskrnl.exe/tests/driver.c:280 error: patch failed: dlls/ole32/tests/compobj.c:3817 error: patch failed: dlls/ole32/tests/defaulthandler.c:286 error: patch failed: dlls/ole32/tests/marshal.c:1344 error: patch failed: dlls/ole32/tests/moniker.c:96 error: patch failed: dlls/ole32/tests/ole2.c:3209 error: patch failed: dlls/ole32/tests/ole_server.c:472 error: patch failed: dlls/ole32/tests/stg_prop.c:650 error: patch failed: dlls/ole32/tests/usrmarshal.c:720 Task: Patch failed to apply

Jan. 28, 2022

Re: [PATCH 20/24] ntoskrnl/tests: Avoid "misleading indentation" warnings.

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=106271 Your paranoid android. === build (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 error: patch failed: dlls/ntdll/tests/file.c:1113 error: patch failed: dlls/ntdll/tests/info.c:2251 error: patch failed: dlls/ntdll/tests/reg.c:374 error: patch failed: dlls/ntoskrnl.exe/tests/driver.c:280 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 error: patch failed: dlls/ntdll/tests/file.c:1113 error: patch failed: dlls/ntdll/tests/info.c:2251 error: patch failed: dlls/ntdll/tests/reg.c:374 error: patch failed: dlls/ntoskrnl.exe/tests/driver.c:280 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 error: patch failed: dlls/ntdll/tests/file.c:1113 error: patch failed: dlls/ntdll/tests/info.c:2251 error: patch failed: dlls/ntdll/tests/reg.c:374 error: patch failed: dlls/ntoskrnl.exe/tests/driver.c:280 Task: Patch failed to apply

Jan. 28, 2022

Re: [PATCH 19/24] ntdll/tests: Avoid "misleading indentation" warnings.

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=106270 Your paranoid android. === build (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 error: patch failed: dlls/ntdll/tests/file.c:1113 error: patch failed: dlls/ntdll/tests/info.c:2251 error: patch failed: dlls/ntdll/tests/reg.c:374 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 error: patch failed: dlls/ntdll/tests/file.c:1113 error: patch failed: dlls/ntdll/tests/info.c:2251 error: patch failed: dlls/ntdll/tests/reg.c:374 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 error: patch failed: dlls/ntdll/tests/file.c:1113 error: patch failed: dlls/ntdll/tests/info.c:2251 error: patch failed: dlls/ntdll/tests/reg.c:374 Task: Patch failed to apply

Jan. 28, 2022

Re: [PATCH 18/24] nsi/tests: Avoid "misleading indentation" warnings.

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=106269 Your paranoid android. === build (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 Task: Patch failed to apply

Jan. 28, 2022

Re: [PATCH 17/24] msxml3/tests: Avoid "misleading indentation" warnings.

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=106268 Your paranoid android. === build (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/dxva2/tests/dxva2.c:356 error: patch failed: dlls/evr/tests/evr.c:645 error: patch failed: dlls/hlink/tests/hlink.c:2364 error: patch failed: dlls/kernel32/tests/actctx.c:2668 error: patch failed: dlls/kernel32/tests/file.c:5313 error: patch failed: dlls/kernel32/tests/loader.c:2442 error: patch failed: dlls/kernel32/tests/locale.c:5519 error: patch failed: dlls/kernel32/tests/mailslot.c:88 error: patch failed: dlls/kernel32/tests/sync.c:202 error: patch failed: dlls/kernel32/tests/thread.c:2338 error: patch failed: dlls/msscript.ocx/tests/msscript.c:1453 error: patch failed: dlls/msvfw32/tests/msvfw.c:477 Task: Patch failed to apply

Jan. 28, 2022