May 2021 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Take the zero_bits parameter into account in NtCreateThreadEx().
by Alexandre Julliard May 7, 2021

May 7, 2021

Module: wine Branch: master Commit: 6de7fa1bde015d8c6d1743dec7c04a9f5652e788 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6de7fa1bde015d8c6d1743de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 7 16:02:54 2021 +0200 ntdll: Take the zero_bits parameter into account in NtCreateThreadEx(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/thread.c | 5 ++++- dlls/ntdll/unix/unix_private.h | 4 ++-- dlls/ntdll/unix/virtual.c | 7 ++++--- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 8431ad0d6b1..1f1e6bc2796 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1871,7 +1871,7 @@ static void start_main_thread(void) if (p___wine_main_argv) *p___wine_main_argv = main_argv; if (p___wine_main_wargv) *p___wine_main_wargv = main_wargv; set_load_order_app_name( main_wargv[0] ); - virtual_alloc_thread_stack( &stack, 0, 0, NULL ); + virtual_alloc_thread_stack( &stack, is_win64 ? 0x7fffffff : 0, 0, 0, NULL ); teb->Tib.StackBase = stack.StackBase; teb->Tib.StackLimit = stack.StackLimit; teb->DeallocationStack = stack.DeallocationStack; diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 4e0d8321061..b257bffd882 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -178,6 +178,9 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT INITIAL_TEB stack; NTSTATUS status; + if (zero_bits > 21 && zero_bits < 32) return STATUS_INVALID_PARAMETER_3; + if (!is_win64 && !is_wow64 && zero_bits >= 32) return STATUS_INVALID_PARAMETER_3; + if (process != NtCurrentProcess()) { apc_call_t call; @@ -244,7 +247,7 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT if ((status = virtual_alloc_teb( &teb ))) goto done; - if ((status = virtual_alloc_thread_stack( &stack, stack_reserve, stack_commit, &extra_stack ))) + if ((status = virtual_alloc_thread_stack( &stack, zero_bits, stack_reserve, stack_commit, &extra_stack ))) { virtual_free_teb( teb ); goto done; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index d3398fed258..ce34cea7fcf 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -197,8 +197,8 @@ extern TEB *virtual_alloc_first_teb(void) DECLSPEC_HIDDEN; extern NTSTATUS virtual_alloc_teb( TEB **ret_teb ) DECLSPEC_HIDDEN; extern void virtual_free_teb( TEB *teb ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_clear_tls_index( ULONG index ) DECLSPEC_HIDDEN; -extern NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, SIZE_T reserve_size, SIZE_T commit_size, - SIZE_T *pthread_size ) DECLSPEC_HIDDEN; +extern NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, ULONG_PTR zero_bits, SIZE_T reserve_size, + SIZE_T commit_size, SIZE_T *pthread_size ) DECLSPEC_HIDDEN; extern void virtual_map_user_shared_data(void) DECLSPEC_HIDDEN; extern NTSTATUS virtual_handle_fault( void *addr, DWORD err, void *stack ) DECLSPEC_HIDDEN; extern unsigned int virtual_locked_server_call( void *req_ptr ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index c3baa5f09c7..d33d1fa40cf 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3044,9 +3044,10 @@ NTSTATUS virtual_clear_tls_index( ULONG index ) /*********************************************************************** * virtual_alloc_thread_stack */ -NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, SIZE_T reserve_size, SIZE_T commit_size, - SIZE_T *pthread_size ) +NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, ULONG_PTR zero_bits, SIZE_T reserve_size, + SIZE_T commit_size, SIZE_T *pthread_size ) { + unsigned short zero_bits_64 = zero_bits_win_to_64( zero_bits ); struct file_view *view; NTSTATUS status; sigset_t sigset; @@ -3063,7 +3064,7 @@ NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, SIZE_T reserve_size, SI server_enter_uninterrupted_section( &virtual_mutex, &sigset ); if ((status = map_view( &view, NULL, size + extra_size, FALSE, - VPROT_READ | VPROT_WRITE | VPROT_COMMITTED, 33 )) != STATUS_SUCCESS) + VPROT_READ | VPROT_WRITE | VPROT_COMMITTED, zero_bits_64 )) != STATUS_SUCCESS) goto done; #ifdef VALGRIND_STACK_REGISTER

1 0

Alexandre Julliard : server: Send the zero_bits parameter for remote NtCreateThreadEx() calls.
by Alexandre Julliard May 7, 2021

May 7, 2021

Module: wine Branch: master Commit: 6a296592aa0fefeed6b7dd505b20c22c2d3174d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a296592aa0fefeed6b7dd50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 7 16:01:45 2021 +0200 server: Send the zero_bits parameter for remote NtCreateThreadEx() calls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 3 ++- dlls/ntdll/unix/thread.c | 15 ++++++++------- include/wine/server_protocol.h | 3 ++- include/winternl.h | 2 +- server/protocol.def | 1 + server/trace.c | 1 + 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index ff632b7c6c0..8400c2930bb 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -550,6 +550,7 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO CLIENT_ID id; HANDLE handle; TEB *teb; + ULONG_PTR zero_bits = call->create_thread.zero_bits; SIZE_T reserve = call->create_thread.reserve; SIZE_T commit = call->create_thread.commit; void *func = wine_server_get_ptr( call->create_thread.func ); @@ -570,7 +571,7 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO attr->Attributes[1].ReturnLength = NULL; result->create_thread.status = NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, NULL, NtCurrentProcess(), func, arg, - call->create_thread.flags, 0, + call->create_thread.flags, zero_bits, commit, reserve, attr ); result->create_thread.handle = wine_server_obj_handle( handle ); result->create_thread.pid = HandleToULong(id.UniqueProcess); diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index a2b9569a7b9..4e0d8321061 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -161,7 +161,7 @@ NTSTATUS WINAPI NtCreateThread( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRI */ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, HANDLE process, PRTL_THREAD_START_ROUTINE start, void *param, - ULONG flags, SIZE_T zero_bits, SIZE_T stack_commit, + ULONG flags, ULONG_PTR zero_bits, SIZE_T stack_commit, SIZE_T stack_reserve, PS_ATTRIBUTE_LIST *attr_list ) { sigset_t sigset; @@ -185,12 +185,13 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT memset( &call, 0, sizeof(call) ); - call.create_thread.type = APC_CREATE_THREAD; - call.create_thread.flags = flags; - call.create_thread.func = wine_server_client_ptr( start ); - call.create_thread.arg = wine_server_client_ptr( param ); - call.create_thread.reserve = stack_reserve; - call.create_thread.commit = stack_commit; + call.create_thread.type = APC_CREATE_THREAD; + call.create_thread.flags = flags; + call.create_thread.func = wine_server_client_ptr( start ); + call.create_thread.arg = wine_server_client_ptr( param ); + call.create_thread.zero_bits = zero_bits; + call.create_thread.reserve = stack_reserve; + call.create_thread.commit = stack_commit; status = server_queue_process_apc( process, &call, &result ); if (status != STATUS_SUCCESS) return status; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 8ae313e6581..f326d78bc3c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -564,6 +564,7 @@ typedef union unsigned int flags; client_ptr_t func; client_ptr_t arg; + mem_size_t zero_bits; mem_size_t reserve; mem_size_t commit; } create_thread; @@ -6232,7 +6233,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 697 +#define SERVER_PROTOCOL_VERSION 698 /* ### protocol_version end ### */ diff --git a/include/winternl.h b/include/winternl.h index 4ccd68daa5f..48ad80c6037 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3678,7 +3678,7 @@ NTSYSAPI NTSTATUS WINAPI NtCreateSection(HANDLE*,ACCESS_MASK,const OBJECT_ATTRI NTSYSAPI NTSTATUS WINAPI NtCreateSemaphore(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,LONG,LONG); NTSYSAPI NTSTATUS WINAPI NtCreateSymbolicLinkObject(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PUNICODE_STRING); NTSYSAPI NTSTATUS WINAPI NtCreateThread(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,HANDLE,PCLIENT_ID,PCONTEXT,PINITIAL_TEB,BOOLEAN); -NTSYSAPI NTSTATUS WINAPI NtCreateThreadEx(HANDLE*,ACCESS_MASK,OBJECT_ATTRIBUTES*,HANDLE,PRTL_THREAD_START_ROUTINE,void*,ULONG,SIZE_T,SIZE_T,SIZE_T,PS_ATTRIBUTE_LIST*); +NTSYSAPI NTSTATUS WINAPI NtCreateThreadEx(HANDLE*,ACCESS_MASK,OBJECT_ATTRIBUTES*,HANDLE,PRTL_THREAD_START_ROUTINE,void*,ULONG,ULONG_PTR,SIZE_T,SIZE_T,PS_ATTRIBUTE_LIST*); NTSYSAPI NTSTATUS WINAPI NtCreateTimer(HANDLE*, ACCESS_MASK, const OBJECT_ATTRIBUTES*, TIMER_TYPE); NTSYSAPI NTSTATUS WINAPI NtCreateToken(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,TOKEN_TYPE,PLUID,PLARGE_INTEGER,PTOKEN_USER,PTOKEN_GROUPS,PTOKEN_PRIVILEGES,PTOKEN_OWNER,PTOKEN_PRIMARY_GROUP,PTOKEN_DEFAULT_DACL,PTOKEN_SOURCE); NTSYSAPI NTSTATUS WINAPI NtCreateUserProcess(HANDLE*,HANDLE*,ACCESS_MASK,ACCESS_MASK,OBJECT_ATTRIBUTES*,OBJECT_ATTRIBUTES*,ULONG,ULONG,RTL_USER_PROCESS_PARAMETERS*,PS_CREATE_INFO*,PS_ATTRIBUTE_LIST*); diff --git a/server/protocol.def b/server/protocol.def index 9361933d47c..abfd6d70240 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -580,6 +580,7 @@ typedef union unsigned int flags; /* creation flags */ client_ptr_t func; /* void (__stdcall *func)(void*); start function */ client_ptr_t arg; /* argument for start function */ + mem_size_t zero_bits; /* number of zero high bits for thread stack */ mem_size_t reserve; /* reserve size for thread stack */ mem_size_t commit; /* commit size for thread stack */ } create_thread; diff --git a/server/trace.c b/server/trace.c index 0fccf47d16a..6b8c1ad3342 100644 --- a/server/trace.c +++ b/server/trace.c @@ -216,6 +216,7 @@ static void dump_apc_call( const char *prefix, const apc_call_t *call ) case APC_CREATE_THREAD: dump_uint64( "APC_CREATE_THREAD,func=", &call->create_thread.func ); dump_uint64( ",arg=", &call->create_thread.arg ); + dump_uint64( ",zero_bits=", &call->create_thread.zero_bits ); dump_uint64( ",reserve=", &call->create_thread.reserve ); dump_uint64( ",commit=", &call->create_thread.commit ); fprintf( stderr, ",flags=%x", call->create_thread.flags );

1 0

Zebediah Figura : ws2_32/tests: Add some tests for nonblocking async recv().
by Alexandre Julliard May 7, 2021

May 7, 2021

Module: wine Branch: master Commit: 1f35115360120f5f355d2948ff634093da472ce0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f35115360120f5f355d2948… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 6 17:54:09 2021 -0500 ws2_32/tests: Add some tests for nonblocking async recv(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 194 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 194 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 116f9e23224..4bb546a4b94 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8679,6 +8679,199 @@ static void test_WSAGetOverlappedResult(void) closesocket(s); } +struct nonblocking_async_recv_params +{ + SOCKET client; + HANDLE event; +}; + +static DWORD CALLBACK nonblocking_async_recv_thread(void *arg) +{ + const struct nonblocking_async_recv_params *params = arg; + OVERLAPPED overlapped = {0}; + DWORD flags = 0, size; + char buffer[5]; + WSABUF wsabuf; + int ret; + + overlapped.hEvent = params->event; + wsabuf.buf = buffer; + wsabuf.len = sizeof(buffer); + memset(buffer, 0, sizeof(buffer)); + ret = WSARecv(params->client, &wsabuf, 1, NULL, &flags, &overlapped, NULL); + todo_wine_if (!params->event) ok(!ret, "got %d\n", ret); + ret = GetOverlappedResult((HANDLE)params->client, &overlapped, &size, FALSE); + ok(ret, "got error %u\n", GetLastError()); + todo_wine ok(size == 4, "got size %u\n", size); + todo_wine_if (!params->event) ok(!strcmp(buffer, "data"), "got %s\n", debugstr_an(buffer, size)); + + return 0; +} + +static void test_nonblocking_async_recv(void) +{ + struct nonblocking_async_recv_params params; + OVERLAPPED overlapped = {0}; + SOCKET client, server; + DWORD flags = 0, size; + HANDLE thread, event; + char buffer[5]; + WSABUF wsabuf; + int ret; + + event = CreateEventW(NULL, TRUE, FALSE, NULL); + wsabuf.buf = buffer; + wsabuf.len = sizeof(buffer); + + tcp_socketpair(&client, &server); + set_blocking(client, FALSE); + set_blocking(server, FALSE); + + WSASetLastError(0xdeadbeef); + ret = recv(client, buffer, sizeof(buffer), 0); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + overlapped.Internal = 0xdeadbeef; + ret = WSARecv(client, &wsabuf, 1, &size, &flags, NULL, NULL); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); + ok(overlapped.Internal == 0xdeadbeef, "got status %#x\n", (NTSTATUS)overlapped.Internal); + + /* Overlapped, with a NULL event. */ + + overlapped.hEvent = NULL; + + memset(buffer, 0, sizeof(buffer)); + WSASetLastError(0xdeadbeef); + ret = WSARecv(client, &wsabuf, 1, NULL, &flags, &overlapped, NULL); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + ret = WaitForSingleObject((HANDLE)client, 0); + ok(ret == WAIT_TIMEOUT, "expected timeout\n"); + + ret = send(server, "data", 4, 0); + ok(ret == 4, "got %d\n", ret); + + ret = WaitForSingleObject((HANDLE)client, 1000); + ok(!ret, "wait timed out\n"); + ret = GetOverlappedResult((HANDLE)client, &overlapped, &size, FALSE); + ok(ret, "got error %u\n", GetLastError()); + ok(size == 4, "got size %u\n", size); + ok(!strcmp(buffer, "data"), "got %s\n", debugstr_an(buffer, size)); + + /* Overlapped, with a non-NULL event. */ + + overlapped.hEvent = event; + + memset(buffer, 0, sizeof(buffer)); + WSASetLastError(0xdeadbeef); + ret = WSARecv(client, &wsabuf, 1, NULL, &flags, &overlapped, NULL); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + ret = WaitForSingleObject(event, 0); + ok(ret == WAIT_TIMEOUT, "expected timeout\n"); + + ret = send(server, "data", 4, 0); + ok(ret == 4, "got %d\n", ret); + + ret = WaitForSingleObject(event, 1000); + ok(!ret, "wait timed out\n"); + ret = GetOverlappedResult((HANDLE)client, &overlapped, &size, FALSE); + ok(ret, "got error %u\n", GetLastError()); + ok(size == 4, "got size %u\n", size); + ok(!strcmp(buffer, "data"), "got %s\n", debugstr_an(buffer, size)); + + /* With data already in the pipe; usually this does return 0 (but not + * reliably). */ + + ret = send(server, "data", 4, 0); + ok(ret == 4, "got %d\n", ret); + + memset(buffer, 0, sizeof(buffer)); + ret = WSARecv(client, &wsabuf, 1, NULL, &flags, &overlapped, NULL); + ok(!ret || WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + ret = WaitForSingleObject(event, 1000); + ok(!ret, "wait timed out\n"); + ret = GetOverlappedResult((HANDLE)client, &overlapped, &size, FALSE); + ok(ret, "got error %u\n", GetLastError()); + ok(size == 4, "got size %u\n", size); + ok(!strcmp(buffer, "data"), "got %s\n", debugstr_an(buffer, size)); + + closesocket(client); + closesocket(server); + + /* With a non-overlapped socket, WSARecv() always blocks when passed an + * overlapped structure, but returns WSAEWOULDBLOCK otherwise. */ + + tcp_socketpair_flags(&client, &server, 0); + set_blocking(client, FALSE); + set_blocking(server, FALSE); + + WSASetLastError(0xdeadbeef); + ret = recv(client, buffer, sizeof(buffer), 0); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + overlapped.Internal = 0xdeadbeef; + ret = WSARecv(client, &wsabuf, 1, &size, &flags, NULL, NULL); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); + ok(overlapped.Internal == 0xdeadbeef, "got status %#x\n", (NTSTATUS)overlapped.Internal); + + /* Overlapped, with a NULL event. */ + + params.client = client; + params.event = NULL; + thread = CreateThread(NULL, 0, nonblocking_async_recv_thread, &params, 0, NULL); + + ret = WaitForSingleObject(thread, 200); + todo_wine ok(ret == WAIT_TIMEOUT, "expected timeout\n"); + + ret = send(server, "data", 4, 0); + ok(ret == 4, "got %d\n", ret); + + ret = WaitForSingleObject(thread, 200); + ok(!ret, "wait timed out\n"); + CloseHandle(thread); + + /* Overlapped, with a non-NULL event. */ + + params.client = client; + params.event = event; + thread = CreateThread(NULL, 0, nonblocking_async_recv_thread, &params, 0, NULL); + + ret = WaitForSingleObject(thread, 200); + todo_wine ok(ret == WAIT_TIMEOUT, "expected timeout\n"); + + ret = send(server, "data", 4, 0); + ok(ret == 4, "got %d\n", ret); + + ret = WaitForSingleObject(thread, 200); + ok(!ret, "wait timed out\n"); + CloseHandle(thread); + + /* With data already in the pipe. */ + + ret = send(server, "data", 4, 0); + ok(ret == 4, "got %d\n", ret); + + memset(buffer, 0, sizeof(buffer)); + ret = WSARecv(client, &wsabuf, 1, NULL, &flags, &overlapped, NULL); + ok(!ret, "got %d\n", ret); + ret = GetOverlappedResult((HANDLE)client, &overlapped, &size, FALSE); + todo_wine ok(ret, "got error %u\n", GetLastError()); + ok(size == 4, "got size %u\n", size); + todo_wine ok(!strcmp(buffer, "data"), "got %s\n", debugstr_an(buffer, size)); + + closesocket(client); + closesocket(server); + + CloseHandle(overlapped.hEvent); +} + START_TEST( sock ) { int i; @@ -8735,6 +8928,7 @@ START_TEST( sock ) test_bind(); test_connecting_socket(); test_WSAGetOverlappedResult(); + test_nonblocking_async_recv(); /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send();

1 0

Rémi Bernon : ntdll/tests: Check that creating huge thread stacks works.
by Alexandre Julliard May 7, 2021

May 7, 2021

Module: wine Branch: master Commit: b44fb883b03b8b8638eb91babbbde71399a45215 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b44fb883b03b8b8638eb91ba… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 7 12:08:04 2021 +0200 ntdll/tests: Check that creating huge thread stacks works. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/virtual.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 6980f10c85b..7d457e2d5b8 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -488,6 +488,11 @@ static DWORD WINAPI test_stack_size_thread(void *ptr) ExitThread(0); } +static DWORD WINAPI test_stack_size_dummy_thread(void *ptr) +{ + return 0; +} + static void test_RtlCreateUserStack(void) { IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); @@ -565,6 +570,14 @@ static void test_RtlCreateUserStack(void) WaitForSingleObject(thread, INFINITE); CloseHandle(thread); + if (is_win64) + { + thread = CreateThread(NULL, 0x80000000, test_stack_size_dummy_thread, NULL, STACK_SIZE_PARAM_IS_A_RESERVATION, NULL); + ok(thread != NULL, "CreateThread with huge stack failed\n"); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + } + args.expect_committed = default_commit < 0x2000 ? 0x2000 : default_commit; args.expect_reserved = 0x100000; for (i = 0; i < 32; i++)

1 0

Alexandre Julliard : ntdll: Force executing IL-only binaries on the native machine.
by Alexandre Julliard May 7, 2021

May 7, 2021

Module: wine Branch: master Commit: e9bc48e90a7f31820e3c1171cc6bbdc13a650b8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9bc48e90a7f31820e3c1171… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 7 12:44:59 2021 +0200 ntdll: Force executing IL-only binaries on the native machine. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51101 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 3ac1ed9ab63..5d8c14625f9 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1954,6 +1954,8 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) if (!status) { if (main_image_info.ImageCharacteristics & IMAGE_FILE_DLL) status = STATUS_INVALID_IMAGE_FORMAT; + if (main_image_info.ImageFlags & IMAGE_FLAGS_ComPlusNativeReady) + main_image_info.Machine = native_machine; if (main_image_info.Machine != current_machine) status = STATUS_INVALID_IMAGE_FORMAT; }

1 0

Nikolay Sivov : mf/evr: Implement Flush() for streams.
by Alexandre Julliard May 7, 2021

May 7, 2021

Module: wine Branch: master Commit: 7d51f493b84f350d7d1c5d5cf2c5725e4296baab URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d51f493b84f350d7d1c5d5c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 7 12:27:20 2021 +0300 mf/evr: Implement Flush() for streams. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 64489ac4c58..6a4332965b6 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -462,9 +462,19 @@ static HRESULT WINAPI video_stream_sink_PlaceMarker(IMFStreamSink *iface, MFSTRE static HRESULT WINAPI video_stream_sink_Flush(IMFStreamSink *iface) { - FIXME("%p.\n", iface); + struct video_stream *stream = impl_from_IMFStreamSink(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p.\n", iface); + + EnterCriticalSection(&stream->cs); + if (!stream->parent) + hr = MF_E_STREAMSINK_REMOVED; + else if (SUCCEEDED(hr = IMFTransform_ProcessMessage(stream->parent->mixer, MFT_MESSAGE_COMMAND_FLUSH, 0))) + hr = IMFVideoPresenter_ProcessMessage(stream->parent->presenter, MFVP_MESSAGE_FLUSH, 0); + LeaveCriticalSection(&stream->cs); + + return hr; } static const IMFStreamSinkVtbl video_stream_sink_vtbl =

1 0

Zebediah Figura : ws2_32/tests: Always return overlapped sockets from tcp_socketpair().
by Alexandre Julliard May 7, 2021

May 7, 2021

Module: wine Branch: master Commit: 025d154463fb8491735fbda2ad5e78ee71b20bfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=025d154463fb8491735fbda2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 6 17:54:08 2021 -0500 ws2_32/tests: Always return overlapped sockets from tcp_socketpair(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 57 +++++++++++------------------------------------- 1 file changed, 13 insertions(+), 44 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index eeba272076b..116f9e23224 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -160,52 +160,16 @@ static int client_id; static SOCKET setup_server_socket(struct sockaddr_in *addr, int *len); static SOCKET setup_connector_socket(struct sockaddr_in *addr, int len, BOOL nonblock); -static void tcp_socketpair(SOCKET *src, SOCKET *dst) -{ - SOCKET server = INVALID_SOCKET; - struct sockaddr_in addr; - int len; - int ret; - - *src = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - ok(*src != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); - - server = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - ok(server != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); - - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_addr.s_addr = inet_addr("127.0.0.1"); - ret = bind(server, (struct sockaddr*)&addr, sizeof(addr)); - ok(!ret, "failed to bind socket, error %u\n", WSAGetLastError()); - - len = sizeof(addr); - ret = getsockname(server, (struct sockaddr*)&addr, &len); - ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); - - ret = listen(server, 1); - ok(!ret, "failed to listen, error %u\n", WSAGetLastError()); - - ret = connect(*src, (struct sockaddr*)&addr, sizeof(addr)); - ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); - - len = sizeof(addr); - *dst = accept(server, (struct sockaddr*)&addr, &len); - ok(*dst != INVALID_SOCKET, "failed to accept, error %u\n", WSAGetLastError()); - - closesocket(server); -} - -static void tcp_socketpair_ovl(SOCKET *src, SOCKET *dst) +static void tcp_socketpair_flags(SOCKET *src, SOCKET *dst, DWORD flags) { SOCKET server = INVALID_SOCKET; struct sockaddr_in addr; int len, ret; - *src = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + *src = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, flags); ok(*src != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); - server = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + server = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, flags); ok(server != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); memset(&addr, 0, sizeof(addr)); @@ -231,6 +195,11 @@ static void tcp_socketpair_ovl(SOCKET *src, SOCKET *dst) closesocket(server); } +static void tcp_socketpair(SOCKET *src, SOCKET *dst) +{ + tcp_socketpair_flags(src, dst, WSA_FLAG_OVERLAPPED); +} + static void set_so_opentype ( BOOL overlapped ) { int optval = !overlapped, newval, len = sizeof (int); @@ -8377,29 +8346,29 @@ static void test_iocp(void) SOCKET src, dst; int i; - tcp_socketpair_ovl(&src, &dst); + tcp_socketpair(&src, &dst); sync_read(src, dst); iocp_async_read(src, dst); closesocket(src); closesocket(dst); - tcp_socketpair_ovl(&src, &dst); + tcp_socketpair(&src, &dst); iocp_async_read_thread(src, dst); closesocket(src); closesocket(dst); for (i = 0; i <= 2; i++) { - tcp_socketpair_ovl(&src, &dst); + tcp_socketpair(&src, &dst); iocp_async_read_closesocket(src, i); closesocket(dst); } - tcp_socketpair_ovl(&src, &dst); + tcp_socketpair(&src, &dst); iocp_async_closesocket(src); closesocket(dst); - tcp_socketpair_ovl(&src, &dst); + tcp_socketpair(&src, &dst); iocp_async_read_thread_closesocket(src); closesocket(dst); }

1 0

Zebediah Figura : ws2_32: Use NtStatusToWSAError() in WSAGetOverlappedResult().
by Alexandre Julliard May 7, 2021

May 7, 2021

Module: wine Branch: master Commit: 5a8dc6cd2edfdc90fe655d14d42a07f8709c43bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a8dc6cd2edfdc90fe655d14… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 6 17:54:06 2021 -0500 ws2_32: Use NtStatusToWSAError() in WSAGetOverlappedResult(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ed7218f9fb7..273a6b159f4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5737,7 +5737,7 @@ BOOL WINAPI WSAGetOverlappedResult( SOCKET s, LPWSAOVERLAPPED lpOverlapped, if ( lpdwFlags ) *lpdwFlags = lpOverlapped->u.s.Offset; - if (status) SetLastError( RtlNtStatusToDosError(status) ); + SetLastError( NtStatusToWSAError(status) ); return !status; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 627c12b8a1f..a84f05becbf 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8701,14 +8701,9 @@ static void test_WSAGetOverlappedResult(void) } else { - todo_wine_if (!NT_SUCCESS(status) - && LOWORD(status) != WSAEINVAL - && status != STATUS_CANCELLED - && status != (0x80070000 | ERROR_IO_INCOMPLETE) - && status != (0xc0070000 | ERROR_IO_INCOMPLETE)) - ok(WSAGetLastError() == expect - || (status == (0xc0070000 | ERROR_IO_INCOMPLETE) && WSAGetLastError() == WSAEINVAL), /* < win8 */ - "status %#x: expected error %u, got %u\n", status, expect, WSAGetLastError()); + ok(WSAGetLastError() == expect + || (status == (0xc0070000 | ERROR_IO_INCOMPLETE) && WSAGetLastError() == WSAEINVAL), /* < win8 */ + "status %#x: expected error %u, got %u\n", status, expect, WSAGetLastError()); } } }

1 0

Zebediah Figura : ws2_32: Return TRUE from WSAGetOverlappedResult() if the NT status denotes success.
by Alexandre Julliard May 7, 2021

May 7, 2021

Module: wine Branch: master Commit: 0abc3245719e21b11299a5901e88c0a3495716ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=0abc3245719e21b11299a590… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 6 17:54:07 2021 -0500 ws2_32: Return TRUE from WSAGetOverlappedResult() if the NT status denotes success. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 273a6b159f4..3a8bfa0ce41 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5738,7 +5738,7 @@ BOOL WINAPI WSAGetOverlappedResult( SOCKET s, LPWSAOVERLAPPED lpOverlapped, *lpdwFlags = lpOverlapped->u.s.Offset; SetLastError( NtStatusToWSAError(status) ); - return !status; + return NT_SUCCESS( status ); } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index a84f05becbf..eeba272076b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8690,8 +8690,7 @@ static void test_WSAGetOverlappedResult(void) overlapped.Internal = status; WSASetLastError(0xdeadbeef); ret = WSAGetOverlappedResult(s, &overlapped, &size, FALSE, &flags); - todo_wine_if (expect_ret && status) - ok(ret == expect_ret, "status %#x: expected %d, got %d\n", status, expect_ret, ret); + ok(ret == expect_ret, "status %#x: expected %d, got %d\n", status, expect_ret, ret); if (ret) { ok(WSAGetLastError() == expect /* >= win10 1809 */

1 0

Zebediah Figura : ws2_32: Add more status codes to NtStatusToWSAError().
by Alexandre Julliard May 7, 2021

May 7, 2021

Module: wine Branch: master Commit: 54a39d5779fea1ecf3ad11cff1ee27cfa5005de3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54a39d5779fea1ecf3ad11cf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 6 17:54:05 2021 -0500 ws2_32: Add more status codes to NtStatusToWSAError(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 111 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 82 insertions(+), 29 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 74e86e9d845..ed7218f9fb7 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -972,35 +972,88 @@ static NTSTATUS sock_error_to_ntstatus( DWORD err ) } } -static DWORD NtStatusToWSAError( DWORD status ) -{ - switch ( status ) - { - case STATUS_SUCCESS: return 0; - case STATUS_PENDING: return WSA_IO_PENDING; - case STATUS_INVALID_HANDLE: - case STATUS_OBJECT_TYPE_MISMATCH: return WSAENOTSOCK; - case STATUS_INVALID_PARAMETER: return WSAEINVAL; - case STATUS_PIPE_DISCONNECTED: return WSAESHUTDOWN; - case STATUS_NETWORK_BUSY: return WSAEALREADY; - case STATUS_NETWORK_UNREACHABLE: return WSAENETUNREACH; - case STATUS_CONNECTION_REFUSED: return WSAECONNREFUSED; - case STATUS_INVALID_CONNECTION: return WSAENOTCONN; - case STATUS_CONNECTION_RESET: return WSAECONNRESET; - case STATUS_CONNECTION_ABORTED: return WSAECONNABORTED; - case STATUS_CANCELLED: return WSA_OPERATION_ABORTED; - case STATUS_SHARING_VIOLATION: return WSAEADDRINUSE; - case STATUS_IO_TIMEOUT: - case STATUS_TIMEOUT: return WSAETIMEDOUT; - case STATUS_ACCESS_VIOLATION: return WSAEFAULT; - case STATUS_ACCESS_DENIED: return WSAEACCES; - case STATUS_TOO_MANY_OPENED_FILES: return WSAEMFILE; - case STATUS_DEVICE_NOT_READY: return WSAEWOULDBLOCK; - case STATUS_BUFFER_OVERFLOW: return WSAEMSGSIZE; - case STATUS_NOT_SUPPORTED: return WSAEOPNOTSUPP; - case STATUS_HOST_UNREACHABLE: return WSAEHOSTUNREACH; - default: return RtlNtStatusToDosError( status ); +static DWORD NtStatusToWSAError( NTSTATUS status ) +{ + static const struct + { + NTSTATUS status; + DWORD error; + } + errors[] = + { + {STATUS_PENDING, ERROR_IO_PENDING}, + + {STATUS_BUFFER_OVERFLOW, WSAEMSGSIZE}, + + {STATUS_NOT_IMPLEMENTED, WSAEOPNOTSUPP}, + {STATUS_ACCESS_VIOLATION, WSAEFAULT}, + {STATUS_PAGEFILE_QUOTA, WSAENOBUFS}, + {STATUS_INVALID_HANDLE, WSAENOTSOCK}, + {STATUS_NO_SUCH_DEVICE, WSAENETDOWN}, + {STATUS_NO_SUCH_FILE, WSAENETDOWN}, + {STATUS_NO_MEMORY, WSAENOBUFS}, + {STATUS_CONFLICTING_ADDRESSES, WSAENOBUFS}, + {STATUS_ACCESS_DENIED, WSAEACCES}, + {STATUS_BUFFER_TOO_SMALL, WSAEFAULT}, + {STATUS_OBJECT_TYPE_MISMATCH, WSAENOTSOCK}, + {STATUS_OBJECT_NAME_NOT_FOUND, WSAENETDOWN}, + {STATUS_OBJECT_PATH_NOT_FOUND, WSAENETDOWN}, + {STATUS_SHARING_VIOLATION, WSAEADDRINUSE}, + {STATUS_QUOTA_EXCEEDED, WSAENOBUFS}, + {STATUS_TOO_MANY_PAGING_FILES, WSAENOBUFS}, + {STATUS_INSUFFICIENT_RESOURCES, WSAENOBUFS}, + {STATUS_WORKING_SET_QUOTA, WSAENOBUFS}, + {STATUS_DEVICE_NOT_READY, WSAEWOULDBLOCK}, + {STATUS_PIPE_DISCONNECTED, WSAESHUTDOWN}, + {STATUS_IO_TIMEOUT, WSAETIMEDOUT}, + {STATUS_NOT_SUPPORTED, WSAEOPNOTSUPP}, + {STATUS_REMOTE_NOT_LISTENING, WSAECONNREFUSED}, + {STATUS_BAD_NETWORK_PATH, WSAENETUNREACH}, + {STATUS_NETWORK_BUSY, WSAENETDOWN}, + {STATUS_INVALID_NETWORK_RESPONSE, WSAENETDOWN}, + {STATUS_UNEXPECTED_NETWORK_ERROR, WSAENETDOWN}, + {STATUS_REQUEST_NOT_ACCEPTED, WSAEWOULDBLOCK}, + {STATUS_CANCELLED, ERROR_OPERATION_ABORTED}, + {STATUS_COMMITMENT_LIMIT, WSAENOBUFS}, + {STATUS_LOCAL_DISCONNECT, WSAECONNABORTED}, + {STATUS_REMOTE_DISCONNECT, WSAECONNRESET}, + {STATUS_REMOTE_RESOURCES, WSAENOBUFS}, + {STATUS_LINK_FAILED, WSAECONNRESET}, + {STATUS_LINK_TIMEOUT, WSAETIMEDOUT}, + {STATUS_INVALID_CONNECTION, WSAENOTCONN}, + {STATUS_INVALID_ADDRESS, WSAEADDRNOTAVAIL}, + {STATUS_INVALID_BUFFER_SIZE, WSAEMSGSIZE}, + {STATUS_INVALID_ADDRESS_COMPONENT, WSAEADDRNOTAVAIL}, + {STATUS_TOO_MANY_ADDRESSES, WSAENOBUFS}, + {STATUS_ADDRESS_ALREADY_EXISTS, WSAEADDRINUSE}, + {STATUS_CONNECTION_DISCONNECTED, WSAECONNRESET}, + {STATUS_CONNECTION_RESET, WSAECONNRESET}, + {STATUS_TRANSACTION_ABORTED, WSAECONNABORTED}, + {STATUS_CONNECTION_REFUSED, WSAECONNREFUSED}, + {STATUS_GRACEFUL_DISCONNECT, WSAEDISCON}, + {STATUS_CONNECTION_ACTIVE, WSAEISCONN}, + {STATUS_NETWORK_UNREACHABLE, WSAENETUNREACH}, + {STATUS_HOST_UNREACHABLE, WSAEHOSTUNREACH}, + {STATUS_PROTOCOL_UNREACHABLE, WSAENETUNREACH}, + {STATUS_PORT_UNREACHABLE, WSAECONNRESET}, + {STATUS_REQUEST_ABORTED, WSAEINTR}, + {STATUS_CONNECTION_ABORTED, WSAECONNABORTED}, + {STATUS_DATATYPE_MISALIGNMENT_ERROR,WSAEFAULT}, + {STATUS_HOST_DOWN, WSAEHOSTDOWN}, + {0x80070000 | ERROR_IO_INCOMPLETE, ERROR_IO_INCOMPLETE}, + {0xc0010000 | ERROR_IO_INCOMPLETE, ERROR_IO_INCOMPLETE}, + {0xc0070000 | ERROR_IO_INCOMPLETE, ERROR_IO_INCOMPLETE}, + }; + + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(errors); ++i) + { + if (errors[i].status == status) + return errors[i].error; } + + return NT_SUCCESS(status) ? RtlNtStatusToDosErrorNoTeb(status) : WSAEINVAL; } /* set last error code from NT status without mapping WSA errors */ @@ -5871,7 +5924,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, IOCTL_AFD_CREATE, &create_params, sizeof(create_params), NULL, 0))) { WARN("Failed to initialize socket, status %#x.\n", status); - err = NtStatusToWSAError(status); + err = RtlNtStatusToDosError( status ); if (err == WSAEACCES) /* raw socket denied */ { if (type == SOCK_RAW)

1 0