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

[Paul Gofman (＠gofman)]

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

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

[Paul Gofman]

From: Paul Gofman

---
 dlls/winexinput.sys/main.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c
index 26764fa78ef..5a5c6ca8f00 100644
--- a/dlls/winexinput.sys/main.c
+++ b/dlls/winexinput.sys/main.c
@@ -785,6 +785,8 @@ static NTSTATUS WINAPI fdo_pnp(DEVICE_OBJECT *device, IRP *irp)
         IoSkipCurrentIrpStackLocation(irp);
         status = IoCallDriver(fdo->bus_device, irp);
         IoDetachDevice(fdo->bus_device);
+        if (fdo->cs.DebugInfo)
+            fdo->cs.DebugInfo->Spare[0] = 0;
         RtlDeleteCriticalSection(&fdo->cs);
         HidP_FreeCollectionDescription(&fdo->device_desc);
         free(fdo->report_buf);
@@ -871,7 +873,7 @@ static NTSTATUS WINAPI add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *bus_devi
     fdo->bus_device = bus_device;
     wcscpy(fdo->instance_id, instance_id);

-    RtlInitializeCriticalSection(&fdo->cs);
+    RtlInitializeCriticalSectionEx(&fdo->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
     fdo->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": func_device.cs");

TRACE("device %p, bus_id %s, device_id %s, instance_id %s.\n", device, debugstr_w(bus_id),

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

[Paul Gofman]

From: Paul Gofman

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

diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c
index 721379f329c..46e1e37b72d 100644
--- a/dlls/comctl32/animate.c
+++ b/dlls/comctl32/animate.c
@@ -813,7 +813,7 @@ static BOOL ANIMATE_Create(HWND hWnd, const CREATESTRUCTW *lpcs)

TRACE("Animate style %#lx, parent %p\n", infoPtr->dwStyle, infoPtr->hwndNotify);

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

return TRUE;

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

[Paul Gofman]

From: Paul Gofman

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

diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c
index 2f6eaaadc58..59acbcb6d4c 100644
--- a/dlls/mcicda/mcicda.c
+++ b/dlls/mcicda/mcicda.c
@@ -201,7 +201,7 @@ static	DWORD	MCICDA_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp)
     mciSetDriverData(wmcda->wDevID, (DWORD_PTR)wmcda);
     modp->wCustomCommandTable = MCI_NO_COMMAND_TABLE;
     modp->wType = MCI_DEVTYPE_CD_AUDIO;
-    InitializeCriticalSection(&wmcda->cs);
+    InitializeCriticalSectionEx(&wmcda->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
     wmcda->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": WINE_MCICDAUDIO.cs");
     return modp->wDeviceID;
 }

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

[Paul Gofman]

From: Paul Gofman

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

diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c
index 66b12f3ae9e..7481f0f3480 100644
--- a/dlls/ole32/stg_prop.c
+++ b/dlls/ole32/stg_prop.c
@@ -2513,7 +2513,7 @@ static HRESULT PropertyStorage_BaseConstruct(IStream *stm,

(*pps)->IPropertyStorage_iface.lpVtbl = &IPropertyStorage_Vtbl;
     (*pps)->ref = 1;
-    InitializeCriticalSection(&(*pps)->cs);
+    InitializeCriticalSectionEx(&(*pps)->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
     (*pps)->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PropertyStorage_impl.cs");
     (*pps)->stm = stm;
     (*pps)->fmtid = *rfmtid;

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

[Paul Gofman]

From: Paul Gofman

---
 dlls/qcap/audiorecord.c  | 2 +-
 dlls/qcap/capturegraph.c | 2 +-
 dlls/qcap/vfwcapture.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c
index 775d942f8f8..b65d1c69f90 100644
--- a/dlls/qcap/audiorecord.c
+++ b/dlls/qcap/audiorecord.c
@@ -824,7 +824,7 @@ HRESULT audio_record_create(IUnknown *outer, IUnknown **out)

object->state = State_Stopped;
     InitializeConditionVariable(&object->state_cv);
-    InitializeCriticalSection(&object->state_cs);
+    InitializeCriticalSectionEx(&object->state_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
     object->state_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": audio_record.state_cs");

TRACE("Created audio recorder %p.\n", object);
diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c
index 45cef802ba2..d570ac334d3 100644
--- a/dlls/qcap/capturegraph.c
+++ b/dlls/qcap/capturegraph.c
@@ -62,7 +62,7 @@ HRESULT capture_graph_create(IUnknown *outer, IUnknown **out)
     object->ICaptureGraphBuilder_iface.lpVtbl = &builder_Vtbl;
     object->ref = 1;
     object->mygraph = NULL;
-    InitializeCriticalSection(&object->csFilter);
+    InitializeCriticalSectionEx(&object->csFilter, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
     object->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": CaptureGraphImpl.csFilter");

TRACE("Created capture graph builder %p.\n", object);
diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c
index a51b39c0a11..0899b228ec2 100644
--- a/dlls/qcap/vfwcapture.c
+++ b/dlls/qcap/vfwcapture.c
@@ -904,7 +904,7 @@ HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out)

object->state = State_Stopped;
     InitializeConditionVariable(&object->state_cv);
-    InitializeCriticalSection(&object->state_cs);
+    InitializeCriticalSectionEx(&object->state_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
     object->state_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": vfw_capture.state_cs");

TRACE("Created VFW capture filter %p.\n", object);

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

[Rémi Bernon (＠rbernon)]

This merge request was approved by Rémi Bernon.

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

[Zebediah Figura (＠zfigura)]

This merge request was approved by Zebediah Figura.