[PATCH 0/3] MR5079: Explicitly request debug info in critical sections.

[Paul Gofman (＠gofman)]

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

[PATCH 1/3] strmbase: Force debug info in critical sections.

[Paul Gofman]

From: Paul Gofman

---
 libs/strmbase/filter.c  | 4 ++--
 libs/strmbase/pospass.c | 2 +-
 libs/strmbase/seeking.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/strmbase/filter.c b/libs/strmbase/filter.c
index ee41611a198..fa8738188a2 100644
--- a/libs/strmbase/filter.c
+++ b/libs/strmbase/filter.c
@@ -524,10 +524,10 @@ void strmbase_filter_init(struct strmbase_filter *filter, IUnknown *outer,
     filter->outer_unk = outer ? outer : &filter->IUnknown_inner;
     filter->refcount = 1;

-    InitializeCriticalSection(&filter->filter_cs);
+    InitializeCriticalSectionEx(&filter->filter_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
     if (filter->filter_cs.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1)
         filter->filter_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": strmbase_filter.filter_cs");
-    InitializeCriticalSection(&filter->stream_cs);
+    InitializeCriticalSectionEx(&filter->stream_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
     if (filter->stream_cs.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1)
         filter->stream_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": strmbase_filter.stream_cs");
     filter->clsid = *clsid;
diff --git a/libs/strmbase/pospass.c b/libs/strmbase/pospass.c
index 03cb7783f97..79ebf44cf24 100644
--- a/libs/strmbase/pospass.c
+++ b/libs/strmbase/pospass.c
@@ -730,7 +730,7 @@ void strmbase_passthrough_init(struct strmbase_passthrough *passthrough, IUnknow
     passthrough->IMediaPosition_iface.lpVtbl = &IMediaPositionPassThru_Vtbl;
     passthrough->IMediaSeeking_iface.lpVtbl = &IMediaSeekingPassThru_Vtbl;
     passthrough->ISeekingPassThru_iface.lpVtbl = &ISeekingPassThru_Vtbl;
-    InitializeCriticalSection(&passthrough->time_cs);
+    InitializeCriticalSectionEx(&passthrough->time_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
     passthrough->time_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": strmbase_passthrough.time_cs" );
 }

diff --git a/libs/strmbase/seeking.c b/libs/strmbase/seeking.c
index 91e9ccedfb4..574083b985f 100644
--- a/libs/strmbase/seeking.c
+++ b/libs/strmbase/seeking.c
@@ -49,7 +49,7 @@ HRESULT strmbase_seeking_init(SourceSeeking *pSeeking, const IMediaSeekingVtbl *
     pSeeking->llDuration = pSeeking->llStop;
     pSeeking->dRate = 1.0;
     pSeeking->timeformat = TIME_FORMAT_MEDIA_TIME;
-    InitializeCriticalSection(&pSeeking->cs);
+    InitializeCriticalSectionEx(&pSeeking->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
     pSeeking->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SourceSeeking.cs");
     return S_OK;
 }

[PATCH 2/3] dmime: Force debug info in critical sections.

[Paul Gofman]

From: Paul Gofman

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

diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c
index 08d74a81c25..500bc8b536f 100644
--- a/dlls/dmime/performance.c
+++ b/dlls/dmime/performance.c
@@ -2291,7 +2291,7 @@ HRESULT create_dmperformance(REFIID iid, void **ret_iface)
     obj->ref = 1;

obj->pDefaultPath = NULL;
-    InitializeCriticalSection(&obj->safe);
+    InitializeCriticalSectionEx(&obj->safe, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
     obj->safe.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": performance->safe");
     wine_rb_init(&obj->channel_blocks, channel_block_compare);

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

[Paul Gofman]

From: Paul Gofman

---
 dlls/dmsynth/synth.c     | 2 +-
 dlls/dmsynth/synthsink.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c
index 5453c296be3..ecf1dead8a8 100644
--- a/dlls/dmsynth/synth.c
+++ b/dlls/dmsynth/synth.c
@@ -1992,7 +1992,7 @@ HRESULT synth_create(IUnknown **ret_iface)
         goto failed;
     fluid_sfont_set_data(obj->fluid_sfont, obj);

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

TRACE("Created DirectMusicSynth %p\n", obj);
diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c
index 9263ff56349..c0ac7871f9a 100644
--- a/dlls/dmsynth/synthsink.c
+++ b/dlls/dmsynth/synthsink.c
@@ -754,7 +754,7 @@ HRESULT synth_sink_create(IUnknown **ret_iface)
     obj->ref = 1;

obj->stop_event = CreateEventW(NULL, FALSE, FALSE, NULL);
-    InitializeCriticalSection(&obj->cs);
+    InitializeCriticalSectionEx(&obj->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
     obj->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs");

TRACE("Created DirectMusicSynthSink %p\n", obj);

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

[Zebediah Figura (＠zfigura)]

This merge request was approved by Zebediah Figura.