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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 156572888eedb6eb6c753d6c33f379d2cf11ed6e
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=156572888eedb6eb6c753d6c3...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Thu Sep 27 19:18:35 2018 +0330

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(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/ddraw/device.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index 5db0b81..7866c28 100644
--- 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)