[PATCH v3 3/4] programs/cmd: Fix some CALL errorlevel propagation.

[Eric Pouech]

From: Eric Pouech

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

Signed-off-by: Eric Pouech 
---
 programs/cmd/batch.c                     | 4 +++-
 programs/cmd/tests/test_builtins.bat.exp | 2 +-
 programs/cmd/tests/test_builtins.cmd.exp | 2 +-
 programs/cmd/wcmdmain.c                  | 2 --
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c
index 2a19b7105fd..81f1092c921 100644
--- a/programs/cmd/batch.c
+++ b/programs/cmd/batch.c
@@ -90,7 +90,9 @@ RETURN_CODE WCMD_call_batch(const WCHAR *file, WCHAR *command)
     free(context);
     context = prev_context;

-    return return_code;
+    if (return_code != NO_ERROR && return_code != RETURN_CODE_ABORTED)
+        errorlevel = return_code;
+    return errorlevel;
 }

/*******************************************************************
diff --git a/programs/cmd/tests/test_builtins.bat.exp b/programs/cmd/tests/test_builtins.bat.exp
index 492aace865e..41c21afbb2a 100644
--- a/programs/cmd/tests/test_builtins.bat.exp
+++ b/programs/cmd/tests/test_builtins.bat.exp
@@ -33,7 +33,7 @@ SUCCESS 0
 FAILURE 1024
 SUCCESS 0
 @todo_wine@SUCCESS 0
-@todo_wine@FAILURE 666
+FAILURE 666
 FAILURE 2
 FAILURE 666
 FAILURE 666
diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp
index e7cde79523c..c0d37439bd6 100644
--- a/programs/cmd/tests/test_builtins.cmd.exp
+++ b/programs/cmd/tests/test_builtins.cmd.exp
@@ -484,7 +484,7 @@ SUCCESS 0
 FAILURE 1024
 SUCCESS 0
 @todo_wine@SUCCESS 0
-@todo_wine@FAILURE 666
+FAILURE 666
 FAILURE 2
 FAILURE 666
 FAILURE 666
diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index a510459cefa..0b9de9d5f74 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -1324,8 +1324,6 @@ static RETURN_CODE run_full_path(const WCHAR *file, WCHAR *full_cmdline, BOOL ca
             TRACE("Batch completed, but was not 'called' so skipping outer batch too\n");
             context->skip_rest = TRUE;
         }
-        if (return_code != RETURN_CODE_ABORTED)
-            errorlevel = return_code;
         return return_code;
     }