[PATCH 0/5] MR5089: Explicitly request debug info in critical sections.
From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/mapi32/prop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index 95176829f7e..8018ceecd4d 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -2335,7 +2335,7 @@ SCODE WINAPI CreateIProp(LPCIID iid, ALLOCATEBUFFER *lpAlloc, lpPropData->ulObjAccess = IPROP_READWRITE; lpPropData->ulNumValues = 0; list_init(&lpPropData->values); - InitializeCriticalSection(&lpPropData->cs); + InitializeCriticalSectionEx(&lpPropData->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); lpPropData->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IPropDataImpl.cs"); *lppPropData = &lpPropData->IPropData_iface; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5089
From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/propsys/propstore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/propsys/propstore.c b/dlls/propsys/propstore.c index 9906df83f6f..d2ce67969bf 100644 --- a/dlls/propsys/propstore.c +++ b/dlls/propsys/propstore.c @@ -464,7 +464,7 @@ HRESULT PropertyStore_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv This->IPropertyStoreCache_iface.lpVtbl = &PropertyStore_Vtbl; This->ref = 1; - InitializeCriticalSection(&This->lock); + InitializeCriticalSectionEx(&This->lock, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PropertyStore.lock"); list_init(&This->formats); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5089
From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/rpcrt4/rpc_assoc.c | 4 ++-- dlls/rpcrt4/rpc_server.c | 2 +- dlls/rpcrt4/rpc_transport.c | 2 +- dlls/rpcrt4/rpcrt4_main.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/rpc_assoc.c b/dlls/rpcrt4/rpc_assoc.c index 6a6768e1677..c3eec9558dd 100644 --- a/dlls/rpcrt4/rpc_assoc.c +++ b/dlls/rpcrt4/rpc_assoc.c @@ -72,7 +72,7 @@ static RPC_STATUS RpcAssoc_Alloc(LPCSTR Protseq, LPCSTR NetworkAddr, assoc->refs = 1; list_init(&assoc->free_connection_pool); list_init(&assoc->context_handle_list); - InitializeCriticalSection(&assoc->cs); + InitializeCriticalSectionEx(&assoc->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); assoc->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcAssoc.cs"); assoc->Protseq = strdup(Protseq); assoc->NetworkAddr = strdup(NetworkAddr); @@ -463,7 +463,7 @@ RPC_STATUS RpcServerAssoc_AllocateContextHandle(RpcAssoc *assoc, void *CtxGuard, return RPC_S_OUT_OF_MEMORY; context_handle->ctx_guard = CtxGuard; - InitializeCriticalSection(&context_handle->lock); + InitializeCriticalSectionEx(&context_handle->lock, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); context_handle->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcContextHandle.lock"); context_handle->refs = 1; diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 41431ebca02..eb733f69980 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -965,7 +965,7 @@ static RPC_STATUS alloc_serverprotoseq(UINT MaxCalls, const char *Protseq, RpcSe (*ps)->ops = ops; list_init(&(*ps)->listeners); list_init(&(*ps)->connections); - InitializeCriticalSection(&(*ps)->cs); + InitializeCriticalSectionEx(&(*ps)->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); (*ps)->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcServerProtseq.cs"); list_add_head(&protseqs, &(*ps)->entry); diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 62bbd9f2939..8d53e7cee35 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1756,7 +1756,7 @@ static RpcConnection *rpcrt4_ncacn_http_alloc(void) httpc->cancel_event = CreateEventW(NULL, FALSE, FALSE, NULL); httpc->async_data->refs = 1; httpc->async_data->inet_buffers.dwStructSize = sizeof(INTERNET_BUFFERSW); - InitializeCriticalSection(&httpc->async_data->cs); + InitializeCriticalSectionEx(&httpc->async_data->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); httpc->async_data->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcHttpAsyncData.cs"); return &httpc->common; } diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index 122ab94f17c..37d82f330dc 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -950,7 +950,7 @@ static struct threaddata *get_or_create_threaddata(void) tdata = calloc(1, sizeof(*tdata)); if (!tdata) return NULL; - InitializeCriticalSection(&tdata->cs); + InitializeCriticalSectionEx(&tdata->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); tdata->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": threaddata.cs"); tdata->thread_id = GetCurrentThreadId(); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5089
From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/vcomp/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 63ec0502b9b..91afea33112 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -1712,7 +1712,7 @@ static CRITICAL_SECTION *alloc_critsect(void) ExitProcess(1); } - InitializeCriticalSection(critsect); + InitializeCriticalSectionEx(critsect, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); critsect->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": critsect"); return critsect; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5089
From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/webservices/channel.c | 6 +++--- dlls/webservices/error.c | 2 +- dlls/webservices/heap.c | 2 +- dlls/webservices/listener.c | 2 +- dlls/webservices/msg.c | 2 +- dlls/webservices/proxy.c | 2 +- dlls/webservices/reader.c | 2 +- dlls/webservices/writer.c | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 5851fd9d4af..b58a2d44457 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -252,9 +252,9 @@ static struct channel *alloc_channel(void) if (!(ret = calloc( 1, size ))) return NULL; ret->magic = CHANNEL_MAGIC; - InitializeCriticalSection( &ret->cs ); - InitializeCriticalSection( &ret->send_q.cs ); - InitializeCriticalSection( &ret->recv_q.cs ); + InitializeCriticalSectionEx( &ret->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); + InitializeCriticalSectionEx( &ret->send_q.cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); + InitializeCriticalSectionEx( &ret->recv_q.cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": channel.cs"); ret->send_q.cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": channel.send_q.cs"); ret->recv_q.cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": channel.recv_q.cs"); diff --git a/dlls/webservices/error.c b/dlls/webservices/error.c index aa1a9744f34..9e57f454ce9 100644 --- a/dlls/webservices/error.c +++ b/dlls/webservices/error.c @@ -67,7 +67,7 @@ static struct error *alloc_error(void) } ret->magic = ERROR_MAGIC; - InitializeCriticalSection( &ret->cs ); + InitializeCriticalSectionEx( &ret->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": error.cs"); prop_init( error_props, count, ret->prop, &ret[1] ); diff --git a/dlls/webservices/heap.c b/dlls/webservices/heap.c index b2ee514b970..71ef42c9530 100644 --- a/dlls/webservices/heap.c +++ b/dlls/webservices/heap.c @@ -184,7 +184,7 @@ static struct heap *alloc_heap(void) if (!(ret = calloc( 1, size ))) return NULL; ret->magic = HEAP_MAGIC; - InitializeCriticalSection( &ret->cs ); + InitializeCriticalSectionEx( &ret->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": heap.cs"); prop_init( heap_props, count, ret->prop, &ret[1] ); diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index 3112d5d84fd..da4e135703f 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -141,7 +141,7 @@ static struct listener *alloc_listener(void) free( ret ); return NULL; } - InitializeCriticalSection( &ret->cs ); + InitializeCriticalSectionEx( &ret->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": listener.cs"); prop_init( listener_props, count, ret->prop, &ret[1] ); diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 7f6cd028163..5912195e015 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -108,7 +108,7 @@ static struct msg *alloc_msg(void) ret->state = WS_MESSAGE_STATE_EMPTY; ret->header_size = HEADER_ARRAY_SIZE; - InitializeCriticalSection( &ret->cs ); + InitializeCriticalSectionEx( &ret->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": msg.cs"); prop_init( msg_props, count, ret->prop, &ret[1] ); diff --git a/dlls/webservices/proxy.c b/dlls/webservices/proxy.c index bde4cdb168f..d00ad4ad70b 100644 --- a/dlls/webservices/proxy.c +++ b/dlls/webservices/proxy.c @@ -62,7 +62,7 @@ static struct proxy *alloc_proxy(void) if (!(ret = calloc( 1, size ))) return NULL; ret->magic = PROXY_MAGIC; - InitializeCriticalSection( &ret->cs ); + InitializeCriticalSectionEx( &ret->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": proxy.cs"); prop_init( proxy_props, count, ret->prop, &ret[1] ); diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 0c8ddcea035..0cd974c9118 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -422,7 +422,7 @@ static struct reader *alloc_reader(void) ret->nb_prefixes = ret->nb_prefixes_allocated = 1; ret->magic = READER_MAGIC; - InitializeCriticalSection( &ret->cs ); + InitializeCriticalSectionEx( &ret->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": reader.cs"); prop_init( reader_props, count, ret->prop, &ret[1] ); diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 6923035f00c..df8535f8647 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -109,7 +109,7 @@ static struct writer *alloc_writer(void) if (!(ret = calloc( 1, size ))) return NULL; ret->magic = WRITER_MAGIC; - InitializeCriticalSection( &ret->cs ); + InitializeCriticalSectionEx( &ret->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": writer.cs"); prop_init( writer_props, count, ret->prop, &ret[1] ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5089
This merge request was approved by Hans Leidekker. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5089
participants (3)
-
Hans Leidekker (＠hans) -
Paul Gofman
-
Paul Gofman (＠gofman)