ddraw: Make SetPalette fail for non-palettized surfaces.

4b53dde0 · Alexander Dorofeyev · Alexandre Julliard · cb9252db · 4b53dde0
Commit 4b53dde0 authored Mar 23, 2008 by Alexander Dorofeyev Committed by Alexandre Julliard Mar 24, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

surface.c dlls/ddraw/surface.c +5 -0

No files found.
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -2501,6 +2501,11 @@ IDirectDrawSurfaceImpl_SetPalette(IDirectDrawSurface7 *iface,
    HRESULT hr;
    TRACE("(%p)->(%p)\n", This, Pal);

+    if (!(This->surface_desc.u4.ddpfPixelFormat.dwFlags & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 |
+            DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 | DDPF_PALETTEINDEXEDTO8))) {
+        return DDERR_INVALIDPIXELFORMAT;
+    }
+
    /* Find the old palette */
    EnterCriticalSection(&ddraw_cs);
    hr = IDirectDrawSurface_GetPalette(iface, &oldPal);