[PATCH 0/2] MR1119: Add FSCTL_GET_REPARSE_POINT semi-stub and tests
From: Joel Holdsworth <joel(a)airwebreathe.org.uk> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39627 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53439 Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- dlls/ntdll/tests/file.c | 3 --- dlls/ntdll/unix/file.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 31d6e5b8b9f..8085ed5fcb3 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -5343,16 +5343,13 @@ static void test_reparse_points(void) ok( !status, "open %s failed %#lx\n", wine_dbgstr_w(nameW.Buffer), status ); status = NtFsControlFile( handle, NULL, NULL, NULL, &io, FSCTL_GET_REPARSE_POINT, NULL, 0, NULL, 0 ); - todo_wine ok( status == STATUS_INVALID_USER_BUFFER, "expected %#lx, got %#lx\n", STATUS_INVALID_USER_BUFFER, status ); status = NtFsControlFile( handle, NULL, NULL, NULL, &io, FSCTL_GET_REPARSE_POINT, NULL, 0, reparse_data, 0 ); - todo_wine ok( status == STATUS_INVALID_USER_BUFFER, "expected %#lx, got %#lx\n", STATUS_INVALID_USER_BUFFER, status ); /* a volume cannot be a reparse point by definition */ status = NtFsControlFile( handle, NULL, NULL, NULL, &io, FSCTL_GET_REPARSE_POINT, NULL, 0, reparse_data, 1 ); - todo_wine ok( status == STATUS_NOT_A_REPARSE_POINT, "expected %#lx, got %#lx\n", STATUS_NOT_A_REPARSE_POINT, status ); CloseHandle( handle ); diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 604ca866890..d37cb5ad5a0 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -6030,6 +6030,20 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap break; } + case FSCTL_GET_REPARSE_POINT: + { + if (out_buffer && out_size >= 1) + { + FIXME("FSCTL_GET_REPARSE_POINT semi-stub\n"); + status = STATUS_NOT_A_REPARSE_POINT; + } + else + { + status = STATUS_INVALID_USER_BUFFER; + } + break; + } + case FSCTL_GET_OBJECT_ID: { FILE_OBJECTID_BUFFER *info = out_buffer; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1119
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=125189 Your paranoid android. === debian11 (32 bit report) === d3d8: device.c:3365: Test failed: Expected message 0x1c for window 0x1, but didn't receive it === debian11 (build log) === Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24716. Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24716. Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24716.
From: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- dlls/ntdll/tests/file.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index c011733626f..31d6e5b8b9f 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -5326,6 +5326,38 @@ static void test_mailslot_name(void) CloseHandle( device ); } +static void test_reparse_points(void) +{ + OBJECT_ATTRIBUTES attr; + HANDLE handle; + IO_STATUS_BLOCK io; + NTSTATUS status; + unsigned char reparse_data[1]; + + static WCHAR z_volW[] = L"\\??\\C:\\"; + UNICODE_STRING nameW = {sizeof(z_volW) - 2, sizeof(z_volW), z_volW}; + + InitializeObjectAttributes( &attr, &nameW, 0, NULL, NULL ); + + status = NtOpenFile( &handle, READ_CONTROL, &attr, &io, 0, 0 ); + ok( !status, "open %s failed %#lx\n", wine_dbgstr_w(nameW.Buffer), status ); + + status = NtFsControlFile( handle, NULL, NULL, NULL, &io, FSCTL_GET_REPARSE_POINT, NULL, 0, NULL, 0 ); + todo_wine + ok( status == STATUS_INVALID_USER_BUFFER, "expected %#lx, got %#lx\n", STATUS_INVALID_USER_BUFFER, status ); + + status = NtFsControlFile( handle, NULL, NULL, NULL, &io, FSCTL_GET_REPARSE_POINT, NULL, 0, reparse_data, 0 ); + todo_wine + ok( status == STATUS_INVALID_USER_BUFFER, "expected %#lx, got %#lx\n", STATUS_INVALID_USER_BUFFER, status ); + + /* a volume cannot be a reparse point by definition */ + status = NtFsControlFile( handle, NULL, NULL, NULL, &io, FSCTL_GET_REPARSE_POINT, NULL, 0, reparse_data, 1 ); + todo_wine + ok( status == STATUS_NOT_A_REPARSE_POINT, "expected %#lx, got %#lx\n", STATUS_NOT_A_REPARSE_POINT, status ); + + CloseHandle( handle ); +} + START_TEST(file) { HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); @@ -5399,4 +5431,5 @@ START_TEST(file) test_query_ea(); test_flush_buffers_file(); test_mailslot_name(); + test_reparse_points(); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1119
On Thu Oct 20 13:08:59 2022 +0000, **** wrote:
Marvin replied on the mailing list: ``` 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=125189 Your paranoid android. === debian11 (32 bit report) === d3d8: device.c:3365: Test failed: Expected message 0x1c for window 0x1, but didn't receive it === debian11 (build log) === Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24716. Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24716. Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24716. ``` I don't think this is a meaningful report.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/1119#note_11562
participants (3)
-
Joel Holdsworth -
Joel Holdsworth (＠jhol)
-
Marvin