[PATCH 0/3] MR6845: server: Set overlapped fd to signaled after setting completion information.
For React Native. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6845
From: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ntdll/tests/file.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 95bd1c37cac..9f8d29f9810 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4111,9 +4111,7 @@ static void _test_completion_flags(unsigned line, HANDLE handle, DWORD expected_ ok_(__FILE__,line)(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08lx\n", status); ok_(__FILE__,line)(io.Status == STATUS_SUCCESS, "Status = %lx\n", io.Status); ok_(__FILE__,line)(io.Information == sizeof(info), "Information = %Iu\n", io.Information); - /* FILE_SKIP_SET_USER_EVENT_ON_FAST_IO is not supported on win2k3 */ - ok_(__FILE__,line)((info.Flags & ~FILE_SKIP_SET_USER_EVENT_ON_FAST_IO) == expected_flags, - "got %08lx\n", info.Flags); + ok_(__FILE__,line)((info.Flags & expected_flags) == expected_flags, "got %08lx\n", info.Flags); } static void test_file_completion_information(void) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6845
From: Zhiyi Zhang <zzhang(a)codeweavers.com> Test that setting completion information for an overlapped file could make it become signaled if FILE_SKIP_SET_EVENT_ON_HANDLE is not set. --- dlls/ntdll/tests/file.c | 53 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 9f8d29f9810..e5001c4e856 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4117,13 +4117,16 @@ static void _test_completion_flags(unsigned line, HANDLE handle, DWORD expected_ static void test_file_completion_information(void) { DECLSPEC_ALIGN(TEST_OVERLAPPED_READ_SIZE) static unsigned char aligned_buf[TEST_OVERLAPPED_READ_SIZE]; + static const char pipe_name[] = "\\\\.\\pipe\\test_file_completion_information"; static const char buf[] = "testdata"; FILE_IO_COMPLETION_NOTIFICATION_INFORMATION info; + HANDLE port, h, completion, server, client; + FILE_COMPLETION_INFORMATION fci; + BYTE recv_buf[TEST_BUF_LEN]; + DWORD num_bytes, flag; OVERLAPPED ov, *pov; IO_STATUS_BLOCK io; NTSTATUS status; - DWORD num_bytes; - HANDLE port, h; ULONG_PTR key; BOOL ret; int i; @@ -4297,6 +4300,52 @@ static void test_file_completion_information(void) CloseHandle(ov.hEvent); CloseHandle(port); CloseHandle(h); + + /* Test that setting FileCompletionInformation makes an overlapped file signaled unless FILE_SKIP_SET_EVENT_ON_HANDLE is set */ + for (flag = 0; flag <= FILE_SKIP_SET_USER_EVENT_ON_FAST_IO; flag = flag ? flag << 1 : 1) + { + winetest_push_context("%#lx", flag); + + status = pNtCreateIoCompletion(&completion, IO_COMPLETION_ALL_ACCESS, NULL, 0); + ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status); + + server = CreateNamedPipeA(pipe_name, PIPE_ACCESS_INBOUND | FILE_FLAG_OVERLAPPED, + PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, 4, 1024, 1024, + 1000, NULL); + ok(server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed, error %lu.\n", GetLastError()); + client = CreateFileA(pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, + FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, NULL); + ok(client != INVALID_HANDLE_VALUE, "CreateFile failed, error %lu.\n", GetLastError()); + + memset(&ov, 0, sizeof(ov)); + ReadFile(server, recv_buf, TEST_BUF_LEN, &num_bytes, &ov); + ok(!is_signaled(server), "Expected not signaled.\n"); + + info.Flags = flag; + status = pNtSetInformationFile(server, &io, &info, sizeof(info), FileIoCompletionNotificationInformation); + ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status); + test_completion_flags(server, flag); + + fci.CompletionPort = completion; + fci.CompletionKey = CKEY_FIRST; + io.Status = 0xdeadbeef; + status = pNtSetInformationFile(server, &io, &fci, sizeof(fci), FileCompletionInformation); + ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status); + ok(io.Status == STATUS_SUCCESS, "Got unexpected iosb.Status %#lx.\n", io.Status); + if (flag == FILE_SKIP_SET_EVENT_ON_HANDLE) + ok(!is_signaled(server), "Expected not signaled.\n"); + else + todo_wine + ok(is_signaled(server), "Expected signaled.\n"); + + status = pNtClose(client); + ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status); + status = pNtClose(server); + ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status); + status = pNtClose(completion); + ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status); + winetest_pop_context(); + } } static void test_file_id_information(void) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6845
From: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ntdll/tests/file.c | 1 - server/fd.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index e5001c4e856..02bdf67796d 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4335,7 +4335,6 @@ static void test_file_completion_information(void) if (flag == FILE_SKIP_SET_EVENT_ON_HANDLE) ok(!is_signaled(server), "Expected not signaled.\n"); else - todo_wine ok(is_signaled(server), "Expected signaled.\n"); status = pNtClose(client); diff --git a/server/fd.c b/server/fd.c index 04688c5eb0d..dc2475b2d28 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2911,6 +2911,7 @@ DECL_HANDLER(set_completion_info) { fd->completion = get_completion_obj( current->process, req->chandle, IO_COMPLETION_MODIFY_STATE ); fd->comp_key = req->ckey; + set_fd_signaled( fd, 1 ); } else set_error( STATUS_INVALID_PARAMETER ); release_object( fd ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6845
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=149762 Your paranoid android. === debian11b (64 bit WoW report) === user32: input.c:4305: Test succeeded inside todo block: button_down_hwnd_todo 1: got MSG_TEST_WIN hwnd 0000000000E6010A, msg WM_LBUTTONDOWN, wparam 0x1, lparam 0x320032 win.c:4070: Test failed: Expected active window 000000000245018E, got 0000000000000000. win.c:4071: Test failed: Expected focus window 000000000245018E, got 0000000000000000.
participants (3)
-
Marvin -
Zhiyi Zhang -
Zhiyi Zhang (＠zhiyi)