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

Alexandre Julliard : ntdll: Remove path from application name to open loadorder key.
by Alexandre Julliard April 5, 2021

April 5, 2021

Module: wine Branch: master Commit: 7a1ed2e1219a5048653cf163018d317d6c99bf75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a1ed2e1219a5048653cf163… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 3 13:00:46 2021 +0200 ntdll: Remove path from application name to open loadorder key. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50914 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loadorder.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/loadorder.c b/dlls/ntdll/unix/loadorder.c index 49af8eb6adb..5285bb58007 100644 --- a/dlls/ntdll/unix/loadorder.c +++ b/dlls/ntdll/unix/loadorder.c @@ -384,16 +384,20 @@ enum loadorder get_load_order( const UNICODE_STRING *nt_name ) enum loadorder ret = LO_INVALID; HANDLE std_key, app_key = 0; const WCHAR *path = nt_name->Buffer; - const WCHAR *app_name = NULL; + const WCHAR *p, *app_name = NULL; WCHAR *module, *basename; int len; + if (!init_done) init_load_order(); + std_key = get_standard_key(); + if (NtCurrentTeb()->Peb->ImageBaseAddress) + { app_name = NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer; + if ((p = wcsrchr( app_name, '\\' ))) app_name = p + 1; + app_key = get_app_key( app_name ); + } - if (!init_done) init_load_order(); - std_key = get_standard_key(); - if (app_name) app_key = get_app_key( app_name ); if (!wcsncmp( path, prefixW, 4 )) path += 4; TRACE("looking for %s\n", debugstr_w(path)); @@ -402,7 +406,7 @@ enum loadorder get_load_order( const UNICODE_STRING *nt_name ) */ if (!wcsnicmp( system_dir + 4, path, wcslen(system_dir) - 4 )) { - const WCHAR *p = path + wcslen( system_dir ) - 4; + p = path + wcslen( system_dir ) - 4; while (*p == '\\' || *p == '/') p++; if (!wcschr( p, '\\' ) && !wcschr( p, '/' )) path = p; }

1 0

Alexandre Julliard : ntdll: Move Wow64 initialization to LdrInitializeThunk().
by Alexandre Julliard April 5, 2021

April 5, 2021

Module: wine Branch: master Commit: 4f594e155254cdd236bf1b44299c9cd4cccdcb73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f594e155254cdd236bf1b44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 5 12:04:25 2021 +0200 ntdll: Move Wow64 initialization to LdrInitializeThunk(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 100 ++++++++++++++++++++++++++++------------------------ 1 file changed, 53 insertions(+), 47 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index daee7675196..35cef275e9a 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3484,6 +3484,56 @@ static void process_breakpoint(void) } +#ifndef _WIN64 +void *Wow64Transition = NULL; + +static void map_wow64cpu(void) +{ + SIZE_T size = 0; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; + HANDLE file, section; + IO_STATUS_BLOCK io; + NTSTATUS status; + + RtlInitUnicodeString( &string, L"\\??\\C:\\windows\\sysnative\\wow64cpu.dll" ); + InitializeObjectAttributes( &attr, &string, 0, NULL, NULL ); + if ((status = NtOpenFile( &file, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE ))) + { + WARN("failed to open wow64cpu, status %#x\n", status); + return; + } + if (!NtCreateSection( &section, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | + SECTION_MAP_READ | SECTION_MAP_EXECUTE, + NULL, NULL, PAGE_EXECUTE_READ, SEC_COMMIT, file )) + { + NtMapViewOfSection( section, NtCurrentProcess(), &Wow64Transition, 0, + 0, NULL, &size, ViewShare, 0, PAGE_EXECUTE_READ ); + NtClose( section ); + } + NtClose( file ); +} + +static void init_wow64(void) +{ + PEB *peb = NtCurrentTeb()->Peb; + PEB64 *peb64; + + if (!NtCurrentTeb64()) return; + peb64 = UlongToPtr( NtCurrentTeb64()->Peb ); + peb64->ImageBaseAddress = PtrToUlong( peb->ImageBaseAddress ); + peb64->OSMajorVersion = peb->OSMajorVersion; + peb64->OSMinorVersion = peb->OSMinorVersion; + peb64->OSBuildNumber = peb->OSBuildNumber; + peb64->OSPlatformId = peb->OSPlatformId; + peb64->SessionId = peb->SessionId; + + map_wow64cpu(); +} +#endif + + /****************************************************************** * LdrInitializeThunk (NTDLL.@) * @@ -3518,6 +3568,9 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR ANSI_STRING func_name; WINE_MODREF *kernel32; +#ifndef _WIN64 + init_wow64(); +#endif wm = build_main_module(); wm->ldr.LoadCount = -1; @@ -3984,39 +4037,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) } -#ifndef _WIN64 -void *Wow64Transition = NULL; - -static void map_wow64cpu(void) -{ - SIZE_T size = 0; - OBJECT_ATTRIBUTES attr; - UNICODE_STRING string; - HANDLE file, section; - IO_STATUS_BLOCK io; - NTSTATUS status; - - RtlInitUnicodeString( &string, L"\\??\\C:\\windows\\sysnative\\wow64cpu.dll" ); - InitializeObjectAttributes( &attr, &string, 0, NULL, NULL ); - if ((status = NtOpenFile( &file, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE ))) - { - WARN("failed to open wow64cpu, status %#x\n", status); - return; - } - if (!NtCreateSection( &section, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | - SECTION_MAP_READ | SECTION_MAP_EXECUTE, - NULL, NULL, PAGE_EXECUTE_READ, SEC_COMMIT, file )) - { - NtMapViewOfSection( section, NtCurrentProcess(), &Wow64Transition, 0, - 0, NULL, &size, ViewShare, 0, PAGE_EXECUTE_READ ); - NtClose( section ); - } - NtClose( file ); -} -#endif - - /*********************************************************************** * process_init */ @@ -4050,20 +4070,6 @@ static NTSTATUS process_init(void) init_user_process_params(); load_global_options(); version_init(); - -#ifndef _WIN64 - if (NtCurrentTeb64()) - { - PEB64 *peb64 = UlongToPtr( NtCurrentTeb64()->Peb ); - peb64->ImageBaseAddress = PtrToUlong( peb->ImageBaseAddress ); - peb64->OSMajorVersion = peb->OSMajorVersion; - peb64->OSMinorVersion = peb->OSMinorVersion; - peb64->OSBuildNumber = peb->OSBuildNumber; - peb64->OSPlatformId = peb->OSPlatformId; - peb64->SessionId = peb->SessionId; - map_wow64cpu(); - } -#endif return STATUS_SUCCESS; }

1 0

Alexandre Julliard : ntdll: Stop exporting wine_server_send_fd() and wine_server_release_fd().
by Alexandre Julliard April 5, 2021

April 5, 2021

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

Alexandre Julliard : ntdll: Retrieve Wine version strings through NtQuerySystemInformation().
by Alexandre Julliard April 5, 2021

April 5, 2021

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: Move the PEB initialization to LdrInitializeThunk().
by Alexandre Julliard April 5, 2021

April 5, 2021

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

Rémi Bernon : server: Split the fallback to desktop async keystate.
by Alexandre Julliard April 2, 2021

April 2, 2021

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

Rémi Bernon : server: Remove tid from set_key_state request.
by Alexandre Julliard April 2, 2021

April 2, 2021

Module: wine Branch: master Commit: 6444e4fadefb90bea8075b2e883c06cdb03454b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6444e4fadefb90bea8075b2e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 2 10:08:00 2021 +0200 server: Remove tid from set_key_state request. As it is always set to GetCurrentThreadId(). 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> --- dlls/user32/input.c | 1 - dlls/winex11.drv/keyboard.c | 1 - include/wine/server_protocol.h | 4 +--- server/protocol.def | 3 +-- server/queue.c | 18 +++--------------- server/request.h | 5 ++--- server/trace.c | 3 +-- 7 files changed, 8 insertions(+), 27 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 46dff3a89d4..8992c463c48 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -591,7 +591,6 @@ BOOL WINAPI SetKeyboardState( LPBYTE state ) SERVER_START_REQ( set_key_state ) { - req->tid = GetCurrentThreadId(); wine_server_add_data( req, state, 256 ); ret = !wine_server_call_err( req ); } diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 517522727fe..35a801fc895 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1177,7 +1177,6 @@ static void set_async_key_state( const BYTE state[256] ) { SERVER_START_REQ( set_key_state ) { - req->tid = GetCurrentThreadId(); req->async = 1; wine_server_add_data( req, state, 256 ); wine_server_call( req ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 642841fceeb..9756e9cb8b7 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3846,10 +3846,8 @@ struct get_key_state_reply struct set_key_state_request { struct request_header __header; - thread_id_t tid; int async; /* VARARG(keystate,bytes); */ - char __pad_20[4]; }; struct set_key_state_reply { @@ -6226,7 +6224,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 689 +#define SERVER_PROTOCOL_VERSION 690 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index c468c5b7151..617818f622d 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2758,9 +2758,8 @@ enum coords_relative VARARG(keystate,bytes); /* state array for all the keys */ @END -/* Set queue keyboard state for a given thread */ +/* Set queue keyboard state for current thread */ @REQ(set_key_state) - thread_id_t tid; /* id of thread */ int async; /* whether to change the async state too */ VARARG(keystate,bytes); /* state array for all the keys */ @END diff --git a/server/queue.c b/server/queue.c index 13a3641cfb8..e1f4f208fc8 100644 --- a/server/queue.c +++ b/server/queue.c @@ -3004,30 +3004,18 @@ DECL_HANDLER(get_key_state) } -/* set queue keyboard state for a given thread */ +/* set queue keyboard state for current thread */ DECL_HANDLER(set_key_state) { - struct thread *thread; struct desktop *desktop; data_size_t size = min( 256, get_req_data_size() ); - if (!req->tid) /* set global async key state */ + if (current->queue) memcpy( current->queue->input->keystate, get_req_data(), size ); + if (req->async && (desktop = get_thread_desktop( current, 0 ))) { - if (!(desktop = get_thread_desktop( current, 0 ))) return; memcpy( desktop->keystate, get_req_data(), size ); release_object( desktop ); } - else - { - if (!(thread = get_thread_from_id( req->tid ))) return; - if (thread->queue) memcpy( thread->queue->input->keystate, get_req_data(), size ); - if (req->async && (desktop = get_thread_desktop( thread, 0 ))) - { - memcpy( desktop->keystate, get_req_data(), size ); - release_object( desktop ); - } - release_object( thread ); - } } diff --git a/server/request.h b/server/request.h index a389a4eb6f7..6777f90b067 100644 --- a/server/request.h +++ b/server/request.h @@ -1724,9 +1724,8 @@ C_ASSERT( FIELD_OFFSET(struct get_key_state_request, key) == 16 ); C_ASSERT( sizeof(struct get_key_state_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_key_state_reply, state) == 8 ); C_ASSERT( sizeof(struct get_key_state_reply) == 16 ); -C_ASSERT( FIELD_OFFSET(struct set_key_state_request, tid) == 12 ); -C_ASSERT( FIELD_OFFSET(struct set_key_state_request, async) == 16 ); -C_ASSERT( sizeof(struct set_key_state_request) == 24 ); +C_ASSERT( FIELD_OFFSET(struct set_key_state_request, async) == 12 ); +C_ASSERT( sizeof(struct set_key_state_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_foreground_window_request, handle) == 12 ); C_ASSERT( sizeof(struct set_foreground_window_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_foreground_window_reply, previous) == 8 ); diff --git a/server/trace.c b/server/trace.c index ee11cfc9c3c..44bc8d8ee6f 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3413,8 +3413,7 @@ static void dump_get_key_state_reply( const struct get_key_state_reply *req ) static void dump_set_key_state_request( const struct set_key_state_request *req ) { - fprintf( stderr, " tid=%04x", req->tid ); - fprintf( stderr, ", async=%d", req->async ); + fprintf( stderr, " async=%d", req->async ); dump_varargs_bytes( ", keystate=", cur_size ); }

1 0

Zebediah Figura : winedevice: Introduce a custom service control to reënumerate root PnP devices.
by Alexandre Julliard April 2, 2021

April 2, 2021

Module: wine Branch: master Commit: 73bfe36eab54e28b8deddc3ad1cf1d2df29f6956 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73bfe36eab54e28b8deddc3a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 2 10:53:35 2021 -0500 winedevice: Introduce a custom service control to reënumerate root PnP devices. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + dlls/ntoskrnl.exe/ntoskrnl_private.h | 3 ++- dlls/ntoskrnl.exe/pnp.c | 23 +++++++++++++++++++---- programs/winedevice/device.c | 6 ++++++ 5 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 1ddd3f4d4f0..bb9f4bf5259 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3824,7 +3824,7 @@ NTSTATUS WINAPI ZwLoadDriver( const UNICODE_STRING *service_name ) driver = WINE_RB_ENTRY_VALUE( entry, struct wine_driver, entry ); driver->service_handle = service_handle; - pnp_manager_enumerate_root_devices( service_name->Buffer + wcslen( servicesW ) ); + wine_enumerate_root_devices( service_name->Buffer + wcslen( servicesW ) ); set_service_status( service_handle, SERVICE_RUNNING, SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN ); diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0f5ab76a195..6dea87f347b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1686,3 +1686,4 @@ # or 'wine_' (for user-visible functions) to avoid namespace conflicts. @ cdecl wine_ntoskrnl_main_loop(long) +@ cdecl wine_enumerate_root_devices(wstr) diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index c0b588f3135..c736a9805a0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -101,11 +101,12 @@ struct wine_driver void ObReferenceObject( void *obj ) DECLSPEC_HIDDEN; -void pnp_manager_enumerate_root_devices( const WCHAR *driver_name ) DECLSPEC_HIDDEN; void pnp_manager_start(void) DECLSPEC_HIDDEN; void pnp_manager_stop_driver( struct wine_driver *driver ) DECLSPEC_HIDDEN; void pnp_manager_stop(void) DECLSPEC_HIDDEN; +void CDECL wine_enumerate_root_devices( const WCHAR *driver_name ); + struct wine_driver *get_driver( const WCHAR *name ) DECLSPEC_HIDDEN; static const WCHAR servicesW[] = {'\\','R','e','g','i','s','t','r','y', diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index dce6bb90c68..7994a8b85b9 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -1047,13 +1047,14 @@ void pnp_manager_stop(void) RpcBindingFree( &plugplay_binding_handle ); } -void pnp_manager_enumerate_root_devices( const WCHAR *driver_name ) +void CDECL wine_enumerate_root_devices( const WCHAR *driver_name ) { static const WCHAR driverW[] = {'\\','D','r','i','v','e','r','\\',0}; static const WCHAR rootW[] = {'R','O','O','T',0}; WCHAR buffer[MAX_SERVICE_NAME + ARRAY_SIZE(driverW)], id[MAX_DEVICE_ID_LEN]; SP_DEVINFO_DATA sp_device = {sizeof(sp_device)}; - struct root_pnp_device *pnp_device; + struct list new_list = LIST_INIT(new_list); + struct root_pnp_device *pnp_device, *next; struct wine_driver *driver; DEVICE_OBJECT *device; NTSTATUS status; @@ -1082,8 +1083,13 @@ void pnp_manager_enumerate_root_devices( const WCHAR *driver_name ) SetupDiGetDeviceInstanceIdW( set, &sp_device, id, ARRAY_SIZE(id), NULL ); - if (find_root_pnp_device( driver, id )) + if ((pnp_device = find_root_pnp_device( driver, id ))) + { + TRACE("Found device %s already enumerated.\n", debugstr_w(id)); + list_remove( &pnp_device->entry ); + list_add_tail( &new_list, &pnp_device->entry ); continue; + } TRACE("Adding new root-enumerated device %s.\n", debugstr_w(id)); @@ -1097,10 +1103,19 @@ void pnp_manager_enumerate_root_devices( const WCHAR *driver_name ) pnp_device = device->DeviceExtension; wcscpy( pnp_device->id, id ); pnp_device->device = device; - list_add_tail( &driver->root_pnp_devices, &pnp_device->entry ); + list_add_tail( &new_list, &pnp_device->entry ); start_device( device, set, &sp_device ); } + LIST_FOR_EACH_ENTRY_SAFE( pnp_device, next, &driver->root_pnp_devices, struct root_pnp_device, entry ) + { + TRACE("Removing device %s.\n", debugstr_w(pnp_device->id)); + + remove_device( pnp_device->device ); + } + + list_move_head( &driver->root_pnp_devices, &new_list ); + SetupDiDestroyDeviceInfoList(set); } diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 3acc5e8a799..509cab96308 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -35,6 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winedevice); static const WCHAR servicesW[] = L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"; extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ); +extern void CDECL wine_enumerate_root_devices( const WCHAR *driver_name ); static WCHAR winedeviceW[] = L"winedevice"; static SERVICE_STATUS_HANDLE service_handle; @@ -55,6 +56,8 @@ static void set_service_status( SERVICE_STATUS_HANDLE handle, DWORD state, DWORD SetServiceStatus( handle, &status ); } +#define SERVICE_CONTROL_REENUMERATE_ROOT_DEVICES 128 + static DWORD device_handler( DWORD ctrl, const WCHAR *driver_name ) { UNICODE_STRING service_name; @@ -78,6 +81,9 @@ static DWORD device_handler( DWORD ctrl, const WCHAR *driver_name ) result = RtlNtStatusToDosError(ZwUnloadDriver( &service_name )); break; + case SERVICE_CONTROL_REENUMERATE_ROOT_DEVICES: + wine_enumerate_root_devices( driver_name ); + default: FIXME( "got driver ctrl %x for %s\n", ctrl, wine_dbgstr_w(driver_name) ); break;

1 0

Hugh McMaster : reg: Abort 'add' operation when parsing command-line arguments that are not switches.
by Alexandre Julliard April 2, 2021

April 2, 2021

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

Rémi Bernon : server: Remove tid from get_key_state request.
by Alexandre Julliard April 2, 2021

April 2, 2021

Module: wine Branch: master Commit: 626870abe2e800cc9407d05d5c00500a4ad97b3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=626870abe2e800cc9407d05d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 2 10:07:59 2021 +0200 server: Remove tid from get_key_state request. And replace it with an async param if we want the global async keystate. 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> --- dlls/user32/input.c | 4 +--- dlls/wineandroid.drv/keyboard.c | 2 +- dlls/winemac.drv/keyboard.c | 2 +- dlls/winex11.drv/keyboard.c | 2 +- include/wine/server_protocol.h | 4 ++-- server/protocol.def | 4 ++-- server/queue.c | 14 +++++--------- server/request.h | 2 +- server/trace.c | 2 +- 9 files changed, 15 insertions(+), 21 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index e06f8b4413e..46dff3a89d4 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -413,7 +413,7 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) ret = 0; SERVER_START_REQ( get_key_state ) { - req->tid = 0; + req->async = 1; req->key = key; if (key_state_info) { @@ -550,7 +550,6 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetKeyState(INT vkey) SERVER_START_REQ( get_key_state ) { - req->tid = GetCurrentThreadId(); req->key = vkey; if (!wine_server_call( req )) retval = (signed char)(reply->state & 0x81); } @@ -573,7 +572,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetKeyboardState( LPBYTE state ) memset( state, 0, 256 ); SERVER_START_REQ( get_key_state ) { - req->tid = GetCurrentThreadId(); req->key = -1; wine_server_set_reply( req, state, 256 ); ret = !wine_server_call_err( req ); diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index a0f3257f74b..1c8a1e4f68f 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -660,7 +660,7 @@ static BOOL get_async_key_state( BYTE state[256] ) SERVER_START_REQ( get_key_state ) { - req->tid = 0; + req->async = 1; req->key = -1; wine_server_set_reply( req, state, 256 ); ret = !wine_server_call( req ); diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 45770b3125b..1b74300e93a 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -942,7 +942,7 @@ static BOOL get_async_key_state(BYTE state[256]) SERVER_START_REQ(get_key_state) { - req->tid = 0; + req->async = 1; req->key = -1; wine_server_set_reply(req, state, 256); ret = !wine_server_call(req); diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 48da12c0292..517522727fe 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1161,7 +1161,7 @@ static BOOL get_async_key_state( BYTE state[256] ) SERVER_START_REQ( get_key_state ) { - req->tid = 0; + req->async = 1; req->key = -1; wine_server_set_reply( req, state, 256 ); ret = !wine_server_call( req ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 36506bd258d..642841fceeb 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3830,7 +3830,7 @@ struct get_last_input_time_reply struct get_key_state_request { struct request_header __header; - thread_id_t tid; + int async; int key; char __pad_20[4]; }; @@ -6226,7 +6226,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 688 +#define SERVER_PROTOCOL_VERSION 689 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index be524f92868..c468c5b7151 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2749,9 +2749,9 @@ enum coords_relative @END -/* Retrieve queue keyboard state for a given thread */ +/* Retrieve queue keyboard state for current thread or global async state */ @REQ(get_key_state) - thread_id_t tid; /* id of thread */ + int async; /* whether to query the async state */ int key; /* optional key code or -1 */ @REPLY unsigned char state; /* state of specified key */ diff --git a/server/queue.c b/server/queue.c index e47980a4aa8..13a3641cfb8 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2964,14 +2964,13 @@ DECL_HANDLER(get_thread_input) } -/* retrieve queue keyboard state for a given thread */ +/* retrieve queue keyboard state for current thread or global async state */ DECL_HANDLER(get_key_state) { - struct thread *thread; struct desktop *desktop; data_size_t size = min( 256, get_reply_max_size() ); - if (!req->tid) /* get global async key state */ + if (req->async) /* get global async key state */ { if (!(desktop = get_thread_desktop( current, 0 ))) return; if (req->key >= 0) @@ -2985,15 +2984,12 @@ DECL_HANDLER(get_key_state) else { unsigned char *keystate; - if (!(thread = get_thread_from_id( req->tid ))) return; - if (thread->queue) + if (current->queue) { - if (req->key >= 0) reply->state = thread->queue->input->keystate[req->key & 0xff]; - set_reply_data( thread->queue->input->keystate, size ); - release_object( thread ); + if (req->key >= 0) reply->state = current->queue->input->keystate[req->key & 0xff]; + set_reply_data( current->queue->input->keystate, size ); return; } - release_object( thread ); /* fallback to desktop keystate */ if (!(desktop = get_thread_desktop( current, 0 ))) return; diff --git a/server/request.h b/server/request.h index d0baa089b4e..a389a4eb6f7 100644 --- a/server/request.h +++ b/server/request.h @@ -1719,7 +1719,7 @@ C_ASSERT( sizeof(struct get_thread_input_reply) == 64 ); C_ASSERT( sizeof(struct get_last_input_time_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_last_input_time_reply, time) == 8 ); C_ASSERT( sizeof(struct get_last_input_time_reply) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_key_state_request, tid) == 12 ); +C_ASSERT( FIELD_OFFSET(struct get_key_state_request, async) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_key_state_request, key) == 16 ); C_ASSERT( sizeof(struct get_key_state_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_key_state_reply, state) == 8 ); diff --git a/server/trace.c b/server/trace.c index b45dfc286b7..ee11cfc9c3c 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3401,7 +3401,7 @@ static void dump_get_last_input_time_reply( const struct get_last_input_time_rep static void dump_get_key_state_request( const struct get_key_state_request *req ) { - fprintf( stderr, " tid=%04x", req->tid ); + fprintf( stderr, " async=%d", req->async ); fprintf( stderr, ", key=%d", req->key ); }

1 0