RFC: d3d8 refcount implementation

[Markus Amsler]

After spamming wine-patches with d3d tests, I tried to implement the
probed behaviour. Attached are two patches, which makes all d3d8
refcount test pass. They are small and ugly. The problems are:

The implicit surfaces now gets released if the refcount is -1. Somehow 
we have to force releasing d3d8 sufaces from wined3d. No idea how.

I added a flag to mark the implicit surfaces. It's redundant, because 
wined3d knows the implicit surfaces. The other idea is calling 
GetRenderTarget and friends in Surface_(AddRef/Release). Besides the 
problem of an endless recursion, it would be quite an overhead.

Another problem is, that IWineD3DDeviceImpl_Uninit3D calls via GetParent 
AddRef/Release on the d3d8 surface. This causes the device to be 
released again(=>endless recursion). I "solved" it with ignoring  an 
addref from 0 in the d3d8 Device, which causes the release to be -1 => 
no wined3d device releasing. Works but ugly.

Ideas, suggestions?
> From 1a73ec5958e2e4c7fd076184c9e1f1cf7427d936 Mon Sep 17 00:00:00 2001

From: Markus Amsler 
Date: Mon, 13 Nov 2006 22:29:12 +0100
Subject: [PATCH] d3d8: Force implicit surfaces to handle their own refcount.
To: wine-patches

---
 dlls/d3d8/d3d8_private.h |    3 +++
 dlls/d3d8/directx.c      |    2 ++
 dlls/d3d8/surface.c      |    4 ++--
 dlls/d3d8/tests/device.c |    6 +++---
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h
index b32033f..9ca9989 100644
--- a/dlls/d3d8/d3d8_private.h
+++ b/dlls/d3d8/d3d8_private.h
@@ -246,6 +246,9 @@ struct IDirect3DSurface8Impl

/* Parent reference */
     LPDIRECT3DDEVICE8                  parentDevice;
+
+    /* Flags an implicit surface */
+    BOOL                      implicit;
 };

/* ------------------ */
diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c
index 42ae40d..b51181e 100644
--- a/dlls/d3d8/directx.c
+++ b/dlls/d3d8/directx.c
@@ -202,6 +202,7 @@ HRESULT WINAPI D3D8CB_CreateRenderTarget
         *ppSurface = d3dSurface->wineD3DSurface;
         IUnknown_Release(d3dSurface->parentDevice);
         d3dSurface->parentDevice = NULL;
+        d3dSurface->implicit = TRUE;
     } else {
         *ppSurface = NULL;
     }
@@ -281,6 +282,7 @@ HRESULT WINAPI D3D8CB_CreateDepthStencil
         *ppSurface = d3dSurface->wineD3DSurface;
         IUnknown_Release(d3dSurface->parentDevice);
         d3dSurface->parentDevice = NULL;
+        d3dSurface->implicit = TRUE;
     }
     return res;
 }
diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c
index 8ab312e..83265e9 100644
--- a/dlls/d3d8/surface.c
+++ b/dlls/d3d8/surface.c
@@ -46,7 +46,7 @@ static ULONG WINAPI IDirect3DSurface8Imp

TRACE("(%p)\n", This);

-    IWineD3DSurface_GetContainerParent(This->wineD3DSurface, &containerParent);
+    if (!This->implicit) IWineD3DSurface_GetContainerParent(This->wineD3DSurface, &containerParent);
     if (containerParent) {
         /* Forward to the containerParent */
         TRACE("(%p) : Forwarding to %p\n", This, containerParent);
@@ -65,7 +65,7 @@ static ULONG WINAPI IDirect3DSurface8Imp

TRACE("(%p)\n", This);

-    IWineD3DSurface_GetContainerParent(This->wineD3DSurface, &containerParent);
+    if (!This->implicit) IWineD3DSurface_GetContainerParent(This->wineD3DSurface, &containerParent);
     if (containerParent) {
         /* Forward to the containerParent */
         TRACE("(%p) : Forwarding to %p\n", This, containerParent);
diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c
index 06f8aab..86e10af 100644
--- a/dlls/d3d8/tests/device.c
+++ b/dlls/d3d8/tests/device.c
@@ -429,17 +429,17 @@ static void test_refcount(void)
         /* check implicit back buffer */
         hr = IDirect3DSwapChain8_GetBackBuffer(pSwapChain, 0, 0, &pBackBuffer);
         todo_wine CHECK_CALL( hr, "GetBackBuffer", pDevice, ++refcount);
-        todo_wine CHECK_REFCOUNT( pSwapChain, 1);
+        CHECK_REFCOUNT( pSwapChain, 1);
         if(pBackBuffer)
         {
             todo_wine CHECK_CONTAINER( Surface, pBackBuffer, IID_IDirect3DDevice8, pDevice, S_OK);
             todo_wine CHECK_REFCOUNT( pBackBuffer, 1);

todo_wine CHECK_ADDREF_REFCOUNT(pBackBuffer, 2);
-            todo_wine CHECK_REFCOUNT(pSwapChain, 1);
+            CHECK_REFCOUNT(pSwapChain, 1);
             todo_wine CHECK_REFCOUNT(pDevice, refcount);
             todo_wine CHECK_RELEASE_REFCOUNT(pBackBuffer, 1);
-            todo_wine CHECK_REFCOUNT(pSwapChain, 1);
+            CHECK_REFCOUNT(pSwapChain, 1);
             todo_wine CHECK_REFCOUNT(pDevice, refcount);

todo_wine CHECK_RELEASE_REFCOUNT( pBackBuffer, 0);