system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 07:05:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

d3d9: Handle surface container in d3d9.

Browse source
This commit is contained in:
Markus Amsler 2006-12-18 00:17:51 +01:00 committed by Alexandre Julliard
parent 87083c9d71
commit 467b1dd3ad
4 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dlls/d3d9/d3d9_private.h
View file

@ -310,6 +310,9 @@ typedef struct IDirect3DSurface9Impl
/* Parent reference */
LPDIRECT3DDEVICE9 parentDevice;
/* The surface container */
IUnknown *container;
/* If set forward refcounting to this object */
IUnknown *forwardReference;

1
dlls/d3d9/device.c
View file

@ -1013,6 +1013,7 @@ HRESULT WINAPI D3D9CB_CreateSurface(IUnknown *device, IUnknown *pSuperior, UINT
if (SUCCEEDED(res)) {
*ppSurface = d3dSurface->wineD3DSurface;
d3dSurface->container = pSuperior;
IUnknown_Release(d3dSurface->parentDevice);
d3dSurface->parentDevice = NULL;
d3dSurface->forwardReference = pSuperior;

2
dlls/d3d9/directx.c
View file

@ -189,6 +189,7 @@ HRESULT WINAPI D3D9CB_CreateRenderTarget(IUnknown *device, IUnknown *pSuperior,
if (SUCCEEDED(res)) {
*ppSurface = d3dSurface->wineD3DSurface;
d3dSurface->container = pSuperior;
d3dSurface->isImplicit = TRUE;
/* Implicit surfaces are created with an refcount of 0 */
IUnknown_Release((IUnknown *)d3dSurface);
@ -285,6 +286,7 @@ HRESULT WINAPI D3D9CB_CreateDepthStencilSurface(IUnknown *device, IUnknown *pSup
(IDirect3DSurface9 **)&d3dSurface, pSharedHandle);
if (SUCCEEDED(res)) {
*ppSurface = d3dSurface->wineD3DSurface;
d3dSurface->container = device;
d3dSurface->isImplicit = TRUE;
/* Implicit surfaces are created with an refcount of 0 */
IUnknown_Release((IUnknown *)d3dSurface);

24
dlls/d3d9/surface.c
View file

@ -139,35 +139,17 @@ static D3DRESOURCETYPE WINAPI IDirect3DSurface9Impl_GetType(LPDIRECT3DSURFACE9 i
/* IDirect3DSurface9 Interface follow: */
static HRESULT WINAPI IDirect3DSurface9Impl_GetContainer(LPDIRECT3DSURFACE9 iface, REFIID riid, void** ppContainer) {
IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface;
IWineD3DBase *wineD3DContainer = NULL;
IUnknown *wineD3DContainerParent = NULL;
HRESULT res;
TRACE("(This %p, riid %s, ppContainer %p)\n", This, debugstr_guid(riid), ppContainer);
if (!This->container) return E_NOINTERFACE;
if (!ppContainer) {
ERR("Called without a valid ppContainer\n");
}
/* Get the WineD3D container. */
res = IWineD3DSurface_GetContainer(This->wineD3DSurface, &IID_IWineD3DBase, (void **)&wineD3DContainer);
if (res != D3D_OK) return res;
if (!wineD3DContainer) {
ERR("IWineD3DSurface_GetContainer should never return NULL\n");
}
/* Get the parent */
IWineD3DBase_GetParent(wineD3DContainer, &wineD3DContainerParent);
IUnknown_Release(wineD3DContainer);
if (!wineD3DContainerParent) {
ERR("IWineD3DBase_GetParent should never return NULL\n");
}
/* Now, query the interface of the parent for the riid */
res = IUnknown_QueryInterface(wineD3DContainerParent, riid, ppContainer);
IUnknown_Release(wineD3DContainerParent);
res = IUnknown_QueryInterface(This->container, riid, ppContainer);
TRACE("Returning ppContainer %p, *ppContainer %p\n", ppContainer, *ppContainer);