[PATCH 0/5] MR5172: Explicitly request debug info in critical sections.
From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/msvcp90/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index c297f635e90..e8998383ecc 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -264,7 +264,7 @@ DEFINE_THISCALL_WRAPPER(mutex_ctor, 4) mutex* __thiscall mutex_ctor(mutex *this) { CRITICAL_SECTION *cs = operator_new(sizeof(*cs)); - InitializeCriticalSection(cs); + InitializeCriticalSectionEx(cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); cs->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Mutex critical section"); this->mutex = cs; return this; @@ -347,7 +347,7 @@ void __cdecl _Init_locks__Init_locks_ctor(_Init_locks *this) { for(i=0; i<_MAX_LOCK; i++) { - InitializeCriticalSection(&lockit_cs[i]); + InitializeCriticalSectionEx(&lockit_cs[i], 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); lockit_cs[i].DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Lockit critical section"); } } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5172
From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 4 ++-- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/lock.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index a9879879301..c612758f033 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -1637,7 +1637,7 @@ static ThreadScheduler* ThreadScheduler_ctor(ThreadScheduler *this, this->shutdown_count = this->shutdown_size = 0; this->shutdown_events = NULL; - InitializeCriticalSection(&this->cs); + InitializeCriticalSectionEx(&this->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); this->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ThreadScheduler"); list_init(&this->scheduled_chores); @@ -3525,7 +3525,7 @@ _ReentrantBlockingLock* __thiscall _ReentrantBlockingLock_ctor(_ReentrantBlockin { TRACE("(%p)\n", this); - InitializeCriticalSection(&this->cs); + InitializeCriticalSectionEx(&this->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); this->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _ReentrantBlockingLock"); return this; } diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b4e80a4b5d0..a3a872d4be3 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -606,7 +606,7 @@ static FILE* msvcrt_alloc_fp(void) { if (file<MSVCRT__iob || file>=MSVCRT__iob+_IOB_ENTRIES) { - InitializeCriticalSection(&((file_crit*)file)->crit); + InitializeCriticalSectionEx(&((file_crit*)file)->crit, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); ((file_crit*)file)->crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": file_crit.crit"); } MSVCRT_stream_idx++; diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 216d3d71504..886bb625b10 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -44,7 +44,7 @@ static inline void msvcrt_mlock_set_entry_initialized( int locknum, BOOL initial static inline void msvcrt_initialize_mlock( int locknum ) { - InitializeCriticalSection( &(lock_table[ locknum ].crit) ); + InitializeCriticalSectionEx( &(lock_table[ locknum ].crit), 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); lock_table[ locknum ].crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": LOCKTABLEENTRY.crit"); msvcrt_mlock_set_entry_initialized( locknum, TRUE ); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5172
From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/netapi32/nbcmdqueue.c | 2 +- dlls/netapi32/nbnamecache.c | 2 +- dlls/netapi32/nbt.c | 2 +- dlls/netapi32/netbios.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/netapi32/nbcmdqueue.c b/dlls/netapi32/nbcmdqueue.c index df15c616261..f02e5eb12d8 100644 --- a/dlls/netapi32/nbcmdqueue.c +++ b/dlls/netapi32/nbcmdqueue.c @@ -61,7 +61,7 @@ struct NBCmdQueue *NBCmdQueueCreate(HANDLE heap) if (queue) { queue->heap = heap; - InitializeCriticalSection(&queue->cs); + InitializeCriticalSectionEx(&queue->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); queue->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": NBCmdQueue.cs"); queue->head = NULL; } diff --git a/dlls/netapi32/nbnamecache.c b/dlls/netapi32/nbnamecache.c index 0ec9a9d5158..5bc529addac 100644 --- a/dlls/netapi32/nbnamecache.c +++ b/dlls/netapi32/nbnamecache.c @@ -100,7 +100,7 @@ struct NBNameCache *NBNameCacheCreate(HANDLE heap, DWORD entryExpireTimeMS) if (cache) { cache->heap = heap; - InitializeCriticalSection(&cache->cs); + InitializeCriticalSectionEx(&cache->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); cache->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": NBNameCache.cs"); cache->entryExpireTimeMS = entryExpireTimeMS; cache->head = NULL; diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index c364a116fca..7eac6477439 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -1036,7 +1036,7 @@ static UCHAR NetBTCall(void *adapt, PNCB ncb, void **sess) if (session) { session->fd = fd; - InitializeCriticalSection(&session->cs); + InitializeCriticalSectionEx(&session->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); session->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": NetBTSession.cs"); *sess = session; } diff --git a/dlls/netapi32/netbios.c b/dlls/netapi32/netbios.c index e74c9bf1b0f..d7414a8db07 100644 --- a/dlls/netapi32/netbios.c +++ b/dlls/netapi32/netbios.c @@ -103,7 +103,7 @@ static UCHAR nbResizeAdapterTable(UCHAR newSize) void NetBIOSInit(void) { memset(&gNBTable, 0, sizeof(gNBTable)); - InitializeCriticalSection(&gNBTable.cs); + InitializeCriticalSectionEx(&gNBTable.cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); gNBTable.cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": NetBIOSAdapterTable.cs"); } @@ -211,7 +211,7 @@ BOOL NetBIOSRegisterAdapter(ULONG transport, DWORD ifIndex, void *data) gNBTable.table[i].impl.ifIndex = ifIndex; gNBTable.table[i].impl.data = data; gNBTable.table[i].cmdQueue = NBCmdQueueCreate(GetProcessHeap()); - InitializeCriticalSection(&gNBTable.table[i].cs); + InitializeCriticalSectionEx(&gNBTable.table[i].cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); gNBTable.table[i].cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": NetBIOSAdapterTable.NetBIOSAdapter.cs"); gNBTable.table[i].enabled = TRUE; ret = TRUE; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5172
From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/rsaenh/handle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rsaenh/handle.c b/dlls/rsaenh/handle.c index 88887b9f45f..e0f828f72ce 100644 --- a/dlls/rsaenh/handle.c +++ b/dlls/rsaenh/handle.c @@ -55,7 +55,7 @@ void init_handle_table(struct handle_table *lpTable) lpTable->paEntries = NULL; lpTable->iEntries = 0; lpTable->iFirstFree = 0; - InitializeCriticalSection(&lpTable->mutex); + InitializeCriticalSectionEx(&lpTable->mutex, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); lpTable->mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": HANDLETABLE.mutex"); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5172
From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/wined3d/wined3d_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 80994f5f0fd..fbd59e94d22 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4145,7 +4145,7 @@ struct wined3d_shader_limits #define wined3d_lock_init(lock, name) wined3d_lock_init_(lock, __FILE__ ": " name) static inline void wined3d_lock_init_(CRITICAL_SECTION *lock, const char *name) { - InitializeCriticalSection(lock); + InitializeCriticalSectionEx(lock, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); if (lock->DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) lock->DebugInfo->Spare[0] = (DWORD_PTR)name; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5172
This merge request was approved by Zebediah Figura. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5172
This merge request was approved by Piotr Caban. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5172
participants (4)
-
Paul Gofman -
Paul Gofman (＠gofman)
-
Piotr Caban (＠piotr)
-
Zebediah Figura (＠zfigura)