[PATCH 0/2] MR7029: Fix regression in variable expansion.

[PATCH 1/2] programs/cmd: Add more tests about variable expansion.

[Eric Pouech]

From: Eric Pouech

Signed-off-by: Eric Pouech 
---
 programs/cmd/tests/test_builtins.cmd     | 2 ++
 programs/cmd/tests/test_builtins.cmd.exp | 1 +
 2 files changed, 3 insertions(+)

diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd
index 7a2953b735d..3e102a7f366 100644
--- a/programs/cmd/tests/test_builtins.cmd
+++ b/programs/cmd/tests/test_builtins.cmd
@@ -960,7 +960,9 @@ echo %WINE_VAR:*TY==_%
 echo %WINE_VAR:*TY=%
 set WINE_VAR=
 mkdir dummydir
+set WINE_VAR=\foo;\bar;%CD%
 cd dummydir
+for %%i in (dummydir) do echo %%~$WINE_VAR:i
 echo %CD:~-6,6%
 cd ..
 rmdir dummydir
diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp
index 3c516b79fe5..670da578bf8 100644
--- a/programs/cmd/tests/test_builtins.cmd.exp
+++ b/programs/cmd/tests/test_builtins.cmd.exp
@@ -764,6 +764,7 @@ azertyazERTY
 ertyERTY
 =_QWERTY
 QWERTY
+@todo_wine@@drive@@path@dummydir
 mmydir
 ------------ Testing variable substitution ------------
 --- in FOR variables

[PATCH 2/2] programs/cmd: Fix regression in variable search in expansion.

[Eric Pouech]

From: Eric Pouech

Wine-Bug-Id: 57541

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

diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c
index 15c01de4b89..2a19b7105fd 100644
--- a/programs/cmd/batch.c
+++ b/programs/cmd/batch.c
@@ -350,7 +350,7 @@ void WCMD_HandleTildeModifiers(WCHAR **start, BOOL atExecute)
   }
   if (lastModifier == firstModifier) return; /* Invalid syntax */
   /* put all modifiers in lowercase */
-  for (pos = firstModifier; pos < lastModifier; pos++)
+  for (pos = firstModifier; pos < lastModifier && *pos != L'$'; pos++)
       *pos = towlower(*pos);

/* So now, firstModifier points to beginning of modifiers, lastModifier
diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp
index 670da578bf8..4499a3ce678 100644
--- a/programs/cmd/tests/test_builtins.cmd.exp
+++ b/programs/cmd/tests/test_builtins.cmd.exp
@@ -764,7 +764,7 @@ azertyazERTY
 ertyERTY
 =_QWERTY
 QWERTY
-@todo_wine@@drive@@path@dummydir
+@drive@@path@dummydir
 mmydir
 ------------ Testing variable substitution ------------
 --- in FOR variables