[PATCH 0/5] MR5095: Explicitly request debug info in critical sections.
From: Paul Gofman <pgofman(a)codeweavers.com> --- 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; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5095
From: Paul Gofman <pgofman(a)codeweavers.com> --- 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( -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5095
From: Paul Gofman <pgofman(a)codeweavers.com> --- 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 67a7a34249a..eb6fc66f6f3 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -1229,7 +1229,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; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5095
From: Paul Gofman <pgofman(a)codeweavers.com> --- 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); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5095
From: Paul Gofman <pgofman(a)codeweavers.com> --- 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(®Info->cs); + InitializeCriticalSectionEx(®Info->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); regInfo->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PWINE_REGSTOREINFO->cs"); list_init(®Info->certsToDelete); list_init(®Info->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); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5095
This merge request was approved by Hans Leidekker. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5095
This merge request was approved by Huw Davies. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5095
participants (4)
-
Hans Leidekker (＠hans) -
Huw Davies (＠huw)
-
Paul Gofman
-
Paul Gofman (＠gofman)