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

Hans Leidekker : secur32: Use wide character string literals.
by Alexandre Julliard May 7, 2021

May 7, 2021

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

Hans Leidekker : secur32: Build with msvcrt.
by Alexandre Julliard May 7, 2021

May 7, 2021

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: Move Schannel support to a Unix library.
by Alexandre Julliard May 7, 2021

May 7, 2021

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: Use a pthread mutex in the macOS backend.
by Alexandre Julliard May 7, 2021

May 7, 2021

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: Use a reserved flag for the cached credentials hack.
by Alexandre Julliard May 7, 2021

May 7, 2021

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

Giovanni Mascellani : mfreadwrite: Accept new media type only when format data are equal.
by Alexandre Julliard May 7, 2021

May 7, 2021

Module: wine Branch: master Commit: ac39b313b618ab8d1613302c3604ba505afff0df URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac39b313b618ab8d1613302c… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri May 7 14:23:12 2021 +0200 mfreadwrite: Accept new media type only when format data are equal. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 4 ++-- dlls/mfreadwrite/tests/mfplat.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 62e4f2d9bdb..d26778dad36 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -1578,7 +1578,7 @@ static HRESULT source_reader_set_compatible_media_type(struct source_reader *rea return MF_E_INVALIDMEDIATYPE; /* No need for a decoder or type change. */ - if (flags & MF_MEDIATYPE_EQUAL_FORMAT_TYPES) + if (flags & MF_MEDIATYPE_EQUAL_FORMAT_DATA) return S_OK; if (FAILED(hr = source_reader_get_source_type_handler(reader, index, &type_handler))) @@ -1586,7 +1586,7 @@ static HRESULT source_reader_set_compatible_media_type(struct source_reader *rea while (!type_set && IMFMediaTypeHandler_GetMediaTypeByIndex(type_handler, i++, &native_type) == S_OK) { - static const DWORD compare_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES; + static const DWORD compare_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_DATA; if (SUCCEEDED(IMFMediaType_IsEqual(native_type, type, &flags)) && (flags & compare_flags) == compare_flags) { diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 8381e535d26..ded45afe771 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -1062,7 +1062,6 @@ static void test_source_reader_from_media_source(void) ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type); -todo_wine ok(hr == MF_E_TOPO_CODEC_NOT_FOUND, "Unexpected success setting current media type, hr %#x.\n", hr); IMFMediaType_Release(media_type);

1 0

Giovanni Mascellani : mfreadwrite/tests: Test setting a non-native bit depth on the reader.
by Alexandre Julliard May 7, 2021

May 7, 2021

Module: wine Branch: master Commit: aef6a2343c73ca7e3c5016f8442b57e5adb9e5cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=aef6a2343c73ca7e3c5016f8… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri May 7 14:23:11 2021 +0200 mfreadwrite/tests: Test setting a non-native bit depth on the reader. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/tests/mfplat.c | 52 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 8ea4e5038f6..8381e535d26 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -362,6 +362,8 @@ static HRESULT WINAPI test_source_CreatePresentationDescriptor(IMFMediaSource *i ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_BITS_PER_SAMPLE, 32); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); hr = MFCreateStreamDescriptor(i, 1, &media_type, &sds[i]); ok(hr == S_OK, "Failed to create stream descriptor, hr %#x.\n", hr); @@ -897,6 +899,7 @@ static void test_source_reader_from_media_source(void) struct async_callback *callback; IMFSourceReader *reader; IMFMediaSource *source; + IMFMediaType *media_type; HRESULT hr; DWORD actual_index, stream_flags; IMFSample *sample; @@ -1042,6 +1045,55 @@ static void test_source_reader_from_media_source(void) IMFSourceReader_Release(reader); IMFMediaSource_Release(source); + /* Request a non-native bit depth. */ + source = create_test_source(1); + ok(!!source, "Failed to create test source.\n"); + + hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader); + ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_BITS_PER_SAMPLE, 16); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type); +todo_wine + ok(hr == MF_E_TOPO_CODEC_NOT_FOUND, "Unexpected success setting current media type, hr %#x.\n", hr); + + IMFMediaType_Release(media_type); + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_BITS_PER_SAMPLE, 32); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type); + ok(hr == S_OK, "Failed to set current media type, hr %#x.\n", hr); + + hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); + ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + + hr = IMFSourceReader_ReadSample(reader, 0, 0, &actual_index, &stream_flags, &timestamp, &sample); + ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); + ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); + ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); + ok(timestamp == 123, "Unexpected timestamp.\n"); + ok(!!sample, "Expected sample object.\n"); + IMFSample_Release(sample); + + IMFMediaType_Release(media_type); + IMFSourceReader_Release(reader); + IMFMediaSource_Release(source); + /* Async mode. */ source = create_test_source(3); ok(!!source, "Failed to create test source.\n");

1 0

Paul Gofman : vulkan-1/tests: Consider vkGetPhysicalDevicePresentRectanglesKHR absence in test_null_hwnd().
by Alexandre Julliard May 7, 2021

May 7, 2021

Module: wine Branch: master Commit: 4ac1c48e9d900ed16e0e6d6bd4b684d9243b3890 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ac1c48e9d900ed16e0e6d6b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 7 14:31:01 2021 +0300 vulkan-1/tests: Consider vkGetPhysicalDevicePresentRectanglesKHR absence in test_null_hwnd(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/tests/vulkan.c | 45 +++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index e516d0d61c8..1d23c4112cf 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -441,11 +441,13 @@ static const char *test_null_hwnd_extensions[] = { "VK_KHR_surface", "VK_KHR_win32_surface", + "VK_KHR_device_group_creation", }; static void test_null_hwnd(VkInstance vk_instance, VkPhysicalDevice vk_physical_device) { PFN_vkGetPhysicalDeviceSurfacePresentModesKHR pvkGetPhysicalDeviceSurfacePresentModesKHR; + PFN_vkGetPhysicalDevicePresentRectanglesKHR pvkGetPhysicalDevicePresentRectanglesKHR; VkDeviceGroupPresentModeFlagsKHR present_mode_flags; VkWin32SurfaceCreateInfoKHR surface_create_info; VkSurfaceCapabilitiesKHR surf_caps; @@ -461,6 +463,9 @@ static void test_null_hwnd(VkInstance vk_instance, VkPhysicalDevice vk_physical_ pvkGetPhysicalDeviceSurfacePresentModesKHR = (void *)vkGetInstanceProcAddr(vk_instance, "vkGetPhysicalDeviceSurfacePresentModesKHR"); + pvkGetPhysicalDevicePresentRectanglesKHR = (void *)vkGetInstanceProcAddr(vk_instance, + "vkGetPhysicalDevicePresentRectanglesKHR"); + surface_create_info.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR; surface_create_info.pNext = NULL; surface_create_info.flags = 0; @@ -499,25 +504,35 @@ static void test_null_hwnd(VkInstance vk_instance, VkPhysicalDevice vk_physical_ ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); heap_free(modes); - count = 0; - vr = vkGetPhysicalDevicePresentRectanglesKHR(vk_physical_device, surface, &count, NULL); - ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); - ok(count == 1, "Got unexpected count %u.\n", count); - memset(&rect, 0xcc, sizeof(rect)); - vr = vkGetPhysicalDevicePresentRectanglesKHR(vk_physical_device, surface, &count, &rect); - if (vr == VK_SUCCESS) /* Fails on AMD, succeeds on Nvidia. */ + if (pvkGetPhysicalDevicePresentRectanglesKHR) { + count = 0; + vr = pvkGetPhysicalDevicePresentRectanglesKHR(vk_physical_device, surface, &count, NULL); + ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); ok(count == 1, "Got unexpected count %u.\n", count); - ok(!rect.offset.x && !rect.offset.y && !rect.extent.width && !rect.extent.height, - "Got unexpected rect %d, %d, %u, %u.\n", - rect.offset.x, rect.offset.y, rect.extent.width, rect.extent.height); - } + memset(&rect, 0xcc, sizeof(rect)); + vr = pvkGetPhysicalDevicePresentRectanglesKHR(vk_physical_device, surface, &count, &rect); + if (vr == VK_SUCCESS) /* Fails on AMD, succeeds on Nvidia. */ + { + ok(count == 1, "Got unexpected count %u.\n", count); + ok(!rect.offset.x && !rect.offset.y && !rect.extent.width && !rect.extent.height, + "Got unexpected rect %d, %d, %u, %u.\n", + rect.offset.x, rect.offset.y, rect.extent.width, rect.extent.height); + } - if ((vr = create_device(vk_physical_device, 0, NULL, NULL, &vk_device)) < 0) + if ((vr = create_device(vk_physical_device, 0, NULL, NULL, &vk_device)) < 0) + { + skip("Failed to create device, vr %d.\n", vr); + vkDestroySurfaceKHR(vk_instance, surface, NULL); + return; + } + } + else { - skip("Failed to create device, vr %d.\n", vr); - vkDestroySurfaceKHR(vk_instance, surface, NULL); - return; + /* The function should be available in practice with VK_KHR_device_group_creation, but spec lists + * it as a part of VK_KHR_device_group device extension which we don't check, so consider the + * absence of the function. */ + win_skip("pvkGetPhysicalDevicePresentRectanglesKHR is no available.\n"); } if (0)

1 0

Alexandre Julliard : ntdll: Only compute the zero_bits mask when needed.
by Alexandre Julliard May 7, 2021

May 7, 2021

Module: wine Branch: master Commit: 6f9562db2028cf1567585230f1cc6bc61d3962e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f9562db2028cf1567585230… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 7 16:28:19 2021 +0200 ntdll: Only compute the zero_bits mask when needed. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 68 ++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 39 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index d33d1fa40cf..176f47190f6 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -1074,35 +1074,28 @@ static struct file_view *find_view( const void *addr, size_t size ) /*********************************************************************** - * zero_bits_win_to_64 - * - * Convert from Windows hybrid 32bit-based / bitmask to 64bit-based format + * get_zero_bits_mask */ -static inline unsigned short zero_bits_win_to_64( ULONG_PTR zero_bits ) +static inline UINT_PTR get_zero_bits_mask( ULONG_PTR zero_bits ) { - unsigned short zero_bits_64; + unsigned int shift; + + if (zero_bits == 0) return ~(UINT_PTR)0; - if (zero_bits == 0) return 0; - if (zero_bits < 32) return 32 + zero_bits; - zero_bits_64 = 63; + if (zero_bits < 32) shift = 32 + zero_bits; + else + { + shift = 63; #ifdef _WIN64 - if (zero_bits >> 32) { zero_bits_64 -= 32; zero_bits >>= 32; } + if (zero_bits >> 32) { shift -= 32; zero_bits >>= 32; } #endif - if (zero_bits >> 16) { zero_bits_64 -= 16; zero_bits >>= 16; } - if (zero_bits >> 8) { zero_bits_64 -= 8; zero_bits >>= 8; } - if (zero_bits >> 4) { zero_bits_64 -= 4; zero_bits >>= 4; } - if (zero_bits >> 2) { zero_bits_64 -= 2; zero_bits >>= 2; } - if (zero_bits >> 1) { zero_bits_64 -= 1; } - return zero_bits_64; -} - - -/*********************************************************************** - * get_zero_bits_64_mask - */ -static inline UINT_PTR get_zero_bits_64_mask( USHORT zero_bits_64 ) -{ - return (UINT_PTR)((~(UINT64)0) >> zero_bits_64); + if (zero_bits >> 16) { shift -= 16; zero_bits >>= 16; } + if (zero_bits >> 8) { shift -= 8; zero_bits >>= 8; } + if (zero_bits >> 4) { shift -= 4; zero_bits >>= 4; } + if (zero_bits >> 2) { shift -= 2; zero_bits >>= 2; } + if (zero_bits >> 1) { shift -= 1; } + } + return (UINT_PTR)((~(UINT64)0) >> shift); } @@ -1849,7 +1842,7 @@ static NTSTATUS map_fixed_area( void *base, size_t size, unsigned int vprot ) * virtual_mutex must be held by caller. */ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, - int top_down, unsigned int vprot, unsigned short zero_bits_64 ) + int top_down, unsigned int vprot, ULONG_PTR zero_bits ) { void *ptr; NTSTATUS status; @@ -1869,7 +1862,7 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, alloc.size = size; alloc.top_down = top_down; - alloc.limit = (void*)(get_zero_bits_64_mask( zero_bits_64 ) & (UINT_PTR)user_space_limit); + alloc.limit = (void*)(get_zero_bits_mask( zero_bits ) & (UINT_PTR)user_space_limit); if (mmap_enum_reserved_areas( alloc_reserved_area_callback, &alloc, top_down )) { @@ -1880,7 +1873,7 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, goto done; } - if (zero_bits_64) + if (zero_bits) { if (!(ptr = map_free_area( address_space_start, alloc.limit, size, top_down, get_unix_prot(vprot) ))) @@ -2376,7 +2369,7 @@ static NTSTATUS get_mapping_info( HANDLE handle, ACCESS_MASK access, unsigned in * Map a PE image section into memory. */ static NTSTATUS virtual_map_image( HANDLE mapping, ACCESS_MASK access, void **addr_ptr, SIZE_T *size_ptr, - unsigned short zero_bits_64, HANDLE shared_file, ULONG alloc_type, + ULONG_PTR zero_bits, HANDLE shared_file, ULONG alloc_type, pe_image_info_t *image_info, WCHAR *filename, BOOL is_builtin ) { unsigned int vprot = SEC_IMAGE | SEC_FILE | VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY; @@ -2405,9 +2398,9 @@ static NTSTATUS virtual_map_image( HANDLE mapping, ACCESS_MASK access, void **ad if ((ULONG_PTR)base != image_info->base) base = NULL; if ((char *)base >= (char *)address_space_start) /* make sure the DOS area remains free */ - status = map_view( &view, base, size, alloc_type & MEM_TOP_DOWN, vprot, zero_bits_64 ); + status = map_view( &view, base, size, alloc_type & MEM_TOP_DOWN, vprot, zero_bits ); - if (status) status = map_view( &view, NULL, size, alloc_type & MEM_TOP_DOWN, vprot, zero_bits_64 ); + if (status) status = map_view( &view, NULL, size, alloc_type & MEM_TOP_DOWN, vprot, zero_bits ); if (status) goto done; status = map_image_into_view( view, filename, unix_fd, base, image_info->header_size, @@ -2446,7 +2439,7 @@ done: * * Map a file section into memory. */ -static NTSTATUS virtual_map_section( HANDLE handle, PVOID *addr_ptr, unsigned short zero_bits_64, +static NTSTATUS virtual_map_section( HANDLE handle, PVOID *addr_ptr, ULONG_PTR zero_bits, SIZE_T commit_size, const LARGE_INTEGER *offset_ptr, SIZE_T *size_ptr, ULONG alloc_type, ULONG protect ) { @@ -2495,7 +2488,7 @@ static NTSTATUS virtual_map_section( HANDLE handle, PVOID *addr_ptr, unsigned sh /* check if we can replace that mapping with the builtin */ res = load_builtin( image_info, filename, addr_ptr, size_ptr ); if (res == STATUS_IMAGE_ALREADY_LOADED) - res = virtual_map_image( handle, access, addr_ptr, size_ptr, zero_bits_64, shared_file, + res = virtual_map_image( handle, access, addr_ptr, size_ptr, zero_bits, shared_file, alloc_type, image_info, filename, FALSE ); if (shared_file) NtClose( shared_file ); free( image_info ); @@ -2530,7 +2523,7 @@ static NTSTATUS virtual_map_section( HANDLE handle, PVOID *addr_ptr, unsigned sh server_enter_uninterrupted_section( &virtual_mutex, &sigset ); - res = map_view( &view, base, size, alloc_type & MEM_TOP_DOWN, vprot, zero_bits_64 ); + res = map_view( &view, base, size, alloc_type & MEM_TOP_DOWN, vprot, zero_bits ); if (res) goto done; TRACE( "handle=%p size=%lx offset=%x%08x\n", handle, size, offset.u.HighPart, offset.u.LowPart ); @@ -3047,7 +3040,6 @@ NTSTATUS virtual_clear_tls_index( ULONG index ) NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, ULONG_PTR zero_bits, SIZE_T reserve_size, SIZE_T commit_size, SIZE_T *pthread_size ) { - unsigned short zero_bits_64 = zero_bits_win_to_64( zero_bits ); struct file_view *view; NTSTATUS status; sigset_t sigset; @@ -3064,7 +3056,7 @@ NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, ULONG_PTR zero_bits, SI server_enter_uninterrupted_section( &virtual_mutex, &sigset ); if ((status = map_view( &view, NULL, size + extra_size, FALSE, - VPROT_READ | VPROT_WRITE | VPROT_COMMITTED, zero_bits_64 )) != STATUS_SUCCESS) + VPROT_READ | VPROT_WRITE | VPROT_COMMITTED, zero_bits )) != STATUS_SUCCESS) goto done; #ifdef VALGRIND_STACK_REGISTER @@ -3653,7 +3645,6 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG_PTR z sigset_t sigset; SIZE_T size = *size_ptr; NTSTATUS status = STATUS_SUCCESS; - unsigned short zero_bits_64 = zero_bits_win_to_64( zero_bits ); TRACE("%p %p %08lx %x %08x\n", process, *ret, size, type, protect ); @@ -3736,7 +3727,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG_PTR z if (vprot & VPROT_WRITECOPY) status = STATUS_INVALID_PAGE_PROTECTION; else if (is_dos_memory) status = allocate_dos_memory( &view, vprot ); - else status = map_view( &view, base, size, type & MEM_TOP_DOWN, vprot, zero_bits_64 ); + else status = map_view( &view, base, size, type & MEM_TOP_DOWN, vprot, zero_bits ); if (status == STATUS_SUCCESS) base = view->base; } @@ -4320,7 +4311,6 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p NTSTATUS res; SIZE_T mask = granularity_mask; LARGE_INTEGER offset; - unsigned short zero_bits_64 = zero_bits_win_to_64( zero_bits ); offset.QuadPart = offset_ptr ? offset_ptr->QuadPart : 0; @@ -4378,7 +4368,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p return result.map_view.status; } - return virtual_map_section( handle, addr_ptr, zero_bits_64, commit_size, + return virtual_map_section( handle, addr_ptr, zero_bits, commit_size, offset_ptr, size_ptr, alloc_type, protect ); }

1 0

Alexandre Julliard : ntdll: RtlCreateUserThread() also takes a zero_bits parameter.
by Alexandre Julliard May 7, 2021

May 7, 2021

Module: wine Branch: master Commit: 40165dfa5843a4b5ce5d93da8f6a1b771f810cdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=40165dfa5843a4b5ce5d93da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 7 16:03:27 2021 +0200 ntdll: RtlCreateUserThread() also takes a zero_bits parameter. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/thread.c | 2 +- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/tests/virtual.c | 61 ++++++++++++++++++++++++++++++++++++++++++---- dlls/ntdll/thread.c | 4 +-- dlls/ntdll/threadpool.c | 10 ++++---- include/winternl.h | 2 +- 6 files changed, 66 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=40165dfa5843a4b5ce5d…

1 0