Henri Verbeet : wined3d: Store an IWineD3DResourceImpl pointer in struct wined3d_rendertarget_view.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 098cdf4ae390f378357a6ce17f678ccbe5e7b210
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=098cdf4ae390f378357a6ce17f...

Author: Henri Verbeet 
Date:   Mon Jan 17 18:49:30 2011 +0100

wined3d: Store an IWineD3DResourceImpl pointer in struct wined3d_rendertarget_view.

---

dlls/wined3d/view.c            |    8 ++++----
 dlls/wined3d/wined3d_private.h |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
index 28dc401..2b98de3 100644
--- a/dlls/wined3d/view.c
+++ b/dlls/wined3d/view.c
@@ -65,7 +65,7 @@ static ULONG STDMETHODCALLTYPE rendertarget_view_Release(IWineD3DRendertargetVie

if (!refcount)
     {
-        IWineD3DResource_Release(This->resource);
+        IWineD3DResource_Release((IWineD3DResource *)This->resource);
         HeapFree(GetProcessHeap(), 0, This);
     }

@@ -88,8 +88,8 @@ static HRESULT STDMETHODCALLTYPE rendertarget_view_GetResource(IWineD3DRendertar
 {
     struct wined3d_rendertarget_view *This = (struct wined3d_rendertarget_view *)iface;

-    IWineD3DResource_AddRef(This->resource);
-    *resource = This->resource;
+    IWineD3DResource_AddRef((IWineD3DResource *)This->resource);
+    *resource = (IWineD3DResource *)This->resource;

return WINED3D_OK;
 }
@@ -112,6 +112,6 @@ void wined3d_rendertarget_view_init(struct wined3d_rendertarget_view *view,
     view->vtbl = &wined3d_rendertarget_view_vtbl;
     view->refcount = 1;
     IWineD3DResource_AddRef((IWineD3DResource *)resource);
-    view->resource = (IWineD3DResource *)resource;
+    view->resource = resource;
     view->parent = parent;
 }
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index e53d1a1..65db699 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2569,7 +2569,7 @@ struct wined3d_rendertarget_view
     const struct IWineD3DRendertargetViewVtbl *vtbl;
     LONG refcount;

-    IWineD3DResource *resource;
+    struct IWineD3DResourceImpl *resource;
     void *parent;
 };