=?UTF-8?Q?Stefan=20D=C3=B6singer=20?=: ddraw: Refuse SetPalette and GetPalette on lost surfaces.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Jul 7 16:09:52 CDT 2014
Module: wine
Branch: master
Commit: 403d7c1dee11959dfaa781a14ed6f4c8fae90292
URL: http://source.winehq.org/git/wine.git/?a=commit;h=403d7c1dee11959dfaa781a14ed6f4c8fae90292
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Sun Jul 6 18:06:43 2014 +0200
ddraw: Refuse SetPalette and GetPalette on lost surfaces.
The SetPalette check is outside of ddraw_surface_set_palette to make
sure the palettes are properly freed when a lost P8 surface is destroyed.
---
dlls/ddraw/surface.c | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index e0fdf81..3d61e61 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -4515,6 +4515,11 @@ static HRESULT WINAPI ddraw_surface7_GetPalette(IDirectDrawSurface7 *iface, IDir
if (!palette)
return DDERR_INVALIDPARAMS;
+ if (IDirectDrawSurface7_IsLost(iface) == DDERR_SURFACELOST)
+ {
+ WARN("Surface lost, returning DDERR_SURFACELOST.\n");
+ return DDERR_SURFACELOST;
+ }
wined3d_mutex_lock();
if ((palette_impl = surface->palette))
@@ -4705,6 +4710,11 @@ static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDir
if (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL)
return DDERR_NOTONMIPMAPSUBLEVEL;
+ if (IDirectDrawSurface7_IsLost(iface) == DDERR_SURFACELOST)
+ {
+ WARN("Surface lost, returning DDERR_SURFACELOST.\n");
+ return DDERR_SURFACELOST;
+ }
return ddraw_surface_set_palette(surface, palette);
}
@@ -4715,6 +4725,12 @@ static HRESULT WINAPI ddraw_surface4_SetPalette(IDirectDrawSurface4 *iface, IDir
TRACE("iface %p, palette %p.\n", iface, palette);
+ if (IDirectDrawSurface4_IsLost(iface) == DDERR_SURFACELOST)
+ {
+ WARN("Surface lost, returning DDERR_SURFACELOST.\n");
+ return DDERR_SURFACELOST;
+ }
+
return ddraw_surface_set_palette(surface, palette);
}
@@ -4724,6 +4740,12 @@ static HRESULT WINAPI ddraw_surface3_SetPalette(IDirectDrawSurface3 *iface, IDir
TRACE("iface %p, palette %p.\n", iface, palette);
+ if (IDirectDrawSurface3_IsLost(iface) == DDERR_SURFACELOST)
+ {
+ WARN("Surface lost, returning DDERR_SURFACELOST.\n");
+ return DDERR_SURFACELOST;
+ }
+
return ddraw_surface_set_palette(surface, palette);
}
@@ -4733,6 +4755,12 @@ static HRESULT WINAPI ddraw_surface2_SetPalette(IDirectDrawSurface2 *iface, IDir
TRACE("iface %p, palette %p.\n", iface, palette);
+ if (IDirectDrawSurface2_IsLost(iface) == DDERR_SURFACELOST)
+ {
+ WARN("Surface lost, returning DDERR_SURFACELOST.\n");
+ return DDERR_SURFACELOST;
+ }
+
return ddraw_surface_set_palette(surface, palette);
}
@@ -4742,6 +4770,12 @@ static HRESULT WINAPI ddraw_surface1_SetPalette(IDirectDrawSurface *iface, IDire
TRACE("iface %p, palette %p.\n", iface, palette);
+ if (IDirectDrawSurface_IsLost(iface) == DDERR_SURFACELOST)
+ {
+ WARN("Surface lost, returning DDERR_SURFACELOST.\n");
+ return DDERR_SURFACELOST;
+ }
+
return ddraw_surface_set_palette(surface, palette);
}
More information about the wine-cvs
mailing list