ddraw: The texture interface shares its refcount with the surface interface…

ddraw: The texture interface shares its refcount with the surface interface version used to create the surface. This probably implies that on native the texture interface is part of a separate object that's aggregated by the surface.

ddraw: The texture interface shares its refcount with the surface interface…
814fd3b3 · Henri Verbeet · Alexandre Julliard · 7dd4f439 · 814fd3b3 · 814fd3b3
Commit 814fd3b3 authored Apr 01, 2012 by Henri Verbeet Committed by Alexandre Julliard Apr 02, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 6 deletions

ddraw_private.h dlls/ddraw/ddraw_private.h +1 -0

surface.c dlls/ddraw/surface.c +11 -6

No files found.
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -151,6 +151,7 @@ struct ddraw_surface

    LONG                     ref7, ref4, ref3, ref2, ref1, iface_count, gamma_count;
    IUnknown                *ifaceToRelease;
+    IUnknown *texture_outer;

    int                     version;


--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -429,7 +429,7 @@ static ULONG WINAPI d3d_texture2_AddRef(IDirect3DTexture2 *iface)

    TRACE("iface %p.\n", iface);

-    return ddraw_surface1_AddRef(&surface->IDirectDrawSurface_iface);
+    return IUnknown_AddRef(surface->texture_outer);
 }

 static ULONG WINAPI d3d_texture1_AddRef(IDirect3DTexture *iface)
@@ -438,7 +438,7 @@ static ULONG WINAPI d3d_texture1_AddRef(IDirect3DTexture *iface)

    TRACE("iface %p.\n", iface);

-    return ddraw_surface1_AddRef(&surface->IDirectDrawSurface_iface);
+    return IUnknown_AddRef(surface->texture_outer);
 }

 /*****************************************************************************
@@ -659,18 +659,20 @@ static ULONG WINAPI ddraw_gamma_control_Release(IDirectDrawGammaControl *iface)

 static ULONG WINAPI d3d_texture2_Release(IDirect3DTexture2 *iface)
 {
-    struct ddraw_surface *This = impl_from_IDirect3DTexture2(iface);
+    struct ddraw_surface *surface = impl_from_IDirect3DTexture2(iface);
+
    TRACE("iface %p.\n", iface);

-    return ddraw_surface1_Release(&This->IDirectDrawSurface_iface);
+    return IUnknown_Release(surface->texture_outer);
 }

 static ULONG WINAPI d3d_texture1_Release(IDirect3DTexture *iface)
 {
-    struct ddraw_surface *This = impl_from_IDirect3DTexture(iface);
+    struct ddraw_surface *surface = impl_from_IDirect3DTexture(iface);
+
    TRACE("iface %p.\n", iface);

-    return ddraw_surface1_Release(&This->IDirectDrawSurface_iface);
+    return IUnknown_Release(surface->texture_outer);
 }

 /*****************************************************************************
@@ -5733,14 +5735,17 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw,
    if (version == 7)
    {
        surface->ref7 = 1;
+        surface->texture_outer = (IUnknown *)&surface->IDirectDrawSurface7_iface;
    }
    else if (version == 4)
    {
        surface->ref4 = 1;
+        surface->texture_outer = (IUnknown *)&surface->IDirectDrawSurface4_iface;
    }
    else
    {
        surface->ref1 = 1;
+        surface->texture_outer = (IUnknown *)&surface->IDirectDrawSurface_iface;
    }

    copy_to_surfacedesc2(&surface->surface_desc, desc);