[PATCH 2/5] d3d9: Use the surface implementation pointer in reset_enum_callback().

Henri Verbeet hverbeet at codeweavers.com
Tue Apr 24 13:54:12 CDT 2012


---
 dlls/d3d9/device.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 7fd300fb..ddfaae6 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -507,7 +507,7 @@ static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource)
     wined3d_resource_get_desc(resource, &desc);
     if (desc.pool == WINED3D_POOL_DEFAULT)
     {
-        IDirect3DSurface9 *surface;
+        IDirect3DSurface9Impl *surface;
 
         if (desc.resource_type != WINED3D_RTYPE_SURFACE)
         {
@@ -516,9 +516,7 @@ static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource)
         }
 
         surface = wined3d_resource_get_parent(resource);
-
-        IDirect3DSurface9_AddRef(surface);
-        if (IDirect3DSurface9_Release(surface))
+        if (surface->ref)
         {
             WARN("Surface %p (resource %p) in pool D3DPOOL_DEFAULT blocks the Reset call.\n", surface, resource);
             return D3DERR_INVALIDCALL;
-- 
1.7.3.4




More information about the wine-patches mailing list