- Wine-Commits - list.winehq.org

Shaun Ren : sapi: Introduce create_token_category helper in tts.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: 0f8b59a245bc85e45c0fc8987d6f42794165c4d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/0f8b59a245bc85e45c0fc8987d6f42… Author: Shaun Ren <shaun.ren(a)linux.com> Date: Thu Feb 15 17:13:55 2024 -0500 sapi: Introduce create_token_category helper in tts. --- dlls/sapi/tts.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index e719a544a01..381558659b8 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -82,6 +82,15 @@ static inline struct tts_engine_site *impl_from_ISpTTSEngineSite(ISpTTSEngineSit return CONTAINING_RECORD(iface, struct tts_engine_site, ISpTTSEngineSite_iface); } +static HRESULT create_token_category(const WCHAR *cat_id, ISpObjectTokenCategory **cat) +{ + HRESULT hr; + if (FAILED(hr = CoCreateInstance(&CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpObjectTokenCategory, (void **)cat))) + return hr; + return ISpObjectTokenCategory_SetId(*cat, cat_id, FALSE); +} + static HRESULT create_default_token(const WCHAR *cat_id, ISpObjectToken **token) { ISpObjectTokenCategory *cat; @@ -90,17 +99,13 @@ static HRESULT create_default_token(const WCHAR *cat_id, ISpObjectToken **token) TRACE("(%s, %p).\n", debugstr_w(cat_id), token); - if (FAILED(hr = CoCreateInstance(&CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER, - &IID_ISpObjectTokenCategory, (void **)&cat))) + if (FAILED(hr = create_token_category(cat_id, &cat))) return hr; - if (FAILED(hr = ISpObjectTokenCategory_SetId(cat, cat_id, FALSE)) || - FAILED(hr = ISpObjectTokenCategory_GetDefaultTokenId(cat, &default_token_id))) - { - ISpObjectTokenCategory_Release(cat); - return hr; - } + hr = ISpObjectTokenCategory_GetDefaultTokenId(cat, &default_token_id); ISpObjectTokenCategory_Release(cat); + if (FAILED(hr)) + return hr; if (FAILED(hr = CoCreateInstance(&CLSID_SpObjectToken, NULL, CLSCTX_INPROC_SERVER, &IID_ISpObjectToken, (void **)token)))

1 0

Paul Gofman : crypt32: Force debug info in critical sections.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: 164520f59316a9f23d6a47625f4e7c4286b0ec15 URL: https://gitlab.winehq.org/wine/wine/-/commit/164520f59316a9f23d6a47625f4e7c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Feb 16 18:42:32 2024 -0600 crypt32: Force debug info in critical sections. --- dlls/crypt32/collectionstore.c | 2 +- dlls/crypt32/oid.c | 2 +- dlls/crypt32/proplist.c | 2 +- dlls/crypt32/regstore.c | 2 +- dlls/crypt32/store.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index e8d6db78641..0193be86222 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -478,7 +478,7 @@ WINECRYPT_CERTSTORE *CRYPT_CollectionOpenStore(HCRYPTPROV hCryptProv, { memset(store, 0, sizeof(WINE_COLLECTIONSTORE)); CRYPT_InitStore(&store->hdr, dwFlags, StoreTypeCollection, &CollectionStoreVtbl); - InitializeCriticalSection(&store->cs); + InitializeCriticalSectionEx(&store->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); store->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PWINE_COLLECTIONSTORE->cs"); list_init(&store->stores); } diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 4739da7255e..e00c683e181 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -125,7 +125,7 @@ HCRYPTOIDFUNCSET WINAPI CryptInitOIDFunctionSet(LPCSTR pszFuncName, ret->name = CryptMemAlloc(strlen(pszFuncName) + 1); if (ret->name) { - InitializeCriticalSection(&ret->cs); + InitializeCriticalSectionEx(&ret->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": OIDFunctionSet.cs"); list_init(&ret->functions); strcpy(ret->name, pszFuncName); diff --git a/dlls/crypt32/proplist.c b/dlls/crypt32/proplist.c index 9d3317307f8..acc2a43d8bc 100644 --- a/dlls/crypt32/proplist.c +++ b/dlls/crypt32/proplist.c @@ -46,7 +46,7 @@ CONTEXT_PROPERTY_LIST *ContextPropertyList_Create(void) if (list) { - InitializeCriticalSection(&list->cs); + InitializeCriticalSectionEx(&list->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); list->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PCONTEXT_PROPERTY_LIST->cs"); list_init(&list->properties); } diff --git a/dlls/crypt32/regstore.c b/dlls/crypt32/regstore.c index 4f8914798f6..8567604c39b 100644 --- a/dlls/crypt32/regstore.c +++ b/dlls/crypt32/regstore.c @@ -545,7 +545,7 @@ WINECRYPT_CERTSTORE *CRYPT_RegOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags, regInfo->dwOpenFlags = dwFlags; regInfo->memStore = memStore; regInfo->key = key; - InitializeCriticalSection(&regInfo->cs); + InitializeCriticalSectionEx(&regInfo->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); regInfo->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PWINE_REGSTOREINFO->cs"); list_init(&regInfo->certsToDelete); list_init(&regInfo->crlsToDelete); diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index fef3a1fc4f9..de2d760d2b0 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -388,7 +388,7 @@ static WINECRYPT_CERTSTORE *CRYPT_MemOpenStore(HCRYPTPROV hCryptProv, { memset(store, 0, sizeof(WINE_MEMSTORE)); CRYPT_InitStore(&store->hdr, dwFlags, StoreTypeMem, &MemStoreVtbl); - InitializeCriticalSection(&store->cs); + InitializeCriticalSectionEx(&store->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); store->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ContextList.cs"); list_init(&store->certs); list_init(&store->crls);

1 0

Shaun Ren : sapi: Implement ISpeechVoice::Speak.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: 5243f2e82cace7234a66e2036146a32f7aa62d80 URL: https://gitlab.winehq.org/wine/wine/-/commit/5243f2e82cace7234a66e2036146a3… Author: Shaun Ren <shaun.ren(a)linux.com> Date: Fri Feb 16 14:28:42 2024 -0500 sapi: Implement ISpeechVoice::Speak. --- dlls/sapi/tests/tts.c | 9 +++++++++ dlls/sapi/tts.c | 6 ++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index 38ec1d31bfc..87711eac61a 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -431,6 +431,7 @@ static void test_spvoice(void) ULONG stream_num; DWORD regid; DWORD start, duration; + ISpeechVoice *speech_voice; HRESULT hr; if (waveOutGetNumDevs() == 0) { @@ -681,6 +682,14 @@ static void test_spvoice(void) ok(hr == S_OK, "got %#lx.\n", hr); ok(duration < 300, "took %lu ms.\n", duration); + hr = ISpVoice_QueryInterface(voice, &IID_ISpeechVoice, (void **)&speech_voice); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = ISpeechVoice_Speak(speech_voice, NULL, SVSFPurgeBeforeSpeak, NULL); + ok(hr == S_OK, "got %#lx.\n", hr); + + ISpeechVoice_Release(speech_voice); + done: reset_engine_params(&test_engine); ISpVoice_Release(voice); diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index c2e36fc274d..e719a544a01 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -357,9 +357,11 @@ static HRESULT WINAPI speech_voice_get_SynchronousSpeakTimeout(ISpeechVoice *ifa static HRESULT WINAPI speech_voice_Speak(ISpeechVoice *iface, BSTR text, SpeechVoiceSpeakFlags flags, LONG *number) { - FIXME("(%p, %s, %#x, %p): stub.\n", iface, debugstr_w(text), flags, number); + struct speech_voice *This = impl_from_ISpeechVoice(iface); - return E_NOTIMPL; + TRACE("(%p, %s, %#x, %p).\n", iface, debugstr_w(text), flags, number); + + return ISpVoice_Speak(&This->ISpVoice_iface, text, flags, (ULONG *)number); } static HRESULT WINAPI speech_voice_SpeakStream(ISpeechVoice *iface, ISpeechBaseStream *stream,

1 0

Shaun Ren : sapi: Free typelib on DLL detach.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: afac7d7e3ffc67c3575512634fd757f81ce839b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/afac7d7e3ffc67c3575512634fd757… Author: Shaun Ren <shaun.ren(a)linux.com> Date: Wed Feb 14 20:07:41 2024 -0500 sapi: Free typelib on DLL detach. --- dlls/sapi/main.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/sapi/main.c b/dlls/sapi/main.c index 108db7d13d8..8adcc7449fb 100644 --- a/dlls/sapi/main.c +++ b/dlls/sapi/main.c @@ -145,3 +145,21 @@ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj ) return IClassFactory_QueryInterface( cf, iid, obj ); } + +/****************************************************************** + * DllMain + */ +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, void *reserved ) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + case DLL_PROCESS_DETACH: + if (reserved) break; + release_typelib(); + break; + } + return TRUE; +}

1 0

Paul Gofman : combase: Force debug info in critical sections.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: 9149c7e99989db830178ca14e67a84b6f1a3953d URL: https://gitlab.winehq.org/wine/wine/-/commit/9149c7e99989db830178ca14e67a84… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Feb 16 18:40:22 2024 -0600 combase: Force debug info in critical sections. --- dlls/combase/apartment.c | 2 +- dlls/combase/marshal.c | 2 +- dlls/combase/stubmanager.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/combase/apartment.c b/dlls/combase/apartment.c index 92f1e32c502..85e06a6fd57 100644 --- a/dlls/combase/apartment.c +++ b/dlls/combase/apartment.c @@ -376,7 +376,7 @@ static struct apartment *apartment_construct(DWORD model) apt->refs = 1; apt->remunk_exported = FALSE; apt->oidc = 1; - InitializeCriticalSection(&apt->cs); + InitializeCriticalSectionEx(&apt->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); apt->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": apartment"); apt->multi_threaded = !(model & COINIT_APARTMENTTHREADED); diff --git a/dlls/combase/marshal.c b/dlls/combase/marshal.c index 84f57b8c1c8..f638604f5a3 100644 --- a/dlls/combase/marshal.c +++ b/dlls/combase/marshal.c @@ -1575,7 +1575,7 @@ static HRESULT proxy_manager_construct( list_init(&This->entry); list_init(&This->interfaces); - InitializeCriticalSection(&This->cs); + InitializeCriticalSectionEx(&This->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": proxy_manager"); /* the apartment the object was unmarshaled into */ diff --git a/dlls/combase/stubmanager.c b/dlls/combase/stubmanager.c index 1b079f22fef..566f92c8a75 100644 --- a/dlls/combase/stubmanager.c +++ b/dlls/combase/stubmanager.c @@ -187,7 +187,7 @@ static struct stub_manager *new_stub_manager(struct apartment *apt, IUnknown *ob list_init(&sm->ifstubs); - InitializeCriticalSection(&sm->lock); + InitializeCriticalSectionEx(&sm->lock, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); sm->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": stub_manager"); IUnknown_AddRef(object);

1 0

Paul Gofman : kernelbase: Force debug info in critical sections.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: 6ba603a03c22a0b89f0c7c5f91fd61129bc30864 URL: https://gitlab.winehq.org/wine/wine/-/commit/6ba603a03c22a0b89f0c7c5f91fd61… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Feb 16 18:38:53 2024 -0600 kernelbase: Force debug info in critical sections. --- dlls/kernelbase/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index f425df4263b..7806ad2ec1f 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -1267,7 +1267,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_ goto error; } - RtlInitializeCriticalSection( &info->cs ); + RtlInitializeCriticalSectionEx( &info->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); info->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": FIND_FIRST_INFO.cs"); info->path = nt_name; info->magic = FIND_FIRST_MAGIC;

1 0

Paul Gofman : winhttp: Force debug info in critical sections.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: 5e3cc883260254b51a5554128d8e6749993f93d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e3cc883260254b51a5554128d8e67… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Feb 16 09:59:41 2024 -0600 winhttp: Force debug info in critical sections. --- dlls/winhttp/request.c | 2 +- dlls/winhttp/session.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 29b30fc2583..4a64095797a 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -6096,7 +6096,7 @@ HRESULT WinHttpRequest_create( void **obj ) if (!(request = calloc( 1, sizeof(*request) ))) return E_OUTOFMEMORY; request->IWinHttpRequest_iface.lpVtbl = &winhttp_request_vtbl; request->refs = 1; - InitializeCriticalSection( &request->cs ); + InitializeCriticalSectionEx( &request->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); request->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": winhttp_request.cs"); initialize_request( request ); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index b009639297d..f6b4423600e 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -319,7 +319,7 @@ HINTERNET WINAPI WinHttpOpen( LPCWSTR agent, DWORD access, LPCWSTR proxy, LPCWST session->websocket_receive_buffer_size = 32768; session->websocket_send_buffer_size = 32768; list_init( &session->cookie_cache ); - InitializeCriticalSection( &session->cs ); + InitializeCriticalSectionEx( &session->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); session->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": session.cs"); if (agent && !(session->agent = wcsdup( agent ))) goto end;

1 0

Zhiyi Zhang : dsound: Reject WAVEFORMATEX formats with more than two channels.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: 7c7b2e8e7e8c0be1a756e6d7c705b68017459e26 URL: https://gitlab.winehq.org/wine/wine/-/commit/7c7b2e8e7e8c0be1a756e6d7c705b6… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Feb 20 11:04:13 2024 +0800 dsound: Reject WAVEFORMATEX formats with more than two channels. Formats with more than two channels require WAVEFORMATEXTENSIBLE according to tests. Fix Viking: Battle for Asgard (211160) audio cracking in its intro video. --- dlls/dsound/dsound.c | 3 +++ dlls/dsound/primary.c | 3 +++ dlls/dsound/tests/dsound.c | 2 -- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index b35f9c7cbdd..356f211d7bb 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -490,6 +490,9 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( return DSERR_INVALIDPARAM; } + if (dsbd->lpwfxFormat->nChannels > 2 && dsbd->lpwfxFormat->wFormatTag != WAVE_FORMAT_EXTENSIBLE) + return DSERR_INVALIDPARAM; + if (dsbd->lpwfxFormat->wFormatTag == WAVE_FORMAT_EXTENSIBLE) { WAVEFORMATEXTENSIBLE *pwfxe = (WAVEFORMATEXTENSIBLE*)dsbd->lpwfxFormat; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 2e2473b4db2..6bb7b2ffba4 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -465,6 +465,9 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe return DSERR_INVALIDPARAM; } + if (passed_fmt->nChannels > 2 && passed_fmt->wFormatTag != WAVE_FORMAT_EXTENSIBLE) + return DSERR_ALLOCATED; + /* **** */ AcquireSRWLockExclusive(&device->buffer_list_lock); EnterCriticalSection(&(device->mixlock)); diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index c957f3a8a4b..500bc19f655 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1500,7 +1500,6 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - todo_wine ok(rc == (buf ? DSERR_ALLOCATED : DSERR_INVALIDPARAM), "%s: SetFormat: %08lx\n", testname, rc); wfx.wFormatTag = WAVE_FORMAT_PCM; @@ -1510,7 +1509,6 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - todo_wine ok(rc == (buf ? DSERR_ALLOCATED : DSERR_INVALIDPARAM), "%s: SetFormat: %08lx\n", testname, rc); fmtex.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX);

1 0

Paul Gofman : xaudio2: Force debug info in critical sections.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: 431a483edcb10766f08ba5284ec659d115699ff4 URL: https://gitlab.winehq.org/wine/wine/-/commit/431a483edcb10766f08ba5284ec659… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Feb 16 18:37:12 2024 -0600 xaudio2: Force debug info in critical sections. --- dlls/xaudio2_7/xaudio_dll.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index b821e9667b7..cd1c62f3cd4 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1566,7 +1566,7 @@ static inline XA2VoiceImpl *create_voice(IXAudio2Impl *This) voice->IXAudio2SubmixVoice_iface.lpVtbl = &XAudio2SubmixVoice_Vtbl; voice->FAudioVoiceCallback_vtbl = FAudioVoiceCallback_Vtbl; - InitializeCriticalSection(&voice->lock); + InitializeCriticalSectionEx(&voice->lock, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); voice->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": XA2VoiceImpl.lock"); return voice; @@ -1900,10 +1900,10 @@ static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *p list_init(&object->voices); - InitializeCriticalSection(&object->lock); + InitializeCriticalSectionEx(&object->lock, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IXAudio2Impl.lock"); - InitializeCriticalSection(&object->mst.lock); + InitializeCriticalSectionEx(&object->mst.lock, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->mst.lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": XA2MasteringVoice.lock"); FAudioCOMConstructWithCustomAllocatorEXT(

1 0

Zhiyi Zhang : dsound/tests: Test that formats with more than two channels require WAVEFORMATEXTENSIBLE.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: b3ec5bc7ea3138d7fe8b6a1a5fa441ae305ab413 URL: https://gitlab.winehq.org/wine/wine/-/commit/b3ec5bc7ea3138d7fe8b6a1a5fa441… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Feb 20 10:54:45 2024 +0800 dsound/tests: Test that formats with more than two channels require WAVEFORMATEXTENSIBLE. --- dlls/dsound/tests/dsound.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 9656a458415..c957f3a8a4b 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1481,6 +1481,51 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I fmtex.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; rc = do_invalid_fmt_test(dso, buf, (WAVEFORMATEX*)&fmtex, &got_buf); ok(rc == E_INVALIDARG, "%s: SetFormat: %08lx\n", testname, rc); + + /* The following 4 tests show that formats with more than two channels require WAVEFORMATEXTENSIBLE */ + wfx.wFormatTag = WAVE_FORMAT_PCM; + wfx.nChannels = 2; + wfx.nSamplesPerSec = 44100; + wfx.wBitsPerSample = 16; + wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; + wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; + rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); + ok(rc == S_OK, "%s: SetFormat: %08lx\n", testname, rc); + IDirectSoundBuffer_Release(got_buf); + + wfx.wFormatTag = WAVE_FORMAT_PCM; + wfx.nChannels = 4; + wfx.nSamplesPerSec = 44100; + wfx.wBitsPerSample = 16; + wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; + wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; + rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); + todo_wine + ok(rc == (buf ? DSERR_ALLOCATED : DSERR_INVALIDPARAM), "%s: SetFormat: %08lx\n", testname, rc); + + wfx.wFormatTag = WAVE_FORMAT_PCM; + wfx.nChannels = 6; + wfx.nSamplesPerSec = 44100; + wfx.wBitsPerSample = 16; + wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; + wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; + rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); + todo_wine + ok(rc == (buf ? DSERR_ALLOCATED : DSERR_INVALIDPARAM), "%s: SetFormat: %08lx\n", testname, rc); + + fmtex.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); + fmtex.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + fmtex.Format.nChannels = 6; + fmtex.Format.nSamplesPerSec = 44100; + fmtex.Format.wBitsPerSample = 16; + fmtex.Format.nBlockAlign = fmtex.Format.nChannels * fmtex.Format.wBitsPerSample / 8; + fmtex.Format.nAvgBytesPerSec = fmtex.Format.nSamplesPerSec * fmtex.Format.nBlockAlign; + fmtex.Samples.wValidBitsPerSample = fmtex.Format.wBitsPerSample; + fmtex.dwChannelMask = KSAUDIO_SPEAKER_5POINT1; + fmtex.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + rc = do_invalid_fmt_test(dso, buf, (WAVEFORMATEX *)&fmtex, &got_buf); + ok(rc == S_OK, "%s: SetFormat: %08lx\n", testname, rc); + IDirectSoundBuffer_Release(got_buf); } static HRESULT test_invalid_fmts(LPGUID lpGuid)

1 0