[PATCH 4/5] ddraw: Alpha palettes can only be attached to textures.

Stefan Dösinger stefan at codeweavers.com
Wed May 7 08:16:37 CDT 2014


---
 dlls/ddraw/surface.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index d192348..349bbda 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -454,6 +454,13 @@ static HRESULT ddraw_surface_set_palette(struct ddraw_surface *surface, IDirectD
 
     TRACE("iface %p, palette %p.\n", surface, palette);
 
+    if (palette_impl && palette_impl->flags & DDPCAPS_ALPHA
+            && !(surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE))
+    {
+        WARN("Alpha palette set on non-texture surface, returning DDERR_INVALIDSURFACETYPE.\n");
+        return DDERR_INVALIDSURFACETYPE;
+    }
+
     if (!(surface->surface_desc.u4.ddpfPixelFormat.dwFlags & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2
             | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 | DDPF_PALETTEINDEXEDTO8)))
         return DDERR_INVALIDPIXELFORMAT;
-- 
1.8.5.5




More information about the wine-patches mailing list