system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 17:04:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ddrawex: Don't leak surfaces.

Browse source 
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.
This commit is contained in:
Stefan Dösinger 2014-09-04 13:18:16 +02:00 committed by Alexandre Julliard
parent d495cc37a6
commit 28850ae5f8
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dlls/ddrawex/ddraw.c
View file

@ -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);