[PATCH 0/5] MR5163: Explicitly request debug info in critical sections.

[Paul Gofman (＠gofman)]

See https://gitlab.winehq.org/wine/wine/-/merge_requests/5071

[PATCH 1/5] wbemprox: Force debug info in critical sections.

[Paul Gofman]

From: Paul Gofman

---
 dlls/wbemprox/services.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c
index 436097c1e8d..d87d201e24a 100644
--- a/dlls/wbemprox/services.c
+++ b/dlls/wbemprox/services.c
@@ -960,7 +960,7 @@ HRESULT WbemServices_create( const WCHAR *namespace, IWbemContext *context, LPVO
     ws->IWbemServices_iface.lpVtbl = &wbem_services_vtbl;
     ws->refs      = 1;
     ws->ns        = ns;
-    InitializeCriticalSection( &ws->cs );
+    InitializeCriticalSectionEx( &ws->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO );
     ws->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": wbemprox_services.cs");
     if (context)
         IWbemContext_Clone( context, &ws->context );

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

[Paul Gofman]

From: Paul Gofman

---
 dlls/wmvcore/async_reader.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/wmvcore/async_reader.c b/dlls/wmvcore/async_reader.c
index 3a8556a5f0a..ef657d561ba 100644
--- a/dlls/wmvcore/async_reader.c
+++ b/dlls/wmvcore/async_reader.c
@@ -1924,9 +1924,9 @@ static HRESULT WINAPI async_reader_create(IWMReader **reader)
         goto failed;
     IWMReader_Release(&object->IWMReader_iface);

-    InitializeCriticalSection(&object->cs);
+    InitializeCriticalSectionEx(&object->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
     object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": async_reader.cs");
-    InitializeCriticalSection(&object->callback_cs);
+    InitializeCriticalSectionEx(&object->callback_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
     object->callback_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": async_reader.callback_cs");

QueryPerformanceFrequency(&object->clock_frequency);

[PATCH 3/5] browseui: Force debug info in critical sections.

[Paul Gofman]

From: Paul Gofman

---
 dlls/browseui/compcatcachedaemon.c | 2 +-
 dlls/browseui/progressdlg.c        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/browseui/compcatcachedaemon.c b/dlls/browseui/compcatcachedaemon.c
index f7a5e4b449f..6ea983626a4 100644
--- a/dlls/browseui/compcatcachedaemon.c
+++ b/dlls/browseui/compcatcachedaemon.c
@@ -149,7 +149,7 @@ HRESULT CompCatCacheDaemon_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut)

This->IRunnableTask_iface.lpVtbl = &CompCatCacheDaemonVtbl;
     This->refCount = 1;
-    InitializeCriticalSection(&This->cs);
+    InitializeCriticalSectionEx(&This->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
     This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": CompCatCacheDaemon.cs");

TRACE("returning %p\n", This);
diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c
index 9834a4089f2..da73dbb4740 100644
--- a/dlls/browseui/progressdlg.c
+++ b/dlls/browseui/progressdlg.c
@@ -626,7 +626,7 @@ HRESULT ProgressDialog_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut)
     This->IProgressDialog_iface.lpVtbl = &ProgressDialogVtbl;
     This->IOleWindow_iface.lpVtbl = &OleWindowVtbl;
     This->refCount = 1;
-    InitializeCriticalSection(&This->cs);
+    InitializeCriticalSectionEx(&This->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
     This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ProgressDialog.cs");

TRACE("returning %p\n", This);

[PATCH 4/5] itss: Force debug info in critical sections.

[Paul Gofman]

From: Paul Gofman

---
 dlls/itss/chm_lib.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/itss/chm_lib.c b/dlls/itss/chm_lib.c
index f2665cae529..894bfc07a49 100644
--- a/dlls/itss/chm_lib.c
+++ b/dlls/itss/chm_lib.c
@@ -686,11 +686,11 @@ struct chmFile *chm_openW(const WCHAR *filename)
     }

/* initialize mutexes, if needed */
-    InitializeCriticalSection(&newHandle->mutex);
+    InitializeCriticalSectionEx(&newHandle->mutex, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
     newHandle->mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": chmFile.mutex");
-    InitializeCriticalSection(&newHandle->lzx_mutex);
+    InitializeCriticalSectionEx(&newHandle->lzx_mutex, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
     newHandle->lzx_mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": chmFile.lzx_mutex");
-    InitializeCriticalSection(&newHandle->cache_mutex);
+    InitializeCriticalSectionEx(&newHandle->cache_mutex, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
     newHandle->cache_mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": chmFile.cache_mutex");

/* read and verify header */
@@ -817,11 +817,11 @@ struct chmFile *chm_dup(struct chmFile *oldHandle)
     newHandle->cache_num_blocks = 0;

/* initialize mutexes, if needed */
-    InitializeCriticalSection(&newHandle->mutex);
+    InitializeCriticalSectionEx(&newHandle->mutex, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
     newHandle->mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": chmFile.mutex");
-    InitializeCriticalSection(&newHandle->lzx_mutex);
+    InitializeCriticalSectionEx(&newHandle->lzx_mutex, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
     newHandle->lzx_mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": chmFile.lzx_mutex");
-    InitializeCriticalSection(&newHandle->cache_mutex);
+    InitializeCriticalSectionEx(&newHandle->cache_mutex, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
     newHandle->cache_mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": chmFile.cache_mutex");

/* initialize cache */

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

[Paul Gofman]

From: Paul Gofman

---
 dlls/mmdevapi/devenum.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c
index 246625286b8..3c2085339ed 100644
--- a/dlls/mmdevapi/devenum.c
+++ b/dlls/mmdevapi/devenum.c
@@ -344,7 +344,7 @@ static MMDevice *MMDevice_Create(const WCHAR *name, GUID *id, EDataFlow flow, DW
         cur->IMMDevice_iface.lpVtbl = &MMDeviceVtbl;
         cur->IMMEndpoint_iface.lpVtbl = &MMEndpointVtbl;

-        InitializeCriticalSection(&cur->crst);
+        InitializeCriticalSectionEx(&cur->crst, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
         cur->crst.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": MMDevice.crst");

list_add_tail(&device_list, &cur->entry);

[PATCH 0/5] MR5163: Explicitly request debug info in critical sections. - approved

[Hans Leidekker (＠hans)]

This merge request was approved by Hans Leidekker.

[PATCH 0/5] MR5163: Explicitly request debug info in critical sections. - approved

[Zebediah Figura (＠zfigura)]

This merge request was approved by Zebediah Figura.