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

Hans Leidekker : msv1_0: Implement SpAcquireCredentialsHandle and SpFreeCredentialsHandle.
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: wine Branch: master Commit: e73932e08d0d587329ec15abca9a3d6f89070200 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e73932e08d0d587329ec15ab… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 29 12:47:32 2021 +0200 msv1_0: Implement SpAcquireCredentialsHandle and SpFreeCredentialsHandle. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 */

1 0

Alexandre Julliard : regsvr32: Restart the correct version for all supported architectures.
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: wine Branch: master Commit: 20984f2e1f7f6445a5b6bcdf8aa1354c8d539128 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20984f2e1f7f6445a5b6bcdf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 29 17:09:06 2021 +0200 regsvr32: Restart the correct version for all supported architectures. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regsvr32/Makefile.in | 2 +- programs/regsvr32/regsvr32.c | 51 ++++++++++++++++--------------------------- 2 files changed, 20 insertions(+), 33 deletions(-) diff --git a/programs/regsvr32/Makefile.in b/programs/regsvr32/Makefile.in index d8aee0ea666..3321ca68a94 100644 --- a/programs/regsvr32/Makefile.in +++ b/programs/regsvr32/Makefile.in @@ -1,5 +1,5 @@ MODULE = regsvr32.exe -IMPORTS = ole32 user32 +IMPORTS = ole32 user32 kernelbase EXTRADLLFLAGS = -mwindows -municode -mno-cygwin diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index ee915ed3e21..fb307d797a1 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -112,46 +112,39 @@ static LPCWSTR find_arg_start(LPCWSTR cmdline) return s; } -static void reexec_self(void) +static void reexec_self( WORD machine ) { - /* restart current process as 32-bit or 64-bit with same command line */ -#ifndef _WIN64 - BOOL wow64; -#endif - WCHAR systemdir[MAX_PATH]; + WCHAR app[MAX_PATH]; LPCWSTR args; WCHAR *cmdline; + ULONG i, machines[8]; + HANDLE process = 0; STARTUPINFOW si = {0}; PROCESS_INFORMATION pi; + void *cookie; -#ifdef _WIN64 - TRACE("restarting as 32-bit\n"); - GetSystemWow64DirectoryW(systemdir, MAX_PATH); -#else - TRACE("restarting as 64-bit\n"); + NtQuerySystemInformationEx( SystemSupportedProcessorArchitectures, &process, sizeof(process), + machines, sizeof(machines), NULL ); + for (i = 0; machines[i]; i++) if (LOWORD(machines[i]) == machine) break; + if (!machines[i]) return; + if (HIWORD(machines[i]) & 4 /* native machine */) machine = IMAGE_FILE_MACHINE_TARGET_HOST; + if (!GetSystemWow64Directory2W( app, MAX_PATH, machine )) return; + wcscat( app, L"\\regsvr32.exe" ); - if (!IsWow64Process(GetCurrentProcess(), &wow64) || !wow64) - { - TRACE("not running in wow64, can't restart as 64-bit\n"); - return; - } - - GetWindowsDirectoryW(systemdir, MAX_PATH); - wcscat(systemdir, L"\\SysNative"); -#endif + TRACE( "restarting as %s\n", debugstr_w(app) ); args = find_arg_start(GetCommandLineW()); cmdline = HeapAlloc(GetProcessHeap(), 0, - (wcslen(systemdir)+wcslen(L"\\regsvr32.exe")+wcslen(args)+1)*sizeof(WCHAR)); + (wcslen(app)+wcslen(args)+1)*sizeof(WCHAR)); - wcscpy(cmdline, systemdir); - wcscat(cmdline, L"\\regsvr32.exe"); + wcscpy(cmdline, app); wcscat(cmdline, args); si.cb = sizeof(si); - if (CreateProcessW(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + Wow64DisableWow64FsRedirection(&cookie); + if (CreateProcessW(app, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) { DWORD exit_code; WaitForSingleObject(pi.hProcess, INFINITE); @@ -162,16 +155,10 @@ static void reexec_self(void) { WINE_TRACE("failed to restart, err=%d\n", GetLastError()); } - + Wow64RevertWow64FsRedirection(cookie); HeapFree(GetProcessHeap(), 0, cmdline); } -#ifdef _WIN64 -# define ALT_MACHINE IMAGE_FILE_MACHINE_I386 -#else -# define ALT_MACHINE IMAGE_FILE_MACHINE_AMD64 -#endif - /** * Loads procedure. * @@ -193,7 +180,7 @@ static VOID *LoadProc(const WCHAR* strDll, const char* procName, HMODULE* DllHan (module = LoadLibraryExW(strDll, 0, LOAD_LIBRARY_AS_IMAGE_RESOURCE))) { IMAGE_NT_HEADERS *nt = RtlImageNtHeader( (HMODULE)((ULONG_PTR)module & ~3) ); - if (nt->FileHeader.Machine == ALT_MACHINE) reexec_self(); + reexec_self( nt->FileHeader.Machine ); } output_write(STRING_DLL_LOAD_FAILED, strDll); ExitProcess(LOADLIBRARY_FAILED);

1 0

Francois Gouget : winetest: Fix the path to the ntoskrnl.exe/tests source.
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: wine Branch: master Commit: f932fb327ae1459dac54a488bc4a0a5dbdd49cd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f932fb327ae1459dac54a488… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 29 15:14:40 2021 +0200 winetest: Fix the path to the ntoskrnl.exe/tests source. It's the only test with a .exe extension for which the source is not in programs! Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index cb2f23a161e..a05c8f9939b 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -518,7 +518,8 @@ static const char* get_test_source_file(const char* test, const char* subtest) static char buffer[MAX_PATH]; int len = strlen(test); - if (len > 4 && !strcmp( test + len - 4, ".exe" )) + if (len > 4 && !strcmp( test + len - 4, ".exe" ) && + strcmp( test, "ntoskrnl.exe" )) /* the one exception! */ { len = sprintf(buffer, "programs/%s", test) - 4; buffer[len] = 0;

1 0

Hans Leidekker : msv1_0: Add a Unix library to support ntlm_auth.
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: wine Branch: master Commit: 80d82eec913cd854a36993f150ff5750ecbf2c7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=80d82eec913cd854a36993f1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 29 12:47:31 2021 +0200 msv1_0: Add a Unix library to support ntlm_auth. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=80d82eec913cd854a369…

1 0

Hans Leidekker : msv1_0: Initial implementation of the LSA and user mode interfaces.
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: wine Branch: master Commit: 1eefdd6bee17d547a3ac3cf639203021aa16d7e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1eefdd6bee17d547a3ac3cf6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 29 12:47:30 2021 +0200 msv1_0: Initial implementation of the LSA and user mode interfaces. Just enough to initialize the provider. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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(-) 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)

1 0

Alexandre Julliard : ntdll/tests: Fix a test failure on Windows 8.
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: wine Branch: master Commit: b5095a1028b9c79170dfe0d927422a0658bee502 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5095a1028b9c79170dfe0d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 29 22:53:59 2021 +0200 ntdll/tests: Fix a test failure on Windows 8. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index b68edfa64dc..f12b2862a99 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -3097,7 +3097,7 @@ static void test_wow64(void) ok( (char *)teb64 + 0x2000 == (char *)NtCurrentTeb(), "unexpected diff %p / %p\n", teb64, NtCurrentTeb() ); ok( (char *)teb64 + teb64->WowTebOffset == (char *)NtCurrentTeb() || - broken( NtCurrentTeb()->WowTebOffset == 1 ), /* vista */ + broken( !teb64->WowTebOffset || teb64->WowTebOffset == 1 ), /* pre-win10 */ "wrong WowTebOffset %x (%p/%p)\n", teb64->WowTebOffset, teb64, NtCurrentTeb() ); ok( !teb64->GdiBatchCount, "GdiBatchCount set %x\n", teb64->GdiBatchCount ); ok( teb64->Tib.ExceptionList == PtrToUlong( NtCurrentTeb() ), "wrong Tib.ExceptionList %s / %p\n",

1 0

Paul Gofman : ntdll: Implement NtGetNextThread().
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: wine Branch: master Commit: 02e3327f0687559486739f7da7b602c2baae070a URL: https://source.winehq.org/git/wine.git/?a=commit;h=02e3327f0687559486739f7d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Apr 28 18:21:21 2021 +0300 ntdll: Implement NtGetNextThread(). Largely based on a patch by Nikolay Sivov for NtGetNextProcess(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/tests/om.c | 93 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/thread.c | 28 +++++++++++++ include/wine/server_protocol.h | 23 ++++++++++- server/protocol.def | 12 ++++++ server/request.h | 10 +++++ server/thread.c | 49 ++++++++++++++++++++++ server/trace.c | 17 ++++++++ 8 files changed, 232 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02e3327f068755948673…

1 0

Rémi Bernon : user32: Translate missing vkeys in ToUnicodeEx.
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: wine Branch: master Commit: fde6c6119d37f922cfd649c49d0f4f5a633e6384 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fde6c6119d37f922cfd649c4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 29 09:53:54 2021 +0200 user32: Translate missing vkeys in ToUnicodeEx. As shown by user32 input and msg tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index a79f80ed190..b21ec73696d 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -898,6 +898,7 @@ INT WINAPI ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, /* FIXME: English keyboard layout specific */ if (scan & 0x8000) buffer[0] = 0; /* key up */ + else if (virt == VK_ESCAPE) buffer[0] = VK_ESCAPE; else if (!ctrl) { switch (virt) @@ -943,6 +944,8 @@ INT WINAPI ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, case VK_OEM_5: buffer[0] = 0x1c; break; case VK_OEM_6: buffer[0] = 0x1d; break; case VK_SUBTRACT: buffer[0] = 0x1e; break; + case VK_RETURN: buffer[0] = shift ? 0 : '\n'; break; + case VK_SPACE: buffer[0] = ' '; break; default: if (virt >= 'A' && virt <= 'Z') buffer[0] = virt - 'A' + 1; else buffer[0] = 0;

1 0

Zebediah Figura : ws2_32/tests: Move host lookup tests to protocol.c.
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: wine Branch: master Commit: 1699d4b785af173d0fcc24a7f1ac881f43f47fa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1699d4b785af173d0fcc24a7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 28 16:26:31 2021 -0500 ws2_32/tests: Move host lookup tests to protocol.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/protocol.c | 258 +++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/tests/sock.c | 268 ------------------------------------------- 2 files changed, 258 insertions(+), 268 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1699d4b785af173d0fcc…

1 0

Zebediah Figura : ws2_32/tests: Move service lookup tests to protocol.c.
by Alexandre Julliard April 29, 2021

April 29, 2021

Module: wine Branch: master Commit: 29fafd55692fda12b2e95e55b2f62e858b8d40ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=29fafd55692fda12b2e95e55… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 28 16:26:32 2021 -0500 ws2_32/tests: Move service lookup tests to protocol.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/protocol.c | 330 ++++++++++++++++++++++++++++++++++++++++++- dlls/ws2_32/tests/sock.c | 321 ----------------------------------------- 2 files changed, 328 insertions(+), 323 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=29fafd55692fda12b2e9…

1 0