wine-commits June 2007

wine-commits@winehq.org

5 participants
856 discussions

Francois Gouget : msdmo: Improve the prototypes Win64 compatibility by replacing long with LONG.
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: e84562a15a58b274054f4ec5c62cc8ffdad9d766 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e84562a15a58b274054f4ec5c… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 12 17:52:20 2007 +0200 msdmo: Improve the prototypes Win64 compatibility by replacing long with LONG. --- dlls/msdmo/dmoreg.c | 8 ++++---- include/dmoreg.h | 4 ++-- tools/winapi/win32.api | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 74aa1b4..ff0440a 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -650,11 +650,11 @@ static const IEnumDMOVtbl edmovt = }; -HRESULT WINAPI DMOGetTypes(REFCLSID a, unsigned long b, unsigned long* c, - DMO_PARTIAL_MEDIATYPE* d, unsigned long e, - unsigned long* f, DMO_PARTIAL_MEDIATYPE* g) +HRESULT WINAPI DMOGetTypes(REFCLSID a, ULONG b, ULONG* c, + DMO_PARTIAL_MEDIATYPE* d, ULONG e, + ULONG* f, DMO_PARTIAL_MEDIATYPE* g) { - FIXME("(%p,%lu,%p,%p,%lu,%p,%p),stub!\n",a,b,c,d,e,f,g); + FIXME("(%p,%u,%p,%p,%u,%p,%p),stub!\n",a,b,c,d,e,f,g); return E_NOTIMPL; } diff --git a/include/dmoreg.h b/include/dmoreg.h index 0852346..c352790 100644 --- a/include/dmoreg.h +++ b/include/dmoreg.h @@ -42,8 +42,8 @@ HRESULT WINAPI DMORegister(LPCWSTR,REFCLSID,REFGUID,DWORD,DWORD,const DMO_PARTIA HRESULT WINAPI DMOUnregister(REFCLSID,REFGUID); HRESULT WINAPI DMOEnum(REFGUID,DWORD,DWORD,const DMO_PARTIAL_MEDIATYPE*,DWORD, const DMO_PARTIAL_MEDIATYPE*,IEnumDMO**); -HRESULT WINAPI DMOGetTypes(REFCLSID,unsigned long,unsigned long*,DMO_PARTIAL_MEDIATYPE*, - unsigned long,unsigned long*,DMO_PARTIAL_MEDIATYPE*); +HRESULT WINAPI DMOGetTypes(REFCLSID,ULONG,ULONG*,DMO_PARTIAL_MEDIATYPE*, + ULONG,ULONG*,DMO_PARTIAL_MEDIATYPE*); HRESULT WINAPI DMOGetName(REFCLSID,WCHAR*); DEFINE_GUID(DMOCATEGORY_AUDIO_DECODER, diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 1039cbd..989755f 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -2305,7 +2305,7 @@ PWSTR DWORD HRESULT -unsigned long +ULONG %ptr @@ -2315,7 +2315,7 @@ DMO_PARTIAL_MEDIATYPE * IEnumDMO ** REFCLSID REFGUID -unsigned long * +ULONG * %wstr

1 0

Francois Gouget : msdmo: dmoreg.h should include mediaobj.h.
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: 12042c040fea34069ce25c5a81b06cee845f4298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12042c040fea34069ce25c5a8… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 12 17:50:49 2007 +0200 msdmo: dmoreg.h should include mediaobj.h. --- include/dmoreg.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/dmoreg.h b/include/dmoreg.h index 592cbd3..0852346 100644 --- a/include/dmoreg.h +++ b/include/dmoreg.h @@ -19,6 +19,8 @@ #ifndef __DMOREG_H__ #define __DMOREG_H__ +#include "mediaobj.h" + typedef struct _DMO_PARTIAL_MEDIATYPE { GUID type;

1 0

Francois Gouget : hhctrl.ocx: winapi_check expects the module name to be all uppercase in the documentation .
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: 6455295e40762f29b749aad01a1b5fd66d8da376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6455295e40762f29b749aad01… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 12 17:50:32 2007 +0200 hhctrl.ocx: winapi_check expects the module name to be all uppercase in the documentation. --- dlls/hhctrl.ocx/hhctrl.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index b687a83..44a1eb3 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -87,7 +87,7 @@ static const char *command_to_string(UINT command) } /****************************************************************** - * HtmlHelpW (hhctrl.ocx.15) + * HtmlHelpW (HHCTRL.OCX.15) */ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR data) { @@ -159,7 +159,7 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat } /****************************************************************** - * HtmlHelpA (hhctrl.ocx.14) + * HtmlHelpA (HHCTRL.OCX.14) */ HWND WINAPI HtmlHelpA(HWND caller, LPCSTR filename, UINT command, DWORD_PTR data) { @@ -223,7 +223,7 @@ HWND WINAPI HtmlHelpA(HWND caller, LPCSTR filename, UINT command, DWORD_PTR data } /****************************************************************** - * doWinMain (hhctrl.ocx.13) + * doWinMain (HHCTRL.OCX.13) */ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) { @@ -244,7 +244,7 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) } /****************************************************************** - * DllGetClassObject (hhctrl.ocx.@) + * DllGetClassObject (HHCTRL.OCX.@) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) {

1 0

Francois Gouget : winapi_check: .exe and .ocx files can also export APIs.
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: 8f3187bdf160dcad643d2962ad008f18e191a890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f3187bdf160dcad643d2962a… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 12 17:50:20 2007 +0200 winapi_check: .exe and .ocx files can also export APIs. --- tools/winapi/winapi_documentation.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winapi/winapi_documentation.pm b/tools/winapi/winapi_documentation.pm index f41cd49..a168cfa 100644 --- a/tools/winapi/winapi_documentation.pm +++ b/tools/winapi/winapi_documentation.pm @@ -125,7 +125,7 @@ sub check_documentation($) { if(!$documentation_error && $options->documentation_wrong) { foreach (split(/\n/, $documentation)) { - if (/^\s*\*\s*(\S+)\s*[$\[]\s*(\w+(?:\.(?:DRV|VXD))?)\s*\.\s*([^\s$\]]*)\s*[\)\]].*?$/) { + if (/^\s*\*\s*(\S+)\s*[$\[]\s*(\w+(?:\.(?:DRV|EXE|OCX|VXD))?)\s*\.\s*([^\s$\]]*)\s*[\)\]].*?$/) { my $external_name = $1; my $module = $2; my $ordinal = $3;

1 0

Francois Gouget : gdiplus: Add missing '\n' in Wine trace.
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: 3aebd595a8d51ec90f16181e85c19a65c3257b81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aebd595a8d51ec90f16181e8… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 12 17:50:06 2007 +0200 gdiplus: Add missing '\n' in Wine trace. --- dlls/gdiplus/gdiplus.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 6b2683a..7ebd848 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -55,10 +55,10 @@ Status WINAPI GdiplusStartup(ULONG_PTR *token, const struct GdiplusStartupInput return UnsupportedGdiplusVersion; } else if ((input->DebugEventCallback) || (input->SuppressBackgroundThread) || (input->SuppressExternalCodecs)){ - FIXME("Unimplemented for non-default GdiplusStartupInput"); + FIXME("Unimplemented for non-default GdiplusStartupInput\n"); return NotImplemented; } else if(output) { - FIXME("Unimplemented for non-null GdiplusStartupOutput"); + FIXME("Unimplemented for non-null GdiplusStartupOutput\n"); return NotImplemented; }

1 0

Francois Gouget : wined3d: Pass the D3DCB_CreateAdditionalSwapChain() error code to the upper layers (needed for d3d9).
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: 6f24b198f3ad1be91580625ac7c72febacface6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f24b198f3ad1be91580625ac… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 12 17:49:58 2007 +0200 wined3d: Pass the D3DCB_CreateAdditionalSwapChain() error code to the upper layers (needed for d3d9). --- dlls/wined3d/device.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d81ea0b..d4a9f77 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1803,6 +1803,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreatePalette(IWineD3DDevice *iface, DW static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPRESENT_PARAMETERS* pPresentationParameters, D3DCB_CREATEADDITIONALSWAPCHAIN D3DCB_CreateAdditionalSwapChain) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; IWineD3DSwapChainImpl *swapchain; + HRESULT hr; DWORD state; TRACE("(%p)->(%p,%p)\n", This, pPresentationParameters, D3DCB_CreateAdditionalSwapChain); @@ -1818,9 +1819,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR /* Setup the implicit swapchain */ TRACE("Creating implicit swapchain\n"); - if (FAILED(D3DCB_CreateAdditionalSwapChain((IUnknown *) This->parent, pPresentationParameters, (IWineD3DSwapChain **)&swapchain)) || !swapchain) { + hr=D3DCB_CreateAdditionalSwapChain((IUnknown *) This->parent, pPresentationParameters, (IWineD3DSwapChain **)&swapchain); + if (FAILED(hr) || !swapchain) { WARN("Failed to create implicit swapchain\n"); - return WINED3DERR_INVALIDCALL; + return hr; } This->NumberOfSwapChains = 1;

1 0

Stefan Dösinger : d3d8: Hold the lock in IDirect3Dtexture8 methods.
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: 00c8dbe2aa8ce9e751d954df9922d9b5e5029b33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00c8dbe2aa8ce9e751d954df9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun May 27 14:30:07 2007 +0200 d3d8: Hold the lock in IDirect3Dtexture8 methods. --- dlls/d3d8/texture.c | 103 ++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 89 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 8965735..03f26d5 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -57,7 +57,9 @@ static ULONG WINAPI IDirect3DTexture8Impl_Release(LPDIRECT3DTEXTURE8 iface) { TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + EnterCriticalSection(&d3d8_cs); IWineD3DTexture_Destroy(This->wineD3DTexture, D3D8CB_DestroySurface); + LeaveCriticalSection(&d3d8_cs); IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } @@ -67,74 +69,127 @@ static ULONG WINAPI IDirect3DTexture8Impl_Release(LPDIRECT3DTEXTURE8 iface) { /* IDirect3DTexture8 IDirect3DResource8 Interface follow: */ static HRESULT WINAPI IDirect3DTexture8Impl_GetDevice(LPDIRECT3DTEXTURE8 iface, IDirect3DDevice8 **ppDevice) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)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 IDirect3DTexture8Impl_SetPrivateData(LPDIRECT3DTEXTURE8 iface, REFGUID refguid, CONST void *pData, DWORD SizeOfData, DWORD Flags) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DTexture_SetPrivateData(This->wineD3DTexture, refguid, pData, SizeOfData, Flags); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DTexture_SetPrivateData(This->wineD3DTexture, refguid, pData, SizeOfData, Flags); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DTexture8Impl_GetPrivateData(LPDIRECT3DTEXTURE8 iface, REFGUID refguid, void *pData, DWORD* pSizeOfData) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DTexture_GetPrivateData(This->wineD3DTexture, refguid, pData, pSizeOfData); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DTexture_GetPrivateData(This->wineD3DTexture, refguid, pData, pSizeOfData); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DTexture8Impl_FreePrivateData(LPDIRECT3DTEXTURE8 iface, REFGUID refguid) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DTexture_FreePrivateData(This->wineD3DTexture, refguid); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DTexture_FreePrivateData(This->wineD3DTexture, refguid); + LeaveCriticalSection(&d3d8_cs); + return hr; } static DWORD WINAPI IDirect3DTexture8Impl_SetPriority(LPDIRECT3DTEXTURE8 iface, DWORD PriorityNew) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DTexture_SetPriority(This->wineD3DTexture, PriorityNew); + + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DTexture_SetPriority(This->wineD3DTexture, PriorityNew); + LeaveCriticalSection(&d3d8_cs); + return ret; } static DWORD WINAPI IDirect3DTexture8Impl_GetPriority(LPDIRECT3DTEXTURE8 iface) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DTexture_GetPriority(This->wineD3DTexture); + + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DTexture_GetPriority(This->wineD3DTexture); + LeaveCriticalSection(&d3d8_cs); + return ret; } static void WINAPI IDirect3DTexture8Impl_PreLoad(LPDIRECT3DTEXTURE8 iface) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; TRACE("(%p) Relay\n", This); + + EnterCriticalSection(&d3d8_cs); IWineD3DTexture_PreLoad(This->wineD3DTexture); + LeaveCriticalSection(&d3d8_cs); } static D3DRESOURCETYPE WINAPI IDirect3DTexture8Impl_GetType(LPDIRECT3DTEXTURE8 iface) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; + D3DRESOURCETYPE type; TRACE("(%p) Relay\n", This); - return IWineD3DTexture_GetType(This->wineD3DTexture); + + EnterCriticalSection(&d3d8_cs); + type = IWineD3DTexture_GetType(This->wineD3DTexture); + LeaveCriticalSection(&d3d8_cs); + return type; } /* IDirect3DTexture8 IDirect3DBaseTexture8 Interface follow: */ static DWORD WINAPI IDirect3DTexture8Impl_SetLOD(LPDIRECT3DTEXTURE8 iface, DWORD LODNew) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DTexture_SetLOD(This->wineD3DTexture, LODNew); + + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DTexture_SetLOD(This->wineD3DTexture, LODNew); + LeaveCriticalSection(&d3d8_cs); + return ret; } static DWORD WINAPI IDirect3DTexture8Impl_GetLOD(LPDIRECT3DTEXTURE8 iface) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DTexture_GetLOD(This->wineD3DTexture); + + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DTexture_GetLOD(This->wineD3DTexture); + LeaveCriticalSection(&d3d8_cs); + return ret; } static DWORD WINAPI IDirect3DTexture8Impl_GetLevelCount(LPDIRECT3DTEXTURE8 iface) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DTexture_GetLevelCount(This->wineD3DTexture); + + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DTexture_GetLevelCount(This->wineD3DTexture); + LeaveCriticalSection(&d3d8_cs); + return ret; } /* IDirect3DTexture8 Interface follow: */ static HRESULT WINAPI IDirect3DTexture8Impl_GetLevelDesc(LPDIRECT3DTEXTURE8 iface, UINT Level, D3DSURFACE_DESC *pDesc) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; + HRESULT hr; WINED3DSURFACE_DESC wined3ddesc; TRACE("(%p) Relay\n", This); @@ -150,7 +205,10 @@ static HRESULT WINAPI IDirect3DTexture8Impl_GetLevelDesc(LPDIRECT3DTEXTURE8 ifac wined3ddesc.Width = &pDesc->Width; wined3ddesc.Height = &pDesc->Height; - return IWineD3DTexture_GetLevelDesc(This->wineD3DTexture, Level, &wined3ddesc); + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DTexture_GetLevelDesc(This->wineD3DTexture, Level, &wined3ddesc); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DTexture8Impl_GetSurfaceLevel(LPDIRECT3DTEXTURE8 iface, UINT Level, IDirect3DSurface8 **ppSurfaceLevel) { @@ -159,30 +217,47 @@ static HRESULT WINAPI IDirect3DTexture8Impl_GetSurfaceLevel(LPDIRECT3DTEXTURE8 i IWineD3DSurface *mySurface = NULL; TRACE("(%p) Relay\n", This); + EnterCriticalSection(&d3d8_cs); hrc = IWineD3DTexture_GetSurfaceLevel(This->wineD3DTexture, Level, &mySurface); if (hrc == D3D_OK && NULL != ppSurfaceLevel) { IWineD3DSurface_GetParent(mySurface, (IUnknown **)ppSurfaceLevel); IWineD3DSurface_Release(mySurface); } + LeaveCriticalSection(&d3d8_cs); return hrc; } static HRESULT WINAPI IDirect3DTexture8Impl_LockRect(LPDIRECT3DTEXTURE8 iface, UINT Level, D3DLOCKED_RECT *pLockedRect, CONST RECT *pRect, DWORD Flags) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DTexture_LockRect(This->wineD3DTexture, Level, (WINED3DLOCKED_RECT *) pLockedRect, pRect, Flags); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DTexture_LockRect(This->wineD3DTexture, Level, (WINED3DLOCKED_RECT *) pLockedRect, pRect, Flags); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DTexture8Impl_UnlockRect(LPDIRECT3DTEXTURE8 iface, UINT Level) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DTexture_UnlockRect(This->wineD3DTexture, Level); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DTexture_UnlockRect(This->wineD3DTexture, Level); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DTexture8Impl_AddDirtyRect(LPDIRECT3DTEXTURE8 iface, CONST RECT *pDirtyRect) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DTexture_AddDirtyRect(This->wineD3DTexture, pDirtyRect); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DTexture_AddDirtyRect(This->wineD3DTexture, pDirtyRect); + LeaveCriticalSection(&d3d8_cs); + return hr; } const IDirect3DTexture8Vtbl Direct3DTexture8_Vtbl =

1 0

Stefan Dösinger : d3d8: Hold the lock in IDirect3DVolumeTexture8 methods.
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: e980058f5808b4c321ef3b8a3c64fe6ecc649b44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e980058f5808b4c321ef3b8a3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun May 27 02:49:26 2007 +0200 d3d8: Hold the lock in IDirect3DVolumeTexture8 methods. --- dlls/d3d8/volumetexture.c | 104 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 90 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index 0b01fb2..fc35f3d 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -57,7 +57,9 @@ static ULONG WINAPI IDirect3DVolumeTexture8Impl_Release(LPDIRECT3DVOLUMETEXTURE8 TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + EnterCriticalSection(&d3d8_cs); IWineD3DVolumeTexture_Destroy(This->wineD3DVolumeTexture, D3D8CB_DestroyVolume); + LeaveCriticalSection(&d3d8_cs); IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } @@ -67,69 +69,122 @@ static ULONG WINAPI IDirect3DVolumeTexture8Impl_Release(LPDIRECT3DVOLUMETEXTURE8 /* IDirect3DVolumeTexture8 IDirect3DResource8 Interface follow: */ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetDevice(LPDIRECT3DVOLUMETEXTURE8 iface, IDirect3DDevice8 **ppDevice) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)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 IDirect3DVolumeTexture8Impl_SetPrivateData(LPDIRECT3DVOLUMETEXTURE8 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVolumeTexture_SetPrivateData(This->wineD3DVolumeTexture, refguid, pData, SizeOfData, Flags); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVolumeTexture_SetPrivateData(This->wineD3DVolumeTexture, refguid, pData, SizeOfData, Flags); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetPrivateData(LPDIRECT3DVOLUMETEXTURE8 iface, REFGUID refguid, void *pData, DWORD *pSizeOfData) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVolumeTexture_GetPrivateData(This->wineD3DVolumeTexture, refguid, pData, pSizeOfData); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVolumeTexture_GetPrivateData(This->wineD3DVolumeTexture, refguid, pData, pSizeOfData); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVolumeTexture8Impl_FreePrivateData(LPDIRECT3DVOLUMETEXTURE8 iface, REFGUID refguid) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVolumeTexture_FreePrivateData(This->wineD3DVolumeTexture, refguid); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVolumeTexture_FreePrivateData(This->wineD3DVolumeTexture, refguid); + LeaveCriticalSection(&d3d8_cs); + return hr; } static DWORD WINAPI IDirect3DVolumeTexture8Impl_SetPriority(LPDIRECT3DVOLUMETEXTURE8 iface, DWORD PriorityNew) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DVolumeTexture_SetPriority(This->wineD3DVolumeTexture, PriorityNew); + + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DVolumeTexture_SetPriority(This->wineD3DVolumeTexture, PriorityNew); + LeaveCriticalSection(&d3d8_cs); + return ret; } static DWORD WINAPI IDirect3DVolumeTexture8Impl_GetPriority(LPDIRECT3DVOLUMETEXTURE8 iface) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DVolumeTexture_GetPriority(This->wineD3DVolumeTexture); + + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DVolumeTexture_GetPriority(This->wineD3DVolumeTexture); + LeaveCriticalSection(&d3d8_cs); + return ret; } static void WINAPI IDirect3DVolumeTexture8Impl_PreLoad(LPDIRECT3DVOLUMETEXTURE8 iface) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; TRACE("(%p) Relay\n", This); + + EnterCriticalSection(&d3d8_cs); IWineD3DVolumeTexture_PreLoad(This->wineD3DVolumeTexture); + LeaveCriticalSection(&d3d8_cs); } static D3DRESOURCETYPE WINAPI IDirect3DVolumeTexture8Impl_GetType(LPDIRECT3DVOLUMETEXTURE8 iface) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; + D3DRESOURCETYPE type; TRACE("(%p) Relay\n", This); - return IWineD3DVolumeTexture_GetType(This->wineD3DVolumeTexture); + + EnterCriticalSection(&d3d8_cs); + type = IWineD3DVolumeTexture_GetType(This->wineD3DVolumeTexture); + LeaveCriticalSection(&d3d8_cs); + return type; } /* IDirect3DVolumeTexture8 IDirect3DBaseTexture8 Interface follow: */ static DWORD WINAPI IDirect3DVolumeTexture8Impl_SetLOD(LPDIRECT3DVOLUMETEXTURE8 iface, DWORD LODNew) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DVolumeTexture_SetLOD(This->wineD3DVolumeTexture, LODNew); + + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DVolumeTexture_SetLOD(This->wineD3DVolumeTexture, LODNew); + LeaveCriticalSection(&d3d8_cs); + return ret; } static DWORD WINAPI IDirect3DVolumeTexture8Impl_GetLOD(LPDIRECT3DVOLUMETEXTURE8 iface) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DVolumeTexture_GetLOD(This->wineD3DVolumeTexture); + + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DVolumeTexture_GetLOD(This->wineD3DVolumeTexture); + LeaveCriticalSection(&d3d8_cs); + return ret; } static DWORD WINAPI IDirect3DVolumeTexture8Impl_GetLevelCount(LPDIRECT3DVOLUMETEXTURE8 iface) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DVolumeTexture_GetLevelCount(This->wineD3DVolumeTexture); + + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DVolumeTexture_GetLevelCount(This->wineD3DVolumeTexture); + LeaveCriticalSection(&d3d8_cs); + return ret; } /* IDirect3DVolumeTexture8 Interface follow: */ @@ -137,6 +192,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetLevelDesc(LPDIRECT3DVOLUMET IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; WINED3DVOLUME_DESC wined3ddesc; UINT tmpInt = -1; + HRESULT hr; TRACE("(%p) Relay\n", This); @@ -150,7 +206,10 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetLevelDesc(LPDIRECT3DVOLUMET wined3ddesc.Height = &pDesc->Height; wined3ddesc.Depth = &pDesc->Depth; - return IWineD3DVolumeTexture_GetLevelDesc(This->wineD3DVolumeTexture, Level, &wined3ddesc); + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVolumeTexture_GetLevelDesc(This->wineD3DVolumeTexture, Level, &wined3ddesc); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetVolumeLevel(LPDIRECT3DVOLUMETEXTURE8 iface, UINT Level, IDirect3DVolume8 **ppVolumeLevel) { @@ -160,30 +219,47 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetVolumeLevel(LPDIRECT3DVOLUM TRACE("(%p) Relay\n", This); + EnterCriticalSection(&d3d8_cs); hrc = IWineD3DVolumeTexture_GetVolumeLevel(This->wineD3DVolumeTexture, Level, &myVolume); if (hrc == D3D_OK && NULL != ppVolumeLevel) { IWineD3DVolumeTexture_GetParent(myVolume, (IUnknown **)ppVolumeLevel); IWineD3DVolumeTexture_Release(myVolume); } + LeaveCriticalSection(&d3d8_cs); return hrc; } static HRESULT WINAPI IDirect3DVolumeTexture8Impl_LockBox(LPDIRECT3DVOLUMETEXTURE8 iface, UINT Level, D3DLOCKED_BOX *pLockedVolume, CONST D3DBOX *pBox, DWORD Flags) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay %p %p %p %d\n", This, This->wineD3DVolumeTexture, pLockedVolume, pBox,Flags); - return IWineD3DVolumeTexture_LockBox(This->wineD3DVolumeTexture, Level, (WINED3DLOCKED_BOX *) pLockedVolume, (CONST WINED3DBOX *) pBox, Flags); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVolumeTexture_LockBox(This->wineD3DVolumeTexture, Level, (WINED3DLOCKED_BOX *) pLockedVolume, (CONST WINED3DBOX *) pBox, Flags); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVolumeTexture8Impl_UnlockBox(LPDIRECT3DVOLUMETEXTURE8 iface, UINT Level) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay %p %d\n", This, This->wineD3DVolumeTexture, Level); - return IWineD3DVolumeTexture_UnlockBox(This->wineD3DVolumeTexture, Level); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVolumeTexture_UnlockBox(This->wineD3DVolumeTexture, Level); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVolumeTexture8Impl_AddDirtyBox(LPDIRECT3DVOLUMETEXTURE8 iface, CONST D3DBOX *pDirtyBox) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVolumeTexture_AddDirtyBox(This->wineD3DVolumeTexture, (CONST WINED3DBOX *) pDirtyBox); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVolumeTexture_AddDirtyBox(This->wineD3DVolumeTexture, (CONST WINED3DBOX *) pDirtyBox); + LeaveCriticalSection(&d3d8_cs); + return hr; }

1 0

Stefan Dösinger : d3d8: Hold the lock in volume methods.
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: 3e8948c173de36435a5bdd05a7bc0d6b888a600f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e8948c173de36435a5bdd05a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun May 27 02:41:41 2007 +0200 d3d8: Hold the lock in volume methods. --- dlls/d3d8/volume.c | 45 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 39 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 205c66a..bea2ea9 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -72,7 +72,9 @@ static ULONG WINAPI IDirect3DVolume8Impl_Release(LPDIRECT3DVOLUME8 iface) { TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + EnterCriticalSection(&d3d8_cs); IWineD3DVolume_Release(This->wineD3DVolume); + LeaveCriticalSection(&d3d8_cs); HeapFree(GetProcessHeap(), 0, This); } @@ -85,28 +87,45 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetDevice(LPDIRECT3DVOLUME8 iface, ID IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; IWineD3DDevice *myDevice = NULL; + EnterCriticalSection(&d3d8_cs); IWineD3DVolume_GetDevice(This->wineD3DVolume, &myDevice); IWineD3DDevice_GetParent(myDevice, (IUnknown **)ppDevice); IWineD3DDevice_Release(myDevice); + LeaveCriticalSection(&d3d8_cs); return D3D_OK; } static HRESULT WINAPI IDirect3DVolume8Impl_SetPrivateData(LPDIRECT3DVOLUME8 iface, REFGUID refguid, CONST void *pData, DWORD SizeOfData, DWORD Flags) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVolume_SetPrivateData(This->wineD3DVolume, refguid, pData, SizeOfData, Flags); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVolume_SetPrivateData(This->wineD3DVolume, refguid, pData, SizeOfData, Flags); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVolume8Impl_GetPrivateData(LPDIRECT3DVOLUME8 iface, REFGUID refguid, void *pData, DWORD* pSizeOfData) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVolume_GetPrivateData(This->wineD3DVolume, refguid, pData, pSizeOfData); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVolume_GetPrivateData(This->wineD3DVolume, refguid, pData, pSizeOfData); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVolume8Impl_FreePrivateData(LPDIRECT3DVOLUME8 iface, REFGUID refguid) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVolume_FreePrivateData(This->wineD3DVolume, refguid); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVolume_FreePrivateData(This->wineD3DVolume, refguid); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVolume8Impl_GetContainer(LPDIRECT3DVOLUME8 iface, REFIID riid, void **ppContainer) { @@ -130,6 +149,7 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetContainer(LPDIRECT3DVOLUME8 iface, static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(LPDIRECT3DVOLUME8 iface, D3DVOLUME_DESC *pDesc) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; + HRESULT hr; WINED3DVOLUME_DESC wined3ddesc; TRACE("(%p) Relay\n", This); @@ -144,19 +164,32 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(LPDIRECT3DVOLUME8 iface, D3DV wined3ddesc.Height = &pDesc->Height; wined3ddesc.Depth = &pDesc->Depth; - return IWineD3DVolume_GetDesc(This->wineD3DVolume, &wined3ddesc); + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVolume_GetDesc(This->wineD3DVolume, &wined3ddesc); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVolume8Impl_LockBox(LPDIRECT3DVOLUME8 iface, D3DLOCKED_BOX *pLockedVolume, CONST D3DBOX *pBox, DWORD Flags) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; + HRESULT hr; TRACE("(%p) relay %p %p %p %d\n", This, This->wineD3DVolume, pLockedVolume, pBox, Flags); - return IWineD3DVolume_LockBox(This->wineD3DVolume, (WINED3DLOCKED_BOX *) pLockedVolume, (CONST WINED3DBOX *) pBox, Flags); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVolume_LockBox(This->wineD3DVolume, (WINED3DLOCKED_BOX *) pLockedVolume, (CONST WINED3DBOX *) pBox, Flags); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVolume8Impl_UnlockBox(LPDIRECT3DVOLUME8 iface) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; + HRESULT hr; TRACE("(%p) relay %p\n", This, This->wineD3DVolume); - return IWineD3DVolume_UnlockBox(This->wineD3DVolume); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVolume_UnlockBox(This->wineD3DVolume); + LeaveCriticalSection(&d3d8_cs); + return hr; } static const IDirect3DVolume8Vtbl Direct3DVolume8_Vtbl =

1 0

Stefan Dösinger : d3d8: Hold the lock in IDirect3DVertexBuffer methods.
by Alexandre Julliard 13 Jun '07

13 Jun '07

Module: wine Branch: master Commit: 68d4fbeab3f55dbb1585ba009ae40fcbf4d1add7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68d4fbeab3f55dbb1585ba009… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun May 27 02:31:22 2007 +0200 d3d8: Hold the lock in IDirect3DVertexBuffer methods. --- dlls/d3d8/vertexbuffer.c | 67 +++++++++++++++++++++++++++++++++++++-------- 1 files changed, 55 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/vertexbuffer.c b/dlls/d3d8/vertexbuffer.c index 410659e..5dda94f 100644 --- a/dlls/d3d8/vertexbuffer.c +++ b/dlls/d3d8/vertexbuffer.c @@ -57,7 +57,9 @@ static ULONG WINAPI IDirect3DVertexBuffer8Impl_Release(LPDIRECT3DVERTEXBUFFER8 i TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + EnterCriticalSection(&d3d8_cs); IWineD3DVertexBuffer_Release(This->wineD3DVertexBuffer); + LeaveCriticalSection(&d3d8_cs); IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } @@ -68,81 +70,122 @@ static ULONG WINAPI IDirect3DVertexBuffer8Impl_Release(LPDIRECT3DVERTEXBUFFER8 i /* IDirect3DVertexBuffer8 IDirect3DResource8 Interface follow: */ static HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetDevice(LPDIRECT3DVERTEXBUFFER8 iface, IDirect3DDevice8 **ppDevice) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)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 IDirect3DVertexBuffer8Impl_SetPrivateData(LPDIRECT3DVERTEXBUFFER8 iface, REFGUID refguid, CONST void *pData, DWORD SizeOfData, DWORD Flags) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_SetPrivateData(This->wineD3DVertexBuffer, refguid, pData, SizeOfData, Flags); + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVertexBuffer_SetPrivateData(This->wineD3DVertexBuffer, refguid, pData, SizeOfData, Flags); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetPrivateData(LPDIRECT3DVERTEXBUFFER8 iface, REFGUID refguid, void *pData, DWORD *pSizeOfData) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_GetPrivateData(This->wineD3DVertexBuffer, refguid, pData, pSizeOfData); + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVertexBuffer_GetPrivateData(This->wineD3DVertexBuffer, refguid, pData, pSizeOfData); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVertexBuffer8Impl_FreePrivateData(LPDIRECT3DVERTEXBUFFER8 iface, REFGUID refguid) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_FreePrivateData(This->wineD3DVertexBuffer, refguid); + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVertexBuffer_FreePrivateData(This->wineD3DVertexBuffer, refguid); + LeaveCriticalSection(&d3d8_cs); + return hr; } static DWORD WINAPI IDirect3DVertexBuffer8Impl_SetPriority(LPDIRECT3DVERTEXBUFFER8 iface, DWORD PriorityNew) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_SetPriority(This->wineD3DVertexBuffer, PriorityNew); + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DVertexBuffer_SetPriority(This->wineD3DVertexBuffer, PriorityNew); + LeaveCriticalSection(&d3d8_cs); + return ret; } static DWORD WINAPI IDirect3DVertexBuffer8Impl_GetPriority(LPDIRECT3DVERTEXBUFFER8 iface) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_GetPriority(This->wineD3DVertexBuffer); + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DVertexBuffer_GetPriority(This->wineD3DVertexBuffer); + LeaveCriticalSection(&d3d8_cs); + return ret; } static void WINAPI IDirect3DVertexBuffer8Impl_PreLoad(LPDIRECT3DVERTEXBUFFER8 iface) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; TRACE("(%p) Relay\n", This); - IWineD3DVertexBuffer_PreLoad(This->wineD3DVertexBuffer); - return; + EnterCriticalSection(&d3d8_cs); + IWineD3DVertexBuffer_PreLoad(This->wineD3DVertexBuffer); + LeaveCriticalSection(&d3d8_cs); } static D3DRESOURCETYPE WINAPI IDirect3DVertexBuffer8Impl_GetType(LPDIRECT3DVERTEXBUFFER8 iface) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; + D3DRESOURCETYPE type; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_GetType(This->wineD3DVertexBuffer); + EnterCriticalSection(&d3d8_cs); + type = IWineD3DVertexBuffer_GetType(This->wineD3DVertexBuffer); + LeaveCriticalSection(&d3d8_cs); + return type; } /* IDirect3DVertexBuffer8 Interface follow: */ static HRESULT WINAPI IDirect3DVertexBuffer8Impl_Lock(LPDIRECT3DVERTEXBUFFER8 iface, UINT OffsetToLock, UINT SizeToLock, BYTE **ppbData, DWORD Flags) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_Lock(This->wineD3DVertexBuffer, OffsetToLock, SizeToLock, ppbData, Flags); + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVertexBuffer_Lock(This->wineD3DVertexBuffer, OffsetToLock, SizeToLock, ppbData, Flags); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVertexBuffer8Impl_Unlock(LPDIRECT3DVERTEXBUFFER8 iface) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_Unlock(This->wineD3DVertexBuffer); + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVertexBuffer_Unlock(This->wineD3DVertexBuffer); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetDesc(LPDIRECT3DVERTEXBUFFER8 iface, D3DVERTEXBUFFER_DESC *pDesc) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_GetDesc(This->wineD3DVertexBuffer, (WINED3DVERTEXBUFFER_DESC *) pDesc); + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DVertexBuffer_GetDesc(This->wineD3DVertexBuffer, (WINED3DVERTEXBUFFER_DESC *) pDesc); + LeaveCriticalSection(&d3d8_cs); + return hr; } const IDirect3DVertexBuffer8Vtbl Direct3DVertexBuffer8_Vtbl =

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2007