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

Piotr Caban : api-ms-win-core-console-l1-2-0: Add dll.
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: master Commit: 24aba09015eb3ecbce99d148ac4b48cb173aba80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24aba09015eb3ecbce99d148… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 7 11:24:44 2021 +0200 api-ms-win-core-console-l1-2-0: Add dll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-console-l1-2-0/Makefile.in | 1 + .../api-ms-win-core-console-l1-2-0.spec | 17 +++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 22 insertions(+) diff --git a/configure b/configure index c77184d996c..27d2b8505a3 100755 --- a/configure +++ b/configure @@ -934,6 +934,7 @@ enable_api_ms_win_core_com_l1_1_1 enable_api_ms_win_core_com_private_l1_1_0 enable_api_ms_win_core_comm_l1_1_0 enable_api_ms_win_core_console_l1_1_0 +enable_api_ms_win_core_console_l1_2_0 enable_api_ms_win_core_console_l2_1_0 enable_api_ms_win_core_crt_l1_1_0 enable_api_ms_win_core_crt_l2_1_0 @@ -20140,6 +20141,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-com-l1-1-1 enable_api_ms_win_core_c wine_fn_config_makefile dlls/api-ms-win-core-com-private-l1-1-0 enable_api_ms_win_core_com_private_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-comm-l1-1-0 enable_api_ms_win_core_comm_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-console-l1-1-0 enable_api_ms_win_core_console_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-core-console-l1-2-0 enable_api_ms_win_core_console_l1_2_0 wine_fn_config_makefile dlls/api-ms-win-core-console-l2-1-0 enable_api_ms_win_core_console_l2_1_0 wine_fn_config_makefile dlls/api-ms-win-core-crt-l1-1-0 enable_api_ms_win_core_crt_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-crt-l2-1-0 enable_api_ms_win_core_crt_l2_1_0 diff --git a/configure.ac b/configure.ac index b6e7b2e74f0..5578ee98edf 100644 --- a/configure.ac +++ b/configure.ac @@ -2802,6 +2802,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-com-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-com-private-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-comm-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-console-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-console-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-console-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-crt-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-crt-l2-1-0) diff --git a/dlls/api-ms-win-core-console-l1-2-0/Makefile.in b/dlls/api-ms-win-core-console-l1-2-0/Makefile.in new file mode 100644 index 00000000000..2939ab875c6 --- /dev/null +++ b/dlls/api-ms-win-core-console-l1-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-console-l1-2-0.dll diff --git a/dlls/api-ms-win-core-console-l1-2-0/api-ms-win-core-console-l1-2-0.spec b/dlls/api-ms-win-core-console-l1-2-0/api-ms-win-core-console-l1-2-0.spec new file mode 100644 index 00000000000..3720d6ca8c5 --- /dev/null +++ b/dlls/api-ms-win-core-console-l1-2-0/api-ms-win-core-console-l1-2-0.spec @@ -0,0 +1,17 @@ +@ stdcall AllocConsole() kernel32.AllocConsole +@ stdcall AttachConsole(long) kernel32.AttachConsole +@ stdcall FreeConsole() kernel32.FreeConsole +@ stdcall GetConsoleCP() kernel32.GetConsoleCP +@ stdcall GetConsoleMode(long ptr) kernel32.GetConsoleMode +@ stdcall GetConsoleOutputCP() kernel32.GetConsoleOutputCP +@ stdcall GetNumberOfConsoleInputEvents(long ptr) kernel32.GetNumberOfConsoleInputEvents +@ stdcall PeekConsoleInputA(ptr ptr long ptr) kernel32.PeekConsoleInputA +@ stdcall PeekConsoleInputW(ptr ptr long ptr) kernel32.PeekConsoleInputW +@ stdcall ReadConsoleA(long ptr long ptr ptr) kernel32.ReadConsoleA +@ stdcall ReadConsoleInputA(long ptr long ptr) kernel32.ReadConsoleInputA +@ stdcall ReadConsoleInputW(long ptr long ptr) kernel32.ReadConsoleInputW +@ stdcall ReadConsoleW(long ptr long ptr ptr) kernel32.ReadConsoleW +@ stdcall SetConsoleCtrlHandler(ptr long) kernel32.SetConsoleCtrlHandler +@ stdcall SetConsoleMode(long long) kernel32.SetConsoleMode +@ stdcall WriteConsoleA(long ptr long ptr ptr) kernel32.WriteConsoleA +@ stdcall WriteConsoleW(long ptr long ptr ptr) kernel32.WriteConsoleW diff --git a/tools/make_specfiles b/tools/make_specfiles index 4e79d56667e..ef723fedd3a 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -230,6 +230,7 @@ my @dll_groups = "api-ms-win-core-synch-l1-2-0", "api-ms-win-core-synch-l1-2-1", "api-ms-win-core-console-l1-1-0", + "api-ms-win-core-console-l1-2-0", "api-ms-win-core-console-l2-1-0", "api-ms-win-core-file-l1-1-0", "api-ms-win-core-file-l1-2-1",

1 0

Hans Leidekker : secur32: Use a reserved flag for the cached credentials hack.
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: master Commit: 4a45679f1aa3af87a8cdd032c4f2b79248d398cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a45679f1aa3af87a8cdd032… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 7 11:54:39 2021 +0200 secur32: Use a reserved flag for the cached credentials hack. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msv1_0/main.c | 5 +++-- dlls/secur32/negotiate.c | 22 +++++----------------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/dlls/msv1_0/main.c b/dlls/msv1_0/main.c index f61e3c90efe..df9d0dd0f1a 100644 --- a/dlls/msv1_0/main.c +++ b/dlls/msv1_0/main.c @@ -159,6 +159,7 @@ static char *get_domain_arg( const WCHAR *domain, int domain_len ) return ret; } +#define WINE_NO_CACHED_CREDENTIALS 0x10000000 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 ) @@ -171,7 +172,7 @@ static NTSTATUS NTAPI ntlm_SpAcquireCredentialsHandle( UNICODE_STRING *principal 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) + switch (cred_use & ~SECPKG_CRED_RESERVED) { case SECPKG_CRED_INBOUND: if (!(cred = malloc( sizeof(*cred) ))) return SEC_E_INSUFFICIENT_MEMORY; @@ -194,7 +195,7 @@ static NTSTATUS NTAPI ntlm_SpAcquireCredentialsHandle( UNICODE_STRING *principal cred->domain_arg = NULL; cred->password = NULL; cred->password_len = 0; - cred->no_cached_credentials = 0; + cred->no_cached_credentials = (cred_use & WINE_NO_CACHED_CREDENTIALS); if ((id = auth_data)) { diff --git a/dlls/secur32/negotiate.c b/dlls/secur32/negotiate.c index 6767790d09f..aeddbccd4f4 100644 --- a/dlls/secur32/negotiate.c +++ b/dlls/secur32/negotiate.c @@ -58,16 +58,7 @@ struct sec_handle SecHandle handle_ntlm; }; -/* matches layout from msv1_0 */ -struct ntlm_cred -{ - int mode; - char *username_arg; - char *domain_arg; - char *password; - int password_len; - int no_cached_credentials; /* don't try to use cached Samba credentials */ -}; +#define WINE_NO_CACHED_CREDENTIALS 0x10000000 /*********************************************************************** * AcquireCredentialsHandleW @@ -99,14 +90,11 @@ static SECURITY_STATUS SEC_ENTRY nego_AcquireCredentialsHandleW( if ((package = SECUR32_findPackageW( ntlmW ))) { + ULONG cred_use = pAuthData ? fCredentialUse : fCredentialUse | WINE_NO_CACHED_CREDENTIALS; + ret = package->provider->fnTableW.AcquireCredentialsHandleW( pszPrincipal, ntlmW, - fCredentialUse, pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, &cred->handle_ntlm, ptsExpiry ); - if (ret == SEC_E_OK) - { - struct ntlm_cred *ntlm_cred = (struct ntlm_cred *)cred->handle_ntlm.dwLower; - ntlm_cred->no_cached_credentials = (pAuthData == NULL); - cred->ntlm = package->provider; - } + cred_use, pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, &cred->handle_ntlm, ptsExpiry ); + if (ret == SEC_E_OK) cred->ntlm = package->provider; } if (cred->krb || cred->ntlm)

1 0

Hans Leidekker : secur32: Use a pthread mutex in the macOS backend.
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: master Commit: a84b02992b75501742b4ebcb9031f06b20ecb84b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a84b02992b75501742b4ebcb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 7 11:54:40 2021 +0200 secur32: Use a pthread mutex in the macOS backend. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/Makefile.in | 2 +- dlls/secur32/schannel_macosx.c | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/secur32/Makefile.in b/dlls/secur32/Makefile.in index 89a7c8bd078..a5aa3b52691 100644 --- a/dlls/secur32/Makefile.in +++ b/dlls/secur32/Makefile.in @@ -3,7 +3,7 @@ IMPORTLIB = secur32 IMPORTS = advapi32 DELAYIMPORTS = crypt32 EXTRAINCL = $(GNUTLS_CFLAGS) -EXTRALIBS = $(SECURITY_LIBS) +EXTRALIBS = $(SECURITY_LIBS) $(PTHREAD_LIBS) C_SRCS = \ lsa.c \ diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index ab97615014d..841f928eef3 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -23,6 +23,7 @@ #include "wine/port.h" #include <stdarg.h> +#include <pthread.h> #ifdef HAVE_SECURITY_SECURITY_H #include <Security/Security.h> #define GetCurrentThread GetCurrentThread_Mac @@ -190,10 +191,9 @@ struct mac_session { SSLContextRef context; struct schan_transport *transport; enum schan_mode mode; - CRITICAL_SECTION cs; + pthread_mutex_t mutex; }; - enum { schan_proto_SSL, schan_proto_TLS, @@ -760,8 +760,7 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre if (!s) return FALSE; - InitializeCriticalSection(&s->cs); - s->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": mac_session.cs"); + pthread_mutex_init(&s->mutex, NULL); status = SSLNewContext(cred->credential_use == SECPKG_CRED_INBOUND, &s->context); if (status != noErr) @@ -826,7 +825,7 @@ void schan_imp_dispose_session(schan_imp_session session) status = SSLDisposeContext(s->context); if (status != noErr) ERR("Failed to dispose of session context: %d\n", status); - DeleteCriticalSection(&s->cs); + pthread_mutex_destroy(&s->mutex); heap_free(s); } @@ -1124,13 +1123,13 @@ SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer, TRACE("(%p/%p, %p, %p/%lu)\n", s, s->context, buffer, length, *length); - EnterCriticalSection(&s->cs); + pthread_mutex_lock(&s->mutex); s->mode = schan_mode_WRITE; status = SSLWrite(s->context, buffer, *length, length); s->mode = schan_mode_NONE; - LeaveCriticalSection(&s->cs); + pthread_mutex_unlock(&s->mutex); if (status == noErr) TRACE("Wrote %lu bytes\n", *length); @@ -1161,13 +1160,13 @@ SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, TRACE("(%p/%p, %p, %p/%lu)\n", s, s->context, buffer, length, *length); - EnterCriticalSection(&s->cs); + pthread_mutex_lock(&s->mutex); s->mode = schan_mode_READ; status = SSLRead(s->context, buffer, *length, length); s->mode = schan_mode_NONE; - LeaveCriticalSection(&s->cs); + pthread_mutex_unlock(&s->mutex); if (status == noErr || status == errSSLClosedGraceful) TRACE("Read %lu bytes\n", *length);

1 0

Hans Leidekker : secur32: Move Schannel support to a Unix library.
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: master Commit: 7d0889b7475783b5c68c0e704d69e2140f369ccc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d0889b7475783b5c68c0e70… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 7 11:54:41 2021 +0200 secur32: Move Schannel support to a Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 252 +++++++++++++++++++++++--------- dlls/secur32/schannel_gnutls.c | 323 ++++++++++++++++------------------------- dlls/secur32/schannel_macosx.c | 210 ++++++++++++++++----------- dlls/secur32/secur32.c | 3 + dlls/secur32/secur32_priv.h | 81 ++++++----- 5 files changed, 477 insertions(+), 392 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7d0889b7475783b5c68c…

1 0

Hans Leidekker : secur32: Build with msvcrt.
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: master Commit: 04c6862d3f11819ce2df0e135481773a02b86787 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04c6862d3f11819ce2df0e13… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 7 11:54:42 2021 +0200 secur32: Build with msvcrt. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/Makefile.in | 2 ++ dlls/secur32/negotiate.c | 3 +-- dlls/secur32/schannel.c | 22 +++++++++++----------- dlls/secur32/secur32.c | 28 ++++++++++------------------ dlls/secur32/thunks.c | 5 +++-- dlls/secur32/wrapper.c | 3 ++- 6 files changed, 29 insertions(+), 34 deletions(-) diff --git a/dlls/secur32/Makefile.in b/dlls/secur32/Makefile.in index a5aa3b52691..458f62bb99f 100644 --- a/dlls/secur32/Makefile.in +++ b/dlls/secur32/Makefile.in @@ -5,6 +5,8 @@ DELAYIMPORTS = crypt32 EXTRAINCL = $(GNUTLS_CFLAGS) EXTRALIBS = $(SECURITY_LIBS) $(PTHREAD_LIBS) +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ lsa.c \ negotiate.c \ diff --git a/dlls/secur32/negotiate.c b/dlls/secur32/negotiate.c index aeddbccd4f4..6d45d0c5d54 100644 --- a/dlls/secur32/negotiate.c +++ b/dlls/secur32/negotiate.c @@ -23,10 +23,9 @@ #include "sspi.h" #include "rpc.h" #include "wincred.h" -#include "secur32_priv.h" #include "wine/debug.h" -#include "wine/unicode.h" +#include "secur32_priv.h" WINE_DEFAULT_DEBUG_CHANNEL(secur32); diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 5f6b96903c4..adbc6a810ed 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -25,15 +25,15 @@ #define NONAMELESSUNION #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "winreg.h" #include "winnls.h" #include "lmcons.h" #include "sspi.h" #include "schannel.h" -#include "secur32_priv.h" -#include "wine/unicode.h" #include "wine/debug.h" +#include "secur32_priv.h" WINE_DEFAULT_DEBUG_CHANNEL(secur32); @@ -199,8 +199,8 @@ static void read_config(void) DWORD type, size, value; for(i = 0; i < ARRAY_SIZE(protocol_config_keys); i++) { - strcpyW(subkey_name, protocol_config_keys[i].key_name); - strcatW(subkey_name, clientW); + wcscpy(subkey_name, protocol_config_keys[i].key_name); + wcscat(subkey_name, clientW); res = RegOpenKeyExW(protocols_key, subkey_name, 0, KEY_READ, &key); if(res != ERROR_SUCCESS) { if(protocol_config_keys[i].enabled) @@ -412,8 +412,8 @@ static WCHAR *get_key_container_path(const CERT_CONTEXT *ctx) RtlFreeHeap(GetProcessHeap(), 0, str); return NULL; } - strcpyW(ret, rsabaseW); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret + strlenW(ret), len); + wcscpy(ret, rsabaseW); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret + wcslen(ret), len); RtlFreeHeap(GetProcessHeap(), 0, str); } else if (CertGetCertificateContextProperty(ctx, CERT_KEY_PROV_INFO_PROP_ID, NULL, &prov_size)) @@ -425,21 +425,21 @@ static WCHAR *get_key_container_path(const CERT_CONTEXT *ctx) return NULL; } if (!(ret = RtlAllocateHeap(GetProcessHeap(), 0, - sizeof(rsabaseW) + strlenW(prov->pwszContainerName) * sizeof(WCHAR)))) + sizeof(rsabaseW) + wcslen(prov->pwszContainerName) * sizeof(WCHAR)))) { RtlFreeHeap(GetProcessHeap(), 0, prov); return NULL; } - strcpyW(ret, rsabaseW); - strcatW(ret, prov->pwszContainerName); + wcscpy(ret, rsabaseW); + wcscat(ret, prov->pwszContainerName); RtlFreeHeap(GetProcessHeap(), 0, prov); } if (!ret && GetUserNameW(username, &len) && (ret = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(rsabaseW) + len * sizeof(WCHAR)))) { - strcpyW(ret, rsabaseW); - strcatW(ret, username); + wcscpy(ret, rsabaseW); + wcscat(ret, username); } return ret; diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 04cb52dbec9..374030d0064 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -16,6 +16,7 @@ * 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 <assert.h> #include <stdarg.h> @@ -28,7 +29,6 @@ #include "winternl.h" #include "shlwapi.h" #include "sspi.h" -#include "secur32_priv.h" #include "secext.h" #include "ntsecapi.h" #include "thunks.h" @@ -36,7 +36,7 @@ #include "wine/list.h" #include "wine/debug.h" -#include "wine/unicode.h" +#include "secur32_priv.h" WINE_DEFAULT_DEBUG_CHANNEL(secur32); @@ -174,18 +174,10 @@ PSecurityFunctionTableW WINAPI InitSecurityInterfaceW(void) return &securityFunctionTableW; } -static PWSTR SECUR32_strdupW(PCWSTR str) +static WCHAR *SECUR32_strdupW(const WCHAR *str) { - PWSTR ret; - - if (str) - { - ret = heap_alloc((lstrlenW(str) + 1) * sizeof(WCHAR)); - if (ret) - lstrcpyW(ret, str); - } - else - ret = NULL; + WCHAR *ret = NULL; + if (str && (ret = heap_alloc((wcslen(str) + 1) * sizeof(WCHAR)))) wcscpy(ret, str); return ret; } @@ -595,7 +587,7 @@ static void SECUR32_initializeProviders(void) ; if (*comma == ',') *comma = '\0'; - for (; *ptr && isspaceW(*ptr) && ptr < securityPkgNames + size; + for (; *ptr && iswspace(*ptr) && ptr < securityPkgNames + size; ptr++) ; if (*ptr) @@ -1046,16 +1038,16 @@ BOOLEAN WINAPI GetComputerObjectNameW( break; } - len = strlenW(cnW) + size + 1 + strlenW(ComputersW) + 1 + strlenW(dcW); + len = wcslen(cnW) + size + 1 + wcslen(ComputersW) + 1 + wcslen(dcW); if (domainInfo->DnsDomainName.Buffer) { - suffix = strrchrW(domainInfo->DnsDomainName.Buffer, '.'); + suffix = wcsrchr(domainInfo->DnsDomainName.Buffer, '.'); if (suffix) { *suffix++ = 0; - len += 1 + strlenW(dcW) + strlenW(suffix); + len += 1 + wcslen(dcW) + wcslen(suffix); } - len += strlenW(domainInfo->DnsDomainName.Buffer); + len += wcslen(domainInfo->DnsDomainName.Buffer); } else suffix = NULL; diff --git a/dlls/secur32/thunks.c b/dlls/secur32/thunks.c index 09b20d54abe..7a59c4ee3ca 100644 --- a/dlls/secur32/thunks.c +++ b/dlls/secur32/thunks.c @@ -17,16 +17,17 @@ * 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 "windef.h" #include "winbase.h" #include "winnls.h" #include "winternl.h" #include "sspi.h" -#include "secur32_priv.h" -#include "thunks.h" #include "wine/debug.h" +#include "secur32_priv.h" +#include "thunks.h" WINE_DEFAULT_DEBUG_CHANNEL(secur32); diff --git a/dlls/secur32/wrapper.c b/dlls/secur32/wrapper.c index 67c5b5a7215..7e36f293f62 100644 --- a/dlls/secur32/wrapper.c +++ b/dlls/secur32/wrapper.c @@ -16,14 +16,15 @@ * 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 "windef.h" #include "winbase.h" #include "winnls.h" #include "sspi.h" -#include "secur32_priv.h" #include "wine/debug.h" +#include "secur32_priv.h" WINE_DEFAULT_DEBUG_CHANNEL(secur32);

1 0

Hans Leidekker : secur32: Use wide character string literals.
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: master Commit: 49dbde22bdeec66a657b0ae283c22f2b83711c1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=49dbde22bdeec66a657b0ae2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 7 11:54:43 2021 +0200 secur32: Use wide character string literals. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/lsa.c | 5 +-- dlls/secur32/schannel.c | 91 +++++++++++++++++++------------------------------ dlls/secur32/secur32.c | 44 ++++++++---------------- 3 files changed, 50 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=49dbde22bdeec66a657b…

1 0

Zebediah Figura : ws2_32: Add more status codes to NtStatusToWSAError().
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: master Commit: 54a39d5779fea1ecf3ad11cff1ee27cfa5005de3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54a39d5779fea1ecf3ad11cf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 6 17:54:05 2021 -0500 ws2_32: Add more status codes to NtStatusToWSAError(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 111 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 82 insertions(+), 29 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 74e86e9d845..ed7218f9fb7 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -972,35 +972,88 @@ static NTSTATUS sock_error_to_ntstatus( DWORD err ) } } -static DWORD NtStatusToWSAError( DWORD status ) -{ - switch ( status ) - { - case STATUS_SUCCESS: return 0; - case STATUS_PENDING: return WSA_IO_PENDING; - case STATUS_INVALID_HANDLE: - case STATUS_OBJECT_TYPE_MISMATCH: return WSAENOTSOCK; - case STATUS_INVALID_PARAMETER: return WSAEINVAL; - case STATUS_PIPE_DISCONNECTED: return WSAESHUTDOWN; - case STATUS_NETWORK_BUSY: return WSAEALREADY; - case STATUS_NETWORK_UNREACHABLE: return WSAENETUNREACH; - case STATUS_CONNECTION_REFUSED: return WSAECONNREFUSED; - case STATUS_INVALID_CONNECTION: return WSAENOTCONN; - case STATUS_CONNECTION_RESET: return WSAECONNRESET; - case STATUS_CONNECTION_ABORTED: return WSAECONNABORTED; - case STATUS_CANCELLED: return WSA_OPERATION_ABORTED; - case STATUS_SHARING_VIOLATION: return WSAEADDRINUSE; - case STATUS_IO_TIMEOUT: - case STATUS_TIMEOUT: return WSAETIMEDOUT; - case STATUS_ACCESS_VIOLATION: return WSAEFAULT; - case STATUS_ACCESS_DENIED: return WSAEACCES; - case STATUS_TOO_MANY_OPENED_FILES: return WSAEMFILE; - case STATUS_DEVICE_NOT_READY: return WSAEWOULDBLOCK; - case STATUS_BUFFER_OVERFLOW: return WSAEMSGSIZE; - case STATUS_NOT_SUPPORTED: return WSAEOPNOTSUPP; - case STATUS_HOST_UNREACHABLE: return WSAEHOSTUNREACH; - default: return RtlNtStatusToDosError( status ); +static DWORD NtStatusToWSAError( NTSTATUS status ) +{ + static const struct + { + NTSTATUS status; + DWORD error; + } + errors[] = + { + {STATUS_PENDING, ERROR_IO_PENDING}, + + {STATUS_BUFFER_OVERFLOW, WSAEMSGSIZE}, + + {STATUS_NOT_IMPLEMENTED, WSAEOPNOTSUPP}, + {STATUS_ACCESS_VIOLATION, WSAEFAULT}, + {STATUS_PAGEFILE_QUOTA, WSAENOBUFS}, + {STATUS_INVALID_HANDLE, WSAENOTSOCK}, + {STATUS_NO_SUCH_DEVICE, WSAENETDOWN}, + {STATUS_NO_SUCH_FILE, WSAENETDOWN}, + {STATUS_NO_MEMORY, WSAENOBUFS}, + {STATUS_CONFLICTING_ADDRESSES, WSAENOBUFS}, + {STATUS_ACCESS_DENIED, WSAEACCES}, + {STATUS_BUFFER_TOO_SMALL, WSAEFAULT}, + {STATUS_OBJECT_TYPE_MISMATCH, WSAENOTSOCK}, + {STATUS_OBJECT_NAME_NOT_FOUND, WSAENETDOWN}, + {STATUS_OBJECT_PATH_NOT_FOUND, WSAENETDOWN}, + {STATUS_SHARING_VIOLATION, WSAEADDRINUSE}, + {STATUS_QUOTA_EXCEEDED, WSAENOBUFS}, + {STATUS_TOO_MANY_PAGING_FILES, WSAENOBUFS}, + {STATUS_INSUFFICIENT_RESOURCES, WSAENOBUFS}, + {STATUS_WORKING_SET_QUOTA, WSAENOBUFS}, + {STATUS_DEVICE_NOT_READY, WSAEWOULDBLOCK}, + {STATUS_PIPE_DISCONNECTED, WSAESHUTDOWN}, + {STATUS_IO_TIMEOUT, WSAETIMEDOUT}, + {STATUS_NOT_SUPPORTED, WSAEOPNOTSUPP}, + {STATUS_REMOTE_NOT_LISTENING, WSAECONNREFUSED}, + {STATUS_BAD_NETWORK_PATH, WSAENETUNREACH}, + {STATUS_NETWORK_BUSY, WSAENETDOWN}, + {STATUS_INVALID_NETWORK_RESPONSE, WSAENETDOWN}, + {STATUS_UNEXPECTED_NETWORK_ERROR, WSAENETDOWN}, + {STATUS_REQUEST_NOT_ACCEPTED, WSAEWOULDBLOCK}, + {STATUS_CANCELLED, ERROR_OPERATION_ABORTED}, + {STATUS_COMMITMENT_LIMIT, WSAENOBUFS}, + {STATUS_LOCAL_DISCONNECT, WSAECONNABORTED}, + {STATUS_REMOTE_DISCONNECT, WSAECONNRESET}, + {STATUS_REMOTE_RESOURCES, WSAENOBUFS}, + {STATUS_LINK_FAILED, WSAECONNRESET}, + {STATUS_LINK_TIMEOUT, WSAETIMEDOUT}, + {STATUS_INVALID_CONNECTION, WSAENOTCONN}, + {STATUS_INVALID_ADDRESS, WSAEADDRNOTAVAIL}, + {STATUS_INVALID_BUFFER_SIZE, WSAEMSGSIZE}, + {STATUS_INVALID_ADDRESS_COMPONENT, WSAEADDRNOTAVAIL}, + {STATUS_TOO_MANY_ADDRESSES, WSAENOBUFS}, + {STATUS_ADDRESS_ALREADY_EXISTS, WSAEADDRINUSE}, + {STATUS_CONNECTION_DISCONNECTED, WSAECONNRESET}, + {STATUS_CONNECTION_RESET, WSAECONNRESET}, + {STATUS_TRANSACTION_ABORTED, WSAECONNABORTED}, + {STATUS_CONNECTION_REFUSED, WSAECONNREFUSED}, + {STATUS_GRACEFUL_DISCONNECT, WSAEDISCON}, + {STATUS_CONNECTION_ACTIVE, WSAEISCONN}, + {STATUS_NETWORK_UNREACHABLE, WSAENETUNREACH}, + {STATUS_HOST_UNREACHABLE, WSAEHOSTUNREACH}, + {STATUS_PROTOCOL_UNREACHABLE, WSAENETUNREACH}, + {STATUS_PORT_UNREACHABLE, WSAECONNRESET}, + {STATUS_REQUEST_ABORTED, WSAEINTR}, + {STATUS_CONNECTION_ABORTED, WSAECONNABORTED}, + {STATUS_DATATYPE_MISALIGNMENT_ERROR,WSAEFAULT}, + {STATUS_HOST_DOWN, WSAEHOSTDOWN}, + {0x80070000 | ERROR_IO_INCOMPLETE, ERROR_IO_INCOMPLETE}, + {0xc0010000 | ERROR_IO_INCOMPLETE, ERROR_IO_INCOMPLETE}, + {0xc0070000 | ERROR_IO_INCOMPLETE, ERROR_IO_INCOMPLETE}, + }; + + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(errors); ++i) + { + if (errors[i].status == status) + return errors[i].error; } + + return NT_SUCCESS(status) ? RtlNtStatusToDosErrorNoTeb(status) : WSAEINVAL; } /* set last error code from NT status without mapping WSA errors */ @@ -5871,7 +5924,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, IOCTL_AFD_CREATE, &create_params, sizeof(create_params), NULL, 0))) { WARN("Failed to initialize socket, status %#x.\n", status); - err = NtStatusToWSAError(status); + err = RtlNtStatusToDosError( status ); if (err == WSAEACCES) /* raw socket denied */ { if (type == SOCK_RAW)

1 0

Zebediah Figura : ws2_32: Use NtStatusToWSAError() in WSAGetOverlappedResult().
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: master Commit: 5a8dc6cd2edfdc90fe655d14d42a07f8709c43bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a8dc6cd2edfdc90fe655d14… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 6 17:54:06 2021 -0500 ws2_32: Use NtStatusToWSAError() in WSAGetOverlappedResult(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ed7218f9fb7..273a6b159f4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5737,7 +5737,7 @@ BOOL WINAPI WSAGetOverlappedResult( SOCKET s, LPWSAOVERLAPPED lpOverlapped, if ( lpdwFlags ) *lpdwFlags = lpOverlapped->u.s.Offset; - if (status) SetLastError( RtlNtStatusToDosError(status) ); + SetLastError( NtStatusToWSAError(status) ); return !status; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 627c12b8a1f..a84f05becbf 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8701,14 +8701,9 @@ static void test_WSAGetOverlappedResult(void) } else { - todo_wine_if (!NT_SUCCESS(status) - && LOWORD(status) != WSAEINVAL - && status != STATUS_CANCELLED - && status != (0x80070000 | ERROR_IO_INCOMPLETE) - && status != (0xc0070000 | ERROR_IO_INCOMPLETE)) - ok(WSAGetLastError() == expect - || (status == (0xc0070000 | ERROR_IO_INCOMPLETE) && WSAGetLastError() == WSAEINVAL), /* < win8 */ - "status %#x: expected error %u, got %u\n", status, expect, WSAGetLastError()); + ok(WSAGetLastError() == expect + || (status == (0xc0070000 | ERROR_IO_INCOMPLETE) && WSAGetLastError() == WSAEINVAL), /* < win8 */ + "status %#x: expected error %u, got %u\n", status, expect, WSAGetLastError()); } } }

1 0

Zebediah Figura : ws2_32: Return TRUE from WSAGetOverlappedResult() if the NT status denotes success.
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: master Commit: 0abc3245719e21b11299a5901e88c0a3495716ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=0abc3245719e21b11299a590… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 6 17:54:07 2021 -0500 ws2_32: Return TRUE from WSAGetOverlappedResult() if the NT status denotes success. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 273a6b159f4..3a8bfa0ce41 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5738,7 +5738,7 @@ BOOL WINAPI WSAGetOverlappedResult( SOCKET s, LPWSAOVERLAPPED lpOverlapped, *lpdwFlags = lpOverlapped->u.s.Offset; SetLastError( NtStatusToWSAError(status) ); - return !status; + return NT_SUCCESS( status ); } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index a84f05becbf..eeba272076b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8690,8 +8690,7 @@ static void test_WSAGetOverlappedResult(void) overlapped.Internal = status; WSASetLastError(0xdeadbeef); ret = WSAGetOverlappedResult(s, &overlapped, &size, FALSE, &flags); - todo_wine_if (expect_ret && status) - ok(ret == expect_ret, "status %#x: expected %d, got %d\n", status, expect_ret, ret); + ok(ret == expect_ret, "status %#x: expected %d, got %d\n", status, expect_ret, ret); if (ret) { ok(WSAGetLastError() == expect /* >= win10 1809 */

1 0

Zebediah Figura : ws2_32/tests: Always return overlapped sockets from tcp_socketpair().
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: master Commit: 025d154463fb8491735fbda2ad5e78ee71b20bfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=025d154463fb8491735fbda2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 6 17:54:08 2021 -0500 ws2_32/tests: Always return overlapped sockets from tcp_socketpair(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 57 +++++++++++------------------------------------- 1 file changed, 13 insertions(+), 44 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index eeba272076b..116f9e23224 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -160,52 +160,16 @@ static int client_id; static SOCKET setup_server_socket(struct sockaddr_in *addr, int *len); static SOCKET setup_connector_socket(struct sockaddr_in *addr, int len, BOOL nonblock); -static void tcp_socketpair(SOCKET *src, SOCKET *dst) -{ - SOCKET server = INVALID_SOCKET; - struct sockaddr_in addr; - int len; - int ret; - - *src = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - ok(*src != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); - - server = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - ok(server != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); - - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_addr.s_addr = inet_addr("127.0.0.1"); - ret = bind(server, (struct sockaddr*)&addr, sizeof(addr)); - ok(!ret, "failed to bind socket, error %u\n", WSAGetLastError()); - - len = sizeof(addr); - ret = getsockname(server, (struct sockaddr*)&addr, &len); - ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); - - ret = listen(server, 1); - ok(!ret, "failed to listen, error %u\n", WSAGetLastError()); - - ret = connect(*src, (struct sockaddr*)&addr, sizeof(addr)); - ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); - - len = sizeof(addr); - *dst = accept(server, (struct sockaddr*)&addr, &len); - ok(*dst != INVALID_SOCKET, "failed to accept, error %u\n", WSAGetLastError()); - - closesocket(server); -} - -static void tcp_socketpair_ovl(SOCKET *src, SOCKET *dst) +static void tcp_socketpair_flags(SOCKET *src, SOCKET *dst, DWORD flags) { SOCKET server = INVALID_SOCKET; struct sockaddr_in addr; int len, ret; - *src = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + *src = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, flags); ok(*src != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); - server = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + server = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, flags); ok(server != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); memset(&addr, 0, sizeof(addr)); @@ -231,6 +195,11 @@ static void tcp_socketpair_ovl(SOCKET *src, SOCKET *dst) closesocket(server); } +static void tcp_socketpair(SOCKET *src, SOCKET *dst) +{ + tcp_socketpair_flags(src, dst, WSA_FLAG_OVERLAPPED); +} + static void set_so_opentype ( BOOL overlapped ) { int optval = !overlapped, newval, len = sizeof (int); @@ -8377,29 +8346,29 @@ static void test_iocp(void) SOCKET src, dst; int i; - tcp_socketpair_ovl(&src, &dst); + tcp_socketpair(&src, &dst); sync_read(src, dst); iocp_async_read(src, dst); closesocket(src); closesocket(dst); - tcp_socketpair_ovl(&src, &dst); + tcp_socketpair(&src, &dst); iocp_async_read_thread(src, dst); closesocket(src); closesocket(dst); for (i = 0; i <= 2; i++) { - tcp_socketpair_ovl(&src, &dst); + tcp_socketpair(&src, &dst); iocp_async_read_closesocket(src, i); closesocket(dst); } - tcp_socketpair_ovl(&src, &dst); + tcp_socketpair(&src, &dst); iocp_async_closesocket(src); closesocket(dst); - tcp_socketpair_ovl(&src, &dst); + tcp_socketpair(&src, &dst); iocp_async_read_thread_closesocket(src); closesocket(dst); }

1 0