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

Hans Leidekker : msv1_0: Add a Unix library to support ntlm_auth.
by Alexandre Julliard 29 Apr '21

29 Apr '21

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: Implement SpAcquireCredentialsHandle and SpFreeCredentialsHandle.
by Alexandre Julliard 29 Apr '21

29 Apr '21

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

Hans Leidekker : msv1_0: Implement SpInitLsaModeContext and SpDeleteContext.
by Alexandre Julliard 29 Apr '21

29 Apr '21

Module: wine Branch: master Commit: 368d9cb591f238714e66fa372d68e9b8824b16b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=368d9cb591f238714e66fa37… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 29 12:47:33 2021 +0200 msv1_0: Implement SpInitLsaModeContext and SpDeleteContext. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msv1_0/Makefile.in | 1 + dlls/msv1_0/main.c | 561 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/msv1_0/unixlib.c | 68 ++++++ dlls/msv1_0/unixlib.h | 1 + 4 files changed, 629 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=368d9cb591f238714e66…

1 0

Jacek Caban : winevulkan: Don't use wine_ prefix on PE side.
by Alexandre Julliard 29 Apr '21

29 Apr '21

Module: wine Branch: master Commit: 007a4bc9b0f788f91125b692ea12ce23adf1eb21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=007a4bc9b0f788f91125b692… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 29 14:38:46 2021 +0200 winevulkan: Don't use wine_ prefix on PE side. There is no ABI ambiguity, so we may just use public names. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader.c | 34 +++++++++++++++++----------------- dlls/winevulkan/make_vulkan | 37 +++++++++++++------------------------ dlls/winevulkan/vulkan_loader.h | 2 -- dlls/winevulkan/vulkan_private.h | 1 + 4 files changed, 31 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=007a4bc9b0f788f91125…

1 0

Jacek Caban : winevulkan: Use wine_ prefix for Unix thunks.
by Alexandre Julliard 29 Apr '21

29 Apr '21

Module: wine Branch: master Commit: 0fce8076f2d4bb9b484218d94dc17209879d5caa URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fce8076f2d4bb9b484218d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 29 14:38:50 2021 +0200 winevulkan: Use wine_ prefix for Unix thunks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/vulkan-1.spec | 392 +++++----- dlls/winevulkan/loader_thunks.c | 1554 +++++++++++++++++++-------------------- dlls/winevulkan/loader_thunks.h | 10 - dlls/winevulkan/make_vulkan | 4 +- dlls/winevulkan/vulkan.c | 98 +-- dlls/winevulkan/vulkan_thunks.c | 1474 ++++++++++++++++++------------------- dlls/winevulkan/vulkan_thunks.h | 100 +-- dlls/winevulkan/winevulkan.spec | 398 +++++----- 8 files changed, 2010 insertions(+), 2020 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0fce8076f2d4bb9b4842…

1 0

Paul Gofman : ntdll: Implement NtGetNextThread().
by Alexandre Julliard 29 Apr '21

29 Apr '21

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

Zebediah Figura : ws2_32/tests: Move address lookup tests to protocol.c.
by Alexandre Julliard 29 Apr '21

29 Apr '21

Module: wine Branch: master Commit: edd9ef9c276f6113e9fbf7dea010030df348c16e URL: https://source.winehq.org/git/wine.git/?a=commit;h=edd9ef9c276f6113e9fbf7de… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 28 16:26:30 2021 -0500 ws2_32/tests: Move address lookup tests to protocol.c. sock.c is huge. This doesn't bother some people, but I find that it can be harder to navigate and slower to compile. Splitting it is tricky, but I think there's a pretty natural divide between functions that operate on sockets (e.g. bind, listen, recv, getsockname) and functions that don't (e.g. get*info, inet_*, get*by*, WSC*). 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 | 809 ++++++++++++++++++++++++++++++++++++++++++- dlls/ws2_32/tests/sock.c | 805 ------------------------------------------ 2 files changed, 808 insertions(+), 806 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=edd9ef9c276f6113e9fb…

1 0

Zebediah Figura : ws2_32/tests: Move host lookup tests to protocol.c.
by Alexandre Julliard 29 Apr '21

29 Apr '21

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 29 Apr '21

29 Apr '21

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

Zebediah Figura : ws2_32/tests: Move address/string conversion tests to protocol.c.
by Alexandre Julliard 29 Apr '21

29 Apr '21

Module: wine Branch: master Commit: 8b208093545d040b9bc5d5bac62e8fe57e0e566a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b208093545d040b9bc5d5ba… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 28 16:26:33 2021 -0500 ws2_32/tests: Move address/string conversion 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 | 631 +++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/tests/sock.c | 659 ------------------------------------------- 2 files changed, 631 insertions(+), 659 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8b208093545d040b9bc5…

1 0