[PATCH v12 0/2] MR7131: DIR command improvements: Make /o by itself behave equal to how it does in Windows

List overview All Threads

newer

older

[PATCH 0/2] MR7237: include: Fix...

[PATCH v10 0/1] MR7131: DIR...

Joe Souza (＠JoeS209)

31 Jan 2025 31 Jan '25

6:31 p.m.

"DIR /o" (no order specifier after /o) hasn't functioned the same as it does on Windows. This change makes the functionality of /o by itself equivalent to behavior on Windows.

-- v12: programs/cmd: Tests patch from @epo

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

Show replies by date

Joe Souza

31 Jan 31 Jan

6:31 p.m.

New subject: [PATCH v12 1/2] programs/cmd: Cleanup DIR /O logic.

From: Joe Souza jsouza@yahoo.com

--- programs/cmd/directory.c | 64 ++++++++++++++++++++++++++++++---------- 1 file changed, 48 insertions(+), 16 deletions(-)

diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 3f4f7853710..3a2a5955d12 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -35,7 +35,8 @@ typedef enum _DISPLAYTIME

typedef enum _DISPLAYORDER { - Name = 0, + Unspecified = 0, + Name, Extension, Size, Date @@ -90,16 +91,37 @@ static int __cdecl WCMD_dir_sort (const void *a, const void *b) { const WIN32_FIND_DATAW *filea = (const WIN32_FIND_DATAW *)a; const WIN32_FIND_DATAW *fileb = (const WIN32_FIND_DATAW *)b; + BOOL aDir = filea->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY; + BOOL bDir = fileb->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY; int result = 0;

- /* If /OG or /O-G supplied, dirs go at the top or bottom, ignoring the - requested sort order for the directory components */ - if (orderGroupDirs && - ((filea->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || - (fileb->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))) - { - BOOL aDir = filea->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY; - if (aDir) result = -1; + if (orderGroupDirs && dirOrder == Unspecified) { + /* Special case: If ordering groups and not sorting by other criteria, "." and ".." always go first. */ + if (aDir && !lstrcmpW(filea->cFileName, L".")) { + result = -1; + } else if (bDir && !lstrcmpW(fileb->cFileName, L".")) { + result = 1; + } else if (aDir && !lstrcmpW(filea->cFileName, L"..")) { + result = -1; + } else if (bDir && !lstrcmpW(fileb->cFileName, L"..")) { + result = 1; + } + + if (result) { + if (orderGroupDirsReverse) result = -result; + return result; + } + } + + /* If /OG or /O-G supplied, dirs go at the top or bottom, also sorted + if requested sort order is by name. */ + if (orderGroupDirs && (aDir || bDir)) { + if (aDir && bDir && dirOrder == Name) { + result = lstrcmpiW(filea->cFileName, fileb->cFileName); + if (orderReverse) result = -result; + } else if (aDir) { + result = -1; + } else result = 1; if (orderGroupDirsReverse) result = -result; return result; @@ -674,7 +696,7 @@ RETURN_CODE WCMD_directory(WCHAR *args) orderByCol = FALSE; separator = TRUE; dirTime = Written; - dirOrder = Name; + dirOrder = Unspecified; orderReverse = FALSE; orderGroupDirs = FALSE; orderGroupDirsReverse = FALSE; @@ -744,13 +766,16 @@ RETURN_CODE WCMD_directory(WCHAR *args) if (*p==':') p++; /* Skip optional : */ while (*p && *p != '/') { WINE_TRACE("Processing subparm '%c' (in %s)\n", *p, wine_dbgstr_w(quals)); + /* Options N,E,S,D are mutually-exclusive, first encountered takes precedence. */ switch (*p) { - case 'N': dirOrder = Name; break; - case 'E': dirOrder = Extension; break; - case 'S': dirOrder = Size; break; - case 'D': dirOrder = Date; break; - case '-': if (*(p+1)=='G') orderGroupDirsReverse=TRUE; - else orderReverse = TRUE; + case 'N': if (dirOrder == Unspecified) dirOrder = Name; break; + case 'E': if (dirOrder == Unspecified) dirOrder = Extension; break; + case 'S': if (dirOrder == Unspecified) dirOrder = Size; break; + case 'D': if (dirOrder == Unspecified) dirOrder = Date; break; + case '-': if (dirOrder == Unspecified) { + if (*(p+1)=='G') orderGroupDirsReverse=TRUE; + else if (*(p+1)=='N'||*(p+1)=='E'||*(p+1)=='S'||*(p+1)=='D') orderReverse = TRUE; + } break; case 'G': orderGroupDirs = TRUE; break; default: @@ -760,6 +785,13 @@ RETURN_CODE WCMD_directory(WCHAR *args) } p++; } + /* Handle default case of /O specified by itself, with no specific options. + This is equivalent to /O:GN. */ + if (dirOrder == Unspecified && !orderGroupDirs) { + orderGroupDirs = TRUE; + orderGroupDirsReverse = FALSE; + dirOrder = Name; + } p = p - 1; /* So when step on, move to '/' */ break; case 'A': p = p + 1;

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7131

Joe Souza

6:31 p.m.

New subject: [PATCH v12 2/2] programs/cmd: Tests patch from @epo

From: Joe Souza jsouza@yahoo.com

--- programs/cmd/tests/test_builtins.cmd | 20 +++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 37 ++++++++++++++++++++++++ 2 files changed, 57 insertions(+)

diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 8552d51930a..95d96567d25 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -2923,6 +2923,26 @@ popd cd rd /s/q foobar

+echo ------------ Testing dir /o ------------ +mkdir foobar & cd foobar +echo AAA>a1.aa +mkdir a1.ab +echo A>a1.ac +echo AA>a2.aa +mkdir a2.ac +echo --- +dir /B /O: +echo --- +dir /B /O:GN +echo --- +dir /B /O:G-N +echo --- +dir /B /O:GNE +echo --- +dir /B /O:G-NE +echo --- +dir /B /O:G-E-N +cd .. & rd /s/q foobar echo ------------ Testing attrib ------------ rem FIXME Add tests for archive, hidden and system attributes + mixed attributes modifications mkdir foobar & cd foobar diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 292c24985e8..039c1a3631c 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1754,6 +1754,43 @@ bar\baz removed @pwd@ @drive@@path@foobar @pwd@ +------------ Testing dir /o ------------ +--- +@todo_wine@a1.ab +@todo_wine@a2.ac +@todo_wine@a1.aa +@todo_wine@a1.ac +@todo_wine@a2.aa +--- +@todo_wine@a1.ab +@todo_wine@a2.ac +a1.aa +a1.ac +a2.aa +--- +a2.ac +a1.ab +a2.aa +a1.ac +a1.aa +--- +@todo_wine@a1.ab +@todo_wine@a2.ac +@todo_wine@a1.aa +@todo_wine@a1.ac +@todo_wine@a2.aa +--- +a2.ac +a1.ab +@todo_wine@a2.aa +@todo_wine@a1.ac +a1.aa +--- +a2.ac +a1.ab +@todo_wine@a1.ac +@todo_wine@a2.aa +a1.aa ------------ Testing attrib ------------ A@spaces@@drive@@path@foobar\foo@or_broken@A I@spaces@@drive@@path@foobar\foo A@spaces@@drive@@path@foobar\foo@or_broken@A I@spaces@@drive@@path@foobar\foo

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7131

Marvin

7:08 p.m.

New subject: [PATCH v12 2/2] programs/cmd: Tests patch from @epo

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=151173

Your paranoid android.

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

cmd.exe: batch.c:348: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 1759 (got 'a1.ab', wanted 'a1.ab') batch.c:348: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 1760 (got 'a2.ac', wanted 'a2.ac') batch.c:348: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 1761 (got 'a1.aa', wanted 'a1.aa') batch.c:348: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 1762 (got 'a1.ac', wanted 'a1.ac') batch.c:348: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 1763 (got 'a2.aa', wanted 'a2.aa') batch.c:348: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 1765 (got 'a1.ab', wanted 'a1.ab') batch.c:348: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 1766 (got 'a2.ac', wanted 'a2.ac') batch.c:348: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 1777 (got 'a1.ab', wanted 'a1.ab') batch.c:348: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 1778 (got 'a2.ac', wanted 'a2.ac') batch.c:348: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 1779 (got 'a1.aa', wanted 'a1.aa') batch.c:348: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 1780 (got 'a1.ac', wanted 'a1.ac') batch.c:348: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 1781 (got 'a2.aa', wanted 'a2.aa') batch.c:348: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 1785 (got 'a2.aa', wanted 'a2.aa') batch.c:348: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 1786 (got 'a1.ac', wanted 'a1.ac') batch.c:348: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 1791 (got 'a1.ac', wanted 'a1.ac') batch.c:348: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 1792 (got 'a2.aa', wanted 'a2.aa')

=== debian11 (32 bit ar:MA report) ===

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

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

=== debian11 (32 bit he:IL report) ===

=== debian11 (32 bit hi:IN report) ===

=== debian11 (32 bit ja:JP report) ===

=== debian11 (32 bit zh:CN report) ===

=== debian11b (32 bit WoW report) ===

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

user32: input.c:4306: Test succeeded inside todo block: button_down_hwnd_todo 1: got MSG_TEST_WIN hwnd 0000000000AE00F8, msg WM_LBUTTONDOWN, wparam 0x1, lparam 0x320032 msg.c:6995: Test failed: SetFocus(hwnd) on a button: 3: the winevent_hook 0x8005 was expected, but got hook 0x0005 instead msg.c:6995: Test failed: SetFocus(hwnd) on a button: 3: the winevent_hook 0x8005 was expected, but got winevent_hook 0x0003 instead msg.c:6995: Test failed: SetFocus(hwnd) on a button: 3: the winevent_hook 0x8005 was expected, but got msg 0x030f instead msg.c:6995: Test failed: SetFocus(hwnd) on a button: 3: the winevent_hook 0x8005 was expected, but got msg 0x001c instead msg.c:6995: Test failed: SetFocus(hwnd) on a button: 3: the winevent_hook 0x8005 was expected, but got msg 0x0086 instead msg.c:6995: Test failed: SetFocus(hwnd) on a button: 3: the winevent_hook 0x8005 was expected, but got msg 0x0006 instead msg.c:6995: Test failed: SetFocus(hwnd) on a button: 3: the winevent_hook 0x8005 was expected, but got hook 0x0009 instead

Age (days ago)

Last active (days ago)

wine-gitlab@winehq.org

3 comments

3 participants

tags (0)

participants (3)

Joe Souza
Joe Souza (＠JoeS209)
Marvin