ddraw: Check if surface is a mipmap sublevel or a non-positive X top level…

ddraw: Check if surface is a mipmap sublevel or a non-positive X top level surface through caps in ddraw_surface7_GetPriority(). Signed-off-by: Riccardo Bortolato <rikyz619@gmail.com> Signed-off-by: Stefan Dösinger <stefandoesinger@gmx.at> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ddraw: Check if surface is a mipmap sublevel or a non-positive X top level…
97f0345f · Riccardo Bortolato · Alexandre Julliard · f3e3c895 · 97f0345f
Commit 97f0345f authored Dec 21, 2015 by Riccardo Bortolato Committed by Alexandre Julliard Dec 23, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

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

No files found.
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -2377,9 +2377,12 @@ static HRESULT WINAPI ddraw_surface7_GetPriority(IDirectDrawSurface7 *iface, DWO
        WARN("Called on offscreenplain surface, returning DDERR_INVALIDOBJECT.\n");
        hr = DDERR_INVALIDOBJECT;
    }
-    else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) || !surface->wined3d_texture)
+    else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed)
+            || (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL)
+            || ((surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP)
+                    && !(surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP_POSITIVEX)))
    {
-        WARN("Called on non-managed texture or mipmap sublevel, returning DDERR_INVALIDPARAMS.\n");
+        WARN("Called on non-managed texture, mipmap sublevel or non +X toplevel surface, returning DDERR_INVALIDPARAMS.\n");
        hr = DDERR_INVALIDPARAMS;
    }
    else