From: Rose Hellsing <rose@pinkro.se> The LPC port implementation is now complete, so the tests pass without needing todo_wine markers. --- dlls/ntdll/tests/port.c | 11 ++++------- dlls/ntdll/unix/sync.c | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/port.c b/dlls/ntdll/tests/port.c index 80c60d09683..fb42b11942c 100644 --- a/dlls/ntdll/tests/port.c +++ b/dlls/ntdll/tests/port.c @@ -155,7 +155,7 @@ static BOOL init_function_ptrs(void) !pNtRequestPort || !pNtRegisterThreadTerminatePort || !pNtConnectPort || !pRtlInitUnicodeString) { - todo_wine win_skip("Needed port functions are not available\n"); + win_skip("Needed port functions are not available\n"); FreeLibrary(hntdll); return FALSE; } @@ -239,7 +239,7 @@ static DWORD WINAPI test_ports_client(LPVOID arg) sqos.EffectiveOnly = TRUE; status = pNtConnectPort(&PortHandle, &port, &sqos, 0, 0, &len, NULL, NULL); - todo_wine ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status); if (status != STATUS_SUCCESS) return 1; status = pNtRegisterThreadTerminatePort(PortHandle); @@ -322,10 +322,7 @@ static void test_ports_server( HANDLE PortHandle ) while (TRUE) { status = pNtReplyWaitReceivePort(PortHandle, NULL, NULL, &LpcMessage->msg); - todo_wine - { - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %ld(%lx)\n", status, status); - } + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %ld(%lx)\n", status, status); /* STATUS_INVALID_HANDLE: win2k without admin rights will perform an * endless loop here */ @@ -384,7 +381,7 @@ START_TEST(port) status = pNtCreatePort(&port_handle, &obj, 100, 100, 0); if (status == STATUS_ACCESS_DENIED) skip("Not enough rights\n"); - else ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %ld\n", status); + else ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); if (status == STATUS_SUCCESS) { diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 48a564545d9..48d7bc6041a 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -3529,7 +3529,7 @@ NTSTATUS WINAPI NtReplyWaitReceivePortEx( HANDLE handle, ULONG *id, LPC_MESSAGE { /* Use a reasonable max size for LPC message data. * sizeof(msg->Data) is just 1 due to ANYSIZE_ARRAY. */ - wine_server_set_reply( req, msg->Data, 0x1000 ); + wine_server_set_reply( req, msg->Data, msg->DataSize ); } ret = wine_server_call( req ); if (!ret && msg) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10611