=?UTF-8?Q?Stefan=20D=C3=B6singer=20?=: ddraw/tests: Test DDSCAPS2_D3DTEXTUREMANAGE.

[Alexandre Julliard]

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

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Wed Oct 23 12:05:39 2013 +0200

ddraw/tests: Test DDSCAPS2_D3DTEXTUREMANAGE.

---

 dlls/ddraw/tests/ddraw4.c |   22 ++++++++++++++++++++++
 dlls/ddraw/tests/ddraw7.c |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 0 deletions(-)

diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index b0a70db..457eea0 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -3813,10 +3813,16 @@ static void test_texturemanage(void)
     {
         {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS,
                 ~0U, ~0U},
+        {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS,
+                ~0U, ~0U},
         {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS,
                 ~0U, ~0U},
+        {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS,
+                ~0U, ~0U},
         {DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DD_OK,
                 DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE},
+        {DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, DD_OK,
+                DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE},
         {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, 0, DD_OK,
                 DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE | DDSCAPS_LOCALVIDMEM, 0},
         {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, 0, DD_OK,
@@ -3824,10 +3830,16 @@ static void test_texturemanage(void)
 
         {0, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS,
                 ~0U, ~0U},
+        {0, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS,
+                ~0U, ~0U},
         {DDSCAPS_SYSTEMMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS,
                 ~0U, ~0U},
+        {DDSCAPS_SYSTEMMEMORY, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS,
+                ~0U, ~0U},
         {DDSCAPS_VIDEOMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS,
                 ~0U, ~0U},
+        {DDSCAPS_VIDEOMEMORY, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS,
+                ~0U, ~0U},
         {DDSCAPS_VIDEOMEMORY, 0, DD_OK,
                 DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY, 0},
         {DDSCAPS_SYSTEMMEMORY, 0, DD_OK,
@@ -4589,10 +4601,20 @@ static void test_surface_lock(void)
         },
         {
             DDSCAPS_TEXTURE,
+            DDSCAPS2_D3DTEXTUREMANAGE,
+            "managed texture"
+        },
+        {
+            DDSCAPS_TEXTURE,
             DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_OPAQUE,
             "opaque managed texture"
         },
         {
+            DDSCAPS_TEXTURE,
+            DDSCAPS2_D3DTEXTUREMANAGE | DDSCAPS2_OPAQUE,
+            "opaque managed texture"
+        },
+        {
             DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE,
             0,
             "render target"
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 14a069e..6cf6b7f 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -3626,10 +3626,16 @@ static void test_texturemanage(void)
     {
         {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS,
                 ~0U, ~0U},
+        {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS,
+                ~0U, ~0U},
         {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS,
                 ~0U, ~0U},
+        {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS,
+                ~0U, ~0U},
         {DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DD_OK,
                 DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE},
+        {DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, DD_OK,
+                DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE},
         {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, 0, DD_OK,
                 DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE | DDSCAPS_LOCALVIDMEM, 0},
         {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, 0, DD_OK,
@@ -3637,10 +3643,16 @@ static void test_texturemanage(void)
 
         {0, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS,
                 ~0U, ~0U},
+        {0, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS,
+                ~0U, ~0U},
         {DDSCAPS_SYSTEMMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS,
                 ~0U, ~0U},
+        {DDSCAPS_SYSTEMMEMORY, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS,
+                ~0U, ~0U},
         {DDSCAPS_VIDEOMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS,
                 ~0U, ~0U},
+        {DDSCAPS_VIDEOMEMORY, DDSCAPS2_D3DTEXTUREMANAGE, DDERR_INVALIDCAPS,
+                ~0U, ~0U},
         {DDSCAPS_VIDEOMEMORY, 0, DD_OK,
                 DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY, 0},
         {DDSCAPS_SYSTEMMEMORY, 0, DD_OK,
@@ -4414,10 +4426,20 @@ static void test_surface_lock(void)
         },
         {
             DDSCAPS_TEXTURE,
+            DDSCAPS2_D3DTEXTUREMANAGE,
+            "managed texture"
+        },
+        {
+            DDSCAPS_TEXTURE,
             DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_OPAQUE,
             "opaque managed texture"
         },
         {
+            DDSCAPS_TEXTURE,
+            DDSCAPS2_D3DTEXTUREMANAGE | DDSCAPS2_OPAQUE,
+            "opaque managed texture"
+        },
+        {
             DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE,
             0,
             "render target"
@@ -4449,9 +4471,19 @@ static void test_surface_lock(void)
         },
         {
             DDSCAPS_TEXTURE | DDSCAPS_COMPLEX,
+            DDSCAPS2_D3DTEXTUREMANAGE | DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES,
+            "managed cube"
+        },
+        {
+            DDSCAPS_TEXTURE | DDSCAPS_COMPLEX,
             DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES | DDSCAPS2_OPAQUE,
             "opaque managed cube"
         },
+        {
+            DDSCAPS_TEXTURE | DDSCAPS_COMPLEX,
+            DDSCAPS2_D3DTEXTUREMANAGE | DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES | DDSCAPS2_OPAQUE,
+            "opaque managed cube"
+        },
     };
 
     if (!(ddraw = create_ddraw()))