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

Alexandre Julliard : ntdll: Move the global options initialization to LdrInitializeThunk().
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: 04762b357635d3adb85ccd5e3456e81c23033394 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04762b357635d3adb85ccd5e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 5 12:04:41 2021 +0200 ntdll: Move the global options initialization to LdrInitializeThunk(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 102 ++++++++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 35cef275e9a..8863a20d67e 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3484,6 +3484,54 @@ static void process_breakpoint(void) } +/*********************************************************************** + * load_global_options + */ +static void load_global_options(void) +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING name_str; + HANDLE hkey; + ULONG value; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &name_str; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &name_str, L"Machine\\System\\CurrentControlSet\\Control\\Session Manager" ); + + if (!NtOpenKey( &hkey, KEY_QUERY_VALUE, &attr )) + { + query_dword_option( hkey, L"GlobalFlag", &NtCurrentTeb()->Peb->NtGlobalFlag ); + query_dword_option( hkey, L"SafeProcessSearchMode", &path_safe_mode ); + query_dword_option( hkey, L"SafeDllSearchMode", &dll_safe_mode ); + + if (!query_dword_option( hkey, L"CriticalSectionTimeout", &value )) + NtCurrentTeb()->Peb->CriticalSectionTimeout.QuadPart = (ULONGLONG)value * -10000000; + + if (!query_dword_option( hkey, L"HeapSegmentReserve", &value )) + NtCurrentTeb()->Peb->HeapSegmentReserve = value; + + if (!query_dword_option( hkey, L"HeapSegmentCommit", &value )) + NtCurrentTeb()->Peb->HeapSegmentCommit = value; + + if (!query_dword_option( hkey, L"HeapDeCommitTotalFreeThreshold", &value )) + NtCurrentTeb()->Peb->HeapDeCommitTotalFreeThreshold = value; + + if (!query_dword_option( hkey, L"HeapDeCommitFreeBlockThreshold", &value )) + NtCurrentTeb()->Peb->HeapDeCommitFreeBlockThreshold = value; + + NtClose( hkey ); + } + LdrQueryImageFileExecutionOptions( &NtCurrentTeb()->Peb->ProcessParameters->ImagePathName, + L"GlobalFlag", REG_DWORD, &NtCurrentTeb()->Peb->NtGlobalFlag, + sizeof(DWORD), NULL ); + heap_set_debug_flags( GetProcessHeap() ); +} + + #ifndef _WIN64 void *Wow64Transition = NULL; @@ -3568,6 +3616,9 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR ANSI_STRING func_name; WINE_MODREF *kernel32; + init_user_process_params(); + load_global_options(); + version_init(); #ifndef _WIN64 init_wow64(); #endif @@ -3657,54 +3708,6 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR } -/*********************************************************************** - * load_global_options - */ -static void load_global_options(void) -{ - OBJECT_ATTRIBUTES attr; - UNICODE_STRING name_str; - HANDLE hkey; - ULONG value; - - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = &name_str; - attr.Attributes = OBJ_CASE_INSENSITIVE; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &name_str, L"Machine\\System\\CurrentControlSet\\Control\\Session Manager" ); - - if (!NtOpenKey( &hkey, KEY_QUERY_VALUE, &attr )) - { - query_dword_option( hkey, L"GlobalFlag", &NtCurrentTeb()->Peb->NtGlobalFlag ); - query_dword_option( hkey, L"SafeProcessSearchMode", &path_safe_mode ); - query_dword_option( hkey, L"SafeDllSearchMode", &dll_safe_mode ); - - if (!query_dword_option( hkey, L"CriticalSectionTimeout", &value )) - NtCurrentTeb()->Peb->CriticalSectionTimeout.QuadPart = (ULONGLONG)value * -10000000; - - if (!query_dword_option( hkey, L"HeapSegmentReserve", &value )) - NtCurrentTeb()->Peb->HeapSegmentReserve = value; - - if (!query_dword_option( hkey, L"HeapSegmentCommit", &value )) - NtCurrentTeb()->Peb->HeapSegmentCommit = value; - - if (!query_dword_option( hkey, L"HeapDeCommitTotalFreeThreshold", &value )) - NtCurrentTeb()->Peb->HeapDeCommitTotalFreeThreshold = value; - - if (!query_dword_option( hkey, L"HeapDeCommitFreeBlockThreshold", &value )) - NtCurrentTeb()->Peb->HeapDeCommitFreeBlockThreshold = value; - - NtClose( hkey ); - } - LdrQueryImageFileExecutionOptions( &NtCurrentTeb()->Peb->ProcessParameters->ImagePathName, - L"GlobalFlag", REG_DWORD, &NtCurrentTeb()->Peb->NtGlobalFlag, - sizeof(DWORD), NULL ); - heap_set_debug_flags( GetProcessHeap() ); -} - - /*********************************************************************** * RtlImageDirectoryEntryToData (NTDLL.@) */ @@ -4067,9 +4070,6 @@ static NTSTATUS process_init(void) InitializeListHead( &ldr.InMemoryOrderModuleList ); InitializeListHead( &ldr.InInitializationOrderModuleList ); - init_user_process_params(); - load_global_options(); - version_init(); return STATUS_SUCCESS; }

1 0

Alexandre Julliard : ntdll: Move the PEB initialization to LdrInitializeThunk().
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: beff5c56cdb02d614a5159de0e5ce1914c8ebc77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=beff5c56cdb02d614a5159de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 5 12:05:38 2021 +0200 ntdll: Move the PEB initialization to LdrInitializeThunk(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 62 +++++++++++++++++++++---------------------------- dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/thread.c | 7 +----- 3 files changed, 28 insertions(+), 42 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 8863a20d67e..7a714a5aa6d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -154,7 +154,14 @@ static RTL_CRITICAL_SECTION_DEBUG peb_critsect_debug = }; static RTL_CRITICAL_SECTION peb_lock = { &peb_critsect_debug, -1, 0, 0, 0, 0 }; -static PEB_LDR_DATA ldr = { sizeof(ldr), TRUE }; +static PEB_LDR_DATA ldr = +{ + sizeof(ldr), TRUE, NULL, + { &ldr.InLoadOrderModuleList, &ldr.InLoadOrderModuleList }, + { &ldr.InMemoryOrderModuleList, &ldr.InMemoryOrderModuleList }, + { &ldr.InInitializationOrderModuleList, &ldr.InInitializationOrderModuleList } +}; + static RTL_BITMAP tls_bitmap; static RTL_BITMAP tls_expansion_bitmap; @@ -3615,6 +3622,24 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR { ANSI_STRING func_name; WINE_MODREF *kernel32; + PEB *peb = NtCurrentTeb()->Peb; + + peb->LdrData = &ldr; + peb->FastPebLock = &peb_lock; + peb->TlsBitmap = &tls_bitmap; + peb->TlsExpansionBitmap = &tls_expansion_bitmap; + peb->LoaderLock = &loader_section; + peb->OSMajorVersion = 5; + peb->OSMinorVersion = 1; + peb->OSBuildNumber = 0xA28; + peb->OSPlatformId = VER_PLATFORM_WIN32_NT; + peb->SessionId = 1; + peb->ProcessHeap = RtlCreateHeap( HEAP_GROWABLE, NULL, 0, 0, NULL, NULL ); + + RtlInitializeBitMap( &tls_bitmap, peb->TlsBitmapBits, sizeof(peb->TlsBitmapBits) * 8 ); + RtlInitializeBitMap( &tls_expansion_bitmap, peb->TlsExpansionBitmapBits, + sizeof(peb->TlsExpansionBitmapBits) * 8 ); + RtlSetBits( peb->TlsBitmap, 0, 1 ); /* TLS index 0 is reserved and should be initialized to NULL. */ init_user_process_params(); load_global_options(); @@ -4040,39 +4065,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) } -/*********************************************************************** - * process_init - */ -static NTSTATUS process_init(void) -{ - TEB *teb = NtCurrentTeb(); - PEB *peb = teb->Peb; - - peb->LdrData = &ldr; - peb->FastPebLock = &peb_lock; - peb->TlsBitmap = &tls_bitmap; - peb->TlsExpansionBitmap = &tls_expansion_bitmap; - peb->LoaderLock = &loader_section; - peb->OSMajorVersion = 5; - peb->OSMinorVersion = 1; - peb->OSBuildNumber = 0xA28; - peb->OSPlatformId = VER_PLATFORM_WIN32_NT; - peb->SessionId = 1; - peb->ProcessHeap = RtlCreateHeap( HEAP_GROWABLE, NULL, 0, 0, NULL, NULL ); - - RtlInitializeBitMap( &tls_bitmap, peb->TlsBitmapBits, sizeof(peb->TlsBitmapBits) * 8 ); - RtlInitializeBitMap( &tls_expansion_bitmap, peb->TlsExpansionBitmapBits, - sizeof(peb->TlsExpansionBitmapBits) * 8 ); - RtlSetBits( peb->TlsBitmap, 0, 1 ); /* TLS index 0 is reserved and should be initialized to NULL. */ - init_global_fls_data(); - - InitializeListHead( &ldr.InLoadOrderModuleList ); - InitializeListHead( &ldr.InMemoryOrderModuleList ); - InitializeListHead( &ldr.InInitializationOrderModuleList ); - - return STATUS_SUCCESS; -} - /*********************************************************************** * __wine_set_unix_funcs */ @@ -4080,5 +4072,5 @@ NTSTATUS CDECL __wine_set_unix_funcs( int version, const struct unix_funcs *func { if (version != NTDLL_UNIXLIB_VERSION) return STATUS_REVISION_MISMATCH; unix_funcs = funcs; - return process_init(); + return STATUS_SUCCESS; } diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index e50d48dc3cc..a4a178a462e 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -106,7 +106,6 @@ static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) } /* FLS data */ -extern void init_global_fls_data(void) DECLSPEC_HIDDEN; extern TEB_FLS_DATA *fls_alloc_data(void) DECLSPEC_HIDDEN; #endif diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 25496609f08..3cb3bd469ba 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -241,7 +241,7 @@ TEB_ACTIVE_FRAME * WINAPI RtlGetFrame(void) ***********************************************************************/ -static GLOBAL_FLS_DATA fls_data; +static GLOBAL_FLS_DATA fls_data = { { NULL }, { &fls_data.fls_list_head, &fls_data.fls_list_head } }; static RTL_CRITICAL_SECTION fls_section; static RTL_CRITICAL_SECTION_DEBUG fls_critsect_debug = @@ -254,11 +254,6 @@ static RTL_CRITICAL_SECTION fls_section = { &fls_critsect_debug, -1, 0, 0, 0, 0 #define MAX_FLS_DATA_COUNT 0xff0 -void init_global_fls_data(void) -{ - InitializeListHead( &fls_data.fls_list_head ); -} - static void lock_fls_data(void) { RtlEnterCriticalSection( &fls_section );

1 0

Alexandre Julliard : ntdll: Retrieve Wine version strings through NtQuerySystemInformation().
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: 985bd97c2bb0a161f9cae370ae1893f2b0554ffd URL: https://source.winehq.org/git/wine.git/?a=commit;h=985bd97c2bb0a161f9cae370… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 5 13:05:44 2021 +0200 ntdll: Retrieve Wine version strings through NtQuerySystemInformation(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 6 +++--- dlls/ntdll/unix/loader.c | 48 ++---------------------------------------------- dlls/ntdll/unix/system.c | 18 ++++++++++++++++++ dlls/ntdll/version.c | 37 +++++++++++++++++++++++++++++++++++++ include/winternl.h | 4 +++- 5 files changed, 63 insertions(+), 50 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index c8622ba21f4..cbb45f50dff 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1623,9 +1623,9 @@ @ cdecl -syscall __wine_locked_recvmsg(long ptr long) # Version -@ cdecl -syscall wine_get_version() -@ cdecl -syscall wine_get_build_id() -@ cdecl -syscall wine_get_host_version(ptr ptr) +@ cdecl wine_get_version() +@ cdecl wine_get_build_id() +@ cdecl wine_get_host_version(ptr ptr) # Filesystem @ cdecl -syscall wine_nt_to_unix_file_name(ptr ptr ptr long) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 9c6d58d94ee..c13055a5549 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -51,9 +51,6 @@ #ifdef HAVE_SYS_RESOURCE_H # include <sys/resource.h> #endif -#ifdef HAVE_SYS_UTSNAME_H -#include <sys/utsname.h> -#endif #ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> #endif @@ -335,48 +332,6 @@ static void init_paths( char *argv[] ) } -/********************************************************************* - * wine_get_version - */ -const char * CDECL wine_get_version(void) -{ - return PACKAGE_VERSION; -} - - -/********************************************************************* - * wine_get_build_id - */ -const char * CDECL wine_get_build_id(void) -{ - extern const char wine_build[]; - return wine_build; -} - - -/********************************************************************* - * wine_get_host_version - */ -void CDECL wine_get_host_version( const char **sysname, const char **release ) -{ -#ifdef HAVE_SYS_UTSNAME_H - static struct utsname buf; - static BOOL init_done; - - if (!init_done) - { - uname( &buf ); - init_done = TRUE; - } - if (sysname) *sysname = buf.sysname; - if (release) *release = buf.release; -#else - if (sysname) *sysname = ""; - if (release) *release = ""; -#endif -} - - static void preloader_exec( char **argv ) { if (use_preloader) @@ -2107,7 +2062,8 @@ static void check_command_line( int argc, char *argv[] ) } if (!strcmp( argv[1], "--version" )) { - printf( "%s\n", wine_get_build_id() ); + extern const char wine_build[]; + printf( "%s\n", wine_build ); exit(0); } } diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 56f31e4147f..2b316095f4a 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -40,6 +40,9 @@ #ifdef HAVE_SYS_SYSCTL_H # include <sys/sysctl.h> #endif +#ifdef HAVE_SYS_UTSNAME_H +# include <sys/utsname.h> +#endif #ifdef HAVE_MACHINE_CPU_H # include <machine/cpu.h> #endif @@ -2809,6 +2812,21 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, ret = STATUS_SUCCESS; break; + /* Wine extensions */ + + case SystemWineVersionInformation: + { + static const char version[] = PACKAGE_VERSION; + extern const char wine_build[]; + struct utsname buf; + + uname( &buf ); + len = strlen(version) + strlen(wine_build) + strlen(buf.sysname) + strlen(buf.release) + 4; + snprintf( info, size, "%s%c%s%c%s%c%s", version, 0, wine_build, 0, buf.sysname, 0, buf.release ); + if (size < len) ret = STATUS_INFO_LENGTH_MISMATCH; + break; + } + default: FIXME( "(0x%08x,%p,0x%08x,%p) stub\n", class, info, size, ret_size ); diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 740d8403f5e..cde340cca1d 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -207,6 +207,41 @@ static const struct { WCHAR name[12]; WINDOWS_VERSION ver; } version_names[] = /* initialized to null so that we crash if we try to retrieve the version too early at startup */ static const RTL_OSVERSIONINFOEXW *current_version; +static char wine_version[256]; + +/********************************************************************* + * wine_get_version + */ +const char * CDECL wine_get_version(void) +{ + return wine_version; +} + + +/********************************************************************* + * wine_get_build_id + */ +const char * CDECL wine_get_build_id(void) +{ + const char *p = wine_version; + p += strlen(p) + 1; /* skip version */ + return p; +} + + +/********************************************************************* + * wine_get_host_version + */ +void CDECL wine_get_host_version( const char **sysname, const char **release ) +{ + const char *p = wine_version; + p += strlen(p) + 1; /* skip version */ + p += strlen(p) + 1; /* skip build id */ + if (sysname) *sysname = p; + p += strlen(p) + 1; + if (release) *release = p; +} + /********************************************************************** * get_nt_registry_version @@ -430,6 +465,8 @@ void version_init(void) const WCHAR *p, *appname = NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer; WCHAR appversion[MAX_PATH+20]; + NtQuerySystemInformation( SystemWineVersionInformation, wine_version, sizeof(wine_version), NULL ); + current_version = &VersionData[WIN7]; RtlOpenCurrentUser( KEY_ALL_ACCESS, &root ); diff --git a/include/winternl.h b/include/winternl.h index 9e6bde25569..298ebbc2d36 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1693,7 +1693,9 @@ typedef enum _SYSTEM_INFORMATION_CLASS { SystemDifRemovePluginVerificationOnDriver = 220, SystemShadowStackInformation = 221, SystemBuildVersionInformation = 222, - SystemInformationClassMax +#ifdef __WINESRC__ + SystemWineVersionInformation = 1000, +#endif } SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS; typedef enum _THREADINFOCLASS {

1 0

Alexandre Julliard : ntdll: Stop exporting wine_server_send_fd() and wine_server_release_fd().
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: 2330a5860aef9d767afe4db48ab42cf3155abb55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2330a5860aef9d767afe4db4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 5 13:18:39 2021 +0200 ntdll: Stop exporting wine_server_send_fd() and wine_server_release_fd(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 -- dlls/ntdll/unix/server.c | 11 +---------- dlls/ntdll/unix/unix_private.h | 3 ++- dlls/ws2_32/socket.c | 12 ++++++------ include/wine/server.h | 2 -- 5 files changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index cbb45f50dff..881b57eb80a 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1603,8 +1603,6 @@ @ cdecl -syscall -norelay wine_server_call(ptr) @ cdecl -syscall wine_server_fd_to_handle(long long long ptr) @ cdecl -syscall wine_server_handle_to_fd(long long ptr ptr) -@ cdecl -syscall wine_server_release_fd(long long) -@ cdecl -syscall wine_server_send_fd(long) @ cdecl -syscall __wine_make_process_system() # Unix interface diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 50d89f79c0d..65863f54c4b 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -797,7 +797,7 @@ unsigned int server_queue_process_apc( HANDLE process, const apc_call_t *call, a * * Send a file descriptor to the server. */ -void CDECL wine_server_send_fd( int fd ) +void wine_server_send_fd( int fd ) { struct send_fd data; struct msghdr msghdr; @@ -1120,15 +1120,6 @@ NTSTATUS CDECL wine_server_handle_to_fd( HANDLE handle, unsigned int access, int } -/*********************************************************************** - * wine_server_release_fd - */ -void CDECL wine_server_release_fd( HANDLE handle, int unix_fd ) -{ - close( unix_fd ); -} - - /*********************************************************************** * server_pipe * diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index c02a8f50b24..257566ce976 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -164,7 +164,8 @@ extern unsigned int server_queue_process_apc( HANDLE process, const apc_call_t * apc_result_t *result ) DECLSPEC_HIDDEN; extern int server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd, int *needs_close, enum server_fd_type *type, unsigned int *options ) DECLSPEC_HIDDEN; -extern void process_exit_wrapper( int status ) DECLSPEC_HIDDEN; +extern void wine_server_send_fd( int fd ) DECLSPEC_HIDDEN; +extern void process_exit_wrapper( int status ) DECLSPEC_HIDDEN; extern size_t server_init_process(void) DECLSPEC_HIDDEN; extern void server_init_process_done(void) DECLSPEC_HIDDEN; extern void server_init_thread( void *entry_point, BOOL *suspend ) DECLSPEC_HIDDEN; diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 715c96097fc..4f26d6475aa 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1298,7 +1298,7 @@ static inline int get_sock_fd( SOCKET s, DWORD access, unsigned int *options ) static inline void release_sock_fd( SOCKET s, int fd ) { - wine_server_release_fd( SOCKET2HANDLE(s), fd ); + close( fd ); } static void _enable_event( HANDLE s, unsigned int event, @@ -2450,7 +2450,7 @@ static NTSTATUS WS2_async_recv( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS stat break; result = WS2_recv( fd, wsa, convert_flags(wsa->flags) ); - wine_server_release_fd( wsa->hSocket, fd ); + close( fd ); if (result >= 0) { status = STATUS_SUCCESS; @@ -2581,7 +2581,7 @@ static NTSTATUS WS2_async_send( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS stat /* check to see if the data is ready (non-blocking) */ result = WS2_send( fd, wsa, convert_flags(wsa->flags) ); - wine_server_release_fd( wsa->hSocket, fd ); + close( fd ); if (result >= 0) { @@ -2633,7 +2633,7 @@ static NTSTATUS WS2_async_shutdown( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS case ASYNC_TYPE_WRITE: err = shutdown( fd, 1 ); break; } status = err ? wsaErrStatus() : STATUS_SUCCESS; - wine_server_release_fd( wsa->hSocket, fd ); + close( fd ); break; } iosb->u.Status = status; @@ -2804,7 +2804,7 @@ static NTSTATUS WS2_ReadFile(HANDLE hFile, PIO_STATUS_BLOCK io_status, char* buf else status = STATUS_PENDING; - wine_server_release_fd( hFile, unix_handle ); + close( unix_handle ); TRACE("= 0x%08x (%d)\n", status, result); if (status == STATUS_SUCCESS || status == STATUS_END_OF_FILE) { @@ -2929,7 +2929,7 @@ static NTSTATUS WS2_async_transmitfile( void *user, IO_STATUS_BLOCK *iosb, NTSTA if (!(status = wine_server_handle_to_fd( wsa->write.hSocket, FILE_WRITE_DATA, &fd, NULL ))) { status = WS2_transmitfile_base( fd, wsa ); - wine_server_release_fd( wsa->write.hSocket, fd ); + close( fd ); } if (status == STATUS_PENDING) return status; diff --git a/include/wine/server.h b/include/wine/server.h index ac5dcc6f8bc..57bcdbbb00d 100644 --- a/include/wine/server.h +++ b/include/wine/server.h @@ -50,10 +50,8 @@ struct __server_request_info }; extern unsigned int CDECL wine_server_call( void *req_ptr ); -extern void CDECL wine_server_send_fd( int fd ); extern int CDECL wine_server_fd_to_handle( int fd, unsigned int access, unsigned int attributes, HANDLE *handle ); extern int CDECL wine_server_handle_to_fd( HANDLE handle, unsigned int access, int *unix_fd, unsigned int *options ); -extern void CDECL wine_server_release_fd( HANDLE handle, int unix_fd ); /* do a server call and set the last error code */ static inline unsigned int wine_server_call_err( void *req_ptr )

1 0

Esme Povirk : bcrypt: Don't try to unload gnutls if loading failed.
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: 3db37dc5ae4e8b701c26f96fec97822b8b4da80c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3db37dc5ae4e8b701c26f96f… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Apr 3 13:53:32 2021 -0500 bcrypt: Don't try to unload gnutls if loading failed. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index efab65b8315..2f0c62bc6da 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1908,7 +1908,7 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p *(const struct key_funcs **)ptr_out = &key_funcs; break; case DLL_PROCESS_DETACH: - gnutls_uninitialize(); + if (libgnutls_handle) gnutls_uninitialize(); break; } return STATUS_SUCCESS;

1 0

Rémi Bernon : server: Split the fallback to desktop async keystate.
by Alexandre Julliard 02 Apr '21

02 Apr '21

Module: wine Branch: master Commit: 2fcc1d0ecdebc55a5f515b1390ce715303f6a6ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fcc1d0ecdebc55a5f515b13… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 2 10:08:01 2021 +0200 server: Split the fallback to desktop async keystate. When current thread doesn't have a message queue. It's going to be removed later anyway. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26269 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=27238 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31899 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35907 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45385 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/queue.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/server/queue.c b/server/queue.c index e1f4f208fc8..b026c03e13d 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2981,16 +2981,9 @@ DECL_HANDLER(get_key_state) set_reply_data( desktop->keystate, size ); release_object( desktop ); } - else + else if (!current->queue) { unsigned char *keystate; - if (current->queue) - { - if (req->key >= 0) reply->state = current->queue->input->keystate[req->key & 0xff]; - set_reply_data( current->queue->input->keystate, size ); - return; - } - /* fallback to desktop keystate */ if (!(desktop = get_thread_desktop( current, 0 ))) return; if (req->key >= 0) reply->state = desktop->keystate[req->key & 0xff] & ~0x40; @@ -3001,6 +2994,12 @@ DECL_HANDLER(get_key_state) } release_object( desktop ); } + else + { + unsigned char *keystate = current->queue->input->keystate; + if (req->key >= 0) reply->state = keystate[req->key & 0xff]; + set_reply_data( keystate, size ); + } }

1 0

Nikolay Sivov : mfplay/tests: Add a basic test for player creation.
by Alexandre Julliard 02 Apr '21

02 Apr '21

Module: wine Branch: master Commit: dc57a265f136c6a95f227072078c6236eabdbad5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc57a265f136c6a95f227072… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 1 23:22:58 2021 +0300 mfplay/tests: Add a basic test for player creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/mfplay/Makefile.in | 1 + dlls/mfplay/tests/Makefile.in | 5 +++++ dlls/mfplay/tests/mfplay.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 50 insertions(+) diff --git a/configure b/configure index a19bb0b9581..cf34fa3ada5 100755 --- a/configure +++ b/configure @@ -20739,6 +20739,7 @@ wine_fn_config_makefile dlls/mfmediaengine/tests enable_tests wine_fn_config_makefile dlls/mfplat enable_mfplat wine_fn_config_makefile dlls/mfplat/tests enable_tests wine_fn_config_makefile dlls/mfplay enable_mfplay +wine_fn_config_makefile dlls/mfplay/tests enable_tests wine_fn_config_makefile dlls/mfreadwrite enable_mfreadwrite wine_fn_config_makefile dlls/mfreadwrite/tests enable_tests wine_fn_config_makefile dlls/mfuuid enable_mfuuid diff --git a/configure.ac b/configure.ac index eb08e8b0f17..95eb04d6d49 100644 --- a/configure.ac +++ b/configure.ac @@ -3414,6 +3414,7 @@ WINE_CONFIG_MAKEFILE(dlls/mfmediaengine/tests) WINE_CONFIG_MAKEFILE(dlls/mfplat) WINE_CONFIG_MAKEFILE(dlls/mfplat/tests) WINE_CONFIG_MAKEFILE(dlls/mfplay) +WINE_CONFIG_MAKEFILE(dlls/mfplay/tests) WINE_CONFIG_MAKEFILE(dlls/mfreadwrite) WINE_CONFIG_MAKEFILE(dlls/mfreadwrite/tests) WINE_CONFIG_MAKEFILE(dlls/mfuuid) diff --git a/dlls/mfplay/Makefile.in b/dlls/mfplay/Makefile.in index 0a8645fe840..b21ce0e2161 100644 --- a/dlls/mfplay/Makefile.in +++ b/dlls/mfplay/Makefile.in @@ -1,4 +1,5 @@ MODULE = mfplay.dll +IMPORTLIB = mfplay IMPORTS = uuid mfuuid EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/mfplay/tests/Makefile.in b/dlls/mfplay/tests/Makefile.in new file mode 100644 index 00000000000..ca08c65ce24 --- /dev/null +++ b/dlls/mfplay/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = mfplay.dll +IMPORTS = mfplay + +C_SRCS = \ + mfplay.c diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c new file mode 100644 index 00000000000..e9b5df95039 --- /dev/null +++ b/dlls/mfplay/tests/mfplay.c @@ -0,0 +1,42 @@ +/* + * Copyright 2021 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "mfplay.h" + +#include "wine/test.h" + +static void test_create_player(void) +{ + IMFPMediaPlayer *player; + HRESULT hr; + + hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFPMediaPlayer_Release(player); +} + +START_TEST(mfplay) +{ + test_create_player(); +}

1 0

Hugh McMaster : reg: Abort 'add' operation when parsing command-line arguments that are not switches.
by Alexandre Julliard 02 Apr '21

02 Apr '21

Module: wine Branch: master Commit: b2ead1ffcc8d28b488b561e8c5a9e3cc964699a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2ead1ffcc8d28b488b561e8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Apr 2 22:26:53 2021 +1100 reg: Abort 'add' operation when parsing command-line arguments that are not switches. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/add.c | 74 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/programs/reg/add.c b/programs/reg/add.c index e1fd2223716..f259f0a4100 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -222,46 +222,48 @@ int reg_add(int argc, WCHAR *argvW[]) for (i = 3; i < argc; i++) { - if (argvW[i][0] == '/' || argvW[i][0] == '-') + WCHAR *str; + + if (argvW[i][0] != '/' && argvW[i][0] != '-') + goto invalid; + + str = &argvW[i][1]; + + if (!lstrcmpiW(str, L"ve")) { - WCHAR *str = &argvW[i][1]; + if (value_empty) goto invalid; + value_empty = TRUE; + continue; + } + else if (!str[0] || str[1]) + goto invalid; - if (!lstrcmpiW(str, L"ve")) - { - if (value_empty) goto invalid; - value_empty = TRUE; - continue; - } - else if (!str[0] || str[1]) + switch (towlower(*str)) + { + case 'v': + if (value_name || !(value_name = argvW[++i])) goto invalid; - - switch (towlower(*str)) - { - case 'v': - if (value_name || !(value_name = argvW[++i])) - goto invalid; - break; - case 't': - if (type || !(type = argvW[++i])) - goto invalid; - break; - case 'd': - if (data || !(data = argvW[++i])) - goto invalid; - break; - case 's': - str = argvW[++i]; - if (separator || !str || lstrlenW(str) != 1) - goto invalid; - separator = str[0]; - break; - case 'f': - if (force) goto invalid; - force = TRUE; - break; - default: + break; + case 't': + if (type || !(type = argvW[++i])) goto invalid; - } + break; + case 'd': + if (data || !(data = argvW[++i])) + goto invalid; + break; + case 's': + str = argvW[++i]; + if (separator || !str || lstrlenW(str) != 1) + goto invalid; + separator = str[0]; + break; + case 'f': + if (force) goto invalid; + force = TRUE; + break; + default: + goto invalid; } }

1 0

Hugh McMaster : reg: Abort 'delete' operation when parsing command-line arguments that are not switches.
by Alexandre Julliard 02 Apr '21

02 Apr '21

Module: wine Branch: master Commit: 51e83dec2959ce332264223832abc1a5f09dbf34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51e83dec2959ce3322642238… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Apr 2 22:26:54 2021 +1100 reg: Abort 'delete' operation when parsing command-line arguments that are not switches. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/delete.c | 60 ++++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/programs/reg/delete.c b/programs/reg/delete.c index 519d4b880ec..b23b14e8dab 100644 --- a/programs/reg/delete.c +++ b/programs/reg/delete.c @@ -118,38 +118,40 @@ int reg_delete(int argc, WCHAR *argvW[]) for (i = 3; i < argc; i++) { - if (argvW[i][0] == '/' || argvW[i][0] == '-') - { - WCHAR *str = &argvW[i][1]; + WCHAR *str; - if (!lstrcmpiW(str, L"va")) - { - if (value_all) goto invalid; - value_all = TRUE; - continue; - } - else if (!lstrcmpiW(str, L"ve")) - { - if (value_empty) goto invalid; - value_empty = TRUE; - continue; - } - else if (!str[0] || str[1]) - goto invalid; + if (argvW[i][0] != '/' && argvW[i][0] != '-') + goto invalid; - switch (towlower(*str)) - { - case 'v': - if (value_name || !(value_name = argvW[++i])) - goto invalid; - break; - case 'f': - if (force) goto invalid; - force = TRUE; - break; - default: + str = &argvW[i][1]; + + if (!lstrcmpiW(str, L"va")) + { + if (value_all) goto invalid; + value_all = TRUE; + continue; + } + else if (!lstrcmpiW(str, L"ve")) + { + if (value_empty) goto invalid; + value_empty = TRUE; + continue; + } + else if (!str[0] || str[1]) + goto invalid; + + switch (towlower(*str)) + { + case 'v': + if (value_name || !(value_name = argvW[++i])) goto invalid; - } + break; + case 'f': + if (force) goto invalid; + force = TRUE; + break; + default: + goto invalid; } }

1 0

Hugh McMaster : reg: Abort 'query' operation when parsing command-line arguments that are not switches.
by Alexandre Julliard 02 Apr '21

02 Apr '21

Module: wine Branch: master Commit: 2c7d74594f2bd421f6d904f334171a198a13c66e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c7d74594f2bd421f6d904f3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Apr 2 22:26:55 2021 +1100 reg: Abort 'query' operation when parsing command-line arguments that are not switches. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/query.c | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/programs/reg/query.c b/programs/reg/query.c index 656ac875ec4..cc8f264e780 100644 --- a/programs/reg/query.c +++ b/programs/reg/query.c @@ -334,32 +334,34 @@ int reg_query(int argc, WCHAR *argvW[]) for (i = 3; i < argc; i++) { - if (argvW[i][0] == '/' || argvW[i][0] == '-') - { - WCHAR *str = &argvW[i][1]; + WCHAR *str; - if (!lstrcmpiW(str, L"ve")) - { - if (value_empty) goto invalid; - value_empty = TRUE; - continue; - } - else if (!str[0] || str[1]) - goto invalid; + if (argvW[i][0] != '/' && argvW[i][0] != '-') + goto invalid; - switch (towlower(*str)) - { - case 'v': - if (value_name || !(value_name = argvW[++i])) - goto invalid; - break; - case 's': - if (recurse) goto invalid; - recurse = TRUE; - break; - default: + str = &argvW[i][1]; + + if (!lstrcmpiW(str, L"ve")) + { + if (value_empty) goto invalid; + value_empty = TRUE; + continue; + } + else if (!str[0] || str[1]) + goto invalid; + + switch (towlower(*str)) + { + case 'v': + if (value_name || !(value_name = argvW[++i])) goto invalid; - } + break; + case 's': + if (recurse) goto invalid; + recurse = TRUE; + break; + default: + goto invalid; } }

1 0