ddrawex: Don't leak surfaces.

dds_get_outer AddRefs the inner surface when it creates the wrapper surface. The wrapper releases only one reference when it is destroyed, leaking one of the two. AddRefing in dds_get_outer makes sense because this is also used by e.g. GetAttachedSurface, where it creates a new wrapper for surfaces ddrawex didn't know about yet.

ddrawex: Don't leak surfaces.
28850ae5 · Stefan Dösinger · Alexandre Julliard · d495cc37 · 28850ae5
Commit 28850ae5 authored Sep 04, 2014 by Stefan Dösinger Committed by Alexandre Julliard Sep 04, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 2 deletions

ddraw.c dlls/ddrawex/ddraw.c +12 -2

No files found.
--- a/dlls/ddrawex/ddraw.c
+++ b/dlls/ddrawex/ddraw.c
@@ -338,6 +338,7 @@ static HRESULT WINAPI ddrawex4_CreateSurface(IDirectDraw4 *iface, DDSURFACEDESC2
    HRESULT hr;
    const DWORD perm_dc_flags = DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY;
    BOOL permanent_dc;
+    IDirectDrawSurface4 *inner_surface;

    TRACE("iface %p, desc %p, surface %p, outer_unknown %p.\n",
            iface, desc, surface, outer_unknown);
@@ -362,8 +363,17 @@ static HRESULT WINAPI ddrawex4_CreateSurface(IDirectDraw4 *iface, DDSURFACEDESC2
        permanent_dc = FALSE;
    }

-    hr = IDirectDraw4_CreateSurface(ddrawex->parent, desc, surface, outer_unknown);
-    *surface = dds_get_outer(*surface);
+    hr = IDirectDraw4_CreateSurface(ddrawex->parent, desc, &inner_surface, outer_unknown);
+    if (FAILED(hr))
+    {
+        *surface = NULL;
+        return hr;
+    }
+
+    *surface = dds_get_outer(inner_surface);
+    /* The wrapper created by dds_get_outer holds a reference to its inner surface. */
+    IDirectDrawSurface4_Release(inner_surface);
+
    if (permanent_dc)
        prepare_permanent_dc(*surface);