wine-commits May 2021

wine-commits@winehq.org

2 participants
770 discussions

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: 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

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

Francois Gouget : urlmon/tests: Check that .Net is present in the user-agent string.
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: master Commit: 516a6f731797cf74aa15b623faffe943780d07d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=516a6f731797cf74aa15b623… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 7 15:20:01 2021 +0200 urlmon/tests: Check that .Net is present in the user-agent string. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/misc.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 2b3df65d5fc..2142e4a79e7 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1529,6 +1529,8 @@ static void test_user_agent(void) if(i < 8 && i != 1) ok(!strcmp(ua, str2), "unexpected UA for version %u %s, expected %s\n", i, wine_dbgstr_a(ua), wine_dbgstr_a(str2)); + if (winetest_debug > 1) + trace("version=%u user-agent=%s\n", i, wine_dbgstr_a(ua)); p += check_prefix(p, "Mozilla/"); p += check_prefix(p, i < 9 ? "4.0 (" : "5.0 ("); @@ -1544,6 +1546,7 @@ static void test_user_agent(void) }else if(sizeof(void*) == 8) { p += check_prefix(p, "Win64; "); #ifdef __x86_64__ + todo_wine p += check_prefix(p, "x64; "); #endif } @@ -1559,12 +1562,17 @@ static void test_user_agent(void) } if(i == 11) { p += check_prefix(p, "; rv:11.0) like Gecko"); + }else if (i >= 9) { + p += check_prefix(p, ")"); }else { - if(i != 1) - ok(*p == ';' || *p == ')', "unexpected suffix %s for version %u\n", - wine_dbgstr_a(p), i); - if(i < 9) - p = strchr(p, ')'); +#ifdef __x86_64__ + todo_wine +#endif + /* This assumes that either p points at some property before + * '; .NET', or that there is more than one such occurence. + */ + ok(strstr(p, "; .NET") != NULL, "no '; .NET' in %s\n", wine_dbgstr_a(p)); + p = strchr(p, ')'); p += check_prefix(p, ")"); }

1 0

Giovanni Mascellani : mfreadwrite: Accept new media type only when format data are equal.
by Alexandre Julliard 07 May '21

07 May '21

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 07 May '21

07 May '21

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

Nikolay Sivov : mf/evr: Implement Flush() for streams.
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: master Commit: 7d51f493b84f350d7d1c5d5cf2c5725e4296baab URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d51f493b84f350d7d1c5d5c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 7 12:27:20 2021 +0300 mf/evr: Implement Flush() for streams. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 64489ac4c58..6a4332965b6 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -462,9 +462,19 @@ static HRESULT WINAPI video_stream_sink_PlaceMarker(IMFStreamSink *iface, MFSTRE static HRESULT WINAPI video_stream_sink_Flush(IMFStreamSink *iface) { - FIXME("%p.\n", iface); + struct video_stream *stream = impl_from_IMFStreamSink(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p.\n", iface); + + EnterCriticalSection(&stream->cs); + if (!stream->parent) + hr = MF_E_STREAMSINK_REMOVED; + else if (SUCCEEDED(hr = IMFTransform_ProcessMessage(stream->parent->mixer, MFT_MESSAGE_COMMAND_FLUSH, 0))) + hr = IMFVideoPresenter_ProcessMessage(stream->parent->presenter, MFVP_MESSAGE_FLUSH, 0); + LeaveCriticalSection(&stream->cs); + + return hr; } static const IMFStreamSinkVtbl video_stream_sink_vtbl =

1 0

Nikolay Sivov : mfplat: Added MFCreateAudioMediaType().
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: master Commit: 85d4cabc84d93bae3e914a5869a81154fcc97de4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85d4cabc84d93bae3e914a58… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 7 15:21:22 2021 +0300 mfplat: Added MFCreateAudioMediaType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 27 +++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index fb90053c605..92d219f26e1 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -3063,6 +3063,33 @@ HRESULT WINAPI MFCreateVideoMediaTypeFromSubtype(const GUID *subtype, IMFVideoMe return S_OK; } +/*********************************************************************** + * MFCreateAudioMediaType (mfplat.@) + */ +HRESULT WINAPI MFCreateAudioMediaType(const WAVEFORMATEX *format, IMFAudioMediaType **media_type) +{ + struct media_type *object; + HRESULT hr; + + TRACE("%p, %p.\n", format, media_type); + + if (!media_type) + return E_INVALIDARG; + + if (FAILED(hr = create_media_type(&object))) + return hr; + + if (FAILED(hr = MFInitMediaTypeFromWaveFormatEx(&object->IMFMediaType_iface, format, sizeof(*format) + format->cbSize))) + { + IMFMediaType_Release(&object->IMFMediaType_iface); + return hr; + } + + *media_type = &object->IMFAudioMediaType_iface; + + return S_OK; +} + static void media_type_get_ratio(IMFMediaType *media_type, const GUID *attr, UINT32 *numerator, UINT32 *denominator) { diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index e8dc01c200c..9a78c2fb0bc 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -43,7 +43,7 @@ @ stdcall MFCreateAlignedMemoryBuffer(long long ptr) @ stdcall MFCreateAsyncResult(ptr ptr ptr ptr) rtworkq.RtwqCreateAsyncResult @ stdcall MFCreateAttributes(ptr long) -@ stub MFCreateAudioMediaType +@ stdcall MFCreateAudioMediaType(ptr ptr) @ stdcall MFCreateCollection(ptr) @ stdcall MFCreateDXGIDeviceManager(ptr ptr) @ stdcall MFCreateDXGISurfaceBuffer(ptr ptr long long ptr) diff --git a/include/mfapi.h b/include/mfapi.h index 986f5b9e3e4..2ac70793d7a 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -508,6 +508,7 @@ HRESULT WINAPI MFCreate2DMediaBuffer(DWORD width, DWORD height, DWORD fourcc, BO HRESULT WINAPI MFCreateAlignedMemoryBuffer(DWORD max_length, DWORD alignment, IMFMediaBuffer **buffer); HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size); HRESULT WINAPI MFCreateAsyncResult(IUnknown *object, IMFAsyncCallback *callback, IUnknown *state, IMFAsyncResult **result); +HRESULT WINAPI MFCreateAudioMediaType(const WAVEFORMATEX *audioformat, IMFAudioMediaType **mediatype); HRESULT WINAPI MFCreateCollection(IMFCollection **collection); HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **manager); HRESULT WINAPI MFCreateDXGISurfaceBuffer(REFIID riid, IUnknown *surface, UINT subresource, BOOL bottomup,

1 0

Paul Gofman : vulkan-1/tests: Consider vkGetPhysicalDevicePresentRectanglesKHR absence in test_null_hwnd().
by Alexandre Julliard 07 May '21

07 May '21

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

Rémi Bernon : ntdll/tests: Check that creating huge thread stacks works.
by Alexandre Julliard 07 May '21

07 May '21

Module: wine Branch: master Commit: b44fb883b03b8b8638eb91babbbde71399a45215 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b44fb883b03b8b8638eb91ba… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 7 12:08:04 2021 +0200 ntdll/tests: Check that creating huge thread stacks works. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/virtual.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 6980f10c85b..7d457e2d5b8 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -488,6 +488,11 @@ static DWORD WINAPI test_stack_size_thread(void *ptr) ExitThread(0); } +static DWORD WINAPI test_stack_size_dummy_thread(void *ptr) +{ + return 0; +} + static void test_RtlCreateUserStack(void) { IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); @@ -565,6 +570,14 @@ static void test_RtlCreateUserStack(void) WaitForSingleObject(thread, INFINITE); CloseHandle(thread); + if (is_win64) + { + thread = CreateThread(NULL, 0x80000000, test_stack_size_dummy_thread, NULL, STACK_SIZE_PARAM_IS_A_RESERVATION, NULL); + ok(thread != NULL, "CreateThread with huge stack failed\n"); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + } + args.expect_committed = default_commit < 0x2000 ? 0x2000 : default_commit; args.expect_reserved = 0x100000; for (i = 0; i < 32; i++)

1 0

← Newer
1
...
58
59
60
61
62
63
64
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2021