[PATCH 0/1] MR6891: cmd: Use CD /D to change directory in POPD (same as PUSHD)

[huangqinjin (＠huangqinjin)]

Fixes https://bugs.winehq.org/show_bug.cgi?id=57137

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

[PATCH 1/1] cmd: Use CD /D to change directory in POPD (same as PUSHD)

[huangqinjin]

From: huangqinjin <huangqinjin(a)gmail.com>

Fixes https://bugs.winehq.org/show_bug.cgi?id=57137
---
 programs/cmd/builtins.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
index d7c5090d17f..f441070aa86 100644
--- a/programs/cmd/builtins.c
+++ b/programs/cmd/builtins.c
@@ -1806,6 +1806,7 @@ RETURN_CODE WCMD_pushd(const WCHAR *args)
 
 RETURN_CODE WCMD_popd(void)
 {
+    RETURN_CODE return_code;
     struct env_stack *temp = pushd_directories;
 
     if (!pushd_directories)
@@ -1813,10 +1814,12 @@ RETURN_CODE WCMD_popd(void)
 
     /* pop the old environment from the stack, and make it the current dir */
     pushd_directories = temp->next;
-    SetCurrentDirectoryW(temp->strings);
+    /* Change directory using CD code with /D parameter */
+    lstrcpyW(quals, L"/D");
+    return_code = WCMD_setshow_default(temp->strings);
     free(temp->strings);
     free(temp);
-    return NO_ERROR;
+    return return_code;
 }
 
 /****************************************************************************
-- 
GitLab

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

[PATCH 1/1] cmd: Use CD /D to change directory in POPD (same as PUSHD)

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

Your paranoid android.


=== debian11 (32 bit report) ===

cmd.exe:
batch.c:348: Test failed: unexpected char 0x30 position 8 in line 107 (got 'SUCCESS 0', wanted 'SUCCESS 666')
batch.c:348: Test failed: unexpected char 0x30 position 8 in line 558 (got 'SUCCESS 0', wanted 'SUCCESS 666')

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

cmd.exe:
batch.c:348: Test failed: unexpected char 0x30 position 8 in line 107 (got 'SUCCESS 0', wanted 'SUCCESS 666')
batch.c:348: Test failed: unexpected char 0x30 position 8 in line 558 (got 'SUCCESS 0', wanted 'SUCCESS 666')

Report validation errors:
d3d11:d3d11 crashed (c0000005)