*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
/* IDirect3DTexture9 IUnknown parts follow: */
-HRESULT WINAPI IDirect3DTexture9Impl_QueryInterface(LPDIRECT3DTEXTURE9 iface, REFIID riid, LPVOID* ppobj) {
+static HRESULT WINAPI IDirect3DTexture9Impl_QueryInterface(LPDIRECT3DTEXTURE9 iface, REFIID riid, LPVOID* ppobj) {
IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface;
if (IsEqualGUID(riid, &IID_IUnknown)
|| IsEqualGUID(riid, &IID_IDirect3DTexture9)) {
IUnknown_AddRef(iface);
*ppobj = This;
- return D3D_OK;
+ return S_OK;
}
WARN("(%p)->(%s,%p) not found\n", This, debugstr_guid(riid), ppobj);
+ *ppobj = NULL;
return E_NOINTERFACE;
}
-ULONG WINAPI IDirect3DTexture9Impl_AddRef(LPDIRECT3DTEXTURE9 iface) {
+static ULONG WINAPI IDirect3DTexture9Impl_AddRef(LPDIRECT3DTEXTURE9 iface) {
IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) : AddRef from %ld\n", This, ref - 1);
+ TRACE("(%p) : AddRef from %d\n", This, ref - 1);
return ref;
}
-ULONG WINAPI IDirect3DTexture9Impl_Release(LPDIRECT3DTEXTURE9 iface) {
+static ULONG WINAPI IDirect3DTexture9Impl_Release(LPDIRECT3DTEXTURE9 iface) {
IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) : ReleaseRef to %ld\n", This, ref);
+ TRACE("(%p) : ReleaseRef to %d\n", This, ref);
if (ref == 0) {
- IWineD3DTexture_Release(This->wineD3DTexture);
+ EnterCriticalSection(&d3d9_cs);
+ IWineD3DTexture_Destroy(This->wineD3DTexture, D3D9CB_DestroySurface);
+ LeaveCriticalSection(&d3d9_cs);
+ IUnknown_Release(This->parentDevice);
HeapFree(GetProcessHeap(), 0, This);
}
return ref;
}
/* IDirect3DTexture9 IDirect3DResource9 Interface follow: */
-HRESULT WINAPI IDirect3DTexture9Impl_GetDevice(LPDIRECT3DTEXTURE9 iface, IDirect3DDevice9** ppDevice) {
+static HRESULT WINAPI IDirect3DTexture9Impl_GetDevice(LPDIRECT3DTEXTURE9 iface, IDirect3DDevice9** ppDevice) {
IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface;
- return IDirect3DResource9Impl_GetDevice((LPDIRECT3DRESOURCE9) This, ppDevice);
+ HRESULT hr;
+ TRACE("(%p) Relay\n", This);
+
+ EnterCriticalSection(&d3d9_cs);
+ hr = IDirect3DResource9Impl_GetDevice((LPDIRECT3DRESOURCE9) This, ppDevice);
+ LeaveCriticalSection(&d3d9_cs);
+ return hr;
}
-HRESULT WINAPI IDirect3DTexture9Impl_SetPrivateData(LPDIRECT3DTEXTURE9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) {
+static HRESULT WINAPI IDirect3DTexture9Impl_SetPrivateData(LPDIRECT3DTEXTURE9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) {
IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface;
- return IWineD3DTexture_SetPrivateData(This->wineD3DTexture, refguid, pData, SizeOfData, Flags);
+ HRESULT hr;
+ TRACE("(%p) Relay\n", This);
+
+ EnterCriticalSection(&d3d9_cs);
+ hr = IWineD3DTexture_SetPrivateData(This->wineD3DTexture, refguid, pData, SizeOfData, Flags);
+ LeaveCriticalSection(&d3d9_cs);
+ return hr;
}
-HRESULT WINAPI IDirect3DTexture9Impl_GetPrivateData(LPDIRECT3DTEXTURE9 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) {
+static HRESULT WINAPI IDirect3DTexture9Impl_GetPrivateData(LPDIRECT3DTEXTURE9 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) {
IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface;
- return IWineD3DTexture_GetPrivateData(This->wineD3DTexture, refguid, pData, pSizeOfData);
+ HRESULT hr;
+ TRACE("(%p) Relay\n", This);
+
+ EnterCriticalSection(&d3d9_cs);
+ hr = IWineD3DTexture_GetPrivateData(This->wineD3DTexture, refguid, pData, pSizeOfData);
+ LeaveCriticalSection(&d3d9_cs);
+ return hr;
}
-HRESULT WINAPI IDirect3DTexture9Impl_FreePrivateData(LPDIRECT3DTEXTURE9 iface, REFGUID refguid) {
+static HRESULT WINAPI IDirect3DTexture9Impl_FreePrivateData(LPDIRECT3DTEXTURE9 iface, REFGUID refguid) {
IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface;
- return IWineD3DTexture_FreePrivateData(This->wineD3DTexture, refguid);
+ HRESULT hr;
+ TRACE("(%p) Relay\n", This);
+
+ EnterCriticalSection(&d3d9_cs);
+ hr = IWineD3DTexture_FreePrivateData(This->wineD3DTexture, refguid);
+ LeaveCriticalSection(&d3d9_cs);
+ return hr;
}
-DWORD WINAPI IDirect3DTexture9Impl_SetPriority(LPDIRECT3DTEXTURE9 iface, DWORD PriorityNew) {
+static DWORD WINAPI IDirect3DTexture9Impl_SetPriority(LPDIRECT3DTEXTURE9 iface, DWORD PriorityNew) {
IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface;
- return IWineD3DTexture_SetPriority(This->wineD3DTexture, PriorityNew);
+ DWORD ret;
+ TRACE("(%p) Relay\n", This);
+
+ EnterCriticalSection(&d3d9_cs);
+ ret = IWineD3DTexture_SetPriority(This->wineD3DTexture, PriorityNew);
+ LeaveCriticalSection(&d3d9_cs);
+ return ret;
}
-DWORD WINAPI IDirect3DTexture9Impl_GetPriority(LPDIRECT3DTEXTURE9 iface) {
+static DWORD WINAPI IDirect3DTexture9Impl_GetPriority(LPDIRECT3DTEXTURE9 iface) {
IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface;
- return IWineD3DTexture_GetPriority(This->wineD3DTexture);
+ DWORD ret;
+ TRACE("(%p) Relay\n", This);
+
+ EnterCriticalSection(&d3d9_cs);
+ ret = IWineD3DTexture_GetPriority(This->wineD3DTexture);
+ LeaveCriticalSection(&d3d9_cs);
+ return ret;
}
-void WINAPI IDirect3DTexture9Impl_PreLoad(LPDIRECT3DTEXTURE9 iface) {
+static void WINAPI IDirect3DTexture9Impl_PreLoad(LPDIRECT3DTEXTURE9 iface) {
IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface;
- return IWineD3DTexture_PreLoad(This->wineD3DTexture);
+ TRACE("(%p) Relay\n", This);
+
+ EnterCriticalSection(&d3d9_cs);
+ IWineD3DTexture_PreLoad(This->wineD3DTexture);
+ LeaveCriticalSection(&d3d9_cs);
}
-D3DRESOURCETYPE WINAPI IDirect3DTexture9Impl_GetType(LPDIRECT3DTEXTURE9 iface) {
+static D3DRESOURCETYPE WINAPI IDirect3DTexture9Impl_GetType(LPDIRECT3DTEXTURE9 iface) {
IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface;
- return IWineD3DTexture_GetType(This->wineD3DTexture);
+ HRESULT ret;
+ TRACE("(%p) Relay\n", This);
+
+ EnterCriticalSection(&d3d9_cs);
+ ret = IWineD3DTexture_GetType(This->wineD3DTexture);
+ LeaveCriticalSection(&d3d9_cs);
+ return ret;
}
/* IDirect3DTexture9 IDirect3DBaseTexture9 Interface follow: */
-DWORD WINAPI IDirect3DTexture9Impl_SetLOD(LPDIRECT3DTEXTURE9 iface, DWORD LODNew) {
+static DWORD WINAPI IDirect3DTexture9Impl_SetLOD(LPDIRECT3DTEXTURE9 iface, DWORD LODNew) {
IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface;
- return IWineD3DTexture_SetLOD(This->wineD3DTexture, LODNew);
+ DWORD ret;
+ TRACE("(%p) Relay\n", This);
+
+ EnterCriticalSection(&d3d9_cs);
+ ret = IWineD3DTexture_SetLOD(This->wineD3DTexture, LODNew);
+ LeaveCriticalSection(&d3d9_cs);
+ return ret;
}
-DWORD WINAPI IDirect3DTexture9Impl_GetLOD(LPDIRECT3DTEXTURE9 iface) {
+static DWORD WINAPI IDirect3DTexture9Impl_GetLOD(LPDIRECT3DTEXTURE9 iface) {
IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface;
- return IWineD3DTexture_GetLOD(This->wineD3DTexture);
+ DWORD ret;
+ TRACE("(%p) Relay\n", This);
+
+ EnterCriticalSection(&d3d9_cs);
+ ret = IWineD3DTexture_GetLOD(This->wineD3DTexture);
+ LeaveCriticalSection(&d3d9_cs);
+ return ret;
}
-DWORD WINAPI IDirect3DTexture9Impl_GetLevelCount(LPDIRECT3DTEXTURE9 iface) {
+static DWORD WINAPI IDirect3DTexture9Impl_GetLevelCount(LPDIRECT3DTEXTURE9 iface) {
IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface;
- return IWineD3DTexture_GetLevelCount(This->wineD3DTexture);
+ DWORD ret;
+ TRACE("(%p) Relay\n", This);
+
+ EnterCriticalSection(&d3d9_cs);
+ ret = IWineD3DTexture_GetLevelCount(This->wineD3DTexture);
+ LeaveCriticalSection(&d3d9_cs);
+ return ret;
}
-HRESULT WINAPI IDirect3DTexture9Impl_SetAutoGenFilterType(LPDIRECT3DTEXTURE9 iface, D3DTEXTUREFILTERTYPE FilterType) {
+static HRESULT WINAPI IDirect3DTexture9Impl_SetAutoGenFilterType(LPDIRECT3DTEXTURE9 iface, D3DTEXTUREFILTERTYPE FilterType) {
IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface;
- return IWineD3DTexture_SetAutoGenFilterType(This->wineD3DTexture, FilterType);
+ HRESULT hr;
+ TRACE("(%p) Relay\n", This);
+
+ EnterCriticalSection(&d3d9_cs);
+ hr = IWineD3DTexture_SetAutoGenFilterType(This->wineD3DTexture, (WINED3DTEXTUREFILTERTYPE) FilterType);
+ LeaveCriticalSection(&d3d9_cs);
+ return hr;
}
-D3DTEXTUREFILTERTYPE WINAPI IDirect3DTexture9Impl_GetAutoGenFilterType(LPDIRECT3DTEXTURE9 iface) {
+static D3DTEXTUREFILTERTYPE WINAPI IDirect3DTexture9Impl_GetAutoGenFilterType(LPDIRECT3DTEXTURE9 iface) {
IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface;
- return IWineD3DTexture_GetAutoGenFilterType(This->wineD3DTexture);
+ D3DTEXTUREFILTERTYPE ret;
+ TRACE("(%p) Relay\n", This);
+
+ EnterCriticalSection(&d3d9_cs);
+ ret = (D3DTEXTUREFILTERTYPE) IWineD3DTexture_GetAutoGenFilterType(This->wineD3DTexture);
+ LeaveCriticalSection(&d3d9_cs);
+ return ret;
}
-void WINAPI IDirect3DTexture9Impl_GenerateMipSubLevels(LPDIRECT3DTEXTURE9 iface) {
+static void WINAPI IDirect3DTexture9Impl_GenerateMipSubLevels(LPDIRECT3DTEXTURE9 iface) {
IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface;
- return IWineD3DTexture_GenerateMipSubLevels(This->wineD3DTexture);
+ TRACE("(%p) Relay\n", This);
+
+ EnterCriticalSection(&d3d9_cs);
+ IWineD3DTexture_GenerateMipSubLevels(This->wineD3DTexture);
+ LeaveCriticalSection(&d3d9_cs);
}
/* IDirect3DTexture9 Interface follow: */
-HRESULT WINAPI IDirect3DTexture9Impl_GetLevelDesc(LPDIRECT3DTEXTURE9 iface, UINT Level, D3DSURFACE_DESC* pDesc) {
+static HRESULT WINAPI IDirect3DTexture9Impl_GetLevelDesc(LPDIRECT3DTEXTURE9 iface, UINT Level, D3DSURFACE_DESC* pDesc) {
IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface;
WINED3DSURFACE_DESC wined3ddesc;
UINT tmpInt = -1;
+ HRESULT hr;
+ TRACE("(%p) Relay\n", This);
/* As d3d8 and d3d9 structures differ, pass in ptrs to where data needs to go */
- wined3ddesc.Format = &pDesc->Format;
- wined3ddesc.Type = &pDesc->Type;
+ wined3ddesc.Format = (WINED3DFORMAT *)&pDesc->Format;
+ wined3ddesc.Type = (WINED3DRESOURCETYPE *)&pDesc->Type;
wined3ddesc.Usage = &pDesc->Usage;
- wined3ddesc.Pool = &pDesc->Pool;
+ wined3ddesc.Pool = (WINED3DPOOL *) &pDesc->Pool;
wined3ddesc.Size = &tmpInt; /* required for d3d8 */
- wined3ddesc.MultiSampleType = &pDesc->MultiSampleType;
+ wined3ddesc.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *) &pDesc->MultiSampleType;
wined3ddesc.MultiSampleQuality = &pDesc->MultiSampleQuality;
wined3ddesc.Width = &pDesc->Width;
wined3ddesc.Height = &pDesc->Height;
- return IWineD3DTexture_GetLevelDesc(This->wineD3DTexture, Level, &wined3ddesc);
+ EnterCriticalSection(&d3d9_cs);
+ hr = IWineD3DTexture_GetLevelDesc(This->wineD3DTexture, Level, &wined3ddesc);
+ LeaveCriticalSection(&d3d9_cs);
+ return hr;
}
-HRESULT WINAPI IDirect3DTexture9Impl_GetSurfaceLevel(LPDIRECT3DTEXTURE9 iface, UINT Level, IDirect3DSurface9** ppSurfaceLevel) {
+static HRESULT WINAPI IDirect3DTexture9Impl_GetSurfaceLevel(LPDIRECT3DTEXTURE9 iface, UINT Level, IDirect3DSurface9** ppSurfaceLevel) {
IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface;
HRESULT hrc = D3D_OK;
-
IWineD3DSurface *mySurface = NULL;
+
+ TRACE("(%p) Relay\n", This);
+ EnterCriticalSection(&d3d9_cs);
hrc = IWineD3DTexture_GetSurfaceLevel(This->wineD3DTexture, Level, &mySurface);
if (hrc == D3D_OK && NULL != ppSurfaceLevel) {
IWineD3DSurface_GetParent(mySurface, (IUnknown **)ppSurfaceLevel);
IWineD3DSurface_Release(mySurface);
}
+ LeaveCriticalSection(&d3d9_cs);
return hrc;
}
-HRESULT WINAPI IDirect3DTexture9Impl_LockRect(LPDIRECT3DTEXTURE9 iface, UINT Level, D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) {
+static HRESULT WINAPI IDirect3DTexture9Impl_LockRect(LPDIRECT3DTEXTURE9 iface, UINT Level, D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) {
IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface;
- return IWineD3DTexture_LockRect(This->wineD3DTexture, Level, pLockedRect, pRect, Flags);
+ HRESULT hr;
+ TRACE("(%p) Relay\n", This);
+
+ EnterCriticalSection(&d3d9_cs);
+ hr = IWineD3DTexture_LockRect(This->wineD3DTexture, Level, (WINED3DLOCKED_RECT *) pLockedRect, pRect, Flags);
+ LeaveCriticalSection(&d3d9_cs);
+ return hr;
}
-HRESULT WINAPI IDirect3DTexture9Impl_UnlockRect(LPDIRECT3DTEXTURE9 iface, UINT Level) {
+static HRESULT WINAPI IDirect3DTexture9Impl_UnlockRect(LPDIRECT3DTEXTURE9 iface, UINT Level) {
IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface;
- return IWineD3DTexture_UnlockRect(This->wineD3DTexture, Level);
+ HRESULT hr;
+ TRACE("(%p) Relay\n", This);
+
+ EnterCriticalSection(&d3d9_cs);
+ hr = IWineD3DTexture_UnlockRect(This->wineD3DTexture, Level);
+ LeaveCriticalSection(&d3d9_cs);
+ return hr;
}
-HRESULT WINAPI IDirect3DTexture9Impl_AddDirtyRect(LPDIRECT3DTEXTURE9 iface, CONST RECT* pDirtyRect) {
+static HRESULT WINAPI IDirect3DTexture9Impl_AddDirtyRect(LPDIRECT3DTEXTURE9 iface, CONST RECT* pDirtyRect) {
IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface;
- return IWineD3DTexture_AddDirtyRect(This->wineD3DTexture, pDirtyRect);
+ HRESULT hr;
+ TRACE("(%p) Relay\n", This);
+
+ EnterCriticalSection(&d3d9_cs);
+ hr = IWineD3DTexture_AddDirtyRect(This->wineD3DTexture, pDirtyRect);
+ LeaveCriticalSection(&d3d9_cs);
+ return hr;
}
-const IDirect3DTexture9Vtbl Direct3DTexture9_Vtbl =
+static const IDirect3DTexture9Vtbl Direct3DTexture9_Vtbl =
{
+ /* IUnknown */
IDirect3DTexture9Impl_QueryInterface,
IDirect3DTexture9Impl_AddRef,
IDirect3DTexture9Impl_Release,
+ /* IDirect3DResource9 */
IDirect3DTexture9Impl_GetDevice,
IDirect3DTexture9Impl_SetPrivateData,
IDirect3DTexture9Impl_GetPrivateData,
IDirect3DTexture9Impl_GetPriority,
IDirect3DTexture9Impl_PreLoad,
IDirect3DTexture9Impl_GetType,
-
+ /* IDirect3dBaseTexture9 */
IDirect3DTexture9Impl_SetLOD,
IDirect3DTexture9Impl_GetLOD,
IDirect3DTexture9Impl_GetLevelCount,
IDirect3DTexture9Impl_SetAutoGenFilterType,
IDirect3DTexture9Impl_GetAutoGenFilterType,
IDirect3DTexture9Impl_GenerateMipSubLevels,
+ /* IDirect3DTexture9 */
IDirect3DTexture9Impl_GetLevelDesc,
IDirect3DTexture9Impl_GetSurfaceLevel,
IDirect3DTexture9Impl_LockRect,
/* IDirect3DDevice9 IDirect3DTexture9 Methods follow: */
-HRESULT WINAPI IDirect3DDevice9Impl_CreateTexture(LPDIRECT3DDEVICE9 iface, UINT Width, UINT Height, UINT Levels, DWORD Usage,
+HRESULT WINAPI IDirect3DDevice9Impl_CreateTexture(LPDIRECT3DDEVICE9EX iface, UINT Width, UINT Height, UINT Levels, DWORD Usage,
D3DFORMAT Format, D3DPOOL Pool, IDirect3DTexture9** ppTexture, HANDLE* pSharedHandle) {
IDirect3DTexture9Impl *object;
IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface;
HRESULT hrc = D3D_OK;
- TRACE("(%p) : W(%d) H(%d), Lvl(%d) d(%ld), Fmt(%u), Pool(%d)\n", This, Width, Height, Levels, Usage, Format, Pool);
+ TRACE("(%p) : W(%d) H(%d), Lvl(%d) d(%d), Fmt(%#x), Pool(%d)\n", This, Width, Height, Levels, Usage, Format, Pool);
/* Allocate the storage for the device */
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DTexture9Impl));
if (NULL == object) {
- FIXME("Allocation of memory failed\n");
- *ppTexture = NULL;
+ FIXME("Allocation of memory failed, returning D3DERR_OUTOFVIDEOMEMORY\n");
return D3DERR_OUTOFVIDEOMEMORY;
}
object->lpVtbl = &Direct3DTexture9_Vtbl;
object->ref = 1;
- hrc = IWineD3DDevice_CreateTexture(This->WineD3DDevice, Width, Height, Levels, Usage,
- (WINED3DFORMAT)Format, Pool, &object->wineD3DTexture, pSharedHandle, (IUnknown *)object, D3D9CB_CreateSurface);
+ EnterCriticalSection(&d3d9_cs);
+ hrc = IWineD3DDevice_CreateTexture(This->WineD3DDevice, Width, Height, Levels, Usage & WINED3DUSAGE_MASK,
+ (WINED3DFORMAT)Format, (WINED3DPOOL) Pool, &object->wineD3DTexture, pSharedHandle, (IUnknown *)object, D3D9CB_CreateSurface);
+ LeaveCriticalSection(&d3d9_cs);
if (FAILED(hrc)) {
- /* free up object */
+
+ /* free up object */
FIXME("(%p) call to IWineD3DDevice_CreateTexture failed\n", This);
HeapFree(GetProcessHeap(), 0, object);
- *ppTexture = NULL;
} else {
+ IUnknown_AddRef(iface);
+ object->parentDevice = iface;
*ppTexture= (LPDIRECT3DTEXTURE9) object;
+ TRACE("(%p) Created Texture %p, %p\n", This, object, object->wineD3DTexture);
}
- TRACE("(%p) Created Texture %p, %p\n",This,object,object->wineD3DTexture);
return hrc;
}
projects / wine / blobdiff