/* IDirect3DCubeTexture9 IUnknown parts follow: */
static HRESULT WINAPI IDirect3DCubeTexture9Impl_QueryInterface(LPDIRECT3DCUBETEXTURE9 iface, REFIID riid, LPVOID* ppobj) {
IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface;
+
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj);
+
if (IsEqualGUID(riid, &IID_IUnknown)
|| IsEqualGUID(riid, &IID_IDirect3DResource9)
|| IsEqualGUID(riid, &IID_IDirect3DBaseTexture9)
|| IsEqualGUID(riid, &IID_IDirect3DCubeTexture9)) {
- IUnknown_AddRef(iface);
+ IDirect3DCubeTexture9_AddRef(iface);
*ppobj = This;
return S_OK;
}
IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface;
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) : AddRef from %d\n", This, ref - 1);
+ TRACE("%p increasing refcount to %u.\n", iface, ref);
+
+ if (ref == 1)
+ {
+ IDirect3DDevice9Ex_AddRef(This->parentDevice);
+ wined3d_mutex_lock();
+ IWineD3DCubeTexture_AddRef(This->wineD3DCubeTexture);
+ wined3d_mutex_unlock();
+ }
return ref;
}
IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface;
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) : ReleaseRef to %d\n", This, ref);
+ TRACE("%p decreasing refcount to %u.\n", iface, ref);
if (ref == 0) {
+ IDirect3DDevice9Ex *parentDevice = This->parentDevice;
+
TRACE("Releasing child %p\n", This->wineD3DCubeTexture);
- EnterCriticalSection(&d3d9_cs);
- IWineD3DCubeTexture_Destroy(This->wineD3DCubeTexture, D3D9CB_DestroySurface);
- IUnknown_Release(This->parentDevice);
- LeaveCriticalSection(&d3d9_cs);
+ wined3d_mutex_lock();
+ IWineD3DCubeTexture_Release(This->wineD3DCubeTexture);
+ wined3d_mutex_unlock();
- HeapFree(GetProcessHeap(), 0, This);
+ /* Release the device last, as it may cause the device to be destroyed. */
+ IDirect3DDevice9Ex_Release(parentDevice);
}
return ref;
}
/* IDirect3DCubeTexture9 IDirect3DResource9 Interface follow: */
-static HRESULT WINAPI IDirect3DCubeTexture9Impl_GetDevice(LPDIRECT3DCUBETEXTURE9 iface, IDirect3DDevice9** ppDevice) {
+static HRESULT WINAPI IDirect3DCubeTexture9Impl_GetDevice(IDirect3DCubeTexture9 *iface, IDirect3DDevice9 **device)
+{
IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface;
- HRESULT hr;
- TRACE("(%p) Relay\n" , This);
- EnterCriticalSection(&d3d9_cs);
- hr = IDirect3DResource9Impl_GetDevice((LPDIRECT3DRESOURCE9) This, ppDevice);
- LeaveCriticalSection(&d3d9_cs);
- return hr;
+ TRACE("iface %p, device %p.\n", iface, device);
+
+ *device = (IDirect3DDevice9 *)This->parentDevice;
+ IDirect3DDevice9_AddRef(*device);
+
+ TRACE("Returning device %p.\n", *device);
+
+ return D3D_OK;
}
static HRESULT WINAPI IDirect3DCubeTexture9Impl_SetPrivateData(LPDIRECT3DCUBETEXTURE9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) {
IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface;
HRESULT hr;
- TRACE("(%p) Relay\n", This);
- EnterCriticalSection(&d3d9_cs);
+ TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n",
+ iface, debugstr_guid(refguid), pData, SizeOfData, Flags);
+
+ wined3d_mutex_lock();
hr = IWineD3DCubeTexture_SetPrivateData(This->wineD3DCubeTexture,refguid,pData,SizeOfData,Flags);
- LeaveCriticalSection(&d3d9_cs);
+ wined3d_mutex_unlock();
+
return hr;
}
static HRESULT WINAPI IDirect3DCubeTexture9Impl_GetPrivateData(LPDIRECT3DCUBETEXTURE9 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) {
IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface;
HRESULT hr;
- TRACE("(%p) Relay\n", This);
- EnterCriticalSection(&d3d9_cs);
+ TRACE("iface %p, guid %s, data %p, data_size %p.\n",
+ iface, debugstr_guid(refguid), pData, pSizeOfData);
+
+ wined3d_mutex_lock();
hr = IWineD3DCubeTexture_GetPrivateData(This->wineD3DCubeTexture,refguid,pData,pSizeOfData);
- LeaveCriticalSection(&d3d9_cs);
+ wined3d_mutex_unlock();
+
return hr;
}
static HRESULT WINAPI IDirect3DCubeTexture9Impl_FreePrivateData(LPDIRECT3DCUBETEXTURE9 iface, REFGUID refguid) {
IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface;
HRESULT hr;
- TRACE("(%p) Relay\n", This);
- EnterCriticalSection(&d3d9_cs);
+ TRACE("iface %p, guid %s.\n", iface, debugstr_guid(refguid));
+
+ wined3d_mutex_lock();
hr = IWineD3DCubeTexture_FreePrivateData(This->wineD3DCubeTexture,refguid);
- LeaveCriticalSection(&d3d9_cs);
+ wined3d_mutex_unlock();
+
return hr;
}
static DWORD WINAPI IDirect3DCubeTexture9Impl_SetPriority(LPDIRECT3DCUBETEXTURE9 iface, DWORD PriorityNew) {
IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface;
DWORD ret;
- TRACE("(%p) Relay\n", This);
- EnterCriticalSection(&d3d9_cs);
+ TRACE("iface %p, priority %u.\n", iface, PriorityNew);
+
+ wined3d_mutex_lock();
ret = IWineD3DCubeTexture_SetPriority(This->wineD3DCubeTexture, PriorityNew);
- LeaveCriticalSection(&d3d9_cs);
+ wined3d_mutex_unlock();
+
return ret;
}
static DWORD WINAPI IDirect3DCubeTexture9Impl_GetPriority(LPDIRECT3DCUBETEXTURE9 iface) {
IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface;
DWORD ret;
- TRACE("(%p) Relay\n", This);
- EnterCriticalSection(&d3d9_cs);
+ TRACE("iface %p.\n", iface);
+
+ wined3d_mutex_lock();
ret = IWineD3DCubeTexture_GetPriority(This->wineD3DCubeTexture);
- LeaveCriticalSection(&d3d9_cs);
+ wined3d_mutex_unlock();
+
return ret;
}
static void WINAPI IDirect3DCubeTexture9Impl_PreLoad(LPDIRECT3DCUBETEXTURE9 iface) {
IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface;
- TRACE("(%p) Relay\n", This);
- EnterCriticalSection(&d3d9_cs);
+ TRACE("iface %p.\n", iface);
+
+ wined3d_mutex_lock();
IWineD3DCubeTexture_PreLoad(This->wineD3DCubeTexture);
- LeaveCriticalSection(&d3d9_cs);
+ wined3d_mutex_unlock();
}
static D3DRESOURCETYPE WINAPI IDirect3DCubeTexture9Impl_GetType(LPDIRECT3DCUBETEXTURE9 iface) {
IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface;
D3DRESOURCETYPE ret;
- TRACE("(%p) Relay\n", This);
- EnterCriticalSection(&d3d9_cs);
+ TRACE("iface %p.\n", iface);
+
+ wined3d_mutex_lock();
ret = IWineD3DCubeTexture_GetType(This->wineD3DCubeTexture);
- LeaveCriticalSection(&d3d9_cs);
+ wined3d_mutex_unlock();
+
return ret;
}
static DWORD WINAPI IDirect3DCubeTexture9Impl_SetLOD(LPDIRECT3DCUBETEXTURE9 iface, DWORD LODNew) {
IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface;
DWORD ret;
- TRACE("(%p) Relay\n", This);
- EnterCriticalSection(&d3d9_cs);
+ TRACE("iface %p, lod %u.\n", iface, LODNew);
+
+ wined3d_mutex_lock();
ret = IWineD3DCubeTexture_SetLOD(This->wineD3DCubeTexture, LODNew);
- LeaveCriticalSection(&d3d9_cs);
+ wined3d_mutex_unlock();
+
return ret;
}
static DWORD WINAPI IDirect3DCubeTexture9Impl_GetLOD(LPDIRECT3DCUBETEXTURE9 iface) {
IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface;
DWORD ret;
- TRACE("(%p) Relay\n", This);
- EnterCriticalSection(&d3d9_cs);
- ret = IDirect3DBaseTexture9Impl_GetLOD((LPDIRECT3DBASETEXTURE9) This);
- LeaveCriticalSection(&d3d9_cs);
+ TRACE("iface %p.\n", iface);
+
+ wined3d_mutex_lock();
+ ret = IWineD3DCubeTexture_GetLOD(This->wineD3DCubeTexture);
+ wined3d_mutex_unlock();
+
return ret;
}
static DWORD WINAPI IDirect3DCubeTexture9Impl_GetLevelCount(LPDIRECT3DCUBETEXTURE9 iface) {
IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface;
DWORD ret;
- TRACE("(%p) Relay\n", This);
- EnterCriticalSection(&d3d9_cs);
+ TRACE("iface %p.\n", iface);
+
+ wined3d_mutex_lock();
ret = IWineD3DCubeTexture_GetLevelCount(This->wineD3DCubeTexture);
- LeaveCriticalSection(&d3d9_cs);
+ wined3d_mutex_unlock();
+
return ret;
}
static HRESULT WINAPI IDirect3DCubeTexture9Impl_SetAutoGenFilterType(LPDIRECT3DCUBETEXTURE9 iface, D3DTEXTUREFILTERTYPE FilterType) {
IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface;
HRESULT hr;
- TRACE("(%p) Relay\n", This);
- EnterCriticalSection(&d3d9_cs);
+ TRACE("iface %p, filter_type %#x.\n", iface, FilterType);
+
+ wined3d_mutex_lock();
hr = IWineD3DCubeTexture_SetAutoGenFilterType(This->wineD3DCubeTexture, (WINED3DTEXTUREFILTERTYPE) FilterType);
- LeaveCriticalSection(&d3d9_cs);
+ wined3d_mutex_unlock();
+
return hr;
}
static D3DTEXTUREFILTERTYPE WINAPI IDirect3DCubeTexture9Impl_GetAutoGenFilterType(LPDIRECT3DCUBETEXTURE9 iface) {
IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface;
D3DTEXTUREFILTERTYPE ret;
- TRACE("(%p) Relay\n", This);
- EnterCriticalSection(&d3d9_cs);
+ TRACE("iface %p.\n", iface);
+
+ wined3d_mutex_lock();
ret = (D3DTEXTUREFILTERTYPE) IWineD3DCubeTexture_GetAutoGenFilterType(This->wineD3DCubeTexture);
- LeaveCriticalSection(&d3d9_cs);
+ wined3d_mutex_unlock();
+
return ret;
}
static void WINAPI IDirect3DCubeTexture9Impl_GenerateMipSubLevels(LPDIRECT3DCUBETEXTURE9 iface) {
IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface;
- TRACE("(%p) Relay\n", This);
- EnterCriticalSection(&d3d9_cs);
+ TRACE("iface %p.\n", iface);
+
+ wined3d_mutex_lock();
IWineD3DCubeTexture_GenerateMipSubLevels(This->wineD3DCubeTexture);
- LeaveCriticalSection(&d3d9_cs);
+ wined3d_mutex_unlock();
}
/* IDirect3DCubeTexture9 Interface follow: */
static HRESULT WINAPI IDirect3DCubeTexture9Impl_GetLevelDesc(LPDIRECT3DCUBETEXTURE9 iface, UINT Level, D3DSURFACE_DESC* pDesc) {
IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface;
- WINED3DSURFACE_DESC wined3ddesc;
- UINT tmpInt = -1;
+ WINED3DSURFACE_DESC wined3ddesc;
HRESULT hr;
- TRACE("(%p) Relay\n", This);
+ TRACE("iface %p, level %u, desc %p.\n", iface, Level, pDesc);
- /* As d3d8 and d3d9 structures differ, pass in ptrs to where data needs to go */
- wined3ddesc.Format = (WINED3DFORMAT *)&pDesc->Format;
- wined3ddesc.Type = (WINED3DRESOURCETYPE *) &pDesc->Type;
- wined3ddesc.Usage = &pDesc->Usage;
- wined3ddesc.Pool = (WINED3DPOOL *) &pDesc->Pool;
- wined3ddesc.Size = &tmpInt;
- wined3ddesc.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *) &pDesc->MultiSampleType;
- wined3ddesc.MultiSampleQuality = &pDesc->MultiSampleQuality;
- wined3ddesc.Width = &pDesc->Width;
- wined3ddesc.Height = &pDesc->Height;
-
- EnterCriticalSection(&d3d9_cs);
+ wined3d_mutex_lock();
hr = IWineD3DCubeTexture_GetLevelDesc(This->wineD3DCubeTexture, Level, &wined3ddesc);
- LeaveCriticalSection(&d3d9_cs);
+ wined3d_mutex_unlock();
+
+ if (SUCCEEDED(hr))
+ {
+ pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.format);
+ pDesc->Type = wined3ddesc.resource_type;
+ pDesc->Usage = wined3ddesc.usage;
+ pDesc->Pool = wined3ddesc.pool;
+ pDesc->MultiSampleType = wined3ddesc.multisample_type;
+ pDesc->MultiSampleQuality = wined3ddesc.multisample_quality;
+ pDesc->Width = wined3ddesc.width;
+ pDesc->Height = wined3ddesc.height;
+ }
+
return hr;
}
HRESULT hrc = D3D_OK;
IWineD3DSurface *mySurface = NULL;
- TRACE("(%p) Relay\n", This);
+ TRACE("iface %p, face %#x, level %u, surface %p.\n", iface, FaceType, Level, ppCubeMapSurface);
- EnterCriticalSection(&d3d9_cs);
+ wined3d_mutex_lock();
hrc = IWineD3DCubeTexture_GetCubeMapSurface(This->wineD3DCubeTexture, (WINED3DCUBEMAP_FACES) FaceType, Level, &mySurface);
if (hrc == D3D_OK && NULL != ppCubeMapSurface) {
IWineD3DCubeTexture_GetParent(mySurface, (IUnknown **)ppCubeMapSurface);
IWineD3DCubeTexture_Release(mySurface);
}
- LeaveCriticalSection(&d3d9_cs);
+ wined3d_mutex_unlock();
+
return hrc;
}
static HRESULT WINAPI IDirect3DCubeTexture9Impl_LockRect(LPDIRECT3DCUBETEXTURE9 iface, D3DCUBEMAP_FACES FaceType, UINT Level, D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) {
IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface;
HRESULT hr;
- TRACE("(%p) Relay\n", This);
- EnterCriticalSection(&d3d9_cs);
+ TRACE("iface %p, face %#x, level %u, locked_rect %p, rect %p, flags %#x.\n",
+ iface, FaceType, Level, pLockedRect, pRect, Flags);
+
+ wined3d_mutex_lock();
hr = IWineD3DCubeTexture_LockRect(This->wineD3DCubeTexture, (WINED3DCUBEMAP_FACES) FaceType, Level, (WINED3DLOCKED_RECT *) pLockedRect, pRect, Flags);
- LeaveCriticalSection(&d3d9_cs);
+ wined3d_mutex_unlock();
+
return hr;
}
static HRESULT WINAPI IDirect3DCubeTexture9Impl_UnlockRect(LPDIRECT3DCUBETEXTURE9 iface, D3DCUBEMAP_FACES FaceType, UINT Level) {
IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface;
HRESULT hr;
- TRACE("(%p) Relay\n", This);
- EnterCriticalSection(&d3d9_cs);
+ TRACE("iface %p, face %#x, level %u.\n", iface, FaceType, Level);
+
+ wined3d_mutex_lock();
hr = IWineD3DCubeTexture_UnlockRect(This->wineD3DCubeTexture, (WINED3DCUBEMAP_FACES) FaceType, Level);
- LeaveCriticalSection(&d3d9_cs);
+ wined3d_mutex_unlock();
+
return hr;
}
static HRESULT WINAPI IDirect3DCubeTexture9Impl_AddDirtyRect(LPDIRECT3DCUBETEXTURE9 iface, D3DCUBEMAP_FACES FaceType, CONST RECT* pDirtyRect) {
IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface;
HRESULT hr;
- TRACE("(%p) Relay\n", This);
- EnterCriticalSection(&d3d9_cs);
+ TRACE("iface %p, face %#x, dirty_rect %p.\n", iface, FaceType, pDirtyRect);
+
+ wined3d_mutex_lock();
hr = IWineD3DCubeTexture_AddDirtyRect(This->wineD3DCubeTexture, (WINED3DCUBEMAP_FACES) FaceType, pDirtyRect);
- LeaveCriticalSection(&d3d9_cs);
+ wined3d_mutex_unlock();
+
return hr;
}
IDirect3DCubeTexture9Impl_AddDirtyRect
};
+static void STDMETHODCALLTYPE cubetexture_wined3d_object_destroyed(void *parent)
+{
+ HeapFree(GetProcessHeap(), 0, parent);
+}
+static const struct wined3d_parent_ops d3d9_cubetexture_wined3d_parent_ops =
+{
+ cubetexture_wined3d_object_destroyed,
+};
+HRESULT cubetexture_init(IDirect3DCubeTexture9Impl *texture, IDirect3DDevice9Impl *device,
+ UINT edge_length, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool)
+{
+ HRESULT hr;
-/* IDirect3DDevice9 IDirect3DCubeTexture9 Methods follow: */
-HRESULT WINAPI IDirect3DDevice9Impl_CreateCubeTexture(LPDIRECT3DDEVICE9EX iface,
- UINT EdgeLength, UINT Levels, DWORD Usage,
- D3DFORMAT Format, D3DPOOL Pool,
- IDirect3DCubeTexture9** ppCubeTexture, HANDLE* pSharedHandle) {
-
- IDirect3DCubeTexture9Impl *object;
- IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface;
- HRESULT hr = D3D_OK;
-
- TRACE("(%p) : ELen(%d) Lvl(%d) Usage(%d) fmt(%u), Pool(%d) Shared(%p)\n", This, EdgeLength, Levels, Usage, Format, Pool, pSharedHandle);
-
- /* Allocate the storage for the device */
- object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
-
- if (NULL == object) {
- FIXME("(%p) allocation of CubeTexture failed\n", This);
- return D3DERR_OUTOFVIDEOMEMORY;
- }
- object->lpVtbl = &Direct3DCubeTexture9_Vtbl;
- object->ref = 1;
- EnterCriticalSection(&d3d9_cs);
- hr = IWineD3DDevice_CreateCubeTexture(This->WineD3DDevice, EdgeLength, Levels, Usage,
- (WINED3DFORMAT)Format, (WINED3DPOOL) Pool, &object->wineD3DCubeTexture, pSharedHandle, (IUnknown*)object,
- D3D9CB_CreateSurface);
- LeaveCriticalSection(&d3d9_cs);
-
- if (hr != D3D_OK){
-
- /* free up object */
- FIXME("(%p) call to IWineD3DDevice_CreateCubeTexture failed\n", This);
- HeapFree(GetProcessHeap(), 0, object);
- } else {
- IUnknown_AddRef(iface);
- object->parentDevice = iface;
- *ppCubeTexture = (LPDIRECT3DCUBETEXTURE9) object;
- TRACE("(%p) : Created cube texture %p\n", This, object);
+ texture->lpVtbl = &Direct3DCubeTexture9_Vtbl;
+ texture->ref = 1;
+
+ wined3d_mutex_lock();
+ hr = IWineD3DDevice_CreateCubeTexture(device->WineD3DDevice, edge_length, levels, usage,
+ wined3dformat_from_d3dformat(format), pool, &texture->wineD3DCubeTexture,
+ (IUnknown *)texture, &d3d9_cubetexture_wined3d_parent_ops);
+ wined3d_mutex_unlock();
+ if (FAILED(hr))
+ {
+ WARN("Failed to create wined3d cube texture, hr %#x.\n", hr);
+ return hr;
}
- TRACE("(%p) returning %p\n",This, *ppCubeTexture);
- return hr;
+ texture->parentDevice = (IDirect3DDevice9Ex *)device;
+ IDirect3DDevice9Ex_AddRef(texture->parentDevice);
+
+ return D3D_OK;
}
projects / reactos.git / blobdiff