ddraw: Fix palette handling in IDirect3DTexture_Load.

This fixes a potential refcounting problem and makes the function fail with NULL destination texture's palette and non-NULL source palette like it does on native.

ddraw: Fix palette handling in IDirect3DTexture_Load.
ed44f9d1 · Alexander Dorofeyev · Alexandre Julliard · ddd0ec16 · ed44f9d1
Commit ed44f9d1 authored Feb 17, 2008 by Alexander Dorofeyev Committed by Alexandre Julliard Feb 19, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 7 deletions

texture.c dlls/ddraw/texture.c +3 -7

No files found.
--- a/dlls/ddraw/texture.c
+++ b/dlls/ddraw/texture.c
@@ -365,15 +365,11 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface,
            }
        }

-        /* After seeing some logs, not sure at all about this... */
-        if (pal == NULL)
-        {
-            IWineD3DSurface_SetPalette(This->WineD3DSurface, wine_pal);
-            if (pal_src != NULL) IDirectDrawPalette_AddRef(pal_src);
-        }
-        else if (pal_src != NULL)
+        if (pal_src != NULL)
        {
            PALETTEENTRY palent[256];
+
+            if (pal == NULL) return DDERR_NOPALETTEATTACHED;
            IDirectDrawPalette_GetEntries(pal_src, 0, 0, 256, palent);
            IDirectDrawPalette_SetEntries(pal, 0, 0, 256, palent);
        }