Vitaliy Margolen : d3d8: VertexShader should keep reference to the parent device object.

Alexandre Julliard julliard at wine.codeweavers.com
Wed Apr 12 04:52:09 CDT 2006


Module: wine
Branch: refs/heads/master
Commit: 99136998e2345ac5e2408f5f129c4b5d11db6c5a
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=99136998e2345ac5e2408f5f129c4b5d11db6c5a

Author: Vitaliy Margolen <wine-patch at kievinfo.com>
Date:   Tue Apr 11 22:09:27 2006 -0600

d3d8: VertexShader should keep reference to the parent device object.

---

 dlls/d3d8/d3d8_private.h |    3 +++
 dlls/d3d8/device.c       |    2 ++
 dlls/d3d8/vertexshader.c |    1 +
 3 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h
index c0f8eb0..77a73c9 100644
--- a/dlls/d3d8/d3d8_private.h
+++ b/dlls/d3d8/d3d8_private.h
@@ -531,6 +531,9 @@ struct IDirect3DVertexShader8Impl {
   LONG ref;
 
   IWineD3DVertexShader             *wineD3DVertexShader;
+
+  /* Parent reference */
+  LPDIRECT3DDEVICE8                 parentDevice;
 };
 
 
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index 0176459..2590498 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -1070,6 +1070,8 @@ HRESULT WINAPI IDirect3DDevice8Impl_Crea
             FIXME("(%p) : Number of shaders exceeds the maximum number of possible shaders\n", This);
             hrc = E_OUTOFMEMORY;
         } else {
+            IUnknown_AddRef(iface);
+            object->parentDevice = iface;
             This->vShaders[i] = object;
             *ppShader = i + VS_HIGHESTFIXEDFXF + 1;
         }
diff --git a/dlls/d3d8/vertexshader.c b/dlls/d3d8/vertexshader.c
index 5bba7aa..f11e756 100644
--- a/dlls/d3d8/vertexshader.c
+++ b/dlls/d3d8/vertexshader.c
@@ -56,6 +56,7 @@ ULONG WINAPI IDirect3DVertexShader8Impl_
 
     if (ref == 0) {
         IWineD3DVertexShader_Release(This->wineD3DVertexShader);
+        IUnknown_Release(This->parentDevice);
         HeapFree(GetProcessHeap(), 0, This);
     }
     return ref;




More information about the wine-cvs mailing list