[PATCH 0/1] MR4033: ntdll/test: Fix FILE_RENAME_INFORMATION_EX test failures on Windows 10 1607 & 1709.

[Joel Holdsworth (＠jhol)]

These versions of Windows are not included in the TestBot base VM set hence why
the failures were not caught when the tests were submitted in the original
commit: 07e40a6f9f70338d9810d50b606696b7be984d98

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55733
Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk>

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

[PATCH 1/1] ntdll/test: Fix FILE_RENAME_INFORMATION_EX test failures on Windows 10 1607 & 1709.

[Joel Holdsworth]

From: Joel Holdsworth <joel(a)airwebreathe.org.uk>

These versions of Windows are not included in the TestBot base VM set hence why
the failures were not caught when the tests were submitted in the original
commit: 07e40a6f9f70338d9810d50b606696b7be984d98

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55733
Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk>
---
 dlls/ntdll/tests/file.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index 4e1750a4751..da3611f74f2 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -2259,12 +2259,18 @@ static void test_file_rename_information_ex(void)
 
     io.Status = 0xdeadbeef;
     res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformationEx );
-    ok( io.Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", io.Status );
-    ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res );
-    fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
-    ok( fileDeleted, "file should not exist\n" );
-    fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
-    ok( !fileDeleted, "file should exist\n" );
+    ok( io.Status == STATUS_SUCCESS || io.Status == 0xdeadbeef,
+        "io.Status expected STATUS_SUCCESS or 0xdeadbeef, got %lx\n", io.Status );
+    ok( res == STATUS_SUCCESS || res == STATUS_NOT_SUPPORTED,
+        "res expected STATUS_SUCCESS or STATUS_NOT_SUPPORTED, got %lx\n", res );
+
+    if (res == STATUS_SUCCESS)
+    {
+        fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
+        ok( fileDeleted, "file should not exist\n" );
+        fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
+        ok( !fileDeleted, "file should exist\n" );
+    }
 
     CloseHandle( handle );
     HeapFree( GetProcessHeap(), 0, fri );
-- 
GitLab

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

[PATCH 1/1] ntdll/test: Fix FILE_RENAME_INFORMATION_EX test failures on Windows 10 1607 & 1709.

[Dmitry Timoshkov]

Joel Holdsworth <wine(a)gitlab.winehq.org> wrote:
> io.Status = 0xdeadbeef;
>      res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformationEx );
> -    ok( io.Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", io.Status );
> -    ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res );
> -    fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
> -    ok( fileDeleted, "file should not exist\n" );
> -    fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND;
> -    ok( !fileDeleted, "file should exist\n" );
> +    ok( io.Status == STATUS_SUCCESS || io.Status == 0xdeadbeef,
> +        "io.Status expected STATUS_SUCCESS or 0xdeadbeef, got %lx\n", io.Status );
> +    ok( res == STATUS_SUCCESS || res == STATUS_NOT_SUPPORTED,
> +        "res expected STATUS_SUCCESS or STATUS_NOT_SUPPORTED, got %lx\n", res );

Probably io.Status == 0xdeadbeef should be accepted only in case of
status == STATUS_NOT_SUPPORTED. Also STATUS_NOT_SUPPORTED could be marked
as broken().

-- 
Dmitry.