From 972ffcdd2bc2690a8611b127763bc3c8937db3fa Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Fri, 10 Feb 2023 19:01:07 +0800 Subject: [PATCH] nine: Replace usage of mtx_t with simple_mtx_t in nine_lock.c This is a prepare for removing _MTX_INITIALIZER_NP. Signed-off-by: Yonggang Luo Acked-by: David Heidelberg Acked-by: Eric Engestrom Part-of: --- src/gallium/frontends/nine/nine_lock.c | 883 +++++++++++++------------ 1 file changed, 442 insertions(+), 441 deletions(-) diff --git a/src/gallium/frontends/nine/nine_lock.c b/src/gallium/frontends/nine/nine_lock.c index 86879791261..2a44fa396fb 100644 --- a/src/gallium/frontends/nine/nine_lock.c +++ b/src/gallium/frontends/nine/nine_lock.c @@ -45,21 +45,22 @@ #include "d3d9.h" #include "nine_lock.h" +#include "util/simple_mtx.h" #include "util/u_thread.h" /* Global mutex as described by MSDN */ -static mtx_t d3dlock_global = _MTX_INITIALIZER_NP; +static simple_mtx_t d3dlock_global = SIMPLE_MTX_INITIALIZER; void NineLockGlobalMutex() { - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); } void NineUnlockGlobalMutex() { - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); } static HRESULT NINE_WINAPI @@ -67,9 +68,9 @@ LockAuthenticatedChannel9_GetCertificateSize( struct NineAuthenticatedChannel9 * UINT *pCertificateSize ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineAuthenticatedChannel9_GetCertificateSize(This, pCertificateSize); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -79,9 +80,9 @@ LockAuthenticatedChannel9_GetCertificate( struct NineAuthenticatedChannel9 *This BYTE *ppCertificate ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineAuthenticatedChannel9_GetCertificate(This, CertifacteSize, ppCertificate); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -91,9 +92,9 @@ LockAuthenticatedChannel9_NegotiateKeyExchange( struct NineAuthenticatedChannel9 void *pData ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineAuthenticatedChannel9_NegotiateKeyExchange(This, DataSize, pData); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -105,9 +106,9 @@ LockAuthenticatedChannel9_Query( struct NineAuthenticatedChannel9 *This, void *pOutput ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineAuthenticatedChannel9_Query(This, InputSize, pInput, OutputSize, pOutput); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -118,9 +119,9 @@ LockAuthenticatedChannel9_Configure( struct NineAuthenticatedChannel9 *This, D3DAUTHENTICATEDCHANNEL_CONFIGURE_OUTPUT *pOutput ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineAuthenticatedChannel9_Configure(This, InputSize, pInput, pOutput); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -143,9 +144,9 @@ LockUnknown_SetPrivateData( struct NineUnknown *This, DWORD Flags ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineUnknown_SetPrivateData(This, refguid, pData, SizeOfData, Flags); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -156,9 +157,9 @@ LockUnknown_GetPrivateData( struct NineUnknown *This, DWORD *pSizeOfData ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineUnknown_GetPrivateData(This, refguid, pData, pSizeOfData); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -167,9 +168,9 @@ LockUnknown_FreePrivateData( struct NineUnknown *This, REFGUID refguid ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineUnknown_FreePrivateData(This, refguid); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -179,9 +180,9 @@ LockResource9_GetDevice( struct NineResource9 *This, IDirect3DDevice9 **ppDevice ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineUnknown_GetDevice(NineUnknown(This), ppDevice); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } #endif @@ -191,9 +192,9 @@ LockResource9_SetPriority( struct NineResource9 *This, DWORD PriorityNew ) { DWORD r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineResource9_SetPriority(This, PriorityNew); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -201,9 +202,9 @@ static DWORD NINE_WINAPI LockResource9_GetPriority( struct NineResource9 *This ) { DWORD r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineResource9_GetPriority(This); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -211,9 +212,9 @@ LockResource9_GetPriority( struct NineResource9 *This ) static void NINE_WINAPI LockResource9_PreLoad( struct NineResource9 *This ) { - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); NineResource9_PreLoad(This); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); } #endif @@ -222,9 +223,9 @@ static D3DRESOURCETYPE NINE_WINAPI LockResource9_GetType( struct NineResource9 *This ) { D3DRESOURCETYPE r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineResource9_GetType(This); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } #endif @@ -234,9 +235,9 @@ LockBaseTexture9_SetLOD( struct NineBaseTexture9 *This, DWORD LODNew ) { DWORD r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineBaseTexture9_SetLOD(This, LODNew); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -244,9 +245,9 @@ static DWORD NINE_WINAPI LockBaseTexture9_GetLOD( struct NineBaseTexture9 *This ) { DWORD r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineBaseTexture9_GetLOD(This); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -254,9 +255,9 @@ static DWORD NINE_WINAPI LockBaseTexture9_GetLevelCount( struct NineBaseTexture9 *This ) { DWORD r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineBaseTexture9_GetLevelCount(This); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -265,9 +266,9 @@ LockBaseTexture9_SetAutoGenFilterType( struct NineBaseTexture9 *This, D3DTEXTUREFILTERTYPE FilterType ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineBaseTexture9_SetAutoGenFilterType(This, FilterType); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -275,26 +276,26 @@ static D3DTEXTUREFILTERTYPE NINE_WINAPI LockBaseTexture9_GetAutoGenFilterType( struct NineBaseTexture9 *This ) { D3DTEXTUREFILTERTYPE r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineBaseTexture9_GetAutoGenFilterType(This); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } static void NINE_WINAPI LockBaseTexture9_PreLoad( struct NineBaseTexture9 *This ) { - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); NineBaseTexture9_PreLoad(This); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); } static void NINE_WINAPI LockBaseTexture9_GenerateMipSubLevels( struct NineBaseTexture9 *This ) { - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); NineBaseTexture9_GenerateMipSubLevels(This); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); } static HRESULT NINE_WINAPI @@ -302,9 +303,9 @@ LockCryptoSession9_GetCertificateSize( struct NineCryptoSession9 *This, UINT *pCertificateSize ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineCryptoSession9_GetCertificateSize(This, pCertificateSize); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -314,9 +315,9 @@ LockCryptoSession9_GetCertificate( struct NineCryptoSession9 *This, BYTE *ppCertificate ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineCryptoSession9_GetCertificate(This, CertifacteSize, ppCertificate); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -326,9 +327,9 @@ LockCryptoSession9_NegotiateKeyExchange( struct NineCryptoSession9 *This, void *pData ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineCryptoSession9_NegotiateKeyExchange(This, DataSize, pData); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -340,9 +341,9 @@ LockCryptoSession9_EncryptionBlt( struct NineCryptoSession9 *This, void *pIV ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineCryptoSession9_EncryptionBlt(This, pSrcSurface, pDstSurface, DstSurfaceSize, pIV); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -356,9 +357,9 @@ LockCryptoSession9_DecryptionBlt( struct NineCryptoSession9 *This, void *pIV ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineCryptoSession9_DecryptionBlt(This, pSrcSurface, pDstSurface, SrcSurfaceSize, pEncryptedBlockInfo, pContentKey, pIV); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -368,9 +369,9 @@ LockCryptoSession9_GetSurfacePitch( struct NineCryptoSession9 *This, UINT *pSurfacePitch ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineCryptoSession9_GetSurfacePitch(This, pSrcSurface, pSurfacePitch); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -380,9 +381,9 @@ LockCryptoSession9_StartSessionKeyRefresh( struct NineCryptoSession9 *This, UINT RandomNumberSize ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineCryptoSession9_StartSessionKeyRefresh(This, pRandomNumber, RandomNumberSize); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -390,9 +391,9 @@ static HRESULT NINE_WINAPI LockCryptoSession9_FinishSessionKeyRefresh( struct NineCryptoSession9 *This ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineCryptoSession9_FinishSessionKeyRefresh(This); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -402,9 +403,9 @@ LockCryptoSession9_GetEncryptionBltKey( struct NineCryptoSession9 *This, UINT KeySize ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineCryptoSession9_GetEncryptionBltKey(This, pReadbackKey, KeySize); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -430,9 +431,9 @@ LockCubeTexture9_GetLevelDesc( struct NineCubeTexture9 *This, D3DSURFACE_DESC *pDesc ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineCubeTexture9_GetLevelDesc(This, Level, pDesc); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } #endif @@ -445,9 +446,9 @@ LockCubeTexture9_GetCubeMapSurface( struct NineCubeTexture9 *This, IDirect3DSurface9 **ppCubeMapSurface ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineCubeTexture9_GetCubeMapSurface(This, FaceType, Level, ppCubeMapSurface); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } #endif @@ -461,9 +462,9 @@ LockCubeTexture9_LockRect( struct NineCubeTexture9 *This, DWORD Flags ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineCubeTexture9_LockRect(This, FaceType, Level, pLockedRect, pRect, Flags); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -473,9 +474,9 @@ LockCubeTexture9_UnlockRect( struct NineCubeTexture9 *This, UINT Level ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineCubeTexture9_UnlockRect(This, FaceType, Level); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -485,9 +486,9 @@ LockCubeTexture9_AddDirtyRect( struct NineCubeTexture9 *This, const RECT *pDirtyRect ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineCubeTexture9_AddDirtyRect(This, FaceType, pDirtyRect); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -520,9 +521,9 @@ static HRESULT NINE_WINAPI LockDevice9_TestCooperativeLevel( struct NineDevice9 *This ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_TestCooperativeLevel(This); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -530,9 +531,9 @@ static UINT NINE_WINAPI LockDevice9_GetAvailableTextureMem( struct NineDevice9 *This ) { UINT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetAvailableTextureMem(This); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -540,9 +541,9 @@ static HRESULT NINE_WINAPI LockDevice9_EvictManagedResources( struct NineDevice9 *This ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_EvictManagedResources(This); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -551,9 +552,9 @@ LockDevice9_GetDirect3D( struct NineDevice9 *This, IDirect3D9 **ppD3D9 ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetDirect3D(This, ppD3D9); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -563,9 +564,9 @@ LockDevice9_GetDeviceCaps( struct NineDevice9 *This, D3DCAPS9 *pCaps ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetDeviceCaps(This, pCaps); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } #endif @@ -576,9 +577,9 @@ LockDevice9_GetDisplayMode( struct NineDevice9 *This, D3DDISPLAYMODE *pMode ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetDisplayMode(This, iSwapChain, pMode); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -588,9 +589,9 @@ LockDevice9_GetCreationParameters( struct NineDevice9 *This, D3DDEVICE_CREATION_PARAMETERS *pParameters ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetCreationParameters(This, pParameters); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } #endif @@ -602,9 +603,9 @@ LockDevice9_SetCursorProperties( struct NineDevice9 *This, IDirect3DSurface9 *pCursorBitmap ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetCursorProperties(This, XHotSpot, YHotSpot, pCursorBitmap); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -614,9 +615,9 @@ LockDevice9_SetCursorPosition( struct NineDevice9 *This, int Y, DWORD Flags ) { - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); NineDevice9_SetCursorPosition(This, X, Y, Flags); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); } static BOOL NINE_WINAPI @@ -624,9 +625,9 @@ LockDevice9_ShowCursor( struct NineDevice9 *This, BOOL bShow ) { BOOL r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_ShowCursor(This, bShow); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -636,9 +637,9 @@ LockDevice9_CreateAdditionalSwapChain( struct NineDevice9 *This, IDirect3DSwapChain9 **pSwapChain ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_CreateAdditionalSwapChain(This, pPresentationParameters, pSwapChain); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -648,9 +649,9 @@ LockDevice9_GetSwapChain( struct NineDevice9 *This, IDirect3DSwapChain9 **pSwapChain ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetSwapChain(This, iSwapChain, pSwapChain); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -658,9 +659,9 @@ static UINT NINE_WINAPI LockDevice9_GetNumberOfSwapChains( struct NineDevice9 *This ) { UINT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetNumberOfSwapChains(This); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -669,9 +670,9 @@ LockDevice9_Reset( struct NineDevice9 *This, D3DPRESENT_PARAMETERS *pPresentationParameters ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_Reset(This, pPresentationParameters); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -683,9 +684,9 @@ LockDevice9_Present( struct NineDevice9 *This, const RGNDATA *pDirtyRegion ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_Present(This, pSourceRect, pDestRect, hDestWindowOverride, pDirtyRegion); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -697,9 +698,9 @@ LockDevice9_GetBackBuffer( struct NineDevice9 *This, IDirect3DSurface9 **ppBackBuffer ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetBackBuffer(This, iSwapChain, iBackBuffer, Type, ppBackBuffer); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -709,9 +710,9 @@ LockDevice9_GetRasterStatus( struct NineDevice9 *This, D3DRASTER_STATUS *pRasterStatus ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetRasterStatus(This, iSwapChain, pRasterStatus); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -720,9 +721,9 @@ LockDevice9_SetDialogBoxMode( struct NineDevice9 *This, BOOL bEnableDialogs ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetDialogBoxMode(This, bEnableDialogs); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -732,9 +733,9 @@ LockDevice9_SetGammaRamp( struct NineDevice9 *This, DWORD Flags, const D3DGAMMARAMP *pRamp ) { - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); NineDevice9_SetGammaRamp(This, iSwapChain, Flags, pRamp); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); } static void NINE_WINAPI @@ -742,9 +743,9 @@ LockDevice9_GetGammaRamp( struct NineDevice9 *This, UINT iSwapChain, D3DGAMMARAMP *pRamp ) { - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); NineDevice9_GetGammaRamp(This, iSwapChain, pRamp); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); } static HRESULT NINE_WINAPI @@ -759,9 +760,9 @@ LockDevice9_CreateTexture( struct NineDevice9 *This, HANDLE *pSharedHandle ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_CreateTexture(This, Width, Height, Levels, Usage, Format, Pool, ppTexture, pSharedHandle); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -778,9 +779,9 @@ LockDevice9_CreateVolumeTexture( struct NineDevice9 *This, HANDLE *pSharedHandle ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_CreateVolumeTexture(This, Width, Height, Depth, Levels, Usage, Format, Pool, ppVolumeTexture, pSharedHandle); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -795,9 +796,9 @@ LockDevice9_CreateCubeTexture( struct NineDevice9 *This, HANDLE *pSharedHandle ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_CreateCubeTexture(This, EdgeLength, Levels, Usage, Format, Pool, ppCubeTexture, pSharedHandle); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -811,9 +812,9 @@ LockDevice9_CreateVertexBuffer( struct NineDevice9 *This, HANDLE *pSharedHandle ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_CreateVertexBuffer(This, Length, Usage, FVF, Pool, ppVertexBuffer, pSharedHandle); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -827,9 +828,9 @@ LockDevice9_CreateIndexBuffer( struct NineDevice9 *This, HANDLE *pSharedHandle ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_CreateIndexBuffer(This, Length, Usage, Format, Pool, ppIndexBuffer, pSharedHandle); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -845,9 +846,9 @@ LockDevice9_CreateRenderTarget( struct NineDevice9 *This, HANDLE *pSharedHandle ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_CreateRenderTarget(This, Width, Height, Format, MultiSample, MultisampleQuality, Lockable, ppSurface, pSharedHandle); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -863,9 +864,9 @@ LockDevice9_CreateDepthStencilSurface( struct NineDevice9 *This, HANDLE *pSharedHandle ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_CreateDepthStencilSurface(This, Width, Height, Format, MultiSample, MultisampleQuality, Discard, ppSurface, pSharedHandle); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -877,9 +878,9 @@ LockDevice9_UpdateSurface( struct NineDevice9 *This, const POINT *pDestPoint ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_UpdateSurface(This, pSourceSurface, pSourceRect, pDestinationSurface, pDestPoint); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -889,9 +890,9 @@ LockDevice9_UpdateTexture( struct NineDevice9 *This, IDirect3DBaseTexture9 *pDestinationTexture ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_UpdateTexture(This, pSourceTexture, pDestinationTexture); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -901,9 +902,9 @@ LockDevice9_GetRenderTargetData( struct NineDevice9 *This, IDirect3DSurface9 *pDestSurface ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetRenderTargetData(This, pRenderTarget, pDestSurface); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -913,9 +914,9 @@ LockDevice9_GetFrontBufferData( struct NineDevice9 *This, IDirect3DSurface9 *pDestSurface ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetFrontBufferData(This, iSwapChain, pDestSurface); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -928,9 +929,9 @@ LockDevice9_StretchRect( struct NineDevice9 *This, D3DTEXTUREFILTERTYPE Filter ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_StretchRect(This, pSourceSurface, pSourceRect, pDestSurface, pDestRect, Filter); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -941,9 +942,9 @@ LockDevice9_ColorFill( struct NineDevice9 *This, D3DCOLOR color ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_ColorFill(This, pSurface, pRect, color); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -957,9 +958,9 @@ LockDevice9_CreateOffscreenPlainSurface( struct NineDevice9 *This, HANDLE *pSharedHandle ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_CreateOffscreenPlainSurface(This, Width, Height, Format, Pool, ppSurface, pSharedHandle); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -969,9 +970,9 @@ LockDevice9_SetRenderTarget( struct NineDevice9 *This, IDirect3DSurface9 *pRenderTarget ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetRenderTarget(This, RenderTargetIndex, pRenderTarget); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -981,9 +982,9 @@ LockDevice9_GetRenderTarget( struct NineDevice9 *This, IDirect3DSurface9 **ppRenderTarget ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetRenderTarget(This, RenderTargetIndex, ppRenderTarget); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -992,9 +993,9 @@ LockDevice9_SetDepthStencilSurface( struct NineDevice9 *This, IDirect3DSurface9 *pNewZStencil ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetDepthStencilSurface(This, pNewZStencil); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1003,9 +1004,9 @@ LockDevice9_GetDepthStencilSurface( struct NineDevice9 *This, IDirect3DSurface9 **ppZStencilSurface ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetDepthStencilSurface(This, ppZStencilSurface); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1013,9 +1014,9 @@ static HRESULT NINE_WINAPI LockDevice9_BeginScene( struct NineDevice9 *This ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_BeginScene(This); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1023,9 +1024,9 @@ static HRESULT NINE_WINAPI LockDevice9_EndScene( struct NineDevice9 *This ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_EndScene(This); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1039,9 +1040,9 @@ LockDevice9_Clear( struct NineDevice9 *This, DWORD Stencil ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_Clear(This, Count, pRects, Flags, Color, Z, Stencil); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1051,9 +1052,9 @@ LockDevice9_SetTransform( struct NineDevice9 *This, const D3DMATRIX *pMatrix ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetTransform(This, State, pMatrix); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1063,9 +1064,9 @@ LockDevice9_GetTransform( struct NineDevice9 *This, D3DMATRIX *pMatrix ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetTransform(This, State, pMatrix); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1075,9 +1076,9 @@ LockDevice9_MultiplyTransform( struct NineDevice9 *This, const D3DMATRIX *pMatrix ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_MultiplyTransform(This, State, pMatrix); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1086,9 +1087,9 @@ LockDevice9_SetViewport( struct NineDevice9 *This, const D3DVIEWPORT9 *pViewport ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetViewport(This, pViewport); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1097,9 +1098,9 @@ LockDevice9_GetViewport( struct NineDevice9 *This, D3DVIEWPORT9 *pViewport ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetViewport(This, pViewport); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1108,9 +1109,9 @@ LockDevice9_SetMaterial( struct NineDevice9 *This, const D3DMATERIAL9 *pMaterial ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetMaterial(This, pMaterial); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1119,9 +1120,9 @@ LockDevice9_GetMaterial( struct NineDevice9 *This, D3DMATERIAL9 *pMaterial ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetMaterial(This, pMaterial); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1131,9 +1132,9 @@ LockDevice9_SetLight( struct NineDevice9 *This, const D3DLIGHT9 *pLight ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetLight(This, Index, pLight); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1143,9 +1144,9 @@ LockDevice9_GetLight( struct NineDevice9 *This, D3DLIGHT9 *pLight ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetLight(This, Index, pLight); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1155,9 +1156,9 @@ LockDevice9_LightEnable( struct NineDevice9 *This, BOOL Enable ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_LightEnable(This, Index, Enable); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1167,9 +1168,9 @@ LockDevice9_GetLightEnable( struct NineDevice9 *This, BOOL *pEnable ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetLightEnable(This, Index, pEnable); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1179,9 +1180,9 @@ LockDevice9_SetClipPlane( struct NineDevice9 *This, const float *pPlane ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetClipPlane(This, Index, pPlane); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1191,9 +1192,9 @@ LockDevice9_GetClipPlane( struct NineDevice9 *This, float *pPlane ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetClipPlane(This, Index, pPlane); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1203,9 +1204,9 @@ LockDevice9_SetRenderState( struct NineDevice9 *This, DWORD Value ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetRenderState(This, State, Value); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1215,9 +1216,9 @@ LockDevice9_GetRenderState( struct NineDevice9 *This, DWORD *pValue ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetRenderState(This, State, pValue); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1227,9 +1228,9 @@ LockDevice9_CreateStateBlock( struct NineDevice9 *This, IDirect3DStateBlock9 **ppSB ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_CreateStateBlock(This, Type, ppSB); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1237,9 +1238,9 @@ static HRESULT NINE_WINAPI LockDevice9_BeginStateBlock( struct NineDevice9 *This ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_BeginStateBlock(This); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1248,9 +1249,9 @@ LockDevice9_EndStateBlock( struct NineDevice9 *This, IDirect3DStateBlock9 **ppSB ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_EndStateBlock(This, ppSB); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1259,9 +1260,9 @@ LockDevice9_SetClipStatus( struct NineDevice9 *This, const D3DCLIPSTATUS9 *pClipStatus ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetClipStatus(This, pClipStatus); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1270,9 +1271,9 @@ LockDevice9_GetClipStatus( struct NineDevice9 *This, D3DCLIPSTATUS9 *pClipStatus ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetClipStatus(This, pClipStatus); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1282,9 +1283,9 @@ LockDevice9_GetTexture( struct NineDevice9 *This, IDirect3DBaseTexture9 **ppTexture ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetTexture(This, Stage, ppTexture); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1294,9 +1295,9 @@ LockDevice9_SetTexture( struct NineDevice9 *This, IDirect3DBaseTexture9 *pTexture ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetTexture(This, Stage, pTexture); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1307,9 +1308,9 @@ LockDevice9_GetTextureStageState( struct NineDevice9 *This, DWORD *pValue ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetTextureStageState(This, Stage, Type, pValue); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1320,9 +1321,9 @@ LockDevice9_SetTextureStageState( struct NineDevice9 *This, DWORD Value ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetTextureStageState(This, Stage, Type, Value); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1333,9 +1334,9 @@ LockDevice9_GetSamplerState( struct NineDevice9 *This, DWORD *pValue ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetSamplerState(This, Sampler, Type, pValue); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1346,9 +1347,9 @@ LockDevice9_SetSamplerState( struct NineDevice9 *This, DWORD Value ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetSamplerState(This, Sampler, Type, Value); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1357,9 +1358,9 @@ LockDevice9_ValidateDevice( struct NineDevice9 *This, DWORD *pNumPasses ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_ValidateDevice(This, pNumPasses); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1369,9 +1370,9 @@ LockDevice9_SetPaletteEntries( struct NineDevice9 *This, const PALETTEENTRY *pEntries ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetPaletteEntries(This, PaletteNumber, pEntries); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1381,9 +1382,9 @@ LockDevice9_GetPaletteEntries( struct NineDevice9 *This, PALETTEENTRY *pEntries ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetPaletteEntries(This, PaletteNumber, pEntries); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1392,9 +1393,9 @@ LockDevice9_SetCurrentTexturePalette( struct NineDevice9 *This, UINT PaletteNumber ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetCurrentTexturePalette(This, PaletteNumber); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1403,9 +1404,9 @@ LockDevice9_GetCurrentTexturePalette( struct NineDevice9 *This, UINT *PaletteNumber ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetCurrentTexturePalette(This, PaletteNumber); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1414,9 +1415,9 @@ LockDevice9_SetScissorRect( struct NineDevice9 *This, const RECT *pRect ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetScissorRect(This, pRect); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1425,9 +1426,9 @@ LockDevice9_GetScissorRect( struct NineDevice9 *This, RECT *pRect ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetScissorRect(This, pRect); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1436,9 +1437,9 @@ LockDevice9_SetSoftwareVertexProcessing( struct NineDevice9 *This, BOOL bSoftware ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetSoftwareVertexProcessing(This, bSoftware); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1446,9 +1447,9 @@ static BOOL NINE_WINAPI LockDevice9_GetSoftwareVertexProcessing( struct NineDevice9 *This ) { BOOL r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetSoftwareVertexProcessing(This); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1457,9 +1458,9 @@ LockDevice9_SetNPatchMode( struct NineDevice9 *This, float nSegments ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetNPatchMode(This, nSegments); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1467,9 +1468,9 @@ static float NINE_WINAPI LockDevice9_GetNPatchMode( struct NineDevice9 *This ) { float r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetNPatchMode(This); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1480,9 +1481,9 @@ LockDevice9_DrawPrimitive( struct NineDevice9 *This, UINT PrimitiveCount ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_DrawPrimitive(This, PrimitiveType, StartVertex, PrimitiveCount); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1496,9 +1497,9 @@ LockDevice9_DrawIndexedPrimitive( struct NineDevice9 *This, UINT primCount ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_DrawIndexedPrimitive(This, PrimitiveType, BaseVertexIndex, MinVertexIndex, NumVertices, startIndex, primCount); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1510,9 +1511,9 @@ LockDevice9_DrawPrimitiveUP( struct NineDevice9 *This, UINT VertexStreamZeroStride ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_DrawPrimitiveUP(This, PrimitiveType, PrimitiveCount, pVertexStreamZeroData, VertexStreamZeroStride); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1528,9 +1529,9 @@ LockDevice9_DrawIndexedPrimitiveUP( struct NineDevice9 *This, UINT VertexStreamZeroStride ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_DrawIndexedPrimitiveUP(This, PrimitiveType, MinVertexIndex, NumVertices, PrimitiveCount, pIndexData, IndexDataFormat, pVertexStreamZeroData, VertexStreamZeroStride); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1544,9 +1545,9 @@ LockDevice9_ProcessVertices( struct NineDevice9 *This, DWORD Flags ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_ProcessVertices(This, SrcStartIndex, DestIndex, VertexCount, pDestBuffer, pVertexDecl, Flags); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1556,9 +1557,9 @@ LockDevice9_CreateVertexDeclaration( struct NineDevice9 *This, IDirect3DVertexDeclaration9 **ppDecl ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_CreateVertexDeclaration(This, pVertexElements, ppDecl); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1567,9 +1568,9 @@ LockDevice9_SetVertexDeclaration( struct NineDevice9 *This, IDirect3DVertexDeclaration9 *pDecl ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetVertexDeclaration(This, pDecl); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1578,9 +1579,9 @@ LockDevice9_GetVertexDeclaration( struct NineDevice9 *This, IDirect3DVertexDeclaration9 **ppDecl ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetVertexDeclaration(This, ppDecl); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1589,9 +1590,9 @@ LockDevice9_SetFVF( struct NineDevice9 *This, DWORD FVF ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetFVF(This, FVF); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1600,9 +1601,9 @@ LockDevice9_GetFVF( struct NineDevice9 *This, DWORD *pFVF ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetFVF(This, pFVF); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1612,9 +1613,9 @@ LockDevice9_CreateVertexShader( struct NineDevice9 *This, IDirect3DVertexShader9 **ppShader ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_CreateVertexShader(This, pFunction, ppShader); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1623,9 +1624,9 @@ LockDevice9_SetVertexShader( struct NineDevice9 *This, IDirect3DVertexShader9 *pShader ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetVertexShader(This, pShader); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1634,9 +1635,9 @@ LockDevice9_GetVertexShader( struct NineDevice9 *This, IDirect3DVertexShader9 **ppShader ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetVertexShader(This, ppShader); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1647,9 +1648,9 @@ LockDevice9_SetVertexShaderConstantF( struct NineDevice9 *This, UINT Vector4fCount ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetVertexShaderConstantF(This, StartRegister, pConstantData, Vector4fCount); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1660,9 +1661,9 @@ LockDevice9_GetVertexShaderConstantF( struct NineDevice9 *This, UINT Vector4fCount ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetVertexShaderConstantF(This, StartRegister, pConstantData, Vector4fCount); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1673,9 +1674,9 @@ LockDevice9_SetVertexShaderConstantI( struct NineDevice9 *This, UINT Vector4iCount ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetVertexShaderConstantI(This, StartRegister, pConstantData, Vector4iCount); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1686,9 +1687,9 @@ LockDevice9_GetVertexShaderConstantI( struct NineDevice9 *This, UINT Vector4iCount ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetVertexShaderConstantI(This, StartRegister, pConstantData, Vector4iCount); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1699,9 +1700,9 @@ LockDevice9_SetVertexShaderConstantB( struct NineDevice9 *This, UINT BoolCount ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetVertexShaderConstantB(This, StartRegister, pConstantData, BoolCount); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1712,9 +1713,9 @@ LockDevice9_GetVertexShaderConstantB( struct NineDevice9 *This, UINT BoolCount ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetVertexShaderConstantB(This, StartRegister, pConstantData, BoolCount); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1726,9 +1727,9 @@ LockDevice9_SetStreamSource( struct NineDevice9 *This, UINT Stride ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetStreamSource(This, StreamNumber, pStreamData, OffsetInBytes, Stride); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1740,9 +1741,9 @@ LockDevice9_GetStreamSource( struct NineDevice9 *This, UINT *pStride ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetStreamSource(This, StreamNumber, ppStreamData, pOffsetInBytes, pStride); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1752,9 +1753,9 @@ LockDevice9_SetStreamSourceFreq( struct NineDevice9 *This, UINT Setting ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetStreamSourceFreq(This, StreamNumber, Setting); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1764,9 +1765,9 @@ LockDevice9_GetStreamSourceFreq( struct NineDevice9 *This, UINT *pSetting ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetStreamSourceFreq(This, StreamNumber, pSetting); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1775,9 +1776,9 @@ LockDevice9_SetIndices( struct NineDevice9 *This, IDirect3DIndexBuffer9 *pIndexData ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetIndices(This, pIndexData); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1786,9 +1787,9 @@ LockDevice9_GetIndices( struct NineDevice9 *This, IDirect3DIndexBuffer9 **ppIndexData ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetIndices(This, ppIndexData); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1798,9 +1799,9 @@ LockDevice9_CreatePixelShader( struct NineDevice9 *This, IDirect3DPixelShader9 **ppShader ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_CreatePixelShader(This, pFunction, ppShader); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1809,9 +1810,9 @@ LockDevice9_SetPixelShader( struct NineDevice9 *This, IDirect3DPixelShader9 *pShader ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetPixelShader(This, pShader); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1820,9 +1821,9 @@ LockDevice9_GetPixelShader( struct NineDevice9 *This, IDirect3DPixelShader9 **ppShader ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetPixelShader(This, ppShader); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1833,9 +1834,9 @@ LockDevice9_SetPixelShaderConstantF( struct NineDevice9 *This, UINT Vector4fCount ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetPixelShaderConstantF(This, StartRegister, pConstantData, Vector4fCount); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1846,9 +1847,9 @@ LockDevice9_GetPixelShaderConstantF( struct NineDevice9 *This, UINT Vector4fCount ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetPixelShaderConstantF(This, StartRegister, pConstantData, Vector4fCount); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1859,9 +1860,9 @@ LockDevice9_SetPixelShaderConstantI( struct NineDevice9 *This, UINT Vector4iCount ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetPixelShaderConstantI(This, StartRegister, pConstantData, Vector4iCount); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1872,9 +1873,9 @@ LockDevice9_GetPixelShaderConstantI( struct NineDevice9 *This, UINT Vector4iCount ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetPixelShaderConstantI(This, StartRegister, pConstantData, Vector4iCount); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1885,9 +1886,9 @@ LockDevice9_SetPixelShaderConstantB( struct NineDevice9 *This, UINT BoolCount ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_SetPixelShaderConstantB(This, StartRegister, pConstantData, BoolCount); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1898,9 +1899,9 @@ LockDevice9_GetPixelShaderConstantB( struct NineDevice9 *This, UINT BoolCount ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_GetPixelShaderConstantB(This, StartRegister, pConstantData, BoolCount); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1911,9 +1912,9 @@ LockDevice9_DrawRectPatch( struct NineDevice9 *This, const D3DRECTPATCH_INFO *pRectPatchInfo ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_DrawRectPatch(This, Handle, pNumSegs, pRectPatchInfo); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1924,9 +1925,9 @@ LockDevice9_DrawTriPatch( struct NineDevice9 *This, const D3DTRIPATCH_INFO *pTriPatchInfo ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_DrawTriPatch(This, Handle, pNumSegs, pTriPatchInfo); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1935,9 +1936,9 @@ LockDevice9_DeletePatch( struct NineDevice9 *This, UINT Handle ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_DeletePatch(This, Handle); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -1947,9 +1948,9 @@ LockDevice9_CreateQuery( struct NineDevice9 *This, IDirect3DQuery9 **ppQuery ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9_CreateQuery(This, Type, ppQuery); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2083,9 +2084,9 @@ LockDevice9Ex_SetConvolutionMonoKernel( struct NineDevice9Ex *This, float *columns ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9Ex_SetConvolutionMonoKernel(This, width, height, rows, columns); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2101,9 +2102,9 @@ LockDevice9Ex_ComposeRects( struct NineDevice9Ex *This, int Yoffset ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9Ex_ComposeRects(This, pSrc, pDst, pSrcRectDescs, NumRects, pDstRectDescs, Operation, Xoffset, Yoffset); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2116,9 +2117,9 @@ LockDevice9Ex_PresentEx( struct NineDevice9Ex *This, DWORD dwFlags ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9Ex_PresentEx(This, pSourceRect, pDestRect, hDestWindowOverride, pDirtyRegion, dwFlags); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2127,9 +2128,9 @@ LockDevice9Ex_GetGPUThreadPriority( struct NineDevice9Ex *This, INT *pPriority ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9Ex_GetGPUThreadPriority(This, pPriority); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2138,9 +2139,9 @@ LockDevice9Ex_SetGPUThreadPriority( struct NineDevice9Ex *This, INT Priority ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9Ex_SetGPUThreadPriority(This, Priority); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2149,9 +2150,9 @@ LockDevice9Ex_WaitForVBlank( struct NineDevice9Ex *This, UINT iSwapChain ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9Ex_WaitForVBlank(This, iSwapChain); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2161,9 +2162,9 @@ LockDevice9Ex_CheckResourceResidency( struct NineDevice9Ex *This, UINT32 NumResources ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9Ex_CheckResourceResidency(This, pResourceArray, NumResources); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2172,9 +2173,9 @@ LockDevice9Ex_SetMaximumFrameLatency( struct NineDevice9Ex *This, UINT MaxLatency ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9Ex_SetMaximumFrameLatency(This, MaxLatency); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2183,9 +2184,9 @@ LockDevice9Ex_GetMaximumFrameLatency( struct NineDevice9Ex *This, UINT *pMaxLatency ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9Ex_GetMaximumFrameLatency(This, pMaxLatency); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2194,9 +2195,9 @@ LockDevice9Ex_CheckDeviceState( struct NineDevice9Ex *This, HWND hDestinationWindow ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9Ex_CheckDeviceState(This, hDestinationWindow); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2213,9 +2214,9 @@ LockDevice9Ex_CreateRenderTargetEx( struct NineDevice9Ex *This, DWORD Usage ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9Ex_CreateRenderTargetEx(This, Width, Height, Format, MultiSample, MultisampleQuality, Lockable, ppSurface, pSharedHandle, Usage); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2230,9 +2231,9 @@ LockDevice9Ex_CreateOffscreenPlainSurfaceEx( struct NineDevice9Ex *This, DWORD Usage ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9Ex_CreateOffscreenPlainSurfaceEx(This, Width, Height, Format, Pool, ppSurface, pSharedHandle, Usage); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2249,9 +2250,9 @@ LockDevice9Ex_CreateDepthStencilSurfaceEx( struct NineDevice9Ex *This, DWORD Usage ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9Ex_CreateDepthStencilSurfaceEx(This, Width, Height, Format, MultiSample, MultisampleQuality, Discard, ppSurface, pSharedHandle, Usage); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2261,9 +2262,9 @@ LockDevice9Ex_ResetEx( struct NineDevice9Ex *This, D3DDISPLAYMODEEX *pFullscreenDisplayMode ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9Ex_ResetEx(This, pPresentationParameters, pFullscreenDisplayMode); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2274,9 +2275,9 @@ LockDevice9Ex_GetDisplayModeEx( struct NineDevice9Ex *This, D3DDISPLAYROTATION *pRotation ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9Ex_GetDisplayModeEx(This, iSwapChain, pMode, pRotation); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2424,9 +2425,9 @@ LockDevice9Video_GetContentProtectionCaps( struct NineDevice9Video *This, D3DCONTENTPROTECTIONCAPS *pCaps ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9Video_GetContentProtectionCaps(This, pCryptoType, pDecodeProfile, pCaps); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2437,9 +2438,9 @@ LockDevice9Video_CreateAuthenticatedChannel( struct NineDevice9Video *This, HANDLE *pChannelHandle ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9Video_CreateAuthenticatedChannel(This, ChannelType, ppAuthenticatedChannel, pChannelHandle); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2451,9 +2452,9 @@ LockDevice9Video_CreateCryptoSession( struct NineDevice9Video *This, HANDLE *pCryptoHandle ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineDevice9Video_CreateCryptoSession(This, pCryptoType, pDecodeProfile, ppCryptoSession, pCryptoHandle); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2474,9 +2475,9 @@ LockIndexBuffer9_Lock( struct NineIndexBuffer9 *This, DWORD Flags ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineIndexBuffer9_Lock(This, OffsetToLock, SizeToLock, ppbData, Flags); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2484,9 +2485,9 @@ static HRESULT NINE_WINAPI LockIndexBuffer9_Unlock( struct NineIndexBuffer9 *This ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineIndexBuffer9_Unlock(This); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2496,9 +2497,9 @@ LockIndexBuffer9_GetDesc( struct NineIndexBuffer9 *This, D3DINDEXBUFFER_DESC *pDesc ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineIndexBuffer9_GetDesc(This, pDesc); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } #endif @@ -2526,9 +2527,9 @@ LockPixelShader9_GetDevice( struct NinePixelShader9 *This, IDirect3DDevice9 **ppDevice ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineUnknown_GetDevice(NineUnknown(This), ppDevice); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } #endif @@ -2539,9 +2540,9 @@ LockPixelShader9_GetFunction( struct NinePixelShader9 *This, UINT *pSizeOfData ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NinePixelShader9_GetFunction(This, pData, pSizeOfData); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2559,9 +2560,9 @@ LockQuery9_GetDevice( struct NineQuery9 *This, IDirect3DDevice9 **ppDevice ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineUnknown_GetDevice(NineUnknown(This), ppDevice); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } #endif @@ -2571,9 +2572,9 @@ static D3DQUERYTYPE NINE_WINAPI LockQuery9_GetType( struct NineQuery9 *This ) { D3DQUERYTYPE r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineQuery9_GetType(This); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } #endif @@ -2583,9 +2584,9 @@ static DWORD NINE_WINAPI LockQuery9_GetDataSize( struct NineQuery9 *This ) { DWORD r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineQuery9_GetDataSize(This); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } #endif @@ -2595,9 +2596,9 @@ LockQuery9_Issue( struct NineQuery9 *This, DWORD dwIssueFlags ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineQuery9_Issue(This, dwIssueFlags); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2608,9 +2609,9 @@ LockQuery9_GetData( struct NineQuery9 *This, DWORD dwGetDataFlags ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineQuery9_GetData(This, pData, dwSize, dwGetDataFlags); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2631,9 +2632,9 @@ LockStateBlock9_GetDevice( struct NineStateBlock9 *This, IDirect3DDevice9 **ppDevice ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineUnknown_GetDevice(NineUnknown(This), ppDevice); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } #endif @@ -2642,9 +2643,9 @@ static HRESULT NINE_WINAPI LockStateBlock9_Capture( struct NineStateBlock9 *This ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineStateBlock9_Capture(This); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2652,9 +2653,9 @@ static HRESULT NINE_WINAPI LockStateBlock9_Apply( struct NineStateBlock9 *This ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineStateBlock9_Apply(This); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2673,9 +2674,9 @@ LockSurface9_GetContainer( struct NineSurface9 *This, void **ppContainer ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineSurface9_GetContainer(This, riid, ppContainer); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2685,9 +2686,9 @@ LockSurface9_GetDesc( struct NineSurface9 *This, D3DSURFACE_DESC *pDesc ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineSurface9_GetDesc(This, pDesc); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } #endif @@ -2699,9 +2700,9 @@ LockSurface9_LockRect( struct NineSurface9 *This, DWORD Flags ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineSurface9_LockRect(This, pLockedRect, pRect, Flags); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2709,9 +2710,9 @@ static HRESULT NINE_WINAPI LockSurface9_UnlockRect( struct NineSurface9 *This ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineSurface9_UnlockRect(This); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2720,9 +2721,9 @@ LockSurface9_GetDC( struct NineSurface9 *This, HDC *phdc ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineSurface9_GetDC(This, phdc); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2731,9 +2732,9 @@ LockSurface9_ReleaseDC( struct NineSurface9 *This, HDC hdc ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineSurface9_ReleaseDC(This, hdc); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2766,9 +2767,9 @@ LockSwapChain9_Present( struct NineSwapChain9 *This, DWORD dwFlags ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineSwapChain9_Present(This, pSourceRect, pDestRect, hDestWindowOverride, pDirtyRegion, dwFlags); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2777,9 +2778,9 @@ LockSwapChain9_GetFrontBufferData( struct NineSwapChain9 *This, IDirect3DSurface9 *pDestSurface ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineSwapChain9_GetFrontBufferData(This, pDestSurface); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2790,9 +2791,9 @@ LockSwapChain9_GetBackBuffer( struct NineSwapChain9 *This, IDirect3DSurface9 **ppBackBuffer ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineSwapChain9_GetBackBuffer(This, iBackBuffer, Type, ppBackBuffer); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2801,9 +2802,9 @@ LockSwapChain9_GetRasterStatus( struct NineSwapChain9 *This, D3DRASTER_STATUS *pRasterStatus ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineSwapChain9_GetRasterStatus(This, pRasterStatus); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2812,9 +2813,9 @@ LockSwapChain9_GetDisplayMode( struct NineSwapChain9 *This, D3DDISPLAYMODE *pMode ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineSwapChain9_GetDisplayMode(This, pMode); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2824,9 +2825,9 @@ LockSwapChain9_GetDevice( struct NineSwapChain9 *This, IDirect3DDevice9 **ppDevice ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineUnknown_GetDevice(NineUnknown(This), ppDevice); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } #endif @@ -2836,9 +2837,9 @@ LockSwapChain9_GetPresentParameters( struct NineSwapChain9 *This, D3DPRESENT_PARAMETERS *pPresentationParameters ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineSwapChain9_GetPresentParameters(This, pPresentationParameters); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2860,9 +2861,9 @@ LockSwapChain9Ex_GetLastPresentCount( struct NineSwapChain9Ex *This, UINT *pLastPresentCount ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineSwapChain9Ex_GetLastPresentCount(This, pLastPresentCount); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2871,9 +2872,9 @@ LockSwapChain9Ex_GetPresentStats( struct NineSwapChain9Ex *This, D3DPRESENTSTATS *pPresentationStatistics ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineSwapChain9Ex_GetPresentStats(This, pPresentationStatistics); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2883,9 +2884,9 @@ LockSwapChain9Ex_GetDisplayModeEx( struct NineSwapChain9Ex *This, D3DDISPLAYROTATION *pRotation ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineSwapChain9Ex_GetDisplayModeEx(This, pMode, pRotation); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2912,9 +2913,9 @@ LockTexture9_GetLevelDesc( struct NineTexture9 *This, D3DSURFACE_DESC *pDesc ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineTexture9_GetLevelDesc(This, Level, pDesc); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } #endif @@ -2926,9 +2927,9 @@ LockTexture9_GetSurfaceLevel( struct NineTexture9 *This, IDirect3DSurface9 **ppSurfaceLevel ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineTexture9_GetSurfaceLevel(This, Level, ppSurfaceLevel); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } #endif @@ -2941,9 +2942,9 @@ LockTexture9_LockRect( struct NineTexture9 *This, DWORD Flags ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineTexture9_LockRect(This, Level, pLockedRect, pRect, Flags); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2952,9 +2953,9 @@ LockTexture9_UnlockRect( struct NineTexture9 *This, UINT Level ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineTexture9_UnlockRect(This, Level); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -2963,9 +2964,9 @@ LockTexture9_AddDirtyRect( struct NineTexture9 *This, const RECT *pDirtyRect ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineTexture9_AddDirtyRect(This, pDirtyRect); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -3002,9 +3003,9 @@ LockVertexBuffer9_Lock( struct NineVertexBuffer9 *This, DWORD Flags ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineVertexBuffer9_Lock(This, OffsetToLock, SizeToLock, ppbData, Flags); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -3012,9 +3013,9 @@ static HRESULT NINE_WINAPI LockVertexBuffer9_Unlock( struct NineVertexBuffer9 *This ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineVertexBuffer9_Unlock(This); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -3024,9 +3025,9 @@ LockVertexBuffer9_GetDesc( struct NineVertexBuffer9 *This, D3DVERTEXBUFFER_DESC *pDesc ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineVertexBuffer9_GetDesc(This, pDesc); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } #endif @@ -3054,9 +3055,9 @@ LockVertexDeclaration9_GetDevice( struct NineVertexDeclaration9 *This, IDirect3DDevice9 **ppDevice ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineUnknown_GetDevice(NineUnknown(This), ppDevice); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } #endif @@ -3067,9 +3068,9 @@ LockVertexDeclaration9_GetDeclaration( struct NineVertexDeclaration9 *This, UINT *pNumElements ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineVertexDeclaration9_GetDeclaration(This, pElement, pNumElements); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -3087,9 +3088,9 @@ LockVertexShader9_GetDevice( struct NineVertexShader9 *This, IDirect3DDevice9 **ppDevice ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineUnknown_GetDevice(NineUnknown(This), ppDevice); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } #endif @@ -3100,9 +3101,9 @@ LockVertexShader9_GetFunction( struct NineVertexShader9 *This, UINT *pSizeOfData ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineVertexShader9_GetFunction(This, pData, pSizeOfData); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -3120,9 +3121,9 @@ LockVolume9_GetDevice( struct NineVolume9 *This, IDirect3DDevice9 **ppDevice ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineUnknown_GetDevice(NineUnknown(This), ppDevice); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } #endif @@ -3133,9 +3134,9 @@ LockVolume9_GetContainer( struct NineVolume9 *This, void **ppContainer ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineVolume9_GetContainer(This, riid, ppContainer); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -3145,9 +3146,9 @@ LockVolume9_GetDesc( struct NineVolume9 *This, D3DVOLUME_DESC *pDesc ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineVolume9_GetDesc(This, pDesc); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } #endif @@ -3159,9 +3160,9 @@ LockVolume9_LockBox( struct NineVolume9 *This, DWORD Flags ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineVolume9_LockBox(This, pLockedVolume, pBox, Flags); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -3169,9 +3170,9 @@ static HRESULT NINE_WINAPI LockVolume9_UnlockBox( struct NineVolume9 *This ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineVolume9_UnlockBox(This); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -3196,9 +3197,9 @@ LockVolumeTexture9_GetLevelDesc( struct NineVolumeTexture9 *This, D3DVOLUME_DESC *pDesc ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineVolumeTexture9_GetLevelDesc(This, Level, pDesc); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } #endif @@ -3210,9 +3211,9 @@ LockVolumeTexture9_GetVolumeLevel( struct NineVolumeTexture9 *This, IDirect3DVolume9 **ppVolumeLevel ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineVolumeTexture9_GetVolumeLevel(This, Level, ppVolumeLevel); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } #endif @@ -3225,9 +3226,9 @@ LockVolumeTexture9_LockBox( struct NineVolumeTexture9 *This, DWORD Flags ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineVolumeTexture9_LockBox(This, Level, pLockedVolume, pBox, Flags); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -3236,9 +3237,9 @@ LockVolumeTexture9_UnlockBox( struct NineVolumeTexture9 *This, UINT Level ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineVolumeTexture9_UnlockBox(This, Level); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; } @@ -3247,9 +3248,9 @@ LockVolumeTexture9_AddDirtyBox( struct NineVolumeTexture9 *This, const D3DBOX *pDirtyBox ) { HRESULT r; - mtx_lock(&d3dlock_global); + simple_mtx_lock(&d3dlock_global); r = NineVolumeTexture9_AddDirtyBox(This, pDirtyBox); - mtx_unlock(&d3dlock_global); + simple_mtx_unlock(&d3dlock_global); return r; }