From bae2bac6130364bb658d932cba40159245d7336e Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sun, 1 Apr 2018 13:20:50 +0100
Subject: [PATCH] [CMD_WINETEST] Sync with Wine Staging 3.3. CORE-14434

---
 modules/rostests/winetests/cmd/batch.c               |  5 ++---
 modules/rostests/winetests/cmd/test_builtins.cmd     | 10 ++++++++++
 modules/rostests/winetests/cmd/test_builtins.cmd.exp |  7 +++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/modules/rostests/winetests/cmd/batch.c b/modules/rostests/winetests/cmd/batch.c
index 01c55d74a12..71966090e9a 100644
--- a/modules/rostests/winetests/cmd/batch.c
+++ b/modules/rostests/winetests/cmd/batch.c
@@ -17,11 +17,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include <windows.h>
+#include <windows.h>
 #include <stdio.h>
 
-#include <wine/test.h>
-#include <winnls.h>
+#include "wine/test.h"
 
 static char workdir[MAX_PATH];
 static DWORD workdir_len;
diff --git a/modules/rostests/winetests/cmd/test_builtins.cmd b/modules/rostests/winetests/cmd/test_builtins.cmd
index 62334b17b65..f6846283c72 100644
--- a/modules/rostests/winetests/cmd/test_builtins.cmd
+++ b/modules/rostests/winetests/cmd/test_builtins.cmd
@@ -1696,6 +1696,16 @@ for /f "tokens=2,2,3*" %%i in ("a b c d e f g") do echo h=%%h i=%%i j=%%j k=%%k
 for /f "tokens=3,2,3*" %%i in ("a b c d e f g") do echo h=%%h i=%%i j=%%j k=%%k l=%%l m=%%m n=%%n o=%%o
 cd ..
 rd /s/q foobar
+echo ------ parameter splitting
+echo forFParameterSplittingFunc "myparam1=myvalue1 myparam2=myparam2" mytest> foo
+for /f "tokens=1 delims=;" %%i in (foo) do (call :%%i)
+del foo
+for /f "tokens=1 delims=;" %%i in ("forFParameterSplittingFunc "myparam1^=myvalue1 myparam2^=myparam2" mytest") do (call :%%i)
+goto :forFParameterSplittingEnd
+:forFParameterSplittingFunc
+echo %~0 %~1 %~2 %~3 %~4 %~5
+goto :eof
+:forFParameterSplittingEnd
 
 echo ------------ Testing del ------------
 echo abc > file
diff --git a/modules/rostests/winetests/cmd/test_builtins.cmd.exp b/modules/rostests/winetests/cmd/test_builtins.cmd.exp
index 796550e57ec..5512fee0727 100644
--- a/modules/rostests/winetests/cmd/test_builtins.cmd.exp
+++ b/modules/rostests/winetests/cmd/test_builtins.cmd.exp
@@ -1222,6 +1222,9 @@ h=%h i=a j=b k=c l=d e f g m=%m n=%n o=%o@or_broken@h=%h i=a j=b k=c l=d e f g m
 h=%h i=a j=c k= l= m=%m n=%n o=%o@or_broken@h=%h i=a j=c k= l= m= n=%n o=%o
 h=%h i=b j=c k= l= m=%m n=%n o=%o@or_broken@h=%h i=b j=c k= l= m= n=%n o=%o
 h=%h i=b j=c k= l= m=%m n=%n o=%o@or_broken@h=%h i=b j=c k= l= m= n=%n o=%o
+------ parameter splitting
+:forFParameterSplittingFunc myparam1=myvalue1 myparam2=myparam2 mytest@space@@space@@space@
+:forFParameterSplittingFunc myparam1=myvalue1 myparam2=myparam2 mytest@space@@space@@space@
 ------------ Testing del ------------
 deleting 'file'
 errorlevel is 0, good
@@ -1258,8 +1261,8 @@ file move succeeded
 @todo_wine@bar@or_broken@baz
 read-only files are moveable
 file moved in subdirectory
-@todo_wine@moving a file to itself is a no-op@or_broken@moving a file to itself should be a no-op!
-@todo_wine@ErrorLevel: 0@or_broken@ErrorLevel: 1
+moving a file to itself is a no-op@or_broken@moving a file to itself should be a no-op!
+ErrorLevel: 0@or_broken@ErrorLevel: 1
 --- directory move
 simple directory move succeeded
 moving a directory to itself gives error; errlevel 1