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

[PATCH 4/5] msv1_0: Implement SpAcquireCredentialsHandle and SpFreeCredentialsHandle.
by Hans Leidekker 29 Apr '21

29 Apr '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msv1_0/main.c | 170 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 168 insertions(+), 2 deletions(-) diff --git a/dlls/msv1_0/main.c b/dlls/msv1_0/main.c index 1b143ebf3bd..7dabd8e2ff5 100644 --- a/dlls/msv1_0/main.c +++ b/dlls/msv1_0/main.c @@ -18,6 +18,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -29,6 +30,7 @@ #include "rpc.h" #include "wine/debug.h" +#include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(ntlm); @@ -68,6 +70,12 @@ static inline const char *debugstr_as( const STRING *str ) return debugstr_an( str->Buffer, str->Length ); } +static inline const char *debugstr_us( const UNICODE_STRING *str ) +{ + if (!str) return "<null>"; + return debugstr_wn( str->Buffer, str->Length / sizeof(WCHAR) ); +} + static NTSTATUS NTAPI ntlm_LsaApInitializePackage( ULONG package_id, LSA_DISPATCH_TABLE *dispatch, LSA_STRING *database, LSA_STRING *confidentiality, LSA_STRING **package_name ) @@ -116,6 +124,164 @@ static NTSTATUS NTAPI ntlm_SpGetInfo( SecPkgInfoW *info ) return STATUS_SUCCESS; } +static char *get_username_arg( const WCHAR *user, int user_len ) +{ + static const char arg[] = "--username="; + int len = sizeof(arg); + char *ret; + + len += WideCharToMultiByte( CP_UNIXCP, WC_NO_BEST_FIT_CHARS, user, user_len, NULL, 0, NULL, NULL ); + if (!(ret = malloc( len ))) return NULL; + memcpy( ret, arg, sizeof(arg) - 1 ); + WideCharToMultiByte( CP_UNIXCP, WC_NO_BEST_FIT_CHARS, user, user_len, ret + sizeof(arg) - 1, + len - sizeof(arg) + 1, NULL, NULL ); + ret[len - 1] = 0; + return ret; +} + +static char *get_domain_arg( const WCHAR *domain, int domain_len ) +{ + static const char arg[] = "--domain="; + int len = sizeof(arg); + char *ret; + + len += WideCharToMultiByte( CP_UNIXCP, WC_NO_BEST_FIT_CHARS, domain, domain_len, NULL, 0, NULL, NULL ); + if (!(ret = malloc( len ))) return NULL; + memcpy( ret, arg, sizeof(arg) - 1 ); + WideCharToMultiByte( CP_UNIXCP, WC_NO_BEST_FIT_CHARS, domain, domain_len, ret + sizeof(arg) - 1, + len - sizeof(arg) + 1, NULL, NULL ); + ret[len - 1] = 0; + return ret; +} + +static NTSTATUS NTAPI ntlm_SpAcquireCredentialsHandle( UNICODE_STRING *principal, ULONG cred_use, LUID *logon_id, + void *auth_data, void *get_key_fn, void *get_key_arg, + LSA_SEC_HANDLE *handle, TimeStamp *expiry ) +{ + SECURITY_STATUS status = SEC_E_INSUFFICIENT_MEMORY; + struct ntlm_cred *cred = NULL; + WCHAR *domain = NULL, *user = NULL, *password = NULL; + SEC_WINNT_AUTH_IDENTITY_W *id = NULL; + + TRACE( "%s, 0x%08x, %p, %p, %p, %p, %p, %p\n", debugstr_us(principal), cred_use, logon_id, auth_data, + get_key_fn, get_key_arg, cred, expiry ); + + switch (cred_use) + { + case SECPKG_CRED_INBOUND: + if (!(cred = malloc( sizeof(*cred) ))) return SEC_E_INSUFFICIENT_MEMORY; + cred->mode = MODE_SERVER; + cred->username_arg = NULL; + cred->domain_arg = NULL; + cred->password = NULL; + cred->password_len = 0; + cred->no_cached_credentials = 0; + + *handle = (LSA_SEC_HANDLE)cred; + status = SEC_E_OK; + break; + + case SECPKG_CRED_OUTBOUND: + if (!(cred = malloc( sizeof(*cred) ))) return SEC_E_INSUFFICIENT_MEMORY; + + cred->mode = MODE_CLIENT; + cred->username_arg = NULL; + cred->domain_arg = NULL; + cred->password = NULL; + cred->password_len = 0; + cred->no_cached_credentials = 0; + + if ((id = auth_data)) + { + int domain_len = 0, user_len = 0, password_len = 0; + if (id->Flags & SEC_WINNT_AUTH_IDENTITY_ANSI) + { + if (id->DomainLength) + { + domain_len = MultiByteToWideChar( CP_ACP, 0, (char *)id->Domain, id->DomainLength, NULL, 0 ); + if (!(domain = malloc( sizeof(WCHAR) * domain_len ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (char *)id->Domain, id->DomainLength, domain, domain_len ); + } + if (id->UserLength) + { + user_len = MultiByteToWideChar( CP_ACP, 0, (char *)id->User, id->UserLength, NULL, 0 ); + if (!(user = malloc( sizeof(WCHAR) * user_len ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (char *)id->User, id->UserLength, user, user_len ); + } + if (id->PasswordLength) + { + password_len = MultiByteToWideChar( CP_ACP, 0,(char *)id->Password, id->PasswordLength, NULL, 0 ); + if (!(password = malloc( sizeof(WCHAR) * password_len ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (char *)id->Password, id->PasswordLength, password, password_len ); + } + } + else + { + domain = id->Domain; + domain_len = id->DomainLength; + user = id->User; + user_len = id->UserLength; + password = id->Password; + password_len = id->PasswordLength; + } + + TRACE( "username is %s\n", debugstr_wn(user, user_len) ); + TRACE( "domain name is %s\n", debugstr_wn(domain, domain_len) ); + + cred->username_arg = get_username_arg( user, user_len ); + cred->domain_arg = get_domain_arg( domain, domain_len ); + if (password_len) + { + cred->password_len = WideCharToMultiByte( CP_UNIXCP, WC_NO_BEST_FIT_CHARS, password, password_len, + NULL, 0, NULL, NULL ); + if (!(cred->password = malloc( cred->password_len ))) goto done; + WideCharToMultiByte( CP_UNIXCP, WC_NO_BEST_FIT_CHARS, password, password_len, cred->password, + cred->password_len, NULL, NULL ); + } + } + + *handle = (LSA_SEC_HANDLE)cred; + status = SEC_E_OK; + break; + + case SECPKG_CRED_BOTH: + FIXME( "SECPKG_CRED_BOTH not supported\n" ); + status = SEC_E_UNSUPPORTED_FUNCTION; + break; + + default: + status = SEC_E_UNKNOWN_CREDENTIALS; + break; + } + +done: + if (id && (id->Flags & SEC_WINNT_AUTH_IDENTITY_ANSI)) + { + free( domain ); + free( user ); + free( password ); + } + if (status != SEC_E_OK) free( cred ); + return status; +} + +static NTSTATUS NTAPI ntlm_SpFreeCredentialsHandle( LSA_SEC_HANDLE handle ) +{ + struct ntlm_cred *cred = (struct ntlm_cred *)handle; + + TRACE( "%lx\n", handle ); + + if (!cred) return SEC_E_OK; + + cred->mode = MODE_INVALID; + if (cred->password) memset( cred->password, 0, cred->password_len ); + free( cred->password ); + free( cred->username_arg ); + free( cred->domain_arg ); + free( cred ); + return SEC_E_OK; +} + static SECPKG_FUNCTION_TABLE ntlm_table = { ntlm_LsaApInitializePackage, @@ -130,9 +296,9 @@ static SECPKG_FUNCTION_TABLE ntlm_table = NULL, /* SpShutdown */ ntlm_SpGetInfo, NULL, /* AcceptCredentials */ - NULL, /* SpAcquireCredentialsHandle */ + ntlm_SpAcquireCredentialsHandle, NULL, /* SpQueryCredentialsAttributes */ - NULL, /* SpFreeCredentialsHandle */ + ntlm_SpFreeCredentialsHandle, NULL, /* SaveCredentials */ NULL, /* GetCredentials */ NULL, /* DeleteCredentials */ -- 2.30.2

1 0

[PATCH 3/5] msv1_0: Add a Unix library to support ntlm_auth.
by Hans Leidekker 29 Apr '21

29 Apr '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msv1_0/Makefile.in | 3 +- dlls/msv1_0/main.c | 31 ++++++- dlls/msv1_0/msv1_0.spec | 2 +- dlls/msv1_0/unixlib.c | 185 ++++++++++++++++++++++++++++++++++++++++ dlls/msv1_0/unixlib.h | 97 +++++++++++++++++++++ 5 files changed, 315 insertions(+), 3 deletions(-) create mode 100644 dlls/msv1_0/unixlib.c create mode 100644 dlls/msv1_0/unixlib.h diff --git a/dlls/msv1_0/Makefile.in b/dlls/msv1_0/Makefile.in index 155ce593ab1..21a9c61e317 100644 --- a/dlls/msv1_0/Makefile.in +++ b/dlls/msv1_0/Makefile.in @@ -3,4 +3,5 @@ MODULE = msv1_0.dll EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ - main.c + main.c \ + unixlib.c diff --git a/dlls/msv1_0/main.c b/dlls/msv1_0/main.c index d3480c563f0..1b143ebf3bd 100644 --- a/dlls/msv1_0/main.c +++ b/dlls/msv1_0/main.c @@ -32,9 +32,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntlm); +static HINSTANCE instance; static ULONG ntlm_package_id; static LSA_DISPATCH_TABLE lsa_dispatch; +const struct ntlm_funcs *ntlm_funcs = NULL; + #define NTLM_CAPS \ ( SECPKG_FLAG_INTEGRITY \ | SECPKG_FLAG_PRIVACY \ @@ -75,6 +78,12 @@ static NTSTATUS NTAPI ntlm_LsaApInitializePackage( ULONG package_id, LSA_DISPATC TRACE( "%08x, %p, %s, %s, %p\n", package_id, dispatch, debugstr_as(database), debugstr_as(confidentiality), package_name ); + if (!ntlm_funcs && __wine_init_unix_lib( instance, DLL_PROCESS_ATTACH, NULL, &ntlm_funcs )) + { + ERR( "no NTLM support, expect problems\n" ); + return STATUS_UNSUCCESSFUL; + } + if (!(str = dispatch->AllocateLsaHeap( sizeof(*str) + sizeof("NTLM" )))) return STATUS_NO_MEMORY; ptr = (char *)(str + 1); memcpy( ptr, "NTLM", sizeof("NTLM") ); @@ -90,7 +99,13 @@ static NTSTATUS NTAPI ntlm_LsaApInitializePackage( ULONG package_id, LSA_DISPATC static NTSTATUS NTAPI ntlm_SpInitialize( ULONG_PTR package_id, SECPKG_PARAMETERS *params, LSA_SECPKG_FUNCTION_TABLE *lsa_function_table ) { - FIXME( "%lu, %p, %p\n", package_id, params, lsa_function_table ); + TRACE( "%lu, %p, %p\n", package_id, params, lsa_function_table ); + + if (!ntlm_funcs && __wine_init_unix_lib( instance, DLL_PROCESS_ATTACH, NULL, &ntlm_funcs )) + { + ERR( "no NTLM support, expect problems\n" ); + return STATUS_UNSUCCESSFUL; + } return STATUS_SUCCESS; } @@ -186,3 +201,17 @@ NTSTATUS NTAPI SpUserModeInitialize( ULONG lsa_version, ULONG *package_version, *table_count = 1; return STATUS_SUCCESS; } + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, void *reserved ) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + instance = hinst; + DisableThreadLibraryCalls( hinst ); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} diff --git a/dlls/msv1_0/msv1_0.spec b/dlls/msv1_0/msv1_0.spec index f751ed40521..9dc2eefae5e 100644 --- a/dlls/msv1_0/msv1_0.spec +++ b/dlls/msv1_0/msv1_0.spec @@ -1,4 +1,4 @@ -@ stub DllMain +@ stdcall -private DllMain(long long ptr) @ stub LsaApCallPackage @ stub LsaApCallPackagePassthrough @ stub LsaApCallPackageUntrusted diff --git a/dlls/msv1_0/unixlib.c b/dlls/msv1_0/unixlib.c new file mode 100644 index 00000000000..098b921e985 --- /dev/null +++ b/dlls/msv1_0/unixlib.c @@ -0,0 +1,185 @@ +/* + * Unix interface for ntlm_auth + * + * Copyright 2005, 2006 Kai Blin + * Copyright 2021 Hans Leidekker 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 + */ + +#if 0 +#pragma makedep unix +#endif + +#include <stdarg.h> +#include <unistd.h> +#include <fcntl.h> +#include <errno.h> +#include <sys/wait.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winternl.h" +#include "winbase.h" +#include "sspi.h" + +#include "wine/debug.h" +#include "unixlib.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ntlm); +WINE_DECLARE_DEBUG_CHANNEL(winediag); + +static void CDECL ntlm_cleanup( struct ntlm_ctx *ctx ) +{ + if (!ctx || (ctx->mode != MODE_CLIENT && ctx->mode != MODE_SERVER)) return; + ctx->mode = MODE_INVALID; + + /* closing stdin will terminate ntlm_auth */ + close( ctx->pipe_out ); + close( ctx->pipe_in ); + + if (ctx->pid > 0) /* reap child */ + { + pid_t ret; + do { + ret = waitpid( ctx->pid, NULL, 0 ); + } while (ret < 0 && errno == EINTR); + } + + RtlFreeHeap( GetProcessHeap(), 0, ctx->com_buf ); + RtlFreeHeap( GetProcessHeap(), 0, ctx ); +} + +static SECURITY_STATUS CDECL ntlm_fork( char **argv, struct ntlm_ctx **ret_ctx ) +{ + int pipe_in[2], pipe_out[2]; + struct ntlm_ctx *ctx; + +#ifdef HAVE_PIPE2 + if (pipe2( pipe_in, O_CLOEXEC ) < 0) +#endif + { + if (pipe( pipe_in ) < 0 ) return SEC_E_INTERNAL_ERROR; + fcntl( pipe_in[0], F_SETFD, FD_CLOEXEC ); + fcntl( pipe_in[1], F_SETFD, FD_CLOEXEC ); + } +#ifdef HAVE_PIPE2 + if (pipe2( pipe_out, O_CLOEXEC ) < 0) +#endif + { + if (pipe( pipe_out ) < 0) + { + close( pipe_in[0] ); + close( pipe_in[1] ); + return SEC_E_INTERNAL_ERROR; + } + fcntl( pipe_out[0], F_SETFD, FD_CLOEXEC ); + fcntl( pipe_out[1], F_SETFD, FD_CLOEXEC ); + } + + if (!(ctx = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ctx) ))) + { + close( pipe_in[0] ); + close( pipe_in[1] ); + close( pipe_out[0] ); + close( pipe_out[1] ); + return SEC_E_INSUFFICIENT_MEMORY; + } + + if (!(ctx->pid = fork())) /* child */ + { + dup2( pipe_out[0], 0 ); + close( pipe_out[0] ); + close( pipe_out[1] ); + + dup2( pipe_in[1], 1 ); + close( pipe_in[0] ); + close( pipe_in[1] ); + + execvp( argv[0], argv ); + + write( 1, "BH\n", 3 ); + _exit( 1 ); + } + else + { + ctx->pipe_in = pipe_in[0]; + close( pipe_in[1] ); + ctx->pipe_out = pipe_out[1]; + close( pipe_out[0] ); + *ret_ctx = ctx; + } + + return SEC_E_OK; +} + +#define NTLM_AUTH_MAJOR_VERSION 3 +#define NTLM_AUTH_MINOR_VERSION 0 +#define NTLM_AUTH_MICRO_VERSION 25 + +static BOOL check_version( void ) +{ + struct ntlm_ctx *ctx; + char *argv[3], buf[80]; + BOOL ret = FALSE; + int len; + + argv[0] = (char *)"ntlm_auth"; + argv[1] = (char *)"--version"; + argv[2] = NULL; + if (ntlm_fork( argv, &ctx ) != SEC_E_OK) return FALSE; + + if ((len = read( ctx->pipe_in, buf, sizeof(buf) - 1 )) > 8) + { + char *newline; + int major = 0, minor = 0, micro = 0; + + if ((newline = memchr( buf, '\n', len ))) *newline = 0; + else buf[len] = 0; + + if (sscanf( buf, "Version %d.%d.%d", &major, &minor, &micro ) == 3) + { + if (((major > NTLM_AUTH_MAJOR_VERSION) || + (major == NTLM_AUTH_MAJOR_VERSION && minor > NTLM_AUTH_MINOR_VERSION) || + (major == NTLM_AUTH_MAJOR_VERSION && minor == NTLM_AUTH_MINOR_VERSION && + micro >= NTLM_AUTH_MICRO_VERSION))) + { + TRACE( "detected ntlm_auth version %d.%d.%d\n", major, minor, micro ); + ret = TRUE; + } + } + } + + if (!ret) ERR_(winediag)( "ntlm_auth was not found or is outdated. " + "Make sure that ntlm_auth >= %d.%d.%d is in your path. " + "Usually, you can find it in the winbind package of your distribution.\n", + NTLM_AUTH_MAJOR_VERSION, NTLM_AUTH_MINOR_VERSION, NTLM_AUTH_MICRO_VERSION ); + ntlm_cleanup( ctx ); + return ret; +} + +static const struct ntlm_funcs funcs = +{ + ntlm_cleanup, + ntlm_fork, +}; + +NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) +{ + if (reason != DLL_PROCESS_ATTACH) return STATUS_SUCCESS; + if (!check_version()) return STATUS_DLL_NOT_FOUND; + *(const struct ntlm_funcs **)ptr_out = &funcs; + return STATUS_SUCCESS; +} diff --git a/dlls/msv1_0/unixlib.h b/dlls/msv1_0/unixlib.h new file mode 100644 index 00000000000..c0dd4ca1456 --- /dev/null +++ b/dlls/msv1_0/unixlib.h @@ -0,0 +1,97 @@ +/* + * Copyright 2005, 2006 Kai Blin + * Copyright 2021 Hans Leidekker 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 <sys/types.h> + +enum sign_direction +{ + SIGN_SEND, + SIGN_RECV, +}; + +enum mode +{ + MODE_INVALID = -1, + MODE_CLIENT, + MODE_SERVER, +}; + +struct ntlm_cred +{ + enum mode mode; + char *username_arg; + char *domain_arg; + char *password; + int password_len; + int no_cached_credentials; /* don't try to use cached Samba credentials */ +}; + +struct arc4_info +{ + char x; + char y; + char state[256]; +}; + +#define FLAG_NEGOTIATE_SIGN 0x00000010 +#define FLAG_NEGOTIATE_SEAL 0x00000020 +#define FLAG_NEGOTIATE_ALWAYS_SIGN 0x00008000 +#define FLAG_NEGOTIATE_NTLM2 0x00080000 +#define FLAG_NEGOTIATE_KEY_EXCHANGE 0x40000000 + +struct ntlm_ctx +{ + enum mode mode; + pid_t pid; + unsigned int attrs; + int pipe_in; + int pipe_out; + char *com_buf; + unsigned int com_buf_size; + unsigned int com_buf_offset; + char session_key[16]; + unsigned int flags; + struct + { + struct + { + unsigned int seq_no; + struct arc4_info arc4info; + } ntlm; + struct + { + char send_sign_key[16]; + char send_seal_key[16]; + char recv_sign_key[16]; + char recv_seal_key[16]; + unsigned int send_seq_no; + unsigned int recv_seq_no; + struct arc4_info send_arc4info; + struct arc4_info recv_arc4info; + } ntlm2; + } crypt; +}; + +struct ntlm_funcs +{ + void (CDECL *cleanup)( struct ntlm_ctx * ); + SECURITY_STATUS (CDECL *fork)( char **, struct ntlm_ctx ** ); +}; + +extern const struct ntlm_funcs *ntlm_funcs; -- 2.30.2

1 0

[PATCH 2/5] msv1_0: Initial implementation of the LSA and user mode interfaces.
by Hans Leidekker 29 Apr '21

29 Apr '21

Just enough to initialize the provider. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msv1_0/Makefile.in | 3 + dlls/msv1_0/main.c | 188 ++++++++++++++++++++++++++++++++++++++++ dlls/msv1_0/msv1_0.spec | 4 +- 3 files changed, 193 insertions(+), 2 deletions(-) create mode 100644 dlls/msv1_0/main.c diff --git a/dlls/msv1_0/Makefile.in b/dlls/msv1_0/Makefile.in index ceac399a207..155ce593ab1 100644 --- a/dlls/msv1_0/Makefile.in +++ b/dlls/msv1_0/Makefile.in @@ -1,3 +1,6 @@ MODULE = msv1_0.dll EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + main.c diff --git a/dlls/msv1_0/main.c b/dlls/msv1_0/main.c new file mode 100644 index 00000000000..d3480c563f0 --- /dev/null +++ b/dlls/msv1_0/main.c @@ -0,0 +1,188 @@ +/* + * Copyright 2005, 2006 Kai Blin + * Copyright 2021 Hans Leidekker 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> +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "sspi.h" +#include "ntsecapi.h" +#include "ntsecpkg.h" +#include "rpc.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ntlm); + +static ULONG ntlm_package_id; +static LSA_DISPATCH_TABLE lsa_dispatch; + +#define NTLM_CAPS \ + ( SECPKG_FLAG_INTEGRITY \ + | SECPKG_FLAG_PRIVACY \ + | SECPKG_FLAG_TOKEN_ONLY \ + | SECPKG_FLAG_CONNECTION \ + | SECPKG_FLAG_MULTI_REQUIRED \ + | SECPKG_FLAG_IMPERSONATION \ + | SECPKG_FLAG_ACCEPT_WIN32_NAME \ + | SECPKG_FLAG_NEGOTIABLE \ + | SECPKG_FLAG_LOGON \ + | SECPKG_FLAG_RESTRICTED_TOKENS ) + +#define NTLM_MAX_BUF 1904 + +static const SecPkgInfoW ntlm_package_info = +{ + NTLM_CAPS, + 1, + RPC_C_AUTHN_WINNT, + NTLM_MAX_BUF, + (SEC_WCHAR *)L"NTLM", + (SEC_WCHAR *)L"NTLM Security Package" +}; + +static inline const char *debugstr_as( const STRING *str ) +{ + if (!str) return "<null>"; + return debugstr_an( str->Buffer, str->Length ); +} + +static NTSTATUS NTAPI ntlm_LsaApInitializePackage( ULONG package_id, LSA_DISPATCH_TABLE *dispatch, + LSA_STRING *database, LSA_STRING *confidentiality, + LSA_STRING **package_name ) +{ + LSA_STRING *str; + char *ptr; + + TRACE( "%08x, %p, %s, %s, %p\n", package_id, dispatch, debugstr_as(database), debugstr_as(confidentiality), + package_name ); + + if (!(str = dispatch->AllocateLsaHeap( sizeof(*str) + sizeof("NTLM" )))) return STATUS_NO_MEMORY; + ptr = (char *)(str + 1); + memcpy( ptr, "NTLM", sizeof("NTLM") ); + RtlInitString( str, ptr ); + + ntlm_package_id = package_id; + lsa_dispatch = *dispatch; + + *package_name = str; + return STATUS_SUCCESS; +} + +static NTSTATUS NTAPI ntlm_SpInitialize( ULONG_PTR package_id, SECPKG_PARAMETERS *params, + LSA_SECPKG_FUNCTION_TABLE *lsa_function_table ) +{ + FIXME( "%lu, %p, %p\n", package_id, params, lsa_function_table ); + return STATUS_SUCCESS; +} + +static NTSTATUS NTAPI ntlm_SpGetInfo( SecPkgInfoW *info ) +{ + TRACE( "%p\n", info ); + *info = ntlm_package_info; + return STATUS_SUCCESS; +} + +static SECPKG_FUNCTION_TABLE ntlm_table = +{ + ntlm_LsaApInitializePackage, + NULL, /* LsaLogonUser */ + NULL, /* CallPackage */ + NULL, /* LogonTerminated */ + NULL, /* CallPackageUntrusted */ + NULL, /* CallPackagePassthrough */ + NULL, /* LogonUserEx */ + NULL, /* LogonUserEx2 */ + ntlm_SpInitialize, + NULL, /* SpShutdown */ + ntlm_SpGetInfo, + NULL, /* AcceptCredentials */ + NULL, /* SpAcquireCredentialsHandle */ + NULL, /* SpQueryCredentialsAttributes */ + NULL, /* SpFreeCredentialsHandle */ + NULL, /* SaveCredentials */ + NULL, /* GetCredentials */ + NULL, /* DeleteCredentials */ + NULL, /* SpInitLsaModeContext */ + NULL, /* SpAcceptLsaModeContext */ + NULL, /* SpDeleteContext */ + NULL, /* ApplyControlToken */ + NULL, /* GetUserInfo */ + NULL, /* GetExtendedInformation */ + NULL, /* SpQueryContextAttributes */ + NULL, /* SpAddCredentials */ + NULL, /* SetExtendedInformation */ + NULL, /* SetContextAttributes */ + NULL, /* SetCredentialsAttributes */ + NULL, /* ChangeAccountPassword */ + NULL, /* QueryMetaData */ + NULL, /* ExchangeMetaData */ + NULL, /* GetCredUIContext */ + NULL, /* UpdateCredentials */ + NULL, /* ValidateTargetInfo */ + NULL, /* PostLogonUser */ +}; + +NTSTATUS NTAPI SpLsaModeInitialize( ULONG lsa_version, ULONG *package_version, SECPKG_FUNCTION_TABLE **table, + ULONG *table_count ) +{ + TRACE( "%08x, %p, %p, %p\n", lsa_version, package_version, table, table_count ); + + *package_version = SECPKG_INTERFACE_VERSION; + *table = &ntlm_table; + *table_count = 1; + return STATUS_SUCCESS; +} + +static NTSTATUS NTAPI ntlm_SpInstanceInit( ULONG version, SECPKG_DLL_FUNCTIONS *dll_functions, void **user_functions ) +{ + TRACE( "%08x, %p, %p\n", version, dll_functions, user_functions ); + return STATUS_SUCCESS; +} + +static SECPKG_USER_FUNCTION_TABLE ntlm_user_table = +{ + ntlm_SpInstanceInit, + NULL, /* SpInitUserModeContext */ + NULL, /* SpMakeSignature */ + NULL, /* SpVerifySignature */ + NULL, /* SpSealMessage */ + NULL, /* SpUnsealMessage */ + NULL, /* SpGetContextToken */ + NULL, /* SpQueryContextAttributes */ + NULL, /* SpCompleteAuthToken */ + NULL, /* SpDeleteContext */ + NULL, /* SpFormatCredentialsFn */ + NULL, /* SpMarshallSupplementalCreds */ + NULL, /* SpExportSecurityContext */ + NULL /* SpImportSecurityContext */ +}; + +NTSTATUS NTAPI SpUserModeInitialize( ULONG lsa_version, ULONG *package_version, SECPKG_USER_FUNCTION_TABLE **table, + ULONG *table_count ) +{ + TRACE( "%08x, %p, %p, %p\n", lsa_version, package_version, table, table_count ); + + *package_version = SECPKG_INTERFACE_VERSION; + *table = &ntlm_user_table; + *table_count = 1; + return STATUS_SUCCESS; +} diff --git a/dlls/msv1_0/msv1_0.spec b/dlls/msv1_0/msv1_0.spec index cb544188b87..f751ed40521 100644 --- a/dlls/msv1_0/msv1_0.spec +++ b/dlls/msv1_0/msv1_0.spec @@ -15,5 +15,5 @@ @ stub MsvValidateTarget @ stub SpInitialize @ stub SpInstanceInit -@ stub SpLsaModeInitialize -@ stub SpUserModeInitialize +@ stdcall SpLsaModeInitialize(long ptr ptr ptr) +@ stdcall SpUserModeInitialize(long ptr ptr ptr) -- 2.30.2

1 0

[PATCH 1/5] msv1_0: New dll.
by Hans Leidekker 29 Apr '21

29 Apr '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- configure.ac | 1 + dlls/msv1_0/Makefile.in | 3 +++ dlls/msv1_0/msv1_0.spec | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 dlls/msv1_0/Makefile.in create mode 100644 dlls/msv1_0/msv1_0.spec diff --git a/configure.ac b/configure.ac index 42d141d3214..ae5a1407dd3 100644 --- a/configure.ac +++ b/configure.ac @@ -3486,6 +3486,7 @@ WINE_CONFIG_MAKEFILE(dlls/mssip32) WINE_CONFIG_MAKEFILE(dlls/mstask) WINE_CONFIG_MAKEFILE(dlls/mstask/tests) WINE_CONFIG_MAKEFILE(dlls/msvcirt) +WINE_CONFIG_MAKEFILE(dlls/msv1_0) WINE_CONFIG_MAKEFILE(dlls/msvcirt/tests) WINE_CONFIG_MAKEFILE(dlls/msvcm80) WINE_CONFIG_MAKEFILE(dlls/msvcm90) diff --git a/dlls/msv1_0/Makefile.in b/dlls/msv1_0/Makefile.in new file mode 100644 index 00000000000..ceac399a207 --- /dev/null +++ b/dlls/msv1_0/Makefile.in @@ -0,0 +1,3 @@ +MODULE = msv1_0.dll + +EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/msv1_0/msv1_0.spec b/dlls/msv1_0/msv1_0.spec new file mode 100644 index 00000000000..cb544188b87 --- /dev/null +++ b/dlls/msv1_0/msv1_0.spec @@ -0,0 +1,19 @@ +@ stub DllMain +@ stub LsaApCallPackage +@ stub LsaApCallPackagePassthrough +@ stub LsaApCallPackageUntrusted +@ stub LsaApInitializePackage +@ stub LsaApLogonTerminated +@ stub LsaApLogonUserEx2 +@ stub Msv1_0ExportSubAuthenticationRoutine +@ stub Msv1_0SubAuthenticationPresent +@ stub MsvGetLogonAttemptCount +@ stub MsvIsIpAddressLocal +@ stub MsvIsLocalhostAliases +@ stub MsvSamLogoff +@ stub MsvSamValidate +@ stub MsvValidateTarget +@ stub SpInitialize +@ stub SpInstanceInit +@ stub SpLsaModeInitialize +@ stub SpUserModeInitialize -- 2.30.2

1 0

[PATCH 3/3] riched20: Implement TxGetNaturalSize().
by Huw Davies 29 Apr '21

29 Apr '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/tests/txtsrv.c | 6 +++--- dlls/riched20/txtsrv.c | 39 +++++++++++++++++++++++++++++++----- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 7ca6074587d..3cfd5e63753 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -705,7 +705,7 @@ static void _check_txgetnaturalsize(HRESULT res, LONG width, LONG height, HDC hd expected_width = expected_rect.right - expected_rect.left; expected_height = expected_rect.bottom - expected_rect.top; ok_(__FILE__,line)(res == S_OK, "ITextServices_TxGetNaturalSize failed: 0x%08x.\n", res); - ok_(__FILE__,line)(width >= expected_width && width <= expected_width + 1, + todo_wine ok_(__FILE__,line)(width >= expected_width && width <= expected_width + 1, "got wrong width: %d, expected: %d {+1}.\n", width, expected_width); ok_(__FILE__,line)(height == expected_height, "got wrong height: %d, expected: %d.\n", height, expected_height); @@ -717,7 +717,7 @@ static void test_TxGetNaturalSize(void) ITextHost *host; HRESULT result; SIZEL extent; - static const WCHAR test_text[] = {'T','e','s','t','S','o','m','e','T','e','x','t',0}; + static const WCHAR test_text[] = L"TestSomeText"; LONG width, height; HDC hdcDraw; HWND hwnd; @@ -752,7 +752,7 @@ static void test_TxGetNaturalSize(void) height = 0; result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, hdcDraw, NULL, NULL, TXTNS_FITTOCONTENT, &extent, &width, &height); - todo_wine CHECK_TXGETNATURALSIZE(result, width, height, hdcDraw, rect, test_text); + CHECK_TXGETNATURALSIZE(result, width, height, hdcDraw, rect, test_text); ReleaseDC(hwnd, hdcDraw); DestroyWindow(hwnd); diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 79ade0f6117..5736964c1b1 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -366,14 +366,43 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetBaseLinePos(ITextServices *ifa } DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetNaturalSize,36) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetNaturalSize(ITextServices *iface, DWORD dwAspect, HDC hdcDraw, - HDC hicTargetDev, DVTARGETDEVICE *ptd, DWORD dwMode, - const SIZEL *psizelExtent, LONG *pwidth, LONG *pheight) +DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetNaturalSize( ITextServices *iface, DWORD aspect, HDC draw, + HDC target, DVTARGETDEVICE *td, DWORD mode, + const SIZEL *extent, LONG *width, LONG *height ) { struct text_services *services = impl_from_ITextServices( iface ); + RECT rect; + HDC dc = draw; + BOOL rewrap = FALSE; + HRESULT hr; - FIXME( "%p: STUB\n", services ); - return E_NOTIMPL; + TRACE( "%p: aspect %d, draw %p, target %p, td %p, mode %08x, extent %s, *width %d, *height %d\n", services, + aspect, draw, target, td, mode, wine_dbgstr_point( (POINT *)extent ), *width, *height ); + + if (aspect != DVASPECT_CONTENT || target || td || mode != TXTNS_FITTOCONTENT ) + FIXME( "Many arguments are ignored\n" ); + + SetRect( &rect, 0, 0, *width, *height ); + + hr = update_client_rect( services, &rect ); + if (FAILED( hr )) return hr; + if (hr == S_OK) rewrap = TRUE; + + if (!dc && services->editor->in_place_active) + dc = ITextHost_TxGetDC( services->host ); + if (!dc) return E_FAIL; + + if (rewrap) + { + editor_mark_rewrap_all( services->editor ); + wrap_marked_paras_dc( services->editor, dc, FALSE ); + } + + *width = services->editor->nTotalWidth; + *height = services->editor->nTotalLength; + + if (!draw) ITextHost_TxReleaseDC( services->host, dc ); + return S_OK; } DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetDropTarget,8) -- 2.23.0

3 2

[PATCH] ntdll/tests: Remove Qpc(Interrupt|System)TimeIncrement(Shift) checks.
by Rémi Bernon 29 Apr '21

29 Apr '21

They are not fixed and are updated from time to time (every few secs), randomly failing the tests on the testbot. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/tests/time.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index 2ed28a35d8e..90737521a4d 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -172,14 +172,6 @@ static void test_RtlQueryPerformanceCounter(void) "unexpected QpcBypassEnabled %x, expected 0x83\n", usd->u3.s.QpcBypassEnabled ); ok( usd->QpcFrequency == 10000000, "unexpected QpcFrequency %I64d, expected 10000000\n", usd->QpcFrequency ); ok( !usd->u3.s.QpcShift, "unexpected QpcShift %d, expected 0\n", usd->u3.s.QpcShift ); - ok( usd->QpcInterruptTimeIncrement == ((ULONGLONG)1 << 63), - "unexpected QpcInterruptTimeIncrement %I64x, expected 1<<63\n", usd->QpcInterruptTimeIncrement ); - ok( usd->QpcInterruptTimeIncrementShift == 1, - "unexpected QpcInterruptTimeIncrementShift %d, expected 1\n", usd->QpcInterruptTimeIncrementShift ); - ok( usd->QpcSystemTimeIncrement == ((ULONGLONG)1 << 63), - "unexpected QpcSystemTimeIncrement %I64x, expected 1<<63\n", usd->QpcSystemTimeIncrement ); - ok( usd->QpcSystemTimeIncrementShift == 1, - "unexpected QpcSystemTimeIncrementShift %d, expected 1\n", usd->QpcSystemTimeIncrementShift ); hsd = NULL; status = pNtQuerySystemInformation( SystemHypervisorSharedPageInformation, &hsd, sizeof(void *), &len ); @@ -201,10 +193,6 @@ static void test_RtlQueryPerformanceCounter(void) else { ok( usd->u3.s.QpcShift == 10, "unexpected QpcShift %d, expected 10\n", usd->u3.s.QpcShift ); - ok( usd->QpcInterruptTimeIncrementShift == 2, - "unexpected QpcInterruptTimeIncrementShift %d, expected 2\n", usd->QpcInterruptTimeIncrementShift ); - ok( usd->QpcSystemTimeIncrementShift == 2, - "unexpected QpcSystemTimeIncrementShift %d, expected 2\n", usd->QpcSystemTimeIncrementShift ); tsc0 = __rdtsc(); ret = pRtlQueryPerformanceCounter( &counter ); -- 2.31.0

1 0

[PATCH v2] ntdll/tests: Add RtlQueryPerformanceCounter tests.
by Rémi Bernon 29 Apr '21

29 Apr '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Stop trying to be smart and just use the helper everywhere instead of __umulh. Rename it too. dlls/ntdll/tests/time.c | 106 ++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 1 + 2 files changed, 107 insertions(+) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index 51d9115b87c..f9133f276a3 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -19,8 +19,10 @@ */ #define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "ntdll_test.h" #include "ddk/wdm.h" +#include "intrin.h" #define TICKSPERSEC 10000000 #define TICKSPERMSEC 10000 @@ -35,6 +37,9 @@ static NTSTATUS (WINAPI *pRtlQueryTimeZoneInformation)( RTL_TIME_ZONE_INFORMATIO static NTSTATUS (WINAPI *pRtlQueryDynamicTimeZoneInformation)( RTL_DYNAMIC_TIME_ZONE_INFORMATION *); static BOOL (WINAPI *pRtlQueryUnbiasedInterruptTime)( ULONGLONG *time ); +static BOOL (WINAPI *pRtlQueryPerformanceCounter)(LARGE_INTEGER*); +static BOOL (WINAPI *pRtlQueryPerformanceFrequency)(LARGE_INTEGER*); + static const int MonthLengths[2][12] = { { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }, @@ -122,6 +127,104 @@ static void test_NtQueryPerformanceCounter(void) ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); } +struct hypervisor_shared_data +{ + UINT64 unknown; + UINT64 QpcMultiplier; + UINT64 QpcBias; +}; + +/* 128-bit multiply a by b and return the high 64 bits, same as __umulh */ +static UINT64 multiply_tsc(UINT64 a, UINT64 b) +{ + UINT64 ah = a >> 32, al = (UINT32)a, bh = b >> 32, bl = (UINT32)b, m; + m = (ah * bl) + (bh * al) + ((al * bl) >> 32); + return (ah * bh) + (m >> 32); +} + +static void test_RtlQueryPerformanceCounter(void) +{ + struct hypervisor_shared_data *hsd; + KSHARED_USER_DATA *usd = (void *)0x7ffe0000; + LARGE_INTEGER frequency, counter; + NTSTATUS status; + UINT64 tsc0, tsc1; + ULONG len; + BOOL ret; + + if (!pRtlQueryPerformanceCounter || !pRtlQueryPerformanceFrequency) + { + win_skip( "RtlQueryPerformanceCounter/Frequency not available, skipping tests\n" ); + return; + } + + if (!(usd->u3.s.QpcBypassEnabled & SHARED_GLOBAL_FLAGS_QPC_BYPASS_ENABLED)) + { + todo_wine win_skip("QpcBypassEnabled is not set, skipping tests\n"); + return; + } + + if ((usd->u3.s.QpcBypassEnabled & SHARED_GLOBAL_FLAGS_QPC_BYPASS_USE_HV_PAGE)) + { + ok( usd->u3.s.QpcBypassEnabled == (SHARED_GLOBAL_FLAGS_QPC_BYPASS_ENABLED|SHARED_GLOBAL_FLAGS_QPC_BYPASS_USE_HV_PAGE|SHARED_GLOBAL_FLAGS_QPC_BYPASS_USE_RDTSCP), + "unexpected QpcBypassEnabled %x, expected 0x83\n", usd->u3.s.QpcBypassEnabled ); + ok( usd->QpcFrequency == 10000000, "unexpected QpcFrequency %I64d, expected 10000000\n", usd->QpcFrequency ); + ok( !usd->u3.s.QpcShift, "unexpected QpcShift %d, expected 0\n", usd->u3.s.QpcShift ); + ok( usd->QpcInterruptTimeIncrement == ((ULONGLONG)1 << 63), + "unexpected QpcInterruptTimeIncrement %I64x, expected 1<<63\n", usd->QpcInterruptTimeIncrement ); + ok( usd->QpcInterruptTimeIncrementShift == 1, + "unexpected QpcInterruptTimeIncrementShift %d, expected 1\n", usd->QpcInterruptTimeIncrementShift ); + ok( usd->QpcSystemTimeIncrement == ((ULONGLONG)1 << 63), + "unexpected QpcSystemTimeIncrement %I64x, expected 1<<63\n", usd->QpcSystemTimeIncrement ); + ok( usd->QpcSystemTimeIncrementShift == 1, + "unexpected QpcSystemTimeIncrementShift %d, expected 1\n", usd->QpcSystemTimeIncrementShift ); + + hsd = NULL; + status = pNtQuerySystemInformation( SystemHypervisorSharedPageInformation, &hsd, sizeof(void *), &len ); + ok( !status, "NtQuerySystemInformation returned %x\n", status ); + ok( len == sizeof(void *), "unexpected SystemHypervisorSharedPageInformation length %u\n", len ); + ok( !!hsd, "unexpected SystemHypervisorSharedPageInformation address %p\n", hsd ); + + tsc0 = __rdtsc(); + ret = pRtlQueryPerformanceCounter( &counter ); + tsc1 = __rdtsc(); + ok( ret, "RtlQueryPerformanceCounter failed\n" ); + + tsc0 = multiply_tsc(tsc0, hsd->QpcMultiplier) + hsd->QpcBias + usd->QpcBias; + tsc1 = multiply_tsc(tsc1, hsd->QpcMultiplier) + hsd->QpcBias + usd->QpcBias; + + ok( tsc0 <= counter.QuadPart, "rdtscp %I64d and RtlQueryPerformanceCounter %I64d are out of order\n", tsc0, counter.QuadPart ); + ok( counter.QuadPart <= tsc1, "RtlQueryPerformanceCounter %I64d and rdtscp %I64d are out of order\n", counter.QuadPart, tsc1 ); + } + else + { + ok( usd->u3.s.QpcShift == 10, "unexpected QpcShift %d, expected 10\n", usd->u3.s.QpcShift ); + ok( usd->QpcInterruptTimeIncrementShift == 2, + "unexpected QpcInterruptTimeIncrementShift %d, expected 2\n", usd->QpcInterruptTimeIncrementShift ); + ok( usd->QpcSystemTimeIncrementShift == 2, + "unexpected QpcSystemTimeIncrementShift %d, expected 2\n", usd->QpcSystemTimeIncrementShift ); + + tsc0 = __rdtsc(); + ret = pRtlQueryPerformanceCounter( &counter ); + tsc1 = __rdtsc(); + ok( ret, "RtlQueryPerformanceCounter failed\n" ); + + tsc0 += usd->QpcBias; + tsc0 >>= usd->u3.s.QpcShift; + tsc1 += usd->QpcBias; + tsc1 >>= usd->u3.s.QpcShift; + + ok( tsc0 <= counter.QuadPart, "rdtscp %I64d and RtlQueryPerformanceCounter %I64d are out of order\n", tsc0, counter.QuadPart ); + ok( counter.QuadPart <= tsc1, "RtlQueryPerformanceCounter %I64d and rdtscp %I64d are out of order\n", counter.QuadPart, tsc1 ); + } + + ret = pRtlQueryPerformanceFrequency( &frequency ); + ok( ret, "RtlQueryPerformanceFrequency failed\n" ); + ok( frequency.QuadPart == usd->QpcFrequency, + "RtlQueryPerformanceFrequency returned %I64d, expected USD QpcFrequency %I64d\n", + frequency.QuadPart, usd->QpcFrequency ); +} + static void test_RtlQueryTimeZoneInformation(void) { RTL_DYNAMIC_TIME_ZONE_INFORMATION tzinfo, tzinfo2; @@ -266,6 +369,8 @@ START_TEST(time) pRtlQueryDynamicTimeZoneInformation = (void *)GetProcAddress(mod, "RtlQueryDynamicTimeZoneInformation"); pRtlQueryUnbiasedInterruptTime = (void *)GetProcAddress(mod, "RtlQueryUnbiasedInterruptTime"); + pRtlQueryPerformanceCounter = (void *)GetProcAddress(mod, "RtlQueryPerformanceCounter"); + pRtlQueryPerformanceFrequency = (void *)GetProcAddress(mod, "RtlQueryPerformanceFrequency"); if (pRtlTimeToTimeFields && pRtlTimeFieldsToTime) test_pRtlTimeToTimeFields(); @@ -274,4 +379,5 @@ START_TEST(time) test_NtQueryPerformanceCounter(); test_RtlQueryTimeZoneInformation(); test_user_shared_data_time(); + test_RtlQueryPerformanceCounter(); } diff --git a/include/winternl.h b/include/winternl.h index d35d509eb41..fcdedaec8aa 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1551,6 +1551,7 @@ typedef enum _SYSTEM_INFORMATION_CLASS { SystemFileCacheInformationEx = 81, SystemDynamicTimeZoneInformation = 102, SystemLogicalProcessorInformationEx = 107, + SystemHypervisorSharedPageInformation = 197, SystemInformationClassMax } SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS; -- 2.30.2

3 3

[PATCH v3 1/3] user32: Move ToUnicodeEx from wineandroid.drv to user32.
by Rémi Bernon 29 Apr '21

29 Apr '21

As a fallback implementation, using English keyboard layout. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: Call driver first and return early if it implements the call. dlls/user32/driver.c | 2 +- dlls/user32/input.c | 80 ++++++++++++++++++- dlls/wineandroid.drv/keyboard.c | 94 ----------------------- dlls/wineandroid.drv/wineandroid.drv.spec | 1 - 4 files changed, 77 insertions(+), 100 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 7ac77141696..e5855e1c51b 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -286,7 +286,7 @@ static BOOL CDECL nulldrv_RegisterHotKey( HWND hwnd, UINT modifiers, UINT vk ) static INT CDECL nulldrv_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, LPWSTR str, int size, UINT flags, HKL layout ) { - return 0; + return -2; /* use default implementation */ } static BOOL CDECL nulldrv_UnloadKeyboardLayout( HKL layout ) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 805bfe3e9de..24942f72aa1 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -877,11 +877,83 @@ INT WINAPI ToUnicode(UINT virtKey, UINT scanCode, const BYTE *lpKeyState, /**************************************************************************** * ToUnicodeEx (USER32.@) */ -INT WINAPI ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState, - LPWSTR lpwStr, int size, UINT flags, HKL hkl) +INT WINAPI ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, + WCHAR *str, int size, UINT flags, HKL layout ) { - if (!lpKeyState) return 0; - return USER_Driver->pToUnicodeEx(virtKey, scanCode, lpKeyState, lpwStr, size, flags, hkl); + BOOL shift, ctrl, numlock; + WCHAR buffer[2]; + INT len; + + TRACE_(keyboard)( "virt %u, scan %u, state %p, str %p, size %d, flags %x, layout %p.\n", + virt, scan, state, str, size, flags, layout ); + + if (!state) return 0; + if ((len = USER_Driver->pToUnicodeEx( virt, scan, state, str, size, flags, layout )) >= -1) return len; + + shift = state[VK_SHIFT] & 0x80; + ctrl = state[VK_CONTROL] & 0x80; + numlock = state[VK_NUMLOCK] & 0x01; + + /* FIXME: English keyboard layout specific */ + + if (scan & 0x8000) buffer[0] = 0; /* key up */ + else if (!ctrl) + { + switch (virt) + { + case VK_BACK: buffer[0] = '\b'; break; + case VK_OEM_1: buffer[0] = shift ? ':' : ';'; break; + case VK_OEM_2: buffer[0] = shift ? '?' : '/'; break; + case VK_OEM_3: buffer[0] = shift ? '~' : '`'; break; + case VK_OEM_4: buffer[0] = shift ? '{' : '['; break; + case VK_OEM_5: buffer[0] = shift ? '|' : '\\'; break; + case VK_OEM_6: buffer[0] = shift ? '}' : ']'; break; + case VK_OEM_7: buffer[0] = shift ? '"' : '\''; break; + case VK_OEM_COMMA: buffer[0] = shift ? '<' : ','; break; + case VK_OEM_MINUS: buffer[0] = shift ? '_' : '-'; break; + case VK_OEM_PERIOD: buffer[0] = shift ? '>' : '.'; break; + case VK_OEM_PLUS: buffer[0] = shift ? '+' : '='; break; + case VK_RETURN: buffer[0] = '\r'; break; + case VK_SPACE: buffer[0] = ' '; break; + case VK_TAB: buffer[0] = '\t'; break; + case VK_MULTIPLY: buffer[0] = '*'; break; + case VK_ADD: buffer[0] = '+'; break; + case VK_SUBTRACT: buffer[0] = '-'; break; + case VK_DIVIDE: buffer[0] = '/'; break; + default: + if (virt >= '0' && virt <= '9') + buffer[0] = shift ? ")!@#$%^&*("[virt - '0'] : virt; + else if (virt >= 'A' && virt <= 'Z') + buffer[0] = shift || (state[VK_CAPITAL] & 0x01) ? virt : virt + 'a' - 'A'; + else if (virt >= VK_NUMPAD0 && virt <= VK_NUMPAD9 && numlock && !shift) + buffer[0] = '0' + virt - VK_NUMPAD0; + else if (virt == VK_DECIMAL && numlock && !shift) + buffer[0] = '.'; + else + buffer[0] = 0; + break; + } + } + else /* Control codes */ + { + switch (virt) + { + case VK_OEM_4: buffer[0] = 0x1b; break; + case VK_OEM_5: buffer[0] = 0x1c; break; + case VK_OEM_6: buffer[0] = 0x1d; break; + case VK_SUBTRACT: buffer[0] = 0x1e; break; + default: + if (virt >= 'A' && virt <= 'Z') buffer[0] = virt - 'A' + 1; + else buffer[0] = 0; + break; + } + } + buffer[1] = 0; + len = wcslen( buffer ); + lstrcpynW( str, buffer, size ); + + TRACE_(keyboard)( "ret %d, str %s.\n", len, debugstr_w(str) ); + return len; } /**************************************************************************** diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index 0a6ede0ec5f..04565c3fad8 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -750,100 +750,6 @@ jboolean keyboard_event( JNIEnv *env, jobject obj, jint win, jint action, jint k } -/*********************************************************************** - * ANDROID_ToUnicodeEx - */ -INT CDECL ANDROID_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, - LPWSTR buf, int size, UINT flags, HKL hkl ) -{ - WCHAR buffer[2]; - BOOL shift = state[VK_SHIFT] & 0x80; - BOOL ctrl = state[VK_CONTROL] & 0x80; - BOOL numlock = state[VK_NUMLOCK] & 0x01; - - buffer[0] = buffer[1] = 0; - - if (scan & 0x8000) return 0; /* key up */ - - /* FIXME: hardcoded layout */ - - if (!ctrl) - { - switch (virt) - { - case VK_BACK: buffer[0] = '\b'; break; - case VK_OEM_1: buffer[0] = shift ? ':' : ';'; break; - case VK_OEM_2: buffer[0] = shift ? '?' : '/'; break; - case VK_OEM_3: buffer[0] = shift ? '~' : '`'; break; - case VK_OEM_4: buffer[0] = shift ? '{' : '['; break; - case VK_OEM_5: buffer[0] = shift ? '|' : '\\'; break; - case VK_OEM_6: buffer[0] = shift ? '}' : ']'; break; - case VK_OEM_7: buffer[0] = shift ? '"' : '\''; break; - case VK_OEM_COMMA: buffer[0] = shift ? '<' : ','; break; - case VK_OEM_MINUS: buffer[0] = shift ? '_' : '-'; break; - case VK_OEM_PERIOD: buffer[0] = shift ? '>' : '.'; break; - case VK_OEM_PLUS: buffer[0] = shift ? '+' : '='; break; - case VK_RETURN: buffer[0] = '\r'; break; - case VK_SPACE: buffer[0] = ' '; break; - case VK_TAB: buffer[0] = '\t'; break; - case VK_MULTIPLY: buffer[0] = '*'; break; - case VK_ADD: buffer[0] = '+'; break; - case VK_SUBTRACT: buffer[0] = '-'; break; - case VK_DIVIDE: buffer[0] = '/'; break; - default: - if (virt >= '0' && virt <= '9') - { - buffer[0] = shift ? ")!@#$%^&*("[virt - '0'] : virt; - break; - } - if (virt >= 'A' && virt <= 'Z') - { - buffer[0] = shift || (state[VK_CAPITAL] & 0x01) ? virt : virt + 'a' - 'A'; - break; - } - if (virt >= VK_NUMPAD0 && virt <= VK_NUMPAD9 && numlock && !shift) - { - buffer[0] = '0' + virt - VK_NUMPAD0; - break; - } - if (virt == VK_DECIMAL && numlock && !shift) - { - buffer[0] = '.'; - break; - } - break; - } - } - else /* Control codes */ - { - if (virt >= 'A' && virt <= 'Z') - buffer[0] = virt - 'A' + 1; - else - { - switch (virt) - { - case VK_OEM_4: - buffer[0] = 0x1b; - break; - case VK_OEM_5: - buffer[0] = 0x1c; - break; - case VK_OEM_6: - buffer[0] = 0x1d; - break; - case VK_SUBTRACT: - buffer[0] = 0x1e; - break; - } - } - } - - lstrcpynW( buf, buffer, size ); - TRACE( "returning %d / %s\n", strlenW( buffer ), debugstr_wn(buf, strlenW( buffer ))); - return strlenW( buffer ); -} - - /*********************************************************************** * ANDROID_GetKeyNameText */ diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 00de23de27e..6f27c1586b3 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -7,7 +7,6 @@ @ cdecl GetKeyNameText(long ptr long) ANDROID_GetKeyNameText @ cdecl GetKeyboardLayout(long) ANDROID_GetKeyboardLayout @ cdecl MapVirtualKeyEx(long long long) ANDROID_MapVirtualKeyEx -@ cdecl ToUnicodeEx(long long ptr ptr long long long) ANDROID_ToUnicodeEx @ cdecl VkKeyScanEx(long long) ANDROID_VkKeyScanEx @ cdecl SetCursor(long) ANDROID_SetCursor @ cdecl ChangeDisplaySettingsEx(ptr ptr long long long) ANDROID_ChangeDisplaySettingsEx -- 2.31.0

2 4

[tools] winetest/build-patterns: Identify patterns with new and possibly fixed failures.
by Francois Gouget 29 Apr '21

29 Apr '21

Show the patterns with new failures first, then those that always failed, and finally those that do not have any recent failure and thus may be fixed. This should help catch new failures while they are fresh. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/build-patterns | 113 ++++++++++++++++++++++++++++++++++------ winetest/winetest.conf | 3 ++ 2 files changed, 100 insertions(+), 16 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index e87fabc2f..32bae6b31 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -31,7 +31,7 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } -use vars qw/$workdir $gitdir/; +use vars qw/$workdir $gitdir $patternbuilds/; require "winetest.conf"; my $name0=$0; @@ -262,9 +262,19 @@ my %reports; # should be included in that test's failure pattern. # # - failtype -# The type of the most recent failure (see fail_type()). +# The type of the most recent failure (see fail_type(), last). # In particular this distinguishes random failures from non-random ones. # +# - first +# The @sortedbuilds index of the oldest build with a failure matching +# failtype. So if failtype is 'random' this ignores any 'missing dll' +# failures that may have occurred before. +# scalar(@sortedbuilds) if there is no failure. +# +# - last +# The @sortedbuilds index of the most recent build with a failure. +# -1 if there is none. +# # - status # A hashtable of test results indexed by the build name. my %tests; @@ -388,11 +398,16 @@ foreach my $testname (keys %tests) next if (!$testreport); # Record information about the failures for this report: + # - The index of the first (oldest) and last (most recent) failures. + # Initialized for easy min / max calculations. + $testreport->{first} = @sortedbuilds; + $testreport->{last} = -1; # - Type of failure: random or not (missing dll, etc.) $testreport->{failtype} = ""; - foreach my $build (@sortedbuilds) + for my $i (0..(a)sortedbuilds-1) { + my $build = $sortedbuilds[$i]; my $status = $testreport->{status}->{$build->{name}}; if (!defined $status) { @@ -419,7 +434,13 @@ foreach my $testname (keys %tests) # missing dll to the test running and crashing. # Either way the relevant round of failures starts now. $testreport->{failed} = 1; - last; + $testreport->{first} = $i; + $testreport->{last} = $i; + $testreport->{failtype} = $failtype; + } + else + { + $testreport->{last} = $i; } } } @@ -525,8 +546,9 @@ sub get_status_html($$) sub write_patterns_list($$$$) { - my ($html, $pagereports, $mainpage, $testnames) = @_; + my ($html, $pagereports, $mainpage, $list) = @_; + my $testnames = $list->{testnames}; for my $i (0..@$testnames-1) { my $testname = $testnames->[$i]; @@ -537,9 +559,9 @@ sub write_patterns_list($$$$) print $html " <small>(<a href='$mainpage#$testname'>see all results</a></small>)" if ($mainpage); print $html "<div class='ralign'>"; - my $href = $i ? $testnames->[$i-1] : ""; - print $html "<a href='#$href'>↑</a>"; - $href = $i+1 < @$testnames ? $testnames->[$i+1] : undef; + my $href = $i ? $testnames->[$i-1] : $list->{prevunit}; + print $html "<a href='#$href'>↑</a>" if (defined $href); + $href = $i+1 < @$testnames ? $testnames->[$i+1] : $list->{nextunit}; print $html "<a href='#$href'>↓</a>" if (defined $href); print $html "</div></div>\n"; @@ -669,18 +691,37 @@ sub write_patterns_page($$$) <div class="main"> EOF - # Build a list of test units that will appear on this page so we can - # link them to each other. - my $testnames = []; + # Show the test units with recent failures first. + # Also use these lists to link the test units to each other. + my %lists = ( + recent => {title => "Recent failures", + desc => "have recent failures (that is failures that did not happen for the $patternbuilds oldest builds).", + testnames => []}, + regular => {title => "Regular failures", + desc => "had failures.", + testnames => []}, + old => {title => "Old failures", + desc => "had no failure in the most recent $patternbuilds builds. Fixed or just rare failures?", + testnames => []}, + ); foreach my $testname (sort keys %tests) { my $test = $tests{$testname}; - my $addtest; + + my $first = @sortedbuilds; + my $last = -1; foreach my $reportdir (keys %$pagereports) { my $testreport = $test->{testreports}->{$reportdir}; next if (!$testreport->{failed}); - $addtest = 1; + + $first = $testreport->{first} if ($testreport->{first} < $first); + # For non-random failures we only care about the transition to + # the failure state, which is recorded in 'first'. + my $replast = $testreport->{failtype} eq "random" ? $testreport->{last} : + $testreport->{first} == @sortedbuilds ? -1 : + $testreport->{first}; + $last = $replast if ($replast > $last); foreach my $status (values %{$testreport->{status}}) { @@ -689,12 +730,52 @@ EOF $test->{colors}->{$status} = undef; } } - push @$testnames, $testname if ($addtest); + next if ($last == -1); # no report had a pattern of interest + + my $listid = ($last < @sortedbuilds - $patternbuilds) ? "old" : + ($first > $patternbuilds) ? "recent" : + "regular"; + push @{$lists{$listid}->{testnames}}, $testname; + } + + # Generate the lists index (and up test unit links) + print $html "<h1>$title</h1>\n"; + print $html "<ul>\n"; + my @listids = ("recent", "regular", "old"); + my $prevunit = ""; + foreach my $listid (@listids) + { + my $list = $lists{$listid}; + my $count = @{$list->{testnames}}; + next if (!$count); + print $html "<li><a href='#$listid'>$count test units</a> $list->{desc}</li>\n"; + $list->{prevunit} = $prevunit; + $prevunit = $list->{testnames}->[-1]; + } + print $html "</ul>\n"; + + # Link the last test unit of each list to the first one of the next list + my $nextunit; + foreach my $listid (reverse @listids) + { + my $list = $lists{$listid}; + my $count = @{$list->{testnames}}; + next if (!$count); + $list->{nextunit} = $nextunit; + $nextunit = $list->{testnames}->[0]; } + # Generate the test unit lists themselves my $mainpage = $subpage ? "patterns.html" : ""; - print $html "<h2>$title</h2>\n"; - write_patterns_list($html, $pagereports, $mainpage, $testnames); + foreach my $listid (@listids) + { + my $list = $lists{$listid}; + my $count = @{$list->{testnames}}; + next if (!$count); + print $html "<h2 id='$listid'>$list->{title}</h2>\n"; + write_patterns_list($html, $pagereports, $mainpage, $list); + } + print $html "</div></body></html>\n"; close($html); diff --git a/winetest/winetest.conf b/winetest/winetest.conf index 84824a2b3..f193f8eed 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -24,4 +24,7 @@ $maxunitsize = 32 * 1024; # This should be in line with programs\winetest\send.c $maxfilesize = 1.5 * 1024 * 1024; +# The number of builds after which a failure is considered old / new +$patternbuilds = 10; + 1; # keep require happy -- 2.20.1

1 0

[PATCH] ws2_32/sock: WSARecv/WSASend checks async pendings of the socket.
by dongwan_kim＠tmax.co.kr 28 Apr '21

28 Apr '21

Hi, My name is Dongwan Kim. I found the misbehavior of WSARecv/WSASend when they are called multiple times for overlapped I/O to the same socket . Specifically, the problem occurs if WSARecv is called when overlapped I/O gets ready. WSARecv intercepts the message from the socket. for example, Alice Bob WSARecv( SOCKET_A, buffer1 ) ; <----- X ... <----- Y WSARecv(SOCKET_A, buffer2) ; Bob sent messages( X , Y ) to Alice. Alice should get X to buffer1, Y to buffer 2 respectively. But, In the current version of wine , Alice could get Y to buffer 1 because WSARecv always tries to get message from the socket without checking if there are waiting syncs. I attached my solution and the programs for testing. The test server program receives messages from client with WSARecv. you can run it as : test_server.exe 9088 9088 is port number which is hard-coded in test client program... The test client program sends fragments of a file to server. you can run it as : test_client.exe localhost [file_to_send] I tested with a 96MB file. The programs are not clean... If you need, I can send the source code. Thanks. Best Regards.

1 0