[PATCH 5/6] d3d8: Do not decrease swapchain surface refcount when it is already 0.
Józef Kucia
jkucia at codeweavers.com
Mon Feb 13 06:07:36 CST 2017
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
dlls/d3d8/surface.c | 6 ++++++
dlls/d3d8/tests/device.c | 28 +++++++++++++++++++---------
2 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c
index 56f9282..5cdb5e5 100644
--- a/dlls/d3d8/surface.c
+++ b/dlls/d3d8/surface.c
@@ -90,6 +90,12 @@ static ULONG WINAPI d3d8_surface_Release(IDirect3DSurface8 *iface)
return IDirect3DBaseTexture8_Release(&surface->texture->IDirect3DBaseTexture8_iface);
}
+ if (!surface->resource.refcount)
+ {
+ WARN("Surface does not have any references.\n");
+ return 0;
+ }
+
refcount = InterlockedDecrement(&surface->resource.refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount);
diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c
index 45969fe..6b34ff1 100644
--- a/dlls/d3d8/tests/device.c
+++ b/dlls/d3d8/tests/device.c
@@ -515,10 +515,10 @@ static void test_refcount(void)
*/
hr = IDirect3DDevice8_GetRenderTarget(device, &pRenderTarget);
CHECK_CALL(hr, "GetRenderTarget", device, ++refcount);
- if(pRenderTarget)
+ if (pRenderTarget)
{
CHECK_SURFACE_CONTAINER(pRenderTarget, IID_IDirect3DDevice8, device);
- CHECK_REFCOUNT( pRenderTarget, 1);
+ CHECK_REFCOUNT(pRenderTarget, 1);
CHECK_ADDREF_REFCOUNT(pRenderTarget, 2);
CHECK_REFCOUNT(device, refcount);
@@ -527,7 +527,7 @@ static void test_refcount(void)
hr = IDirect3DDevice8_GetRenderTarget(device, &pRenderTarget);
CHECK_CALL(hr, "GetRenderTarget", device, refcount);
- CHECK_REFCOUNT( pRenderTarget, 2);
+ CHECK_REFCOUNT(pRenderTarget, 2);
CHECK_RELEASE_REFCOUNT( pRenderTarget, 1);
CHECK_RELEASE_REFCOUNT( pRenderTarget, 0);
CHECK_REFCOUNT(device, --refcount);
@@ -537,26 +537,30 @@ static void test_refcount(void)
CHECK_REFCOUNT(device, ++refcount);
CHECK_RELEASE_REFCOUNT(pRenderTarget, 0);
CHECK_REFCOUNT(device, --refcount);
+ CHECK_RELEASE_REFCOUNT(pRenderTarget, 0);
+ CHECK_RELEASE_REFCOUNT(pRenderTarget, 0);
}
/* Render target and back buffer are identical. */
hr = IDirect3DDevice8_GetBackBuffer(device, 0, 0, &pBackBuffer);
CHECK_CALL(hr, "GetBackBuffer", device, ++refcount);
- if(pBackBuffer)
+ if (pBackBuffer)
{
CHECK_RELEASE_REFCOUNT(pBackBuffer, 0);
ok(pRenderTarget == pBackBuffer, "RenderTarget=%p and BackBuffer=%p should be the same.\n",
- pRenderTarget, pBackBuffer);
+ pRenderTarget, pBackBuffer);
+ CHECK_RELEASE_REFCOUNT(pBackBuffer, 0);
+ CHECK_RELEASE_REFCOUNT(pBackBuffer, 0);
pBackBuffer = NULL;
}
CHECK_REFCOUNT(device, --refcount);
hr = IDirect3DDevice8_GetDepthStencilSurface(device, &pStencilSurface);
CHECK_CALL(hr, "GetDepthStencilSurface", device, ++refcount);
- if(pStencilSurface)
+ if (pStencilSurface)
{
CHECK_SURFACE_CONTAINER(pStencilSurface, IID_IDirect3DDevice8, device);
- CHECK_REFCOUNT( pStencilSurface, 1);
+ CHECK_REFCOUNT(pStencilSurface, 1);
CHECK_ADDREF_REFCOUNT(pStencilSurface, 2);
CHECK_REFCOUNT(device, refcount);
@@ -571,6 +575,8 @@ static void test_refcount(void)
CHECK_REFCOUNT(device, ++refcount);
CHECK_RELEASE_REFCOUNT(pStencilSurface, 0);
CHECK_REFCOUNT(device, --refcount);
+ CHECK_RELEASE_REFCOUNT(pStencilSurface, 0);
+ CHECK_RELEASE_REFCOUNT(pStencilSurface, 0);
pStencilSurface = NULL;
}
@@ -729,6 +735,8 @@ static void test_refcount(void)
CHECK_REFCOUNT(device, ++refcount);
CHECK_RELEASE_REFCOUNT(pBackBuffer, 0);
CHECK_REFCOUNT(device, --refcount);
+ CHECK_RELEASE_REFCOUNT(pBackBuffer, 0);
+ CHECK_RELEASE_REFCOUNT(pBackBuffer, 0);
pBackBuffer = NULL;
}
CHECK_REFCOUNT( pSwapChain, 1);
@@ -752,12 +760,14 @@ static void test_refcount(void)
* Otherwise GetRenderTarget would re-allocate it and the pointer would change.*/
hr = IDirect3DDevice8_GetRenderTarget(device, &pRenderTarget2);
CHECK_CALL(hr, "GetRenderTarget", device, ++refcount);
- if(pRenderTarget2)
+ if (pRenderTarget2)
{
CHECK_RELEASE_REFCOUNT(pRenderTarget2, 0);
ok(pRenderTarget == pRenderTarget2, "RenderTarget=%p and RenderTarget2=%p should be the same.\n",
- pRenderTarget, pRenderTarget2);
+ pRenderTarget, pRenderTarget2);
CHECK_REFCOUNT(device, --refcount);
+ CHECK_RELEASE_REFCOUNT(pRenderTarget2, 0);
+ CHECK_RELEASE_REFCOUNT(pRenderTarget2, 0);
pRenderTarget2 = NULL;
}
pRenderTarget = NULL;
--
2.10.2
More information about the wine-patches
mailing list