[PATCH v3 0/2] MR3926: Fix FileLinkInformationEx and FileRenameInformationEx test failures on older Windows versions.

[Joel Holdsworth (＠jhol)]

--
  v3: ntdll: Skip FileRenameInformationEx tests on older Windows versions.
      ntdll: Skip FileRenameInformationEx tests on older Windows versions.

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

[PATCH v3 1/2] ntdll: Skip FileRenameInformationEx tests on older Windows versions.

[Joel Holdsworth]

From: Joel Holdsworth

Test failures were introduced in 67479f8c2fc03c2043b8414bc063e671e36fdbda, and affect Windows 10
1607 and older.

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=55631
Signed-off-by: Joel Holdsworth 
---
 dlls/ntdll/tests/file.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index fc7a6e82059..ac1a6fd5f75 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -1546,6 +1546,16 @@ static void test_file_rename_information(FILE_INFORMATION_CLASS class)

io.Status = 0xdeadbeef;
     res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, class );
+
+    if (class == FileRenameInformationEx && (res == STATUS_NOT_IMPLEMENTED || res == STATUS_INVALID_INFO_CLASS))
+    {
+        todo_wine win_skip( "FileRenameInformationEx not supported\n" );
+        CloseHandle( handle );
+        HeapFree( GetProcessHeap(), 0, fri );
+        delete_object( oldpath );
+        return;
+    }
+
     todo_wine_if( class == FileRenameInformationEx )
     ok( io.Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", io.Status );
     todo_wine_if( class == FileRenameInformationEx )

[PATCH v3 2/2] ntdll: Skip FileRenameInformationEx tests on older Windows versions.

[Joel Holdsworth]

From: Joel Holdsworth

Test failures were introduced in 67479f8c2fc03c2043b8414bc063e671e36fdbda, and affect Windows 10
1607 and older.

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=55631
Signed-off-by: Joel Holdsworth 
---
 dlls/ntdll/tests/file.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index ac1a6fd5f75..1fcffe36a35 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -2255,6 +2255,16 @@ static void test_file_link_information(FILE_INFORMATION_CLASS class)

io.Status = 0xdeadbeef;
     res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, class );
+
+    if (class == FileLinkInformationEx && (res == STATUS_NOT_IMPLEMENTED || res == STATUS_INVALID_INFO_CLASS))
+    {
+        todo_wine win_skip( "FileLinkInformationEx not supported\n" );
+        CloseHandle( handle );
+        HeapFree( GetProcessHeap(), 0, fli );
+        delete_object( oldpath );
+        return;
+    }
+
     todo_wine_if( class == FileLinkInformationEx )
     ok( io.Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", io.Status );
     todo_wine_if( class == FileLinkInformationEx )

[Joel Holdsworth (＠jhol)]

On Wed Sep 27 10:54:48 2023 +0000, Joel Holdsworth wrote:
> changed this line in [version 3 of the diff](/wine/wine/-/merge_requests/3926/diffs?diff_id=72249&start_sha=7e40b4ce52e6bf73292c9437e8e03a0b1a0d861a#a6054b4d823544828fc181519321938fe40b14ff_1538_1530)

Ok. Done now