[PATCH 0/6] MR5191: Explicitly request debug info in critical sections.
From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/mciavi32/mciavi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index 15322b9a35a..a62c791cc9c 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -83,7 +83,7 @@ static DWORD MCIAVI_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) if (!wma) return 0; - InitializeCriticalSection(&wma->cs); + InitializeCriticalSectionEx(&wma->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); wma->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": WINE_MCIAVI.cs"); wma->hStopEvent = CreateEventW(NULL, FALSE, FALSE, NULL); wma->wDevID = modp->wDeviceID; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5191
From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winmm/waveform.c | 4 ++-- dlls/winmm/winmm.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 8c0cc4d879c..f7fe81710e0 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -261,7 +261,7 @@ static inline void WINMM_DecomposeHWAVE(HWAVE hwave, UINT *mmdevice_index, static void WINMM_InitDevice(WINMM_Device *device) { - InitializeCriticalSection(&device->lock); + InitializeCriticalSectionEx(&device->lock, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); device->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": WINMM_Device.lock"); } @@ -549,7 +549,7 @@ static HRESULT WINMM_InitMMDevice(EDataFlow flow, IMMDevice *device, dev->index = index; - InitializeCriticalSection(&dev->lock); + InitializeCriticalSectionEx(&dev->lock, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); dev->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": WINMM_Device.lock"); return S_OK; diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 033a9b3cd29..73050e0affb 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1408,7 +1408,7 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, return ret; } - InitializeCriticalSection(&lpMidiStrm->lock); + InitializeCriticalSectionEx(&lpMidiStrm->lock, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); lpMidiStrm->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": WINMM_MidiStream.lock"); lpMidiStrm->hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5191
From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winebus.sys/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index fa0a9a998d7..dceba4747b8 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -315,7 +315,7 @@ static DEVICE_OBJECT *bus_create_hid_device(struct device_desc *desc, UINT64 uni ext->unix_device = unix_device; list_init(&ext->reports); - InitializeCriticalSection(&ext->cs); + InitializeCriticalSectionEx(&ext->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); ext->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs"); /* add to list of pnp devices */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5191
From: Paul Gofman <pgofman(a)codeweavers.com> --- .../windows.security.credentials.ui.userconsentverifier/async.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windows.security.credentials.ui.userconsentverifier/async.c b/dlls/windows.security.credentials.ui.userconsentverifier/async.c index aba1a02dc96..89edb50ce3c 100644 --- a/dlls/windows.security.credentials.ui.userconsentverifier/async.c +++ b/dlls/windows.security.credentials.ui.userconsentverifier/async.c @@ -354,7 +354,7 @@ static HRESULT async_info_create( IUnknown *invoker, IUnknown *param, async_oper if ((impl->invoker = invoker)) IUnknown_AddRef( impl->invoker ); if ((impl->param = param)) IUnknown_AddRef( impl->param ); - InitializeCriticalSection( &impl->cs ); + InitializeCriticalSectionEx( &impl->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); impl->cs.DebugInfo->Spare[0] = (DWORD_PTR)( __FILE__ ": async_info.cs" ); *out = &impl->IWineAsyncInfoImpl_iface; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5191
From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/amstream/filter.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 0ca0f2e2a1c..dbd6fb4f0d2 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -254,6 +254,8 @@ static ULONG WINAPI filter_Release(IMediaStreamFilter *iface) free(filter->streams); if (filter->clock) IReferenceClock_Release(filter->clock); + if (filter->cs.DebugInfo) + filter->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&filter->cs); free(filter); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5191
From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/amstream/filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index dbd6fb4f0d2..8a7e4fc372c 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -1102,7 +1102,7 @@ HRESULT filter_create(IUnknown *outer, void **out) object->refcount = 1; list_init(&object->free_events); list_init(&object->used_events); - InitializeCriticalSection(&object->cs); + InitializeCriticalSectionEx(&object->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": MediaStreamFilter.cs"); TRACE("Created media stream filter %p.\n", object); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5191
This merge request was approved by Rémi Bernon. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5191
This merge request was approved by Zebediah Figura. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5191
participants (4)
-
Paul Gofman -
Paul Gofman (＠gofman)
-
Rémi Bernon
-
Zebediah Figura (＠zfigura)