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

ddraw: Unset the primary surface's palette when the palette is released.

This commit is contained in:
Henri Verbeet 2013-12-13 09:07:45 +01:00 committed by Alexandre Julliard
parent e0b68129fa
commit c5a8b933af
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/ddraw/ddraw_private.h
View File

@ -379,6 +379,7 @@ struct ddraw_palette
LONG ref;
struct wined3d_palette *wineD3DPalette;
struct ddraw *ddraw;
IUnknown *ifaceToRelease;
DWORD flags;
};

7
dlls/ddraw/palette.c
View File

@ -94,10 +94,10 @@ static ULONG WINAPI ddraw_palette_Release(IDirectDrawPalette *iface)
{
wined3d_mutex_lock();
wined3d_palette_decref(This->wineD3DPalette);
if(This->ifaceToRelease)
{
if ((This->flags & DDPCAPS_PRIMARYSURFACE) && This->ddraw->primary)
This->ddraw->primary->palette = NULL;
if (This->ifaceToRelease)
IUnknown_Release(This->ifaceToRelease);
}
wined3d_mutex_unlock();
HeapFree(GetProcessHeap(), 0, This);
@ -251,6 +251,7 @@ HRESULT ddraw_palette_init(struct ddraw_palette *palette,
return hr;
}
palette->ddraw = ddraw;
palette->ifaceToRelease = (IUnknown *)&ddraw->IDirectDraw7_iface;
IUnknown_AddRef(palette->ifaceToRelease);