March 2007 - Wine-commits - list.winehq.org

Jan Zerebecki : wineesd.drv: Add DebugInfo to critical sections.
by Alexandre Julliard 12 Mar '07

12 Mar '07

Module: wine Branch: master Commit: 6c9acb67bcc0619041cd17af58e985bdc290bbf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c9acb67bcc0619041cd17af5… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Sat Mar 10 22:11:33 2007 +0100 wineesd.drv: Add DebugInfo to critical sections. --- dlls/wineesd.drv/audio.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wineesd.drv/audio.c b/dlls/wineesd.drv/audio.c index 708f243..0bef7d0 100644 --- a/dlls/wineesd.drv/audio.c +++ b/dlls/wineesd.drv/audio.c @@ -545,7 +545,7 @@ static int ESD_InitRingMessage(ESD_MSG_RING* mr) mr->ring_buffer_size = ESD_RING_BUFFER_INCREMENT; mr->messages = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,mr->ring_buffer_size * sizeof(RING_MSG)); InitializeCriticalSection(&mr->msg_crst); - mr->msg_crst.DebugInfo->Spare[0] = (DWORD_PTR)"WINEESD_msg_crst"; + mr->msg_crst.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ESD_MSG_RING.msg_crst"); return 0; } @@ -563,6 +563,7 @@ static int ESD_DestroyRingMessage(ESD_MSG_RING* mr) #endif HeapFree(GetProcessHeap(),0,mr->messages); mr->messages=NULL; + mr->msg_crst.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&mr->msg_crst); return 0; }

1 0

Jan Zerebecki : dsound: Conform critical section DebugInfo names.
by Alexandre Julliard 12 Mar '07

12 Mar '07

Module: wine Branch: master Commit: 4c4821e3052ca3376f3f43891378f5d9306dfceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c4821e3052ca3376f3f43891… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Sat Mar 10 22:08:28 2007 +0100 dsound: Conform critical section DebugInfo names. --- dlls/dsound/buffer.c | 4 ++-- dlls/dsound/capture.c | 2 +- dlls/dsound/dsound.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 45133d5..3f75037 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -1180,7 +1180,7 @@ HRESULT IDirectSoundBufferImpl_Create( DSOUND_RecalcVolPan(&(dsb->volpan)); InitializeCriticalSection(&(dsb->lock)); - dsb->lock.DebugInfo->Spare[0] = (DWORD_PTR)"DSOUNDBUFFER_lock"; + dsb->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectSoundBufferImpl.lock"); /* register buffer if not primary */ if (!(dsbd->dwFlags & DSBCAPS_PRIMARYBUFFER)) { @@ -1319,7 +1319,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate( CopyMemory(dsb->pwfx, pdsb->pwfx, size); InitializeCriticalSection(&(dsb->lock)); - dsb->lock.DebugInfo->Spare[0] = (DWORD_PTR)"DSOUNDBUFFER_lock"; + dsb->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectSoundBufferImpl.lock"); /* register buffer */ hres = DirectSoundDevice_AddBuffer(device, dsb); diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 68b1f06..1e14acd 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -1665,7 +1665,7 @@ static HRESULT DirectSoundCaptureDevice_Create( device->state = STATE_STOPPED; InitializeCriticalSection( &(device->lock) ); - device->lock.DebugInfo->Spare[0] = (DWORD_PTR)"DSCAPTURE_lock"; + device->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": DirectSoundCaptureDevice.lock"); *ppDevice = device; diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 666ddaa..33df102 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1224,7 +1224,7 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice) device->pwfx->cbSize = 0; InitializeCriticalSection(&(device->mixlock)); - device->mixlock.DebugInfo->Spare[0] = (DWORD_PTR)"DSOUND_mixlock"; + device->mixlock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": DirectSoundDevice.mixlock"); RtlInitializeResource(&(device->buffer_list_lock));

1 0

Jan Zerebecki : winex11.drv: Add DebugInfo to critical sections.
by Alexandre Julliard 12 Mar '07

12 Mar '07

Module: wine Branch: master Commit: 2db1e421f1d4a0cb77d3c907d5edcacf88c704a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2db1e421f1d4a0cb77d3c907d… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Sat Mar 10 22:11:01 2007 +0100 winex11.drv: Add DebugInfo to critical sections. --- dlls/winex11.drv/dib.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index cec2058..82cacab 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4608,6 +4608,7 @@ HBITMAP X11DRV_CreateDIBSection( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, /* install fault handler */ InitializeCriticalSection( &physBitmap->lock ); + physBitmap->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": X_PHYSBITMAP.lock"); physBitmap->base = dib.dsBm.bmBits; physBitmap->size = dib.dsBmih.biSizeImage; @@ -4663,6 +4664,7 @@ void X11DRV_DIB_DeleteDIBSection(X_PHYSBITMAP *physBitmap, DIBSECTION *dib) } HeapFree(GetProcessHeap(), 0, physBitmap->colorMap); + physBitmap->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&physBitmap->lock); }

1 0

Jan Zerebecki : winealsa.drv: Conform critical section DebugInfo names.
by Alexandre Julliard 12 Mar '07

12 Mar '07

Module: wine Branch: master Commit: ea363dc6a7d09ff5ae5da74b24982a2d0a75b2a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea363dc6a7d09ff5ae5da74b2… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Sat Mar 10 22:12:14 2007 +0100 winealsa.drv: Conform critical section DebugInfo names. --- dlls/winealsa.drv/alsa.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 353a9c2..b1945b2 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -84,7 +84,7 @@ int ALSA_InitRingMessage(ALSA_MSG_RING* omr) omr->messages = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,omr->ring_buffer_size * sizeof(ALSA_MSG)); InitializeCriticalSection(&omr->msg_crst); - omr->msg_crst.DebugInfo->Spare[0] = (DWORD_PTR)"WINEALSA_msg_crst"; + omr->msg_crst.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ALSA_MSG_RING.msg_crst"); return 0; }

1 0

Jan Zerebecki : rsaenh: Add DebugInfo to critical sections.
by Alexandre Julliard 12 Mar '07

12 Mar '07

Module: wine Branch: master Commit: 021b004cf5d74009a33aa87f35c67bea5856cb2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=021b004cf5d74009a33aa87f3… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Sat Mar 10 22:10:36 2007 +0100 rsaenh: Add DebugInfo to critical sections. --- dlls/rsaenh/handle.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/handle.c b/dlls/rsaenh/handle.c index 1238651..1758391 100644 --- a/dlls/rsaenh/handle.c +++ b/dlls/rsaenh/handle.c @@ -58,6 +58,7 @@ void init_handle_table(HANDLETABLE *lpTable) lpTable->iEntries = 0; lpTable->iFirstFree = 0; InitializeCriticalSection(&lpTable->mutex); + lpTable->mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": HANDLETABLE.mutex"); } /****************************************************************************** @@ -76,6 +77,7 @@ void destroy_handle_table(HANDLETABLE *lpTable) TRACE("(lpTable=%p)\n", lpTable); HeapFree(GetProcessHeap(), 0, lpTable->paEntries); + lpTable->mutex.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&lpTable->mutex); }

1 0

Jan Zerebecki : urlmon: Add DebugInfo to critical sections.
by Alexandre Julliard 12 Mar '07

12 Mar '07

Module: wine Branch: master Commit: cfd121072c23f4b46baaa1ecb318ab422edefbba URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfd121072c23f4b46baaa1ecb… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Sat Mar 10 22:10:52 2007 +0100 urlmon: Add DebugInfo to critical sections. --- dlls/urlmon/binding.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index bd4a447..cd82eb9 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -604,6 +604,7 @@ static ULONG WINAPI Binding_Release(IBinding *iface) IStream_Release(STREAM(This->stream)); ReleaseBindInfo(&This->bindinfo); + This->section.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->section); HeapFree(GetProcessHeap(), 0, This->mime); HeapFree(GetProcessHeap(), 0, This->url); @@ -1220,6 +1221,7 @@ static HRESULT Binding_Create(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding * ret->bindf = 0; InitializeCriticalSection(&ret->section); + ret->section.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": Binding.section"); hres = get_callback(pbc, &ret->callback); if(FAILED(hres)) {

1 0

Jan Zerebecki : wintab32: Add DebugInfo to critical sections.
by Alexandre Julliard 12 Mar '07

12 Mar '07

Module: wine Branch: master Commit: 1e0901179a779c82fe93e6565d10dc8664e0d5b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e0901179a779c82fe93e6565… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Sat Mar 10 22:11:09 2007 +0100 wintab32: Add DebugInfo to critical sections. --- dlls/wintab32/wintab32.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index f621f8e..c34a681 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -74,6 +74,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) case DLL_PROCESS_ATTACH: TRACE("Initialization\n"); InitializeCriticalSection(&csTablet); + csTablet.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": csTablet"); hx11drv = GetModuleHandleA("winex11.drv"); if (hx11drv) { @@ -96,6 +97,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) hwndDefault = 0; } TABLET_Unregister(); + csTablet.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&csTablet); break; }

1 0

Jan Zerebecki : secur32: Add DebugInfo to critical sections.
by Alexandre Julliard 12 Mar '07

12 Mar '07

Module: wine Branch: master Commit: e293d630ff89be0fdbe935c72fdb0c56c2f2d442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e293d630ff89be0fdbe935c72… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Sat Mar 10 22:10:45 2007 +0100 secur32: Add DebugInfo to critical sections. --- dlls/secur32/secur32.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 0841ae7..ee0b080 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -543,6 +543,7 @@ static void SECUR32_initializeProviders(void) TRACE("\n"); InitializeCriticalSection(&cs); + cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs"); /* First load built-in providers */ SECUR32_initSchannelSP(); /* Do not load Negotiate yet. This breaks for some user on the wine-users @@ -684,6 +685,7 @@ static void SECUR32_freeProviders(void) } LeaveCriticalSection(&cs); + cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&cs); }

1 0

Jan Zerebecki : quartz: Add DebugInfo to critical sections.
by Alexandre Julliard 12 Mar '07

12 Mar '07

Module: wine Branch: master Commit: b5619e8628ceac78e08420c87d82dc39253483eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5619e8628ceac78e08420c87… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Sat Mar 10 22:10:20 2007 +0100 quartz: Add DebugInfo to critical sections. Also add missing DeleteCriticalSection. --- dlls/quartz/dsoundrender.c | 6 +++++- dlls/quartz/filesource.c | 5 +++++ dlls/quartz/filtergraph.c | 4 ++++ dlls/quartz/memallocator.c | 3 +++ dlls/quartz/parser.c | 3 +++ dlls/quartz/systemclock.c | 2 ++ dlls/quartz/transform.c | 3 +++ dlls/quartz/videorenderer.c | 3 +++ 8 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 7db6765..bdb6079 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -316,11 +316,13 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) pDSoundRender->IBasicAudio_vtbl = &IBasicAudio_Vtbl; pDSoundRender->refCount = 1; InitializeCriticalSection(&pDSoundRender->csFilter); + pDSoundRender->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": DSoundRenderImpl.csFilter"); pDSoundRender->state = State_Stopped; pDSoundRender->ppPins = CoTaskMemAlloc(1 * sizeof(IPin *)); if (!pDSoundRender->ppPins) { + pDSoundRender->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&pDSoundRender->csFilter); CoTaskMemFree(pDSoundRender); return E_OUTOFMEMORY; @@ -340,6 +342,7 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) else { CoTaskMemFree(pDSoundRender->ppPins); + pDSoundRender->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&pDSoundRender->csFilter); CoTaskMemFree(pDSoundRender); } @@ -395,8 +398,9 @@ static ULONG WINAPI DSoundRender_Release(IBaseFilter * iface) if (!refCount) { + This->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csFilter); - if (This->pClock) + if (This->pClock) IReferenceClock_Release(This->pClock); if (This->dsbuffer) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 66a753f..22209f5 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -314,6 +314,7 @@ HRESULT AsyncReader_create(IUnknown * pUnkOuter, LPVOID * ppv) pAsyncRead->pOutputPin = NULL; InitializeCriticalSection(&pAsyncRead->csFilter); + pAsyncRead->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": AsyncReader.csFilter"); pAsyncRead->pszFileName = NULL; pAsyncRead->pmt = NULL; @@ -378,6 +379,7 @@ static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface) { if (This->pOutputPin) IPin_Release(This->pOutputPin); + This->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csFilter); This->lpVtbl = NULL; CoTaskMemFree(This); @@ -764,6 +766,8 @@ static ULONG WINAPI FileAsyncReaderPin_Release(IPin * iface) } CloseHandle(This->hFile); CloseHandle(This->hEvent); + This->csList.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->csList); CoTaskMemFree(This); return 0; } @@ -862,6 +866,7 @@ static HRESULT FileAsyncReader_Construct(HANDLE hFile, IBaseFilter * pBaseFilter pPinImpl->pHead = NULL; pPinImpl->pin.pConnectSpecific = FileAsyncReaderPin_ConnectSpecific; InitializeCriticalSection(&pPinImpl->csList); + pPinImpl->csList.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": FileAsyncReader.csList"); *ppPin = (IPin *)(&pPinImpl->pin.pin.lpVtbl); return S_OK; diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 4bbe879..724feda 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -76,6 +76,7 @@ static int EventsQueue_Init(EventsQueue* omr) ZeroMemory(omr->messages, omr->ring_buffer_size * sizeof(Event)); InitializeCriticalSection(&omr->msg_crst); + omr->msg_crst.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": EventsQueue.msg_crst"); return TRUE; } @@ -83,6 +84,7 @@ static int EventsQueue_Destroy(EventsQueue* omr) { CloseHandle(omr->msg_event); CoTaskMemFree(omr->messages); + omr->msg_crst.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&omr->msg_crst); return TRUE; } @@ -268,6 +270,7 @@ static ULONG Filtergraph_Release(IFilterGraphImpl *This) { IFilterMapper2_Release(This->pFilterMapper2); CloseHandle(This->hEventCompletion); EventsQueue_Destroy(&This->evqueue); + This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); CoTaskMemFree(This->ppFiltersInGraph); CoTaskMemFree(This->pFilterNames); @@ -4516,6 +4519,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->state = State_Stopped; EventsQueue_Init(&fimpl->evqueue); InitializeCriticalSection(&fimpl->cs); + fimpl->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IFilterGraphImpl.cs"); fimpl->nItfCacheEntries = 0; hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterMapper2, (LPVOID*)&fimpl->pFilterMapper2); diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 4bb6bab..d36b83c 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -105,6 +105,7 @@ static HRESULT BaseMemAllocator_Init(HRESULT (* fnAlloc)(IMemAllocator *), HRESU pMemAlloc->lWaiting = 0; InitializeCriticalSection(&pMemAlloc->csState); + pMemAlloc->csState.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": BaseMemAllocator.csState"); return S_OK; } @@ -155,6 +156,8 @@ static ULONG WINAPI BaseMemAllocator_Release(IMemAllocator * iface) if (This->bCommitted) This->fnFree(iface); CoTaskMemFree(This->pProps); + This->csState.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->csState); CoTaskMemFree(This); return 0; } diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index e9d0854..1da0b6d 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -71,6 +71,7 @@ HRESULT Parser_Create(ParserImpl* pParser, const CLSID* pClsid, PFN_PROCESS_SAMP pParser->lpVtbl = &Parser_Vtbl; pParser->refCount = 1; InitializeCriticalSection(&pParser->csFilter); + pParser->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ParserImpl.csFilter"); pParser->state = State_Stopped; pParser->pClock = NULL; ZeroMemory(&pParser->filterInfo, sizeof(FILTER_INFO)); @@ -93,6 +94,7 @@ HRESULT Parser_Create(ParserImpl* pParser, const CLSID* pClsid, PFN_PROCESS_SAMP else { CoTaskMemFree(pParser->ppPins); + pParser->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&pParser->csFilter); CoTaskMemFree(pParser); } @@ -185,6 +187,7 @@ static ULONG WINAPI Parser_Release(IBaseFilter * iface) { ULONG i; + This->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csFilter); if (This->pClock) IReferenceClock_Release(This->pClock); diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 78374d8..d78611f 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -224,6 +224,7 @@ static ULONG WINAPI SystemClockImpl_Release(IReferenceClock* iface) { WaitForSingleObject(This->adviseThread, INFINITE); CloseHandle(This->adviseThread); } + This->safe.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->safe); CoTaskMemFree(This); } @@ -384,6 +385,7 @@ HRESULT QUARTZ_CreateSystemClock(IUnknown * pUnkOuter, LPVOID * ppv) { obj->lastTimeTickCount = GetTickCount(); InitializeCriticalSection(&obj->safe); + obj->safe.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SystemClockImpl.safe"); return SystemClockImpl_QueryInterface((IReferenceClock*) obj, &IID_IReferenceClock, ppv); } diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index a610d43..22cb2bf 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -187,6 +187,7 @@ HRESULT TransformFilter_Create(TransformFilterImpl* pTransformFilter, const CLSI pTransformFilter->refCount = 1; InitializeCriticalSection(&pTransformFilter->csFilter); + pTransformFilter->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": TransformFilterImpl.csFilter"); pTransformFilter->state = State_Stopped; pTransformFilter->pClock = NULL; ZeroMemory(&pTransformFilter->filterInfo, sizeof(FILTER_INFO)); @@ -219,6 +220,7 @@ HRESULT TransformFilter_Create(TransformFilterImpl* pTransformFilter, const CLSI else { CoTaskMemFree(pTransformFilter->ppPins); + pTransformFilter->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&pTransformFilter->csFilter); CoTaskMemFree(pTransformFilter); } @@ -274,6 +276,7 @@ static ULONG WINAPI TransformFilter_Release(IBaseFilter * iface) { ULONG i; + This->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csFilter); if (This->pClock) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 3ec283a..695258d 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -437,6 +437,7 @@ HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) pVideoRenderer->refCount = 1; InitializeCriticalSection(&pVideoRenderer->csFilter); + pVideoRenderer->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": VideoRendererImpl.csFilter"); pVideoRenderer->state = State_Stopped; pVideoRenderer->pClock = NULL; pVideoRenderer->init = 0; @@ -460,6 +461,7 @@ HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) else { CoTaskMemFree(pVideoRenderer->ppPins); + pVideoRenderer->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&pVideoRenderer->csFilter); CoTaskMemFree(pVideoRenderer); } @@ -520,6 +522,7 @@ static ULONG WINAPI VideoRenderer_Release(IBaseFilter * iface) if (!refCount) { + This->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csFilter); DestroyWindow(This->hWnd);

1 0

Jan Zerebecki : qcap: Add DebugInfo to critical sections.
by Alexandre Julliard 12 Mar '07

12 Mar '07

Module: wine Branch: master Commit: 614ee8314df6c8d5200a72cfd26b56178c074f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=614ee8314df6c8d5200a72cfd… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Sat Mar 10 22:10:09 2007 +0100 qcap: Add DebugInfo to critical sections. --- dlls/qcap/capturegraph.c | 2 ++ dlls/qcap/v4l.c | 2 ++ dlls/qcap/vfwcapture.c | 2 ++ 3 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index 3211790..c947980 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -105,6 +105,7 @@ IUnknown * CALLBACK QCAP_createCaptureGraphBuilder2(IUnknown *pUnkOuter, pCapture->ref = 1; pCapture->mygraph = NULL; InitializeCriticalSection(&pCapture->csFilter); + pCapture->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": CaptureGraphImpl.csFilter"); *phr = S_OK; ObjectRefCount(TRUE); } @@ -160,6 +161,7 @@ fnCaptureGraphBuilder2_Release(ICaptureGraphBuilder2 * iface) if (!ref) { FIXME("Release IGraphFilter or w/e\n"); + This->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csFilter); This->lpVtbl = NULL; This->lpVtbl2 = NULL; diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index bb8dfb9..babf2cf 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -224,6 +224,7 @@ HRESULT qcap_driver_destroy(Capture *capBox) if( capBox->fd != -1 ) close(capBox->fd); + capBox->CritSect.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&capBox->CritSect); CoTaskMemFree(capBox); return S_OK; @@ -789,6 +790,7 @@ Capture * qcap_driver_init( IPin *pOut, USHORT card ) /* capBox->vtbl = &defboxVtbl; */ InitializeCriticalSection( &capBox->CritSect ); + capBox->CritSect.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": Capture.CritSect"); sprintf(device, "/dev/video%i", card); TRACE("opening %s\n", device); diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index ace2b55..d388c00 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -112,6 +112,7 @@ IUnknown * WINAPI QCAP_createVFWCaptureFilter(IUnknown *pUnkOuter, HRESULT *phr) pVfwCapture->state = State_Stopped; pVfwCapture->init = FALSE; InitializeCriticalSection(&pVfwCapture->csFilter); + pVfwCapture->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": VfwCapture.csFilter"); hr = VfwPin_Construct((IBaseFilter *)&pVfwCapture->lpVtbl, &pVfwCapture->csFilter, &pVfwCapture->pOutputPin); if (!SUCCEEDED(hr)) @@ -208,6 +209,7 @@ static ULONG WINAPI VfwCapture_Release(IBaseFilter * iface) IPin_Disconnect(This->pOutputPin); } IPin_Release(This->pOutputPin); + This->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csFilter); This->lpVtbl = NULL; CoTaskMemFree(This);

1 0