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

Andrew Eikum : include/xapo.idl: Add XAPO registration flags.
by Alexandre Julliard 28 Apr '20

28 Apr '20

Module: wine Branch: master Commit: 7ccc45f754a39a425ecc2358a4cfc5675ff11ffb URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ccc45f754a39a425ecc2358… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Apr 28 13:18:16 2020 -0500 include/xapo.idl: Add XAPO registration flags. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/xapo.idl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/xapo.idl b/include/xapo.idl index 7b28ac9f43..841793d4fa 100644 --- a/include/xapo.idl +++ b/include/xapo.idl @@ -20,6 +20,13 @@ import "unknwn.idl"; #define XAPO_REGISTRATION_STRING_LENGTH 256 +cpp_quote("#define XAPO_FLAG_CHANNELS_MUST_MATCH 0x1") +cpp_quote("#define XAPO_FLAG_FRAMERATE_MUST_MATCH 0x2") +cpp_quote("#define XAPO_FLAG_BITSPERSAMPLE_MUST_MATCH 0x4") +cpp_quote("#define XAPO_FLAG_BUFFERCOUNT_MUST_MATCH 0x8") +cpp_quote("#define XAPO_FLAG_INPLACE_SUPPORTED 0x10") +cpp_quote("#define XAPO_FLAG_INPLACE_REQUIRED 0x20") + cpp_quote("#if 0") typedef struct WAVEFORMATEX {

1 0

Zebediah Figura : advapi32: Reimplement EnumServicesStatusW() on top of EnumServicesStatusExW().
by Alexandre Julliard 28 Apr '20

28 Apr '20

Module: wine Branch: master Commit: d01f58a3f2cf48e5bb0728c9bb578f7d7f93bae4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d01f58a3f2cf48e5bb0728c9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 27 22:35:34 2020 -0500 advapi32: Reimplement EnumServicesStatusW() on top of EnumServicesStatusExW(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 124 ++++++++++++++++++------------------------ dlls/advapi32/tests/service.c | 2 +- 2 files changed, 54 insertions(+), 72 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 4d32b44eef..eb195d84d0 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1749,109 +1749,91 @@ done: * EnumServicesStatusW [ADVAPI32.@] */ BOOL WINAPI -EnumServicesStatusW( SC_HANDLE hmngr, DWORD type, DWORD state, LPENUM_SERVICE_STATUSW - services, DWORD size, LPDWORD needed, LPDWORD returned, - LPDWORD resume_handle ) +EnumServicesStatusW( SC_HANDLE manager, DWORD type, DWORD state, ENUM_SERVICE_STATUSW *status, + DWORD size, DWORD *ret_size, DWORD *ret_count, DWORD *resume_handle ) { - DWORD err, i, offset, buflen, count, total_size = 0; - struct enum_service_status *entry; - const WCHAR *str; - BYTE *buf; + ENUM_SERVICE_STATUS_PROCESSW *status_ex; + DWORD alloc_size, count, i; + WCHAR *p; - TRACE("%p 0x%x 0x%x %p %u %p %p %p\n", hmngr, type, state, services, size, needed, - returned, resume_handle); + TRACE("%p 0x%x 0x%x %p %u %p %p %p\n", manager, type, state, status, size, + ret_size, ret_count, resume_handle); - if (!hmngr) + if (!manager) { SetLastError( ERROR_INVALID_HANDLE ); return FALSE; } - if (!needed || !returned) + + if (!ret_size || !ret_count) { - SetLastError( ERROR_INVALID_ADDRESS ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } - /* make sure we pass a valid pointer */ - buflen = max( size, sizeof(*services) ); - if (!(buf = heap_alloc( buflen ))) + *ret_size = 0; + *ret_count = 0; + if (!EnumServicesStatusExW( manager, SC_ENUM_PROCESS_INFO, type, state, + NULL, 0, &alloc_size, &count, resume_handle, NULL ) + && GetLastError() != ERROR_MORE_DATA) + return FALSE; + + if (!(status_ex = heap_alloc( alloc_size ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return FALSE; } - __TRY + if (!EnumServicesStatusExW( manager, SC_ENUM_PROCESS_INFO, type, state, (BYTE *)status_ex, + alloc_size, &alloc_size, &count, resume_handle, NULL ) + && GetLastError() != ERROR_MORE_DATA) { - err = svcctl_EnumServicesStatusW( hmngr, type, state, buf, buflen, needed, &count, resume_handle ); - } - __EXCEPT(rpc_filter) - { - err = map_exception_code( GetExceptionCode() ); + heap_free( status_ex ); + return FALSE; } - __ENDTRY - *returned = 0; - if (err != ERROR_SUCCESS) + for (i = 0; i < count; i++) { - /* double the needed size to fit the potentially larger ENUM_SERVICE_STATUSW */ - if (err == ERROR_MORE_DATA) *needed *= 2; - heap_free( buf ); - SetLastError( err ); - return FALSE; + *ret_size += sizeof(ENUM_SERVICE_STATUSW); + *ret_size += (strlenW( status_ex[i].lpServiceName ) + 1) * sizeof(WCHAR); + if (status_ex[i].lpDisplayName) + *ret_size += (strlenW( status_ex[i].lpDisplayName ) + 1) * sizeof(WCHAR); + + if (*ret_size <= size) + ++*ret_count; } - entry = (struct enum_service_status *)buf; - for (i = 0; i < count; i++) + p = (WCHAR *)(status + *ret_count); + for (i = 0; i < *ret_count; i++) { - total_size += sizeof(*services); - if (entry->service_name) - { - str = (const WCHAR *)(buf + entry->service_name); - total_size += (strlenW( str ) + 1) * sizeof(WCHAR); - } - if (entry->display_name) + strcpyW( p, status_ex[i].lpServiceName ); + status[i].lpServiceName = (WCHAR *)p; + p += strlenW( p ) + 1; + if (status_ex[i].lpDisplayName) { - str = (const WCHAR *)(buf + entry->display_name); - total_size += (strlenW( str ) + 1) * sizeof(WCHAR); + strcpyW( p, status_ex[i].lpDisplayName ); + status[i].lpDisplayName = (WCHAR *)p; + p += strlenW( p ) + 1; } - entry++; + else status[i].lpDisplayName = NULL; + + status[i].ServiceStatus.dwServiceType = status_ex[i].ServiceStatusProcess.dwServiceType; + status[i].ServiceStatus.dwCurrentState = status_ex[i].ServiceStatusProcess.dwCurrentState; + status[i].ServiceStatus.dwControlsAccepted = status_ex[i].ServiceStatusProcess.dwControlsAccepted; + status[i].ServiceStatus.dwWin32ExitCode = status_ex[i].ServiceStatusProcess.dwWin32ExitCode; + status[i].ServiceStatus.dwServiceSpecificExitCode = status_ex[i].ServiceStatusProcess.dwServiceSpecificExitCode; + status[i].ServiceStatus.dwCheckPoint = status_ex[i].ServiceStatusProcess.dwCheckPoint; + status[i].ServiceStatus.dwWaitHint = status_ex[i].ServiceStatusProcess.dwWaitHint; } - if (total_size > size) + heap_free( status_ex ); + if (*ret_size > size) { - heap_free( buf ); - *needed = total_size; SetLastError( ERROR_MORE_DATA ); return FALSE; } - offset = count * sizeof(*services); - entry = (struct enum_service_status *)buf; - for (i = 0; i < count; i++) - { - DWORD str_size; - str = (const WCHAR *)(buf + entry->service_name); - str_size = (strlenW( str ) + 1) * sizeof(WCHAR); - services[i].lpServiceName = (WCHAR *)((char *)services + offset); - memcpy( services[i].lpServiceName, str, str_size ); - offset += str_size; - - if (!entry->display_name) services[i].lpDisplayName = NULL; - else - { - str = (const WCHAR *)(buf + entry->display_name); - str_size = (strlenW( str ) + 1) * sizeof(WCHAR); - services[i].lpDisplayName = (WCHAR *)((char *)services + offset); - memcpy( services[i].lpDisplayName, str, str_size ); - offset += str_size; - } - services[i].ServiceStatus = entry->service_status; - entry++; - } - - heap_free( buf ); - *needed = 0; - *returned = count; + *ret_size = 0; return TRUE; } diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 4bf9f4c34b..7048e5a09a 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1339,7 +1339,7 @@ static void test_enum_svc(void) services, bufsize, &needed, &returned, &resume); ok(ret, "Expected success, got error %u\n", GetLastError()); ok(needed == 0, "Expected needed buffer to be 0 as we are done\n"); - ok(returned == missing, "Expected %u services to be returned\n", missing); + todo_wine ok(returned == missing, "Expected %u services to be returned\n", missing); ok(resume == 0, "Expected the resume handle to be 0\n"); HeapFree(GetProcessHeap(), 0, services);

1 0

Alexandre Julliard : ntdll: Add a helper to exec wineserver.
by Alexandre Julliard 28 Apr '20

28 Apr '20

Module: wine Branch: master Commit: 68a425b19c007a8fc1cc65df4557221e5cfdc5b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68a425b19c007a8fc1cc65df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 28 11:28:25 2020 +0200 ntdll: Add a helper to exec wineserver. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/server.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 48 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index bc25e242a7..d793d314a6 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -113,6 +113,8 @@ static const enum cpu_type client_cpu = CPU_ARM64; #error Unsupported CPU #endif +static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); + const char *build_dir = NULL; const char *data_dir = NULL; const char *config_dir = NULL; @@ -1216,6 +1218,51 @@ int server_pipe( int fd[2] ) } +/*********************************************************************** + * exec_wineserver + * + * Exec a new wine server. + */ +static void exec_wineserver( char **argv ) +{ + char *path; + + if (build_dir) + { + if (!is_win64) /* look for 64-bit server */ + { + char *loader = realpath_dirname( build_path( build_dir, "loader/wine64" )); + if (loader) + { + argv[0] = build_path( loader, "../server/wineserver" ); + execv( argv[0], argv ); + } + } + argv[0] = build_path( build_dir, "server/wineserver" ); + execv( argv[0], argv ); + return; + } + + argv[0] = build_path( bin_dir, "wineserver" ); + execv( argv[0], argv ); + + argv[0] = getenv( "WINESERVER" ); + if (argv[0]) execv( argv[0], argv ); + + if ((path = getenv( "PATH" ))) + { + for (path = strtok( strdup( path ), ":" ); path; path = strtok( NULL, ":" )) + { + argv[0] = build_path( path, "wineserver" ); + execvp( argv[0], argv ); + } + } + + argv[0] = build_path( BINDIR, "wineserver" ); + execv( argv[0], argv ); +} + + /*********************************************************************** * start_server * @@ -1225,7 +1272,6 @@ static void start_server(void) { static BOOL started; /* we only try once */ char *argv[3]; - static char wineserver[] = "server/wineserver"; static char debug[] = "-d"; if (!started) @@ -1235,10 +1281,9 @@ static void start_server(void) if (pid == -1) fatal_perror( "fork" ); if (!pid) { - argv[0] = wineserver; argv[1] = TRACE_ON(server) ? debug : NULL; argv[2] = NULL; - wine_exec_wine_binary( argv[0], argv, getenv("WINESERVER") ); + exec_wineserver( argv ); fatal_error( "could not exec wineserver\n" ); } waitpid( pid, &status, 0 ); @@ -1732,7 +1777,6 @@ void server_init_process_done(void) size_t server_init_thread( void *entry_point, BOOL *suspend ) { static const char *cpu_names[] = { "x86", "x86_64", "PowerPC", "ARM", "ARM64" }; - static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); const char *arch = getenv( "WINEARCH" ); int ret; int reply_pipe[2];

1 0

Alexandre Julliard : ntdll: Add a helper to exec wineloader.
by Alexandre Julliard 28 Apr '20

28 Apr '20

Module: wine Branch: master Commit: 9fd2330a9686bed56cbc8a7731d219d18e5226b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fd2330a9686bed56cbc8a77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 28 11:28:29 2020 +0200 ntdll: Add a helper to exec wineloader. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/process.c | 137 +++++++----------------------------------------- dlls/ntdll/server.c | 131 ++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 151 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9fd2330a9686bed56cbc…

1 0

Alexandre Julliard : ntdll: Store the pending free list in the main process heap.
by Alexandre Julliard 28 Apr '20

28 Apr '20

Module: wine Branch: master Commit: f5f1737456a1b13b2205fbf2e6a765e73763015e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5f1737456a1b13b2205fbf2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 28 11:28:43 2020 +0200 ntdll: Store the pending free list in the main process heap. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index af2a489b72..6bdbd89f8c 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1508,14 +1508,9 @@ void heap_set_debug_flags( HANDLE handle ) if ((heap->flags & HEAP_GROWABLE) && !heap->pending_free && ((flags & HEAP_FREE_CHECKING_ENABLED) || RUNNING_ON_VALGRIND)) { - void *ptr = NULL; - SIZE_T size = MAX_FREE_PENDING * sizeof(*heap->pending_free); - - if (!virtual_alloc_aligned( &ptr, 0, &size, MEM_COMMIT, PAGE_READWRITE, 4 )) - { - heap->pending_free = ptr; - heap->pending_pos = 0; - } + heap->pending_free = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, + MAX_FREE_PENDING * sizeof(*heap->pending_free) ); + heap->pending_pos = 0; } } @@ -1622,12 +1617,7 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); } subheap_notify_free_all(&heapPtr->subheap); - if (heapPtr->pending_free) - { - size = 0; - addr = heapPtr->pending_free; - NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); - } + RtlFreeHeap( GetProcessHeap(), 0, heapPtr->pending_free ); size = 0; addr = heapPtr->subheap.base; NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE );

1 0

Alexandre Julliard : ntdll: Don't use a custom alignment for large heap blocks.
by Alexandre Julliard 28 Apr '20

28 Apr '20

Module: wine Branch: master Commit: 6b4de5102734de7dd77222bdb74f8cf5181022d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b4de5102734de7dd77222bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 28 11:36:26 2020 +0200 ntdll: Don't use a custom alignment for large heap blocks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 6bdbd89f8c..0080a89fdd 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -726,7 +726,8 @@ static void *allocate_large_block( HEAP *heap, DWORD flags, SIZE_T size ) LPVOID address = NULL; if (block_size < size) return NULL; /* overflow */ - if (virtual_alloc_aligned( &address, 0, &block_size, MEM_COMMIT, get_protection_type( flags ), 5 )) + if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0, &block_size, + MEM_COMMIT, get_protection_type( flags ))) { WARN("Could not allocate block for %08lx bytes\n", size ); return NULL;

1 0

Alexandre Julliard : ntdll: Remove VFAT_IOCTL_READDIR_BOTH kernel bugs workarounds.
by Alexandre Julliard 28 Apr '20

28 Apr '20

Module: wine Branch: master Commit: 69f068bfb1046391fd8cd323543dd7bc63e0ec6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=69f068bfb1046391fd8cd323… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 28 12:20:26 2020 +0200 ntdll: Remove VFAT_IOCTL_READDIR_BOTH kernel bugs workarounds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 103 +++++++++++++------------------------------------ 1 file changed, 27 insertions(+), 76 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 1adc0c9b0d..d18df38f62 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1592,46 +1592,6 @@ static NTSTATUS get_dir_data_entry( struct dir_data *dir_data, void *info_ptr, I #ifdef VFAT_IOCTL_READDIR_BOTH -/*********************************************************************** - * start_vfat_ioctl - * - * Wrapper for the VFAT ioctl to work around various kernel bugs. - * dir_section must be held by caller. - */ -static KERNEL_DIRENT *start_vfat_ioctl( int fd ) -{ - static KERNEL_DIRENT *de; - int res; - - if (!de) - { - SIZE_T size = 2 * sizeof(*de) + page_size; - void *addr = NULL; - - if (virtual_alloc_aligned( &addr, 0, &size, MEM_RESERVE, PAGE_READWRITE, 1 )) - return NULL; - /* commit only the size needed for the dir entries */ - /* this leaves an extra unaccessible page, which should make the kernel */ - /* fail with -EFAULT before it stomps all over our memory */ - de = addr; - size = 2 * sizeof(*de); - virtual_alloc_aligned( &addr, 0, &size, MEM_COMMIT, PAGE_READWRITE, 1 ); - } - - /* set d_reclen to 65535 to work around an AFS kernel bug */ - de[0].d_reclen = 65535; - res = ioctl( fd, VFAT_IOCTL_READDIR_BOTH, (long)de ); - if (res == -1) - { - if (errno != ENOENT) return NULL; /* VFAT ioctl probably not supported */ - de[0].d_reclen = 0; /* eof */ - } - else if (!res && de[0].d_reclen == 65535) return NULL; /* AFS bug */ - - return de; -} - - /*********************************************************************** * read_directory_vfat * @@ -1640,40 +1600,42 @@ static KERNEL_DIRENT *start_vfat_ioctl( int fd ) static NTSTATUS read_directory_data_vfat( struct dir_data *data, int fd, const UNICODE_STRING *mask ) { char *short_name, *long_name; - size_t len; - KERNEL_DIRENT *de; + KERNEL_DIRENT de[2]; NTSTATUS status = STATUS_NO_MEMORY; off_t old_pos = lseek( fd, 0, SEEK_CUR ); - if (!(de = start_vfat_ioctl( fd ))) return STATUS_NOT_SUPPORTED; - lseek( fd, 0, SEEK_SET ); + if (ioctl( fd, VFAT_IOCTL_READDIR_BOTH, (long)de ) == -1) + { + if (errno != ENOENT) + { + status = STATUS_NOT_SUPPORTED; + goto done; + } + de[0].d_reclen = 0; + } + if (!append_entry( data, ".", NULL, mask )) goto done; if (!append_entry( data, "..", NULL, mask )) goto done; - while (ioctl( fd, VFAT_IOCTL_READDIR_BOTH, (long)de ) != -1) + while (de[0].d_reclen) { - if (!de[0].d_reclen) break; /* eof */ - - /* make sure names are null-terminated to work around an x86-64 kernel bug */ - len = min( de[0].d_reclen, sizeof(de[0].d_name) - 1 ); - de[0].d_name[len] = 0; - len = min( de[1].d_reclen, sizeof(de[1].d_name) - 1 ); - de[1].d_name[len] = 0; - - if (!strcmp( de[0].d_name, "." ) || !strcmp( de[0].d_name, ".." )) continue; - if (de[1].d_name[0]) - { - short_name = de[0].d_name; - long_name = de[1].d_name; - } - else + if (strcmp( de[0].d_name, "." ) && strcmp( de[0].d_name, ".." )) { - long_name = de[0].d_name; - short_name = NULL; + if (de[1].d_name[0]) + { + short_name = de[0].d_name; + long_name = de[1].d_name; + } + else + { + long_name = de[0].d_name; + short_name = NULL; + } + if (!append_entry( data, long_name, short_name, mask )) goto done; } - if (!append_entry( data, long_name, short_name, mask )) goto done; + if (ioctl( fd, VFAT_IOCTL_READDIR_BOTH, (long)de ) == -1) break; } status = STATUS_SUCCESS; done: @@ -2083,20 +2045,13 @@ static NTSTATUS find_file_in_dir( char *unix_name, int pos, const WCHAR *name, i int fd = open( unix_name, O_RDONLY | O_DIRECTORY ); if (fd != -1) { - KERNEL_DIRENT *kde; + KERNEL_DIRENT kde[2]; - RtlEnterCriticalSection( &dir_section ); - if ((kde = start_vfat_ioctl( fd ))) + if (ioctl( fd, VFAT_IOCTL_READDIR_BOTH, (long)kde ) != -1) { unix_name[pos - 1] = '/'; while (kde[0].d_reclen) { - /* make sure names are null-terminated to work around an x86-64 kernel bug */ - size_t len = min(kde[0].d_reclen, sizeof(kde[0].d_name) - 1 ); - kde[0].d_name[len] = 0; - len = min(kde[1].d_reclen, sizeof(kde[1].d_name) - 1 ); - kde[1].d_name[len] = 0; - if (kde[1].d_name[0]) { ret = ntdll_umbstowcs( kde[1].d_name, strlen(kde[1].d_name), @@ -2104,7 +2059,6 @@ static NTSTATUS find_file_in_dir( char *unix_name, int pos, const WCHAR *name, i if (ret == length && !RtlCompareUnicodeStrings( buffer, ret, name, ret, TRUE )) { strcpy( unix_name + pos, kde[1].d_name ); - RtlLeaveCriticalSection( &dir_section ); close( fd ); goto success; } @@ -2115,19 +2069,16 @@ static NTSTATUS find_file_in_dir( char *unix_name, int pos, const WCHAR *name, i { strcpy( unix_name + pos, kde[1].d_name[0] ? kde[1].d_name : kde[0].d_name ); - RtlLeaveCriticalSection( &dir_section ); close( fd ); goto success; } if (ioctl( fd, VFAT_IOCTL_READDIR_BOTH, (long)kde ) == -1) { - RtlLeaveCriticalSection( &dir_section ); close( fd ); goto not_found; } } } - RtlLeaveCriticalSection( &dir_section ); close( fd ); } /* fall through to normal handling */

1 0

Alexandre Julliard : ntdll: Add a helper for platform-specific threading initialization.
by Alexandre Julliard 28 Apr '20

28 Apr '20

Module: wine Branch: master Commit: ffb7c595c6c1cf0d6760a6394a6a634afe38b378 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffb7c595c6c1cf0d6760a639… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 28 13:17:07 2020 +0200 ntdll: Add a helper for platform-specific threading initialization. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_arm.c | 17 +++++++++-------- dlls/ntdll/signal_arm64.c | 16 +++++++++------- dlls/ntdll/signal_i386.c | 43 +++++++++++++++++++++++-------------------- dlls/ntdll/signal_powerpc.c | 16 +++++++++------- dlls/ntdll/signal_x86_64.c | 8 ++++++++ dlls/ntdll/thread.c | 1 + 7 files changed, 60 insertions(+), 42 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 1c3088ae40..55de8dbce8 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -77,6 +77,7 @@ extern LPCSTR debugstr_us( const UNICODE_STRING *str ) DECLSPEC_HIDDEN; extern LPCSTR debugstr_ObjectAttributes(const OBJECT_ATTRIBUTES *oa) DECLSPEC_HIDDEN; /* init routines */ +extern void signal_init_threading(void) DECLSPEC_HIDDEN; extern NTSTATUS signal_alloc_thread( TEB **teb ) DECLSPEC_HIDDEN; extern void signal_free_thread( TEB *teb ) DECLSPEC_HIDDEN; extern void signal_init_thread( TEB *teb ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 63c008224d..5935f5f8d9 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -952,6 +952,15 @@ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) } +/********************************************************************** + * signal_init_threading + */ +void signal_init_threading(void) +{ + pthread_key_create( &teb_key, NULL ); +} + + /********************************************************************** * signal_alloc_thread */ @@ -997,14 +1006,6 @@ void signal_free_thread( TEB *teb ) */ void signal_init_thread( TEB *teb ) { - static BOOL init_done; - - if (!init_done) - { - pthread_key_create( &teb_key, NULL ); - init_done = TRUE; - } - #if defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_8A__) /* Win32/ARM applications expect the TEB pointer to be in the TPIDRURW register. */ __asm__ __volatile__( "mcr p15, 0, %0, c13, c0, 2" : : "r" (teb) ); diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 15e78dbb56..2c61d8a774 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1250,6 +1250,15 @@ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) } +/********************************************************************** + * signal_init_threading + */ +void signal_init_threading(void) +{ + pthread_key_create( &teb_key, NULL ); +} + + /********************************************************************** * signal_alloc_thread */ @@ -1286,15 +1295,8 @@ void signal_free_thread( TEB *teb ) */ void signal_init_thread( TEB *teb ) { - static BOOL init_done; stack_t ss; - if (!init_done) - { - pthread_key_create( &teb_key, NULL ); - init_done = TRUE; - } - ss.ss_sp = (char *)teb + teb_size; ss.ss_size = signal_stack_size; ss.ss_flags = 0; diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index c953d18a65..f7cdbd606e 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2438,25 +2438,6 @@ static void ldt_set_entry( WORD sel, LDT_ENTRY entry ) LDT_FLAGS_ALLOCATED); } -static void ldt_init(void) -{ -#ifdef __linux__ - /* the preloader may have allocated it already */ - gdt_fs_sel = get_fs(); - if (!gdt_fs_sel || !is_gdt_sel( gdt_fs_sel )) - { - struct modify_ldt_s ldt_info = { -1 }; - - ldt_info.seg_32bit = 1; - ldt_info.usable = 1; - if (set_thread_area( &ldt_info ) >= 0) gdt_fs_sel = (ldt_info.entry_number << 3) | 3; - else gdt_fs_sel = 0; - } -#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) - gdt_fs_sel = GSEL( GUFS_SEL, SEL_UPL ); -#endif -} - WORD ldt_alloc_fs( TEB *teb, int first_thread ) { LDT_ENTRY entry; @@ -2583,6 +2564,29 @@ NTSTATUS WINAPI NtSetLdtEntries( ULONG sel1, LDT_ENTRY entry1, ULONG sel2, LDT_E } +/********************************************************************** + * signal_init_threading + */ +void signal_init_threading(void) +{ +#ifdef __linux__ + /* the preloader may have allocated it already */ + gdt_fs_sel = get_fs(); + if (!gdt_fs_sel || !is_gdt_sel( gdt_fs_sel )) + { + struct modify_ldt_s ldt_info = { -1 }; + + ldt_info.seg_32bit = 1; + ldt_info.usable = 1; + if (set_thread_area( &ldt_info ) >= 0) gdt_fs_sel = (ldt_info.entry_number << 3) | 3; + else gdt_fs_sel = 0; + } +#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) + gdt_fs_sel = GSEL( GUFS_SEL, SEL_UPL ); +#endif +} + + /********************************************************************** * signal_alloc_thread */ @@ -2603,7 +2607,6 @@ NTSTATUS signal_alloc_thread( TEB **teb ) while ((1u << sigstack_alignment) < min_size) sigstack_alignment++; signal_stack_mask = (1 << sigstack_alignment) - 1; signal_stack_size = (1 << sigstack_alignment) - teb_size; - ldt_init(); } size = signal_stack_mask + 1; diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index ee765e226b..0ef71af351 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -1013,6 +1013,15 @@ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) } +/********************************************************************** + * signal_init_threading + */ +void signal_init_threading(void) +{ + pthread_key_create( &teb_key, NULL ); +} + + /********************************************************************** * signal_alloc_thread */ @@ -1058,13 +1067,6 @@ void signal_free_thread( TEB *teb ) */ void signal_init_thread( TEB *teb ) { - static BOOL init_done; - - if (!init_done) - { - pthread_key_create( &teb_key, NULL ); - init_done = TRUE; - } pthread_setspecific( teb_key, teb ); } diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 2f9c3dae22..b53edf7633 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3107,6 +3107,14 @@ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) } +/********************************************************************** + * signal_init_threading + */ +void signal_init_threading(void) +{ +} + + /********************************************************************** * signal_alloc_thread */ diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 73b5c9ebca..7353c86899 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -284,6 +284,7 @@ TEB *thread_init(void) /* allocate and initialize the initial TEB */ + signal_init_threading(); signal_alloc_thread( &teb ); teb->Peb = peb; teb->Tib.StackBase = (void *)~0UL;

1 0

Alexandre Julliard : ntdll: Move signal stack size computation to the common code.
by Alexandre Julliard 28 Apr '20

28 Apr '20

Module: wine Branch: master Commit: 9650f1d3a19857f8bab414188542952b0b21ee1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9650f1d3a19857f8bab41418… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 28 13:26:34 2020 +0200 ntdll: Move signal stack size computation to the common code. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 3 +++ dlls/ntdll/signal_arm.c | 14 ++------------ dlls/ntdll/signal_arm64.c | 1 - dlls/ntdll/signal_i386.c | 21 ++++----------------- dlls/ntdll/signal_powerpc.c | 14 ++------------ dlls/ntdll/signal_x86_64.c | 17 ++--------------- dlls/ntdll/virtual.c | 12 ++++++++++++ 7 files changed, 25 insertions(+), 57 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 55de8dbce8..7b139db90c 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -77,6 +77,9 @@ extern LPCSTR debugstr_us( const UNICODE_STRING *str ) DECLSPEC_HIDDEN; extern LPCSTR debugstr_ObjectAttributes(const OBJECT_ATTRIBUTES *oa) DECLSPEC_HIDDEN; /* init routines */ +extern SIZE_T signal_stack_size DECLSPEC_HIDDEN; +extern SIZE_T signal_stack_mask DECLSPEC_HIDDEN; +extern SIZE_T signal_stack_align DECLSPEC_HIDDEN; extern void signal_init_threading(void) DECLSPEC_HIDDEN; extern NTSTATUS signal_alloc_thread( TEB **teb ) DECLSPEC_HIDDEN; extern void signal_free_thread( TEB *teb ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 5935f5f8d9..3654fe38e5 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -966,22 +966,12 @@ void signal_init_threading(void) */ NTSTATUS signal_alloc_thread( TEB **teb ) { - static size_t sigstack_alignment; - SIZE_T size; + SIZE_T size = signal_stack_mask + 1; NTSTATUS status; - if (!sigstack_alignment) - { - size_t min_size = page_size; - /* find the first power of two not smaller than min_size */ - while ((1u << sigstack_alignment) < min_size) sigstack_alignment++; - assert( sizeof(TEB) <= min_size ); - } - - size = 1 << sigstack_alignment; *teb = NULL; if (!(status = virtual_alloc_aligned( (void **)teb, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, - PAGE_READWRITE, sigstack_alignment ))) + PAGE_READWRITE, signal_stack_align ))) { (*teb)->Tib.Self = &(*teb)->Tib; (*teb)->Tib.ExceptionList = (void *)~0UL; diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 2c61d8a774..2c03169395 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -111,7 +111,6 @@ static DWORD64 get_fault_esr( ucontext_t *sigcontext ) #endif /* linux */ static const size_t teb_size = 0x2000; /* we reserve two pages for the TEB */ -static const size_t signal_stack_size = max( MINSIGSTKSZ, 8192 ); /* stack layout when calling an exception raise function */ struct stack_layout diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index f7cdbd606e..151c72263b 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -474,8 +474,6 @@ struct stack_layout typedef int (*wine_signal_handler)(unsigned int sig); static const size_t teb_size = 4096; /* we reserve one page for the TEB */ -static size_t signal_stack_mask; -static size_t signal_stack_size; static ULONG first_ldt_entry = 32; @@ -2592,26 +2590,14 @@ void signal_init_threading(void) */ NTSTATUS signal_alloc_thread( TEB **teb ) { - static size_t sigstack_alignment; struct x86_thread_data *thread_data; - SIZE_T size; + SIZE_T size = signal_stack_mask + 1; void *addr = NULL; NTSTATUS status; - int first_thread = !sigstack_alignment; + static int first_thread = 1; - if (!sigstack_alignment) - { - size_t min_size = teb_size + max( MINSIGSTKSZ, 8192 ); - /* find the first power of two not smaller than min_size */ - sigstack_alignment = 12; - while ((1u << sigstack_alignment) < min_size) sigstack_alignment++; - signal_stack_mask = (1 << sigstack_alignment) - 1; - signal_stack_size = (1 << sigstack_alignment) - teb_size; - } - - size = signal_stack_mask + 1; if (!(status = virtual_alloc_aligned( &addr, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, - PAGE_READWRITE, sigstack_alignment ))) + PAGE_READWRITE, signal_stack_align ))) { *teb = addr; (*teb)->Tib.Self = &(*teb)->Tib; @@ -2623,6 +2609,7 @@ NTSTATUS signal_alloc_thread( TEB **teb ) NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); status = STATUS_TOO_MANY_THREADS; } + first_thread = 0; } return status; } diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 0ef71af351..81bb8fc596 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -1027,22 +1027,12 @@ void signal_init_threading(void) */ NTSTATUS signal_alloc_thread( TEB **teb ) { - static size_t sigstack_alignment; - SIZE_T size; + SIZE_T size = signal_stack_mask + 1; NTSTATUS status; - if (!sigstack_alignment) - { - size_t min_size = page_size; /* this is just for the TEB, we don't use a signal stack yet */ - /* find the first power of two not smaller than min_size */ - while ((1u << sigstack_alignment) < min_size) sigstack_alignment++; - assert( sizeof(TEB) <= min_size ); - } - - size = 1 << sigstack_alignment; *teb = NULL; if (!(status = virtual_alloc_aligned( (void **)teb, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, - PAGE_READWRITE, sigstack_alignment ))) + PAGE_READWRITE, signal_stack_align ))) { (*teb)->Tib.Self = &(*teb)->Tib; (*teb)->Tib.ExceptionList = (void *)~0UL; diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index b53edf7633..2f4acbc27a 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -282,7 +282,6 @@ enum i386_trap_code }; static const size_t teb_size = 0x2000; /* we reserve two pages for the TEB */ -static size_t signal_stack_size; typedef void (*raise_func)( EXCEPTION_RECORD *rec, CONTEXT *context ); @@ -3120,24 +3119,12 @@ void signal_init_threading(void) */ NTSTATUS signal_alloc_thread( TEB **teb ) { - static size_t sigstack_alignment; - SIZE_T size; + SIZE_T size = signal_stack_mask + 1; NTSTATUS status; - if (!sigstack_alignment) - { - size_t min_size = teb_size + max( MINSIGSTKSZ, 8192 ); - /* find the first power of two not smaller than min_size */ - sigstack_alignment = 12; - while ((1u << sigstack_alignment) < min_size) sigstack_alignment++; - signal_stack_size = (1 << sigstack_alignment) - teb_size; - assert( sizeof(TEB) <= teb_size ); - } - - size = 1 << sigstack_alignment; *teb = NULL; if (!(status = virtual_alloc_aligned( (void **)teb, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, - PAGE_READWRITE, sigstack_alignment ))) + PAGE_READWRITE, signal_stack_align ))) { (*teb)->Tib.Self = &(*teb)->Tib; (*teb)->Tib.ExceptionList = (void *)~0UL; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 6ad2d21e01..f9a461bdd8 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -31,6 +31,7 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> +#include <signal.h> #include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> @@ -159,6 +160,10 @@ static void *address_space_start = (void *)0x10000; #endif /* __i386__ */ static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); +SIZE_T signal_stack_size = 0; +SIZE_T signal_stack_mask = 0; +SIZE_T signal_stack_align = 0; + #define ROUND_ADDR(addr,mask) \ ((void *)((UINT_PTR)(addr) & ~(UINT_PTR)(mask))) @@ -1974,6 +1979,13 @@ void virtual_init(void) } } + size = ROUND_SIZE( 0, sizeof(TEB) ) + max( MINSIGSTKSZ, 8192 ); + /* find the first power of two not smaller than size */ + signal_stack_align = page_shift; + while ((1u << signal_stack_align) < size) signal_stack_align++; + signal_stack_mask = (1 << signal_stack_align) - 1; + signal_stack_size = (1 << signal_stack_align) - ROUND_SIZE( 0, sizeof(TEB) ); + /* try to find space in a reserved area for the views and pages protection table */ #ifdef _WIN64 pages_vprot_size = ((size_t)address_space_limit >> page_shift >> pages_vprot_shift) + 1;

1 0

Alexandre Julliard : ntdll: Move TEB allocation to the common code.
by Alexandre Julliard 28 Apr '20

28 Apr '20

Module: wine Branch: master Commit: bd9a1e23f2a1eb97492ff977dcb0d96fde8ab2ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd9a1e23f2a1eb97492ff977… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 28 13:34:57 2020 +0200 ntdll: Move TEB allocation to the common code. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 5 ++- dlls/ntdll/signal_arm.c | 17 +------- dlls/ntdll/signal_arm64.c | 18 +-------- dlls/ntdll/signal_i386.c | 95 ++++++++++++++++----------------------------- dlls/ntdll/signal_powerpc.c | 17 +------- dlls/ntdll/signal_x86_64.c | 17 +------- dlls/ntdll/thread.c | 34 ++-------------- dlls/ntdll/virtual.c | 54 +++++++++++++++++++++++++- 8 files changed, 102 insertions(+), 155 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bd9a1e23f2a1eb97492f…

1 0