ddraw: Check for DDRAW_NO3D before checking for a video memory surface in d3d_device_create().

While slightly odd, this matches what the tests expect. Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ddraw: Check for DDRAW_NO3D before checking for a video memory surface in d3d_device_create().
15657288 · Henri Verbeet · Alexandre Julliard · fbcdf8c6 · 15657288
Commit 15657288 authored Sep 27, 2018 by Henri Verbeet Committed by Alexandre Julliard Sep 28, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 7 deletions

device.c dlls/ddraw/device.c +7 -7

No files found.
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -6986,18 +6986,18 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn
        return DDERR_NOPALETTEATTACHED;
    }

-    if (!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY))
-    {
-        WARN("Surface %p is not in video memory.\n", target);
-        return D3DERR_SURFACENOTINVIDMEM;
-    }
-
    if (ddraw->flags & DDRAW_NO3D)
    {
        ERR_(winediag)("The application wants to create a Direct3D device, "
                "but the current DirectDrawRenderer does not support this.\n");

-        return DDERR_NO3D;
+        return DDERR_OUTOFMEMORY;
+    }
+
+    if (!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY))
+    {
+        WARN("Surface %p is not in video memory.\n", target);
+        return D3DERR_SURFACENOTINVIDMEM;
    }

    if (ddraw->d3ddevice)