[PATCH 0/1] MR7058: programs/cmd: Skip trailing white spaces in FOR's option.

[eric pouech (＠epo)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=57570

Signed-off-by: Eric Pouech <epouech(a)codeweavers.com>

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7058

[PATCH 1/1] programs/cmd: Skip trailing white spaces in FOR's option.

[Eric Pouech]

From: Eric Pouech <epouech(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=57570

Signed-off-by: Eric Pouech <epouech(a)codeweavers.com>
---
 programs/cmd/wcmdmain.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index 1018fd56624..a510459cefa 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -2120,9 +2120,8 @@ static CMD_FOR_CONTROL *for_control_parse(WCHAR *opts_var)
             p[len - 1] = L'\0';
             p++;
         }
-        for ( ; *p; p = end)
+        for ( ; *(p = WCMD_skip_leading_spaces(p)); p = end)
         {
-            p = WCMD_skip_leading_spaces(p);
             /* Save End of line character (Ignore line if first token (based on delims) starts with it) */
             if ((end = for_fileset_option_split(p, L"eol=")))
             {
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/7058

[PATCH 1/1] programs/cmd: Skip trailing white spaces in FOR's option.

[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=150486

Your paranoid android.


=== debian11b (64 bit WoW report) ===

user32:
input.c:4305: Test succeeded inside todo block: button_down_hwnd_todo 1: got MSG_TEST_WIN hwnd 0000000000FF00E0, msg WM_LBUTTONDOWN, wparam 0x1, lparam 0x320032
win.c:4070: Test failed: Expected active window 0000000002EC015A, got 0000000000000000.
win.c:4071: Test failed: Expected focus window 0000000002EC015A, got 0000000000000000.

Report validation errors:
d3d11:d3d11 has no test summary line (early exit of the main process?)
d3d11:d3d11 has unaccounted for todo messages
d3d11:d3d11 returned a non-zero exit code despite reporting no failures