Henri Verbeet : ddraw: Move the TEXTUREMANAGE validation from CreateSurface () to ddraw_surface_create_texture().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f0f38d9b8d5654923ede43dcba8c9423b4e7cc6b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f0f38d9b8d5654923ede43dcba...

Author: Henri Verbeet 
Date:   Tue Nov 26 10:41:50 2013 +0100

ddraw: Move the TEXTUREMANAGE validation from CreateSurface() to ddraw_surface_create_texture().

---

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

diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index e3373a9..a056ec6 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -2901,21 +2901,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD,
         }
     }

-    if (DDSD->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE))
-    {
-        if (!(DDSD->ddsCaps.dwCaps & DDSCAPS_TEXTURE))
-        {
-            WARN("DDSCAPS2_TEXTUREMANAGE used without DDSCAPS_TEXTURE, returning DDERR_INVALIDCAPS.\n");
-            return DDERR_INVALIDCAPS;
-        }
-        if (DDSD->ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY))
-        {
-            WARN("DDSCAPS2_TEXTUREMANAGE used width DDSCAPS_VIDEOMEMORY "
-                    "or DDSCAPS_SYSTEMMEMORY, returning DDERR_INVALIDCAPS.\n");
-            return DDERR_INVALIDCAPS;
-        }
-    }
-
     /* Modify some flags */
     copy_to_surfacedesc2(&desc2, DDSD);

diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 21eff17..e34531f 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -5608,6 +5608,21 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc,
         DDRAW_dump_surface_desc(desc);
     }

+    if (desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE))
+    {
+        if (!(desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE))
+        {
+            WARN("DDSCAPS2_TEXTUREMANAGE used without DDSCAPS_TEXTURE, returning DDERR_INVALIDCAPS.\n");
+            return DDERR_INVALIDCAPS;
+        }
+        if (desc->ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY))
+        {
+            WARN("DDSCAPS2_TEXTUREMANAGE used width DDSCAPS_VIDEOMEMORY "
+                    "or DDSCAPS_SYSTEMMEMORY, returning DDERR_INVALIDCAPS.\n");
+            return DDERR_INVALIDCAPS;
+        }
+    }
+
     if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL)))
     {
         ERR("Failed to get display mode, hr %#x.\n", hr);