Henri Verbeet : d3d9: Disallow creating managed cube textures on d3d9ex devices.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4d6dfd5d19bb6de1bf16591a9f2a557e3ac94d7e
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=4d6dfd5d19bb6de1bf16591a9...

Author: Henri Verbeet 
Date:   Fri Nov 23 19:18:44 2018 +0330

d3d9: Disallow creating managed cube textures on d3d9ex devices.

Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

dlls/d3d9/tests/d3d9ex.c | 4 ++--
 dlls/d3d9/texture.c      | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c
index 5387296..6601c94 100644
--- a/dlls/d3d9/tests/d3d9ex.c
+++ b/dlls/d3d9/tests/d3d9ex.c
@@ -4289,8 +4289,8 @@ static void test_resource_access(void)
                 case SURFACE_CUBE:
                     hr = IDirect3DDevice9Ex_CreateCubeTexture(device, 16, 1,
                             tests[j].usage, format, tests[j].pool, &texture_cube, NULL);
-                    todo_wine_if(!tests[j].valid && !tests[j].usage && (tests[j].format == FORMAT_DEPTH
-                            || tests[j].pool == D3DPOOL_MANAGED))
+                    todo_wine_if(!tests[j].valid && tests[j].format == FORMAT_DEPTH
+                            && !tests[j].usage && tests[j].pool != D3DPOOL_MANAGED)
                         ok(hr == (tests[j].valid && (tests[j].format != FORMAT_DEPTH || depth_cube)
                                 ? D3D_OK : D3DERR_INVALIDCALL),
                                 "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr);
diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c
index 456e41e..0c58519 100644
--- a/dlls/d3d9/texture.c
+++ b/dlls/d3d9/texture.c
@@ -1383,6 +1383,12 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *devic
     DWORD flags = 0;
     HRESULT hr;

+    if (pool == D3DPOOL_MANAGED && device->d3d_parent->extended)
+    {
+        WARN("Managed resources are not supported by d3d9ex devices.\n");
+        return D3DERR_INVALIDCALL;
+    }
+
     texture->IDirect3DBaseTexture9_iface.lpVtbl = (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_cube_vtbl;
     d3d9_resource_init(&texture->resource);
     list_init(&texture->rtv_list);