ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Detach any attached overlays on surface cleanup. 

Spotted by Dan Kegel / Valgrind.
This commit is contained in:
Henri Verbeet 2011-10-18 20:46:13 +02:00 committed by Alexandre Julliard
parent 4408c5abc6
commit 3042860478
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/wined3d/surface.c
View File

@ -42,6 +42,8 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa
static void surface_cleanup(struct wined3d_surface *surface)
{
struct wined3d_surface *overlay, *cur;
TRACE("surface %p.\n", surface);
if (surface->texture_name || (surface->flags & SFLAG_PBO)
@ -109,6 +111,12 @@ static void surface_cleanup(struct wined3d_surface *surface)
if (surface->overlay_dest)
list_remove(&surface->overlay_entry);
LIST_FOR_EACH_ENTRY_SAFE(overlay, cur, &surface->overlays, struct wined3d_surface, overlay_entry)
{
list_remove(&overlay->overlay_entry);
overlay->overlay_dest = NULL;
}
HeapFree(GetProcessHeap(), 0, surface->palette9);
resource_cleanup(&surface->resource);
@ -1996,6 +2004,8 @@ static HRESULT gdi_surface_private_setup(struct wined3d_surface *surface)
static void surface_gdi_cleanup(struct wined3d_surface *surface)
{
struct wined3d_surface *overlay, *cur;
TRACE("surface %p.\n", surface);
if (surface->flags & SFLAG_DIBSECTION)
@ -2014,6 +2024,12 @@ static void surface_gdi_cleanup(struct wined3d_surface *surface)
if (surface->overlay_dest)
list_remove(&surface->overlay_entry);
LIST_FOR_EACH_ENTRY_SAFE(overlay, cur, &surface->overlays, struct wined3d_surface, overlay_entry)
{
list_remove(&overlay->overlay_entry);
overlay->overlay_dest = NULL;
}
HeapFree(GetProcessHeap(), 0, surface->palette9);
resource_cleanup(&surface->resource);
@ -3277,6 +3293,7 @@ HRESULT CDECL wined3d_surface_update_overlay(struct wined3d_surface *surface, co
if (surface->overlay_dest && (surface->overlay_dest != dst_surface || flags & WINEDDOVER_HIDE))
{
surface->overlay_dest = NULL;
list_remove(&surface->overlay_entry);
}