June 2020 - Wine-commits - list.winehq.org

Rémi Bernon : user32/tests: Add RIM_EXINPUTSINK rawinput message tests.
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: bc282905d9491b9f9fe4ae4b69a8ccdf99c5aaa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc282905d9491b9f9fe4ae4b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 15 12:05:43 2020 +0200 user32/tests: Add RIM_EXINPUTSINK rawinput message tests. When RIM_EXINPUTSINK is used, messages are received in background only if the foreground process didn't register for rawinput messages itself. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 48 ++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 66d421896f..9ec829860a 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1888,6 +1888,9 @@ struct rawinput_test rawinput_tests[] = { TRUE, TRUE, 0, FALSE, FALSE, FALSE, /* todos: */ FALSE, FALSE, FALSE }, { TRUE, TRUE, RIDEV_INPUTSINK, FALSE, TRUE, FALSE, /* todos: */ FALSE, TRUE, FALSE }, { TRUE, TRUE, RIDEV_INPUTSINK, FALSE, TRUE, FALSE, /* todos: */ FALSE, TRUE, FALSE }, + + { TRUE, TRUE, RIDEV_EXINPUTSINK, FALSE, FALSE, FALSE, /* todos: */ FALSE, FALSE, FALSE }, + { TRUE, TRUE, RIDEV_EXINPUTSINK, FALSE, TRUE, FALSE, /* todos: */ FALSE, TRUE, FALSE }, }; static void rawinput_test_process(void) @@ -1922,6 +1925,8 @@ static void rawinput_test_process(void) case 9: case 10: case 11: + case 12: + case 13: GetCursorPos(&pt); hwnd = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, @@ -1938,7 +1943,7 @@ static void rawinput_test_process(void) UpdateWindow(hwnd); empty_message_queue(); - if (i == 9 || i == 10 || i == 11) + if (i == 9 || i == 10 || i == 11 || i == 12) { raw_devices[0].usUsagePage = 0x01; raw_devices[0].usUsage = 0x02; @@ -1967,7 +1972,7 @@ static void rawinput_test_process(void) ResetEvent(done); - if (i == 9 || i == 10 || i == 11) + if (i == 9 || i == 10 || i == 11 || i == 12) { raw_devices[0].dwFlags = RIDEV_REMOVE; raw_devices[0].hwndTarget = 0; @@ -2054,6 +2059,7 @@ static void test_rawinput(const char* argv0) DWORD ret; POINT pt, newpt; HWND hwnd; + BOOL skipped; char path[MAX_PATH]; int i; @@ -2117,14 +2123,16 @@ static void test_rawinput(const char* argv0) raw_devices[0].dwFlags = rawinput_tests[i].register_flags; raw_devices[0].hwndTarget = rawinput_tests[i].register_window ? hwnd : 0; - if (rawinput_tests[i].register_device) + if (!rawinput_tests[i].register_device) + skipped = FALSE; + else { SetLastError(0xdeadbeef); - ret = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); - ok(ret || broken(rawinput_tests[i].register_flags == RIDEV_EXINPUTSINK), /* < vista */ - "%d: RegisterRawInputDevices failed\n", i); - ok(GetLastError() == 0xdeadbeef || broken(rawinput_tests[i].register_flags == RIDEV_EXINPUTSINK), /* < vista */ - "%d: RegisterRawInputDevices returned %08x\n", i, GetLastError()); + skipped = !RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + if (rawinput_tests[i].register_flags == RIDEV_EXINPUTSINK && skipped) + win_skip("RIDEV_EXINPUTSINK not supported\n"); + else + ok(!skipped, "%d: RegisterRawInputDevices failed: %u\n", i, GetLastError()); } SetEvent(process_ready); @@ -2141,15 +2149,18 @@ static void test_rawinput(const char* argv0) SetEvent(process_done); SetEvent(params.done); - todo_wine_if(rawinput_tests[i].todo_legacy) - ok(rawinput_test_received_legacy == rawinput_tests[i].expect_legacy, - "%d: %sexpected WM_MOUSEMOVE message\n", i, rawinput_tests[i].expect_legacy ? "" : "un"); - todo_wine_if(rawinput_tests[i].todo_raw) - ok(rawinput_test_received_raw == rawinput_tests[i].expect_raw, - "%d: %sexpected WM_INPUT message\n", i, rawinput_tests[i].expect_raw ? "" : "un"); - todo_wine_if(rawinput_tests[i].todo_rawfg) - ok(rawinput_test_received_rawfg == rawinput_tests[i].expect_rawfg, - "%d: %sexpected RIM_INPUT message\n", i, rawinput_tests[i].expect_rawfg ? "" : "un"); + if (!skipped) + { + todo_wine_if(rawinput_tests[i].todo_legacy) + ok(rawinput_test_received_legacy == rawinput_tests[i].expect_legacy, + "%d: %sexpected WM_MOUSEMOVE message\n", i, rawinput_tests[i].expect_legacy ? "" : "un"); + todo_wine_if(rawinput_tests[i].todo_raw) + ok(rawinput_test_received_raw == rawinput_tests[i].expect_raw, + "%d: %sexpected WM_INPUT message\n", i, rawinput_tests[i].expect_raw ? "" : "un"); + todo_wine_if(rawinput_tests[i].todo_rawfg) + ok(rawinput_test_received_rawfg == rawinput_tests[i].expect_rawfg, + "%d: %sexpected RIM_INPUT message\n", i, rawinput_tests[i].expect_rawfg ? "" : "un"); + } GetCursorPos(&newpt); ok((newpt.x - pt.x) == 5 || (newpt.x - pt.x) == 4, "%d: Unexpected cursor movement\n", i); @@ -2161,8 +2172,7 @@ static void test_rawinput(const char* argv0) SetLastError(0xdeadbeef); ret = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); - ok(ret, "%d: RegisterRawInputDevices failed\n", i); - ok(GetLastError() == 0xdeadbeef, "%d: RegisterRawInputDevices returned %08x\n", i, GetLastError()); + ok(ret, "%d: RegisterRawInputDevices failed: %u\n", i, GetLastError()); } DestroyWindow(hwnd);

1 0

Rémi Bernon : ntdll: Refine NtSetInformationThread ThreadHideFromDebugger stubs.
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: 537bb7a8aee278d285cb77669fd9258dfaa3222f URL: https://source.winehq.org/git/wine.git/?a=commit;h=537bb7a8aee278d285cb7766… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 22 23:27:47 2020 +0200 ntdll: Refine NtSetInformationThread ThreadHideFromDebugger stubs. CoD: Black Ops 3 and CoD: WWII do each one of these calls and terminate if they return unexpected results. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 27 +++++++++++++++++++++++++++ dlls/ntdll/unix/thread.c | 14 ++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index cf3f7b9f6f..eaf2f1a45b 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2346,6 +2346,7 @@ static void test_affinity(void) DWORD_PTR proc_affinity, thread_affinity; THREAD_BASIC_INFORMATION tbi; SYSTEM_INFO si; + ULONG dummy; GetSystemInfo(&si); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL ); @@ -2450,6 +2451,32 @@ static void test_affinity(void) ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( tbi.AffinityMask == (1 << si.dwNumberOfProcessors) - 1, "Unexpected thread affinity\n" ); + + dummy = 0; + status = pNtSetInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, sizeof(ULONG) ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + dummy = 0; + status = pNtSetInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, 1 ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + status = pNtSetInformationThread( (HANDLE)0xdeadbeef, ThreadHideFromDebugger, NULL, 0 ); + ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status ); + status = pNtSetInformationThread( GetCurrentThread(), ThreadHideFromDebugger, NULL, 0 ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + dummy = 0; + status = NtQueryInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, sizeof(ULONG), NULL ); + if (status == STATUS_INVALID_INFO_CLASS) + win_skip("ThreadHideFromDebugger not available\n"); + else + { + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + dummy = 0; + status = NtQueryInformationThread( (HANDLE)0xdeadbeef, ThreadHideFromDebugger, &dummy, sizeof(ULONG), NULL ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + dummy = 0; + status = NtQueryInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, 1, NULL ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + if (status == STATUS_SUCCESS) ok( dummy == 1, "Expected dummy == 1, got %08x\n", dummy ); + } } static void test_NtGetCurrentProcessorNumber(void) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index d26e0a98ca..2e2e5a3882 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -831,6 +831,8 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, { NTSTATUS status; + TRACE("(%p,%d,%p,%x,%p)\n", handle, class, data, length, ret_len); + switch (class) { case ThreadBasicInformation: @@ -1063,6 +1065,14 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, #endif } + case ThreadHideFromDebugger: + if (length != sizeof(BOOLEAN)) return STATUS_INFO_LENGTH_MISMATCH; + if (!data) return STATUS_ACCESS_VIOLATION; + if (handle != GetCurrentThread()) return STATUS_ACCESS_DENIED; + *(BOOLEAN*)data = TRUE; + if (ret_len) *ret_len = sizeof(BOOLEAN); + return STATUS_SUCCESS; + case ThreadPriority: case ThreadBasePriority: case ThreadImpersonationToken: @@ -1088,6 +1098,8 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, { NTSTATUS status; + TRACE("(%p,%d,%p,%x)\n", handle, class, data, length); + switch (class) { case ThreadZeroTlsCell: @@ -1152,6 +1164,8 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, } case ThreadHideFromDebugger: + if (length) return STATUS_INFO_LENGTH_MISMATCH; + if (handle != GetCurrentThread()) return STATUS_INVALID_HANDLE; /* pretend the call succeeded to satisfy some code protectors */ return STATUS_SUCCESS;

1 0

Rémi Bernon : ntdll: Only raise EXCEPTION_INVALID_HANDLE if debugger is present.
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: b7ccb9d06a897a384b71ccb959b431168ca07e03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7ccb9d06a897a384b71ccb9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 22 23:27:49 2020 +0200 ntdll: Only raise EXCEPTION_INVALID_HANDLE if debugger is present. CoD: WWII writes to PEB->BeingDebugged field, so we cannot completely trust it, but we can double check with ProcessDebugPort. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/om.c | 5 ++++- dlls/ntdll/tests/exception.c | 12 ++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index aaed9abaa9..f14e969652 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -364,9 +364,12 @@ static LONG WINAPI invalid_handle_exception_handler( EXCEPTION_POINTERS *eptr ) /* Everquest 2 / Pirates of the Burning Sea hooks NtClose, so we need a wrapper */ NTSTATUS close_handle( HANDLE handle ) { + DWORD_PTR debug_port; NTSTATUS ret = unix_funcs->NtClose( handle ); - if (ret == STATUS_INVALID_HANDLE && handle && NtCurrentTeb()->Peb->BeingDebugged) + if (ret == STATUS_INVALID_HANDLE && handle && NtCurrentTeb()->Peb->BeingDebugged && + !NtQueryInformationProcess( NtCurrentProcess(), ProcessDebugPort, &debug_port, + sizeof(debug_port), NULL) && debug_port) { __TRY { diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index a5e6faa461..411439f180 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -3595,6 +3595,12 @@ START_TEST(exception) test_suspend_process(); test_unload_trace(); + /* Call of Duty WWII writes to BeingDebugged then closes an invalid handle, + * crashing the game if an exception is raised. */ + NtCurrentTeb()->Peb->BeingDebugged = 0x98; + test_closehandle(0, (HANDLE)0xdeadbeef); + NtCurrentTeb()->Peb->BeingDebugged = 0; + #elif defined(__x86_64__) #define X(f) p##f = (void*)GetProcAddress(hntdll, #f) @@ -3638,6 +3644,12 @@ START_TEST(exception) else skip( "Dynamic unwind functions not found\n" ); + /* Call of Duty WWII writes to BeingDebugged then closes an invalid handle, + * crashing the game if an exception is raised. */ + NtCurrentTeb()->Peb->BeingDebugged = 0x98; + test_closehandle(0, (HANDLE)0xdeadbeef); + NtCurrentTeb()->Peb->BeingDebugged = 0; + #endif VirtualFree(code_mem, 0, MEM_RELEASE);

1 0

Paul Gofman : ntoskrnl/tests: Use the same sin port as ws2_32 tests.
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: 5ead4e1e69c87806dbb4db5cab4ef75fa727a5eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ead4e1e69c87806dbb4db5c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jun 23 00:27:03 2020 +0300 ntoskrnl/tests: Use the same sin port as ws2_32 tests. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.h | 2 ++ dlls/ntoskrnl.exe/tests/driver4.c | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index 4b70046b8e..3bfc4bd80a 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -55,3 +55,5 @@ static inline char *drv_strrchr( const char *str, char ch ) do { if (*str == ch) ret = (char *)(ULONG_PTR)str; } while (*str++); return ret; } + +#define SERVER_LISTEN_PORT 9374 diff --git a/dlls/ntoskrnl.exe/tests/driver4.c b/dlls/ntoskrnl.exe/tests/driver4.c index fedd5f25c2..e11879e9e5 100644 --- a/dlls/ntoskrnl.exe/tests/driver4.c +++ b/dlls/ntoskrnl.exe/tests/driver4.c @@ -243,7 +243,7 @@ static void test_wsk_listen_socket(void) memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; - addr.sin_port = htons(12345); + addr.sin_port = htons(SERVER_LISTEN_PORT); IoReuseIrp(wsk_irp, STATUS_UNSUCCESSFUL); IoSetCompletionRoutine(wsk_irp, irp_completion_routine, &irp_complete_event, TRUE, TRUE, TRUE); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index c53f97e9d1..5555095bd2 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -532,7 +532,7 @@ static DWORD WINAPI wsk_test_thread(void *parameter) memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; - addr.sin_port = htons(12345); + addr.sin_port = htons(SERVER_LISTEN_PORT); addr.sin_addr.s_addr = htonl(0x7f000001); ret = connect(s, (struct sockaddr *)&addr, sizeof(addr));

1 0

Paul Gofman : ntoskrnl/tests: Retry bind if address is in use in test_wsk_listen_socket().
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: 8f80ea670da76bca4b5f915d86b91575010e4979 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f80ea670da76bca4b5f915d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jun 23 00:27:04 2020 +0300 ntoskrnl/tests: Retry bind if address is in use in test_wsk_listen_socket(). Fixes test failures occuring when the tests using the same ports run closely one after another. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver4.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver4.c b/dlls/ntoskrnl.exe/tests/driver4.c index e11879e9e5..5307674de3 100644 --- a/dlls/ntoskrnl.exe/tests/driver4.c +++ b/dlls/ntoskrnl.exe/tests/driver4.c @@ -265,19 +265,25 @@ static void test_wsk_listen_socket(void) ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); ok(wsk_irp->IoStatus.Status == STATUS_SUCCESS, "Got unexpected status %#x.\n", wsk_irp->IoStatus.Status); - IoReuseIrp(wsk_irp, STATUS_UNSUCCESSFUL); - IoSetCompletionRoutine(wsk_irp, irp_completion_routine, &irp_complete_event, TRUE, TRUE, TRUE); - wsk_irp->IoStatus.Status = 0xdeadbeef; - wsk_irp->IoStatus.Information = 0xdeadbeef; - status = tcp_dispatch->WskBind(tcp_socket, (SOCKADDR *)&addr, 0, wsk_irp); - ok(status == STATUS_PENDING, "Got unexpected status %#x.\n", status); - status = KeWaitForSingleObject(&irp_complete_event, Executive, KernelMode, FALSE, NULL); - ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); - ok(wsk_irp->IoStatus.Status == STATUS_SUCCESS, "Got unexpected status %#x.\n", wsk_irp->IoStatus.Status); - ok(!wsk_irp->IoStatus.Information, "Got unexpected Information %#lx.\n", - wsk_irp->IoStatus.Information); + do + { + IoReuseIrp(wsk_irp, STATUS_UNSUCCESSFUL); + IoSetCompletionRoutine(wsk_irp, irp_completion_routine, &irp_complete_event, TRUE, TRUE, TRUE); + wsk_irp->IoStatus.Status = 0xdeadbeef; + wsk_irp->IoStatus.Information = 0xdeadbeef; + status = tcp_dispatch->WskBind(tcp_socket, (SOCKADDR *)&addr, 0, wsk_irp); + ok(status == STATUS_PENDING, "Got unexpected status %#x.\n", status); + status = KeWaitForSingleObject(&irp_complete_event, Executive, KernelMode, FALSE, NULL); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(wsk_irp->IoStatus.Status == STATUS_SUCCESS + || wsk_irp->IoStatus.Status == STATUS_ADDRESS_ALREADY_ASSOCIATED, + "Got unexpected status %#x.\n", wsk_irp->IoStatus.Status); + ok(!wsk_irp->IoStatus.Information, "Got unexpected Information %#lx.\n", + wsk_irp->IoStatus.Information); + } + while (wsk_irp->IoStatus.Status == STATUS_ADDRESS_ALREADY_ASSOCIATED); - timeout.QuadPart = -1000 * 10000; + timeout.QuadPart = -2000 * 10000; IoReuseIrp(wsk_irp, STATUS_UNSUCCESSFUL); IoSetCompletionRoutine(wsk_irp, irp_completion_routine, &irp_complete_event, TRUE, TRUE, TRUE);

1 0

Paul Gofman : netio.sys: Check for callback address before reusing pending IO structure.
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: c2eb5a0f396bed647362cbdac6653dcc4a812922 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2eb5a0f396bed647362cbda… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jun 23 00:27:05 2020 +0300 netio.sys: Check for callback address before reusing pending IO structure. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netio.sys/netio.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index c9203f37ad..64ea891087 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -59,6 +59,7 @@ struct wsk_pending_io { OVERLAPPED ovr; TP_WAIT *tp_wait; + void *callback; IRP *irp; }; @@ -159,27 +160,41 @@ static struct wsk_pending_io *allocate_pending_io(struct wsk_socket_internal *so PTP_WAIT_CALLBACK socket_async_callback, IRP *irp) { struct wsk_pending_io *io = socket->pending_io; - unsigned int i; + unsigned int i, io_index; + io_index = ~0u; for (i = 0; i < ARRAY_SIZE(socket->pending_io); ++i) + { if (!io[i].irp) - break; + { + if (io[i].callback == socket_async_callback) + { + io[i].irp = irp; + return &io[i]; + } + + if (io_index == ~0u) + io_index = i; + } + } - if (i == ARRAY_SIZE(socket->pending_io)) + if (io_index == ~0u) { FIXME("Pending io requests count exceeds limit.\n"); return NULL; } - io[i].irp = irp; + io[io_index].irp = irp; - if (io[i].tp_wait) - return &io[i]; + if (io[io_index].tp_wait) + CloseThreadpoolWait(io[io_index].tp_wait); + else + io[io_index].ovr.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); - io[i].ovr.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); - io[i].tp_wait = CreateThreadpoolWait(socket_async_callback, socket, NULL); + io[io_index].tp_wait = CreateThreadpoolWait(socket_async_callback, socket, NULL); + io[io_index].callback = socket_async_callback; - return &io[i]; + return &io[io_index]; } static struct wsk_pending_io *find_pending_io(struct wsk_socket_internal *socket, TP_WAIT *tp_wait)

1 0

Paul Gofman : netio.sys: Implement wsk_connect() function.
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: af443d730e279a48ec6e37118dc95b51e369cc7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=af443d730e279a48ec6e3711… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jun 23 00:27:06 2020 +0300 netio.sys: Implement wsk_connect() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netio.sys/netio.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 90 insertions(+), 2 deletions(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index 64ea891087..09f09f1e98 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -53,6 +53,15 @@ struct listen_socket_callback_context SOCKET acceptor; }; +struct connect_socket_callback_context +{ + struct wsk_socket_internal *socket; + SOCKADDR *remote_address; + const void *client_dispatch; + void *client_context; + IRP *pending_irp; +}; + #define MAX_PENDING_IO 10 struct wsk_pending_io @@ -73,6 +82,7 @@ struct wsk_socket_internal ADDRESS_FAMILY address_family; USHORT socket_type; ULONG protocol; + BOOL bound; CRITICAL_SECTION cs_socket; @@ -86,6 +96,8 @@ struct wsk_socket_internal }; static LPFN_ACCEPTEX pAcceptEx; +static LPFN_CONNECTEX pConnectEx; + static const WSK_PROVIDER_CONNECTION_DISPATCH wsk_provider_connection_dispatch; static inline struct wsk_socket_internal *wsk_socket_internal_from_wsk_socket(WSK_SOCKET *wsk_socket) @@ -294,6 +306,9 @@ static NTSTATUS WINAPI wsk_bind(WSK_SOCKET *socket, SOCKADDR *local_address, ULO else status = STATUS_SUCCESS; + if (status == STATUS_SUCCESS) + s->bound = TRUE; + TRACE("status %#x.\n", status); irp->IoStatus.Information = 0; dispatch_irp(irp, status); @@ -468,11 +483,84 @@ static const WSK_PROVIDER_LISTEN_DISPATCH wsk_provider_listen_dispatch = wsk_get_local_address, }; +static void WINAPI connect_callback(TP_CALLBACK_INSTANCE *instance, void *socket_, TP_WAIT *wait, + TP_WAIT_RESULT wait_result) +{ + struct wsk_socket_internal *socket = socket_; + struct wsk_pending_io *io; + DWORD size; + + TRACE("instance %p, socket %p, wait %p, wait_result %#x.\n", instance, socket, wait, wait_result); + + lock_socket(socket); + io = find_pending_io(socket, wait); + + GetOverlappedResult((HANDLE)socket->s, &io->ovr, &size, FALSE); + dispatch_pending_io(io, io->ovr.Internal, 0); + unlock_socket(socket); +} + +static BOOL WINAPI init_connect_functions(INIT_ONCE *once, void *param, void **context) +{ + GUID connectex_guid = WSAID_CONNECTEX; + SOCKET s = (SOCKET)param; + DWORD size; + + if (WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER, &connectex_guid, sizeof(connectex_guid), + &pConnectEx, sizeof(pConnectEx), &size, NULL, NULL)) + { + ERR("Could not get AcceptEx address, error %u.\n", WSAGetLastError()); + return FALSE; + } + return TRUE; +} + static NTSTATUS WINAPI wsk_connect(WSK_SOCKET *socket, SOCKADDR *remote_address, ULONG flags, IRP *irp) { - FIXME("socket %p, remote_address %p, flags %#x, irp %p stub.\n", socket, remote_address, flags, irp); + struct wsk_socket_internal *s = wsk_socket_internal_from_wsk_socket(socket); + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + struct wsk_pending_io *io; + int error; - return STATUS_NOT_IMPLEMENTED; + TRACE("socket %p, remote_address %p, flags %#x, irp %p.\n", + socket, remote_address, flags, irp); + + if (!irp) + return STATUS_INVALID_PARAMETER; + + if (!InitOnceExecuteOnce(&init_once, init_connect_functions, (void *)s->s, NULL)) + { + dispatch_irp(irp, STATUS_UNSUCCESSFUL); + return STATUS_PENDING; + } + + lock_socket(s); + + if (!(io = allocate_pending_io(s, connect_callback, irp))) + { + irp->IoStatus.Information = 0; + dispatch_irp(irp, STATUS_UNSUCCESSFUL); + unlock_socket(s); + return STATUS_PENDING; + } + + if (!s->bound) + { + dispatch_pending_io(io, STATUS_INVALID_DEVICE_STATE, 0); + unlock_socket(s); + return STATUS_INVALID_DEVICE_STATE; + } + + if (pConnectEx(s->s, remote_address, sizeof(*remote_address), NULL, 0, NULL, &io->ovr)) + dispatch_pending_io(io, STATUS_SUCCESS, 0); + else if ((error = WSAGetLastError()) == ERROR_IO_PENDING) + SetThreadpoolWait(io->tp_wait, io->ovr.hEvent, NULL); + else + dispatch_pending_io(io, sock_error_to_ntstatus(error), 0); + + unlock_socket(s); + + return STATUS_PENDING; } static NTSTATUS WINAPI wsk_get_remote_address(WSK_SOCKET *socket, SOCKADDR *remote_address, IRP *irp)

1 0

Paul Gofman : ntoskrnl.exe: Add test for connection socket.
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: dd26d6766123b9b26eb1b2ade3e66c2c65f74680 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd26d6766123b9b26eb1b2ad… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jun 23 00:27:07 2020 +0300 ntoskrnl.exe: Add test for connection socket. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.h | 1 + dlls/ntoskrnl.exe/tests/driver4.c | 83 ++++++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 37 ++++++++++++----- 3 files changed, 112 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index 3bfc4bd80a..58a92d4838 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -57,3 +57,4 @@ static inline char *drv_strrchr( const char *str, char ch ) } #define SERVER_LISTEN_PORT 9374 +#define CLIENT_LISTEN_PORT 9375 diff --git a/dlls/ntoskrnl.exe/tests/driver4.c b/dlls/ntoskrnl.exe/tests/driver4.c index 5307674de3..dad1d6a04f 100644 --- a/dlls/ntoskrnl.exe/tests/driver4.c +++ b/dlls/ntoskrnl.exe/tests/driver4.c @@ -376,6 +376,88 @@ static void test_wsk_listen_socket(void) ExFreePool(buffer2); } +static void test_wsk_connect_socket(void) +{ + const WSK_PROVIDER_CONNECTION_DISPATCH *connect_dispatch; + struct socket_context context; + struct sockaddr_in addr; + LARGE_INTEGER timeout; + WSK_SOCKET *socket; + NTSTATUS status; + + timeout.QuadPart = -1000 * 10000; + + IoReuseIrp(wsk_irp, STATUS_UNSUCCESSFUL); + IoSetCompletionRoutine(wsk_irp, irp_completion_routine, &irp_complete_event, TRUE, TRUE, TRUE); + wsk_irp->IoStatus.Status = 0xdeadbeef; + wsk_irp->IoStatus.Information = 0xdeadbeef; + status = provider_npi.Dispatch->WskSocket(provider_npi.Client, AF_INET, SOCK_STREAM, IPPROTO_TCP, + WSK_FLAG_CONNECTION_SOCKET, &context, &connect_dispatch, NULL, NULL, NULL, wsk_irp); + ok(status == STATUS_PENDING, "Got unexpected status %#x.\n", status); + status = KeWaitForSingleObject(&irp_complete_event, Executive, KernelMode, FALSE, NULL); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(wsk_irp->IoStatus.Status == STATUS_SUCCESS, "Got unexpected status %#x.\n", wsk_irp->IoStatus.Status); + ok(wsk_irp->IoStatus.Information, "Got zero Information.\n"); + + socket = (WSK_SOCKET *)wsk_irp->IoStatus.Information; + connect_dispatch = socket->Dispatch; + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_port = htons(CLIENT_LISTEN_PORT); + addr.sin_addr.s_addr = htonl(0x7f000001); + + IoReuseIrp(wsk_irp, STATUS_UNSUCCESSFUL); + IoSetCompletionRoutine(wsk_irp, irp_completion_routine, &irp_complete_event, TRUE, TRUE, TRUE); + status = connect_dispatch->WskConnect(socket, (SOCKADDR *)&addr, 0, wsk_irp); + ok(status == STATUS_INVALID_DEVICE_STATE, "Got unexpected status %#x.\n", status); + status = KeWaitForSingleObject(&irp_complete_event, Executive, KernelMode, FALSE, &timeout); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(wsk_irp->IoStatus.Status == STATUS_INVALID_DEVICE_STATE, "Got unexpected status %#x.\n", wsk_irp->IoStatus.Status); + ok(!wsk_irp->IoStatus.Information, "Got unexpected Information %#lx.\n", + wsk_irp->IoStatus.Information); + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + + IoReuseIrp(wsk_irp, STATUS_UNSUCCESSFUL); + IoSetCompletionRoutine(wsk_irp, irp_completion_routine, &irp_complete_event, TRUE, TRUE, TRUE); + wsk_irp->IoStatus.Status = 0xdeadbeef; + wsk_irp->IoStatus.Information = 0xdeadbeef; + status = connect_dispatch->WskBind(socket, (SOCKADDR *)&addr, 0, wsk_irp); + ok(status == STATUS_PENDING, "Got unexpected status %#x.\n", status); + status = KeWaitForSingleObject(&irp_complete_event, Executive, KernelMode, FALSE, NULL); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(wsk_irp->IoStatus.Status == STATUS_SUCCESS, "Got unexpected status %#x.\n", wsk_irp->IoStatus.Status); + ok(!wsk_irp->IoStatus.Information, "Got unexpected Information %#lx.\n", + wsk_irp->IoStatus.Information); + + addr.sin_port = htons(CLIENT_LISTEN_PORT); + addr.sin_addr.s_addr = htonl(0x7f000001); + + IoReuseIrp(wsk_irp, STATUS_UNSUCCESSFUL); + IoSetCompletionRoutine(wsk_irp, irp_completion_routine, &irp_complete_event, TRUE, TRUE, TRUE); + status = connect_dispatch->WskConnect(socket, (SOCKADDR *)&addr, 0, wsk_irp); + ok(status == STATUS_PENDING, "Got unexpected status %#x.\n", status); + status = KeWaitForSingleObject(&irp_complete_event, Executive, KernelMode, FALSE, &timeout); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(wsk_irp->IoStatus.Status == STATUS_SUCCESS, "Got unexpected status %#x.\n", wsk_irp->IoStatus.Status); + ok(!wsk_irp->IoStatus.Information, "Got unexpected Information %#lx.\n", + wsk_irp->IoStatus.Information); + + IoReuseIrp(wsk_irp, STATUS_UNSUCCESSFUL); + IoSetCompletionRoutine(wsk_irp, irp_completion_routine, &irp_complete_event, TRUE, TRUE, TRUE); + wsk_irp->IoStatus.Status = 0xdeadbeef; + wsk_irp->IoStatus.Information = 0xdeadbeef; + status = connect_dispatch->Basic.WskCloseSocket(socket, wsk_irp); + ok(status == STATUS_PENDING, "Got unexpected status %#x.\n", status); + status = KeWaitForSingleObject(&irp_complete_event, Executive, KernelMode, FALSE, NULL); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(wsk_irp->IoStatus.Status == STATUS_SUCCESS, "Got unexpected status %#x.\n", wsk_irp->IoStatus.Status); + ok(!wsk_irp->IoStatus.Information, "Got unexpected Information %#lx.\n", + wsk_irp->IoStatus.Information); +} + static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -402,6 +484,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st netio_init(); test_wsk_get_address_info(); test_wsk_listen_socket(); + test_wsk_connect_socket(); if (winetest_debug) { diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 5555095bd2..b4ef9d0dcb 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -518,39 +518,58 @@ static DWORD WINAPI wsk_test_thread(void *parameter) { static const char test_send_string[] = "Client test string 1."; static const WORD version = MAKEWORD(2, 2); + SOCKET s_listen, s_accept, s_connect; struct sockaddr_in addr; char buffer[256]; int ret, err; WSADATA data; - SOCKET s; + int opt_val; ret = WSAStartup(version, &data); ok(!ret, "WSAStartup() failed, ret %u.\n", ret); - s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - ok(s != INVALID_SOCKET, "Error creating socket, WSAGetLastError() %u.\n", WSAGetLastError()); + s_connect = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(s_connect != INVALID_SOCKET, "Error creating socket, WSAGetLastError() %u.\n", WSAGetLastError()); + + s_listen = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(s_listen != INVALID_SOCKET, "Error creating socket, WSAGetLastError() %u.\n", WSAGetLastError()); + + opt_val = 1; + setsockopt(s_listen, SOL_SOCKET, SO_REUSEADDR, (const char *)&opt_val, sizeof(opt_val)); memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; - addr.sin_port = htons(SERVER_LISTEN_PORT); + addr.sin_port = htons(CLIENT_LISTEN_PORT); addr.sin_addr.s_addr = htonl(0x7f000001); + ret = bind(s_listen, (struct sockaddr *)&addr, sizeof(addr)); + ok(!ret, "Got unexpected ret %d, WSAGetLastError() %u.\n", ret, WSAGetLastError()); + + ret = listen(s_listen, SOMAXCONN); + ok(!ret, "Got unexpected ret %d, WSAGetLastError() %u.\n", ret, WSAGetLastError()); - ret = connect(s, (struct sockaddr *)&addr, sizeof(addr)); + addr.sin_port = htons(SERVER_LISTEN_PORT); + + ret = connect(s_connect, (struct sockaddr *)&addr, sizeof(addr)); while (ret && ((err = WSAGetLastError()) == WSAECONNREFUSED || err == WSAECONNABORTED)) { SwitchToThread(); - ret = connect(s, (struct sockaddr *)&addr, sizeof(addr)); + ret = connect(s_connect, (struct sockaddr *)&addr, sizeof(addr)); } ok(!ret, "Error connecting, WSAGetLastError() %u.\n", WSAGetLastError()); - ret = send(s, test_send_string, sizeof(test_send_string), 0); + ret = send(s_connect, test_send_string, sizeof(test_send_string), 0); ok(ret == sizeof(test_send_string), "Got unexpected ret %d.\n", ret); - ret = recv(s, buffer, sizeof(buffer), 0); + ret = recv(s_connect, buffer, sizeof(buffer), 0); ok(ret == sizeof(buffer), "Got unexpected ret %d.\n", ret); ok(!strcmp(buffer, "Server test string 1."), "Received unexpected data.\n"); - closesocket(s); + s_accept = accept(s_listen, NULL, NULL); + ok(s_accept != INVALID_SOCKET, "Error creating socket, WSAGetLastError() %u.\n", WSAGetLastError()); + + closesocket(s_accept); + closesocket(s_connect); + closesocket(s_listen); return TRUE; }

1 0

Alex Henrie : ntoskrnl: Provide a more realistic value for register CR0.
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: f83f0e5f13a36a246e12d5838aa5bace3ebe5c3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f83f0e5f13a36a246e12d583… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 23 00:32:58 2020 -0600 ntoskrnl: Provide a more realistic value for register CR0. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48997 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/instr.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 44f2ed4f51..f197570db0 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -35,6 +35,13 @@ #define KSHARED_USER_DATA_PAGE_SIZE 0x1000 +#define CR0_PE 0x00000001 /* Protected Mode */ +#define CR0_ET 0x00000010 /* Extension Type */ +#define CR0_NE 0x00000020 /* Numeric Error */ +#define CR0_WP 0x00010000 /* Write Protect */ +#define CR0_AM 0x00040000 /* Alignment Mask */ +#define CR0_PG 0x80000000 /* Paging */ + enum instr_op { INSTR_OP_MOV, @@ -350,7 +357,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) TRACE( "mov cr%u,%s at 0x%08x\n", reg, reg_names[instr[2] & 7], context->Eip ); switch (reg) { - case 0: *data = 0x10; break; /* FIXME: set more bits ? */ + case 0: *data = CR0_PE|CR0_ET|CR0_NE|CR0_WP|CR0_AM|CR0_PG; break; case 2: *data = 0; break; case 3: *data = 0; break; case 4: *data = 0; break;

1 0

Alistair Leslie-Hughes : directmanipulation: Implement IDirectManipulationViewport2 stub interface.
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: b6ca6c2387f95e16625f53cd6c5c76a9c9b984bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6ca6c2387f95e16625f53cd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 26 09:51:05 2019 +1000 directmanipulation: Implement IDirectManipulationViewport2 stub interface. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/directmanipulation/directmanipulation.c | 341 ++++++++++++++++++++++++++- 1 file changed, 339 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b6ca6c2387f95e16625f…

1 0