[ros-diffs] [reactos] 06/74: [WINESYNC]d3dx9/tests: Add test for D3DXFillVolumeTexture() with default pool texture.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95d6d1b3d173618390094…

commit 95d6d1b3d17361839009449e50f438b799d1c5f7
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Sat Jan 4 01:48:04 2020 +0100
Commit:     Jérôme Gardou <zefklop(a)users.noreply.github.com>
CommitDate: Wed Feb 26 18:19:18 2020 +0100

    [WINESYNC]d3dx9/tests: Add test for D3DXFillVolumeTexture() with default pool
texture.
    
    Signed-off-by: Paul Gofman <gofmanp(a)gmail.com>
    Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id 61e7e6ec1bf5d13d4cafa883ac74fe987c339740 by Paul Gofman
<gofmanp(a)gmail.com>
---
 modules/rostests/winetests/d3dx9_36/texture.c | 8 +++++++-
 sdk/tools/winesync/d3dx9.cfg                  | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/rostests/winetests/d3dx9_36/texture.c
b/modules/rostests/winetests/d3dx9_36/texture.c
index 1a92a85b63e..6c25a158118 100644
--- a/modules/rostests/winetests/d3dx9_36/texture.c
+++ b/modules/rostests/winetests/d3dx9_36/texture.c
@@ -1423,8 +1423,14 @@ static void test_D3DXFillVolumeTexture(IDirect3DDevice9 *device)
 
     size = 4;
     hr = IDirect3DDevice9_CreateVolumeTexture(device, size, size, size, 0, 0,
D3DFMT_A8R8G8B8,
-                                              D3DPOOL_MANAGED, &tex, NULL);
+            D3DPOOL_DEFAULT, &tex, NULL);
+    ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr);
+    hr = D3DXFillVolumeTexture(tex, fillfunc_volume, NULL);
+    ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr);
+    IDirect3DVolumeTexture9_Release(tex);
 
+    hr = IDirect3DDevice9_CreateVolumeTexture(device, size, size, size, 0, 0,
D3DFMT_A8R8G8B8,
+            D3DPOOL_MANAGED, &tex, NULL);
     if (SUCCEEDED(hr))
     {
         hr = D3DXFillVolumeTexture(tex, fillfunc_volume, NULL);
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 8bc93affa53..8045ddd8fda 100644
--- a/sdk/tools/winesync/d3dx9.cfg
+++ b/sdk/tools/winesync/d3dx9.cfg
@@ -33,4 +33,4 @@ files:
   include/d3dx9shape.h: sdk/include/dxsdk/d3dx9shape.h
   include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h
 tags:
-  wine: 4e44d74afb12b40f673e3be0a91cd523013544cd
+  wine: 61e7e6ec1bf5d13d4cafa883ac74fe987c339740