marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d9: Add reference to the parent device for surfaces. 

Allow some objects to have no parent device.
Tighten refcount tests and test refound decrement on Release.
oldstable
Vitaliy Margolen 2006-05-29 15:01:04 -06:00 committed by Alexandre Julliard
parent 115525f3c4
commit 19d19b2b79
6 changed files with 67 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/d3d9/d3d9_private.h
View File

@ -333,6 +333,8 @@ typedef struct IDirect3DSurface9Impl
/* IDirect3DResource9 fields */ /* IDirect3DResource9 fields */
IWineD3DSurface *wineD3DSurface; IWineD3DSurface *wineD3DSurface;
/* Parent reference */
LPDIRECT3DDEVICE9 parentDevice;
} IDirect3DSurface9Impl; } IDirect3DSurface9Impl;
/* ---------------------- */ /* ---------------------- */

12
dlls/d3d9/device.c
View File

@ -277,6 +277,8 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateSurface(LPDIRECT3DDEVICE9 iface, UINT
FIXME("(%p) call to IWineD3DDevice_CreateSurface failed\n", This); FIXME("(%p) call to IWineD3DDevice_CreateSurface failed\n", This);
HeapFree(GetProcessHeap(), 0, object); HeapFree(GetProcessHeap(), 0, object);
} else { } else {
IUnknown_AddRef(iface);
object->parentDevice = iface;
TRACE("(%p) : Created surface %p\n", This, object); TRACE("(%p) : Created surface %p\n", This, object);
*ppSurface = (LPDIRECT3DSURFACE9) object; *ppSurface = (LPDIRECT3DSURFACE9) object;
} }
@ -951,11 +953,15 @@ HRESULT WINAPI D3D9CB_CreateSurface(IUnknown *device, UINT Width, UINT Height,
Lockable = FALSE; Lockable = FALSE;
TRACE("relay\n"); TRACE("relay\n");
res = IDirect3DDevice9Impl_CreateSurface((IDirect3DDevice9 *)device, Width, Height, (D3DFORMAT)Format, Lockable, FALSE/*Discard*/, Level, (IDirect3DSurface9 **)&d3dSurface, D3DRTYPE_SURFACE, Usage, (D3DPOOL) Pool, D3DMULTISAMPLE_NONE, 0 /* MultisampleQuality */, pSharedHandle); res = IDirect3DDevice9Impl_CreateSurface((IDirect3DDevice9 *)device, Width, Height, (D3DFORMAT)Format,
Lockable, FALSE/*Discard*/, Level, (IDirect3DSurface9 **)&d3dSurface, D3DRTYPE_SURFACE,
Usage, (D3DPOOL) Pool, D3DMULTISAMPLE_NONE, 0 /* MultisampleQuality */, pSharedHandle);
if (res == D3D_OK) { if (SUCCEEDED(res)) {
*ppSurface = d3dSurface->wineD3DSurface; *ppSurface = d3dSurface->wineD3DSurface;
}else{ IUnknown_Release(d3dSurface->parentDevice);
d3dSurface->parentDevice = NULL;
} else {
FIXME("(%p) IDirect3DDevice9_CreateSurface failed\n", device); FIXME("(%p) IDirect3DDevice9_CreateSurface failed\n", device);
} }
return res; return res;

10
dlls/d3d9/directx.c
View File

@ -188,6 +188,8 @@ HRESULT WINAPI D3D9CB_CreateRenderTarget(IUnknown *device, UINT Width, UINT Heig
if (SUCCEEDED(res)) { if (SUCCEEDED(res)) {
*ppSurface = d3dSurface->wineD3DSurface; *ppSurface = d3dSurface->wineD3DSurface;
IUnknown_Release(d3dSurface->parentDevice);
d3dSurface->parentDevice = NULL;
} else { } else {
*ppSurface = NULL; *ppSurface = NULL;
} }
@ -220,8 +222,10 @@ HRESULT WINAPI D3D9CB_CreateAdditionalSwapChain(IUnknown *device,
/*copy the presentation parameters*/ /*copy the presentation parameters*/
res = IDirect3DDevice9_CreateAdditionalSwapChain((IDirect3DDevice9 *)device, &localParameters, (IDirect3DSwapChain9 **)&d3dSwapChain); res = IDirect3DDevice9_CreateAdditionalSwapChain((IDirect3DDevice9 *)device, &localParameters, (IDirect3DSwapChain9 **)&d3dSwapChain);
if (res == D3D_OK && d3dSwapChain != NULL) { if (SUCCEEDED(res)) {
*ppSwapChain = d3dSwapChain->wineD3DSwapChain; *ppSwapChain = d3dSwapChain->wineD3DSwapChain;
IUnknown_Release(d3dSwapChain->parentDevice);
d3dSwapChain->parentDevice = NULL;
} else { } else {
*ppSwapChain = NULL; *ppSwapChain = NULL;
} }
@ -256,8 +260,10 @@ HRESULT WINAPI D3D9CB_CreateDepthStencilSurface(IUnknown *device, UINT Width, UI
res = IDirect3DDevice9_CreateDepthStencilSurface((IDirect3DDevice9 *)device, Width, Height, res = IDirect3DDevice9_CreateDepthStencilSurface((IDirect3DDevice9 *)device, Width, Height,
(D3DFORMAT)Format, MultiSample, MultisampleQuality, Discard, (D3DFORMAT)Format, MultiSample, MultisampleQuality, Discard,
(IDirect3DSurface9 **)&d3dSurface, pSharedHandle); (IDirect3DSurface9 **)&d3dSurface, pSharedHandle);
if (res == D3D_OK) { if (SUCCEEDED(res)) {
*ppSurface = d3dSurface->wineD3DSurface; *ppSurface = d3dSurface->wineD3DSurface;
IUnknown_Release(d3dSurface->parentDevice);
d3dSurface->parentDevice = NULL;
} }
return res; return res;
} }

1
dlls/d3d9/surface.c
View File

@ -79,6 +79,7 @@ ULONG WINAPI IDirect3DSurface9Impl_Release(LPDIRECT3DSURFACE9 iface) {
if (ref == 0) { if (ref == 0) {
IWineD3DSurface_Release(This->wineD3DSurface); IWineD3DSurface_Release(This->wineD3DSurface);
if (This->parentDevice) IUnknown_Release(This->parentDevice);
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
} }

2
dlls/d3d9/swapchain.c
View File

@ -58,7 +58,7 @@ ULONG WINAPI IDirect3DSwapChain9Impl_Release(LPDIRECT3DSWAPCHAIN9 iface) {
if (ref == 0) { if (ref == 0) {
IWineD3DSwapChain_Release(This->wineD3DSwapChain); IWineD3DSwapChain_Release(This->wineD3DSwapChain);
IUnknown_Release(This->parentDevice); if (This->parentDevice) IUnknown_Release(This->parentDevice);
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
} }
return ref; return ref;

97
dlls/d3d9/tests/device.c
View File

@ -33,10 +33,18 @@ static int get_refcount(IUnknown *object)
#define CHECK_CALL(r,c,d,rc) \ #define CHECK_CALL(r,c,d,rc) \
if (SUCCEEDED(r)) {\ if (SUCCEEDED(r)) {\
int tmp1 = get_refcount( (IUnknown *)d ); \ int tmp1 = get_refcount( (IUnknown *)d ); \
ok(rc == tmp1, "Invalid refcount. Expected %d got %d\n", rc, tmp1); \ int rc_new = rc; \
ok(tmp1 == rc_new, "Invalid refcount. Expected %d got %d\n", rc_new, tmp1); \
} else {\ } else {\
trace("%s failed: %s\n", c, DXGetErrorString9(r)); \ trace("%s failed: %s\n", c, DXGetErrorString9(r)); \
} }
#define CHECK_RELEASE(obj,d,rc) \
if (obj) { \
int tmp1, rc_new = rc; \
IUnknown_Release( obj ); \
tmp1 = get_refcount( (IUnknown *)d ); \
ok(tmp1 == rc_new, "Invalid refcount. Expected %d got %d\n", rc_new, tmp1); \
}
void test_swapchain(void) void test_swapchain(void)
{ {
@ -206,7 +214,7 @@ void test_refcount(void)
IDirect3DQuery9 *pQuery = NULL; IDirect3DQuery9 *pQuery = NULL;
D3DPRESENT_PARAMETERS d3dpp; D3DPRESENT_PARAMETERS d3dpp;
D3DDISPLAYMODE d3ddm; D3DDISPLAYMODE d3ddm;
int refcount, tmp; int refcount = 0, tmp;
D3DVERTEXELEMENT9 decl[] = D3DVERTEXELEMENT9 decl[] =
{ {
@ -245,95 +253,82 @@ void test_refcount(void)
ok(SUCCEEDED(hr), "Failed to create IDirect3D9Device (%s)\n", DXGetErrorString9(hr)); ok(SUCCEEDED(hr), "Failed to create IDirect3D9Device (%s)\n", DXGetErrorString9(hr));
if (FAILED(hr)) goto cleanup; if (FAILED(hr)) goto cleanup;
refcount = get_refcount( (IUnknown *)pDevice );
ok(refcount == 1, "Invalid device RefCount %d\n", refcount);
/* Buffers */ /* Buffers */
refcount = get_refcount( (IUnknown *)pDevice );
hr = IDirect3DDevice9_CreateIndexBuffer( pDevice, 16, 0, D3DFMT_INDEX32, D3DPOOL_DEFAULT, &pIndexBuffer, NULL ); hr = IDirect3DDevice9_CreateIndexBuffer( pDevice, 16, 0, D3DFMT_INDEX32, D3DPOOL_DEFAULT, &pIndexBuffer, NULL );
CHECK_CALL( hr, "CreateIndexBuffer", pDevice, refcount+1 ); CHECK_CALL( hr, "CreateIndexBuffer", pDevice, ++refcount );
refcount = get_refcount( (IUnknown *)pDevice );
hr = IDirect3DDevice9_CreateVertexBuffer( pDevice, 16, 0, D3DFVF_XYZ, D3DPOOL_DEFAULT, &pVertexBuffer, NULL ); hr = IDirect3DDevice9_CreateVertexBuffer( pDevice, 16, 0, D3DFVF_XYZ, D3DPOOL_DEFAULT, &pVertexBuffer, NULL );
CHECK_CALL( hr, "CreateVertexBuffer", pDevice, refcount+1 ); CHECK_CALL( hr, "CreateVertexBuffer", pDevice, ++refcount );
/* Shaders */ /* Shaders */
refcount = get_refcount( (IUnknown *)pDevice );
hr = IDirect3DDevice9_CreateVertexDeclaration( pDevice, decl, &pVertexDeclaration ); hr = IDirect3DDevice9_CreateVertexDeclaration( pDevice, decl, &pVertexDeclaration );
CHECK_CALL( hr, "CreateVertexDeclaration", pDevice, refcount+1 ); CHECK_CALL( hr, "CreateVertexDeclaration", pDevice, ++refcount );
refcount = get_refcount( (IUnknown *)pDevice );
hr = IDirect3DDevice9_CreateVertexShader( pDevice, simple_vs, &pVertexShader ); hr = IDirect3DDevice9_CreateVertexShader( pDevice, simple_vs, &pVertexShader );
CHECK_CALL( hr, "CreateVertexShader", pDevice, refcount+1 ); CHECK_CALL( hr, "CreateVertexShader", pDevice, ++refcount );
refcount = get_refcount( (IUnknown *)pDevice );
hr = IDirect3DDevice9_CreatePixelShader( pDevice, simple_ps, &pPixelShader ); hr = IDirect3DDevice9_CreatePixelShader( pDevice, simple_ps, &pPixelShader );
CHECK_CALL( hr, "CreatePixelShader", pDevice, refcount+1 ); CHECK_CALL( hr, "CreatePixelShader", pDevice, ++refcount );
/* Textures */ /* Textures */
refcount = get_refcount( (IUnknown *)pDevice );
hr = IDirect3DDevice9_CreateTexture( pDevice, 32, 32, 3, 0, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &pTexture, NULL ); hr = IDirect3DDevice9_CreateTexture( pDevice, 32, 32, 3, 0, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &pTexture, NULL );
CHECK_CALL( hr, "CreateTexture", pDevice, refcount+1 ); CHECK_CALL( hr, "CreateTexture", pDevice, ++refcount );
if (pTexture) if (pTexture)
{ {
tmp = get_refcount( (IUnknown *)pTexture ); tmp = get_refcount( (IUnknown *)pTexture );
/* This should not increment device refcount */ /* This should not increment device refcount */
hr = IDirect3DTexture9_GetSurfaceLevel( pTexture, 1, &pTextureLevel ); hr = IDirect3DTexture9_GetSurfaceLevel( pTexture, 1, &pTextureLevel );
CHECK_CALL( hr, "GetSurfaceLevel", pDevice, refcount+1 ); CHECK_CALL( hr, "GetSurfaceLevel", pDevice, refcount );
/* But should increment texture's refcount */ /* But should increment texture's refcount */
CHECK_CALL( hr, "GetSurfaceLevel", pTexture, tmp+1 ); CHECK_CALL( hr, "GetSurfaceLevel", pTexture, tmp+1 );
} }
refcount = get_refcount( (IUnknown *)pDevice );
hr = IDirect3DDevice9_CreateCubeTexture( pDevice, 32, 0, 0, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &pCubeTexture, NULL ); hr = IDirect3DDevice9_CreateCubeTexture( pDevice, 32, 0, 0, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &pCubeTexture, NULL );
CHECK_CALL( hr, "CreateCubeTexture", pDevice, refcount+1 ); CHECK_CALL( hr, "CreateCubeTexture", pDevice, ++refcount );
refcount = get_refcount( (IUnknown *)pDevice );
hr = IDirect3DDevice9_CreateVolumeTexture( pDevice, 32, 32, 2, 0, 0, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &pVolumeTexture, NULL ); hr = IDirect3DDevice9_CreateVolumeTexture( pDevice, 32, 32, 2, 0, 0, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &pVolumeTexture, NULL );
CHECK_CALL( hr, "CreateVolumeTexture", pDevice, refcount+1 ); CHECK_CALL( hr, "CreateVolumeTexture", pDevice, ++refcount );
/* Surfaces */ /* Surfaces */
refcount = get_refcount( (IUnknown *)pDevice );
hr = IDirect3DDevice9_CreateDepthStencilSurface( pDevice, 32, 32, D3DFMT_D24S8, D3DMULTISAMPLE_NONE, 0, TRUE, &pStencilSurface, NULL ); hr = IDirect3DDevice9_CreateDepthStencilSurface( pDevice, 32, 32, D3DFMT_D24S8, D3DMULTISAMPLE_NONE, 0, TRUE, &pStencilSurface, NULL );
todo_wine {CHECK_CALL( hr, "CreateDepthStencilSurface", pDevice, refcount+1 );} CHECK_CALL( hr, "CreateDepthStencilSurface", pDevice, ++refcount );
refcount = get_refcount( (IUnknown *)pDevice );
hr = IDirect3DDevice9_CreateOffscreenPlainSurface( pDevice, 32, 32, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &pOffscreenSurface, NULL ); hr = IDirect3DDevice9_CreateOffscreenPlainSurface( pDevice, 32, 32, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &pOffscreenSurface, NULL );
todo_wine {CHECK_CALL( hr, "CreateOffscreenPlainSurface", pDevice, refcount+1 );} CHECK_CALL( hr, "CreateOffscreenPlainSurface", pDevice, ++refcount );
refcount = get_refcount( (IUnknown *)pDevice );
hr = IDirect3DDevice9_CreateRenderTarget( pDevice, 32, 32, D3DFMT_X8R8G8B8, D3DMULTISAMPLE_NONE, 0, TRUE, &pRenderTarget, NULL ); hr = IDirect3DDevice9_CreateRenderTarget( pDevice, 32, 32, D3DFMT_X8R8G8B8, D3DMULTISAMPLE_NONE, 0, TRUE, &pRenderTarget, NULL );
todo_wine {CHECK_CALL( hr, "CreateRenderTarget", pDevice, refcount+1 );} CHECK_CALL( hr, "CreateRenderTarget", pDevice, ++refcount );
/* Misc */ /* Misc */
refcount = get_refcount( (IUnknown *)pDevice );
hr = IDirect3DDevice9_CreateStateBlock( pDevice, D3DSBT_ALL, &pStateBlock ); hr = IDirect3DDevice9_CreateStateBlock( pDevice, D3DSBT_ALL, &pStateBlock );
CHECK_CALL( hr, "CreateStateBlock", pDevice, refcount+1 ); CHECK_CALL( hr, "CreateStateBlock", pDevice, ++refcount );
refcount = get_refcount( (IUnknown *)pDevice );
hr = IDirect3DDevice9_CreateAdditionalSwapChain( pDevice, &d3dpp, &pSwapChain ); hr = IDirect3DDevice9_CreateAdditionalSwapChain( pDevice, &d3dpp, &pSwapChain );
CHECK_CALL( hr, "CreateAdditionalSwapChain", pDevice, refcount+1 ); CHECK_CALL( hr, "CreateAdditionalSwapChain", pDevice, ++refcount );
refcount = get_refcount( (IUnknown *)pDevice );
hr = IDirect3DDevice9_CreateQuery( pDevice, D3DQUERYTYPE_EVENT, &pQuery ); hr = IDirect3DDevice9_CreateQuery( pDevice, D3DQUERYTYPE_EVENT, &pQuery );
CHECK_CALL( hr, "CreateQuery", pDevice, refcount+1 ); CHECK_CALL( hr, "CreateQuery", pDevice, ++refcount );
refcount = get_refcount( (IUnknown *)pDevice );
hr = IDirect3DDevice9_BeginStateBlock( pDevice ); hr = IDirect3DDevice9_BeginStateBlock( pDevice );
CHECK_CALL( hr, "BeginStateBlock", pDevice, refcount ); CHECK_CALL( hr, "BeginStateBlock", pDevice, refcount );
hr = IDirect3DDevice9_EndStateBlock( pDevice, &pStateBlock1 ); hr = IDirect3DDevice9_EndStateBlock( pDevice, &pStateBlock1 );
CHECK_CALL( hr, "EndStateBlock", pDevice, refcount+1 ); CHECK_CALL( hr, "EndStateBlock", pDevice, ++refcount );
cleanup: cleanup:
if (pDevice) IUnknown_Release( pDevice ); CHECK_RELEASE(pDevice, pDevice, --refcount);
/* Buffers */ /* Buffers */
if (pVertexBuffer) IUnknown_Release( pVertexBuffer ); CHECK_RELEASE(pVertexBuffer, pDevice, --refcount);
if (pIndexBuffer) IUnknown_Release( pIndexBuffer ); CHECK_RELEASE(pIndexBuffer, pDevice, --refcount);
/* Shaders */ /* Shaders */
if (pVertexDeclaration) IUnknown_Release( pVertexDeclaration ); CHECK_RELEASE(pVertexDeclaration, pDevice, --refcount);
if (pVertexShader) IUnknown_Release( pVertexShader ); CHECK_RELEASE(pVertexShader, pDevice, --refcount);
if (pPixelShader) IUnknown_Release( pPixelShader ); CHECK_RELEASE(pPixelShader, pDevice, --refcount);
/* Textures */ /* Textures */
if (pTexture) IUnknown_Release( pTexture ); /* pTextureLevel is holding a reference to the pTexture */
if (pTextureLevel) IUnknown_Release( pTextureLevel ); CHECK_RELEASE(pTexture, pDevice, refcount);
if (pCubeTexture) IUnknown_Release( pCubeTexture ); CHECK_RELEASE(pTextureLevel, pDevice, --refcount);
if (pVolumeTexture) IUnknown_Release( pVolumeTexture ); CHECK_RELEASE(pCubeTexture, pDevice, --refcount);
CHECK_RELEASE(pVolumeTexture, pDevice, --refcount);
/* Surfaces */ /* Surfaces */
if (pStencilSurface) IUnknown_Release( pStencilSurface ); CHECK_RELEASE(pStencilSurface, pDevice, --refcount);
if (pOffscreenSurface) IUnknown_Release( pOffscreenSurface ); CHECK_RELEASE(pOffscreenSurface, pDevice, --refcount);
if (pRenderTarget) IUnknown_Release( pRenderTarget ); CHECK_RELEASE(pRenderTarget, pDevice, --refcount);
/* Misc */ /* Misc */
if (pStateBlock) IUnknown_Release( pStateBlock ); CHECK_RELEASE(pStateBlock, pDevice, --refcount);
/* Avoid crash for now. CHECK_RELEASE(pSwapChain, pDevice, --refcount);
if (pSwapChain) IUnknown_Release( pSwapChain ); CHECK_RELEASE(pQuery, pDevice, --refcount);
*/ /* This will destroy device - can not check the refcount here */
if (pQuery) IUnknown_Release( pQuery );
if (pStateBlock1) IUnknown_Release( pStateBlock1 ); if (pStateBlock1) IUnknown_Release( pStateBlock1 );
if (pD3d) IUnknown_Release( pD3d ); if (pD3d) IUnknown_Release( pD3d );