[PATCH 2/5] msvcrt: Force debug info in critical sections.

[Paul Gofman]

From: Paul Gofman

---
 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 );
 }