Stefan Dösinger : d3d8: Hold the lock in IDirect3DIndexBuffer8 methods.
Module: wine Branch: master Commit: 1ec8788b3487340ac527194e4ac16b3179b49d3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ec8788b3487340ac527194e4a... Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat May 26 20:09:24 2007 +0200 d3d8: Hold the lock in IDirect3DIndexBuffer8 methods. --- dlls/d3d8/indexbuffer.c | 75 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 65 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/indexbuffer.c b/dlls/d3d8/indexbuffer.c index ad92cf4..c4bd833 100644 --- a/dlls/d3d8/indexbuffer.c +++ b/dlls/d3d8/indexbuffer.c @@ -56,7 +56,9 @@ static ULONG WINAPI IDirect3DIndexBuffer8Impl_Release(LPDIRECT3DINDEXBUFFER8 ifa TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + EnterCriticalSection(&d3d8_cs); IWineD3DIndexBuffer_Release(This->wineD3DIndexBuffer); + LeaveCriticalSection(&d3d8_cs); IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } @@ -66,69 +68,122 @@ static ULONG WINAPI IDirect3DIndexBuffer8Impl_Release(LPDIRECT3DINDEXBUFFER8 ifa /* IDirect3DIndexBuffer8 IDirect3DResource8 Interface follow: */ static HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetDevice(LPDIRECT3DINDEXBUFFER8 iface, IDirect3DDevice8 **ppDevice) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IDirect3DResource8Impl_GetDevice((LPDIRECT3DRESOURCE8) This, ppDevice); + + EnterCriticalSection(&d3d8_cs); + hr = IDirect3DResource8Impl_GetDevice((LPDIRECT3DRESOURCE8) This, ppDevice); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DIndexBuffer8Impl_SetPrivateData(LPDIRECT3DINDEXBUFFER8 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_SetPrivateData(This->wineD3DIndexBuffer, refguid, pData, SizeOfData, Flags); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DIndexBuffer_SetPrivateData(This->wineD3DIndexBuffer, refguid, pData, SizeOfData, Flags); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetPrivateData(LPDIRECT3DINDEXBUFFER8 iface, REFGUID refguid, void *pData, DWORD *pSizeOfData) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_GetPrivateData(This->wineD3DIndexBuffer, refguid, pData, pSizeOfData); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DIndexBuffer_GetPrivateData(This->wineD3DIndexBuffer, refguid, pData, pSizeOfData); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DIndexBuffer8Impl_FreePrivateData(LPDIRECT3DINDEXBUFFER8 iface, REFGUID refguid) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_FreePrivateData(This->wineD3DIndexBuffer, refguid); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DIndexBuffer_FreePrivateData(This->wineD3DIndexBuffer, refguid); + LeaveCriticalSection(&d3d8_cs); + return hr; } static DWORD WINAPI IDirect3DIndexBuffer8Impl_SetPriority(LPDIRECT3DINDEXBUFFER8 iface, DWORD PriorityNew) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_SetPriority(This->wineD3DIndexBuffer, PriorityNew); + + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DIndexBuffer_SetPriority(This->wineD3DIndexBuffer, PriorityNew); + LeaveCriticalSection(&d3d8_cs); + return ret; } static DWORD WINAPI IDirect3DIndexBuffer8Impl_GetPriority(LPDIRECT3DINDEXBUFFER8 iface) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_GetPriority(This->wineD3DIndexBuffer); + + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DIndexBuffer_GetPriority(This->wineD3DIndexBuffer); + LeaveCriticalSection(&d3d8_cs); + return ret; } static void WINAPI IDirect3DIndexBuffer8Impl_PreLoad(LPDIRECT3DINDEXBUFFER8 iface) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; TRACE("(%p) Relay\n", This); + + EnterCriticalSection(&d3d8_cs); IWineD3DIndexBuffer_PreLoad(This->wineD3DIndexBuffer); + LeaveCriticalSection(&d3d8_cs); } static D3DRESOURCETYPE WINAPI IDirect3DIndexBuffer8Impl_GetType(LPDIRECT3DINDEXBUFFER8 iface) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; + D3DRESOURCETYPE type; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_GetType(This->wineD3DIndexBuffer); + + EnterCriticalSection(&d3d8_cs); + type = IWineD3DIndexBuffer_GetType(This->wineD3DIndexBuffer); + LeaveCriticalSection(&d3d8_cs); + return type; } /* IDirect3DIndexBuffer8 Interface follow: */ static HRESULT WINAPI IDirect3DIndexBuffer8Impl_Lock(LPDIRECT3DINDEXBUFFER8 iface, UINT OffsetToLock, UINT SizeToLock, BYTE **ppbData, DWORD Flags) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_Lock(This->wineD3DIndexBuffer, OffsetToLock, SizeToLock, ppbData, Flags); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DIndexBuffer_Lock(This->wineD3DIndexBuffer, OffsetToLock, SizeToLock, ppbData, Flags); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DIndexBuffer8Impl_Unlock(LPDIRECT3DINDEXBUFFER8 iface) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_Unlock(This->wineD3DIndexBuffer); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DIndexBuffer_Unlock(This->wineD3DIndexBuffer); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetDesc(LPDIRECT3DINDEXBUFFER8 iface, D3DINDEXBUFFER_DESC *pDesc) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_GetDesc(This->wineD3DIndexBuffer, (WINED3DINDEXBUFFER_DESC *) pDesc); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DIndexBuffer_GetDesc(This->wineD3DIndexBuffer, (WINED3DINDEXBUFFER_DESC *) pDesc); + LeaveCriticalSection(&d3d8_cs); + return hr; }
participants (1)
-
Alexandre Julliard