Stefan Dösinger : ddraw: Return DDERR_NOPALETTEATTACHED if no palette is attached.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 49beec8635ce984a40c1d2b3140ae086068bc1f4
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=49beec8635ce984a40c1d2b3...

Author: Stefan Dösinger 
Date:   Sat Sep  9 13:45:19 2006 +0200

ddraw: Return DDERR_NOPALETTEATTACHED if no palette is attached.

---

dlls/ddraw/surface.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 587a3e9..74987bf 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -1984,6 +1984,7 @@ IDirectDrawSurfaceImpl_GetPalette(IDirec
     else
     {
         *Pal = NULL;
+        hr = DDERR_NOPALETTEATTACHED;
     }

return hr;
@@ -2055,7 +2056,7 @@ IDirectDrawSurfaceImpl_SetPalette(IDirec

/* Find the old palette */
     hr = IDirectDrawSurface_GetPalette(iface, &oldPal);
-    if(hr != DD_OK) return hr;
+    if(hr != DD_OK && hr != DDERR_NOPALETTEATTACHED) return hr;
     if(oldPal) IDirectDrawPalette_Release(oldPal);  /* For the GetPalette */

/* Set the new Palette */