[PATCH v3 7/9] d3dx9: Validate filter argument in D3DXLoadVolumeFrom{Volume,FileInMemory,Memory}().

[Connor McAdams]

From: Connor McAdams

Signed-off-by: Connor McAdams 
---
 dlls/d3dx9_36/d3dx9_private.h |  8 ++++++++
 dlls/d3dx9_36/tests/volume.c  |  6 ++----
 dlls/d3dx9_36/volume.c        | 10 ++++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h
index ac7c06e73f6..bf16b3a7590 100644
--- a/dlls/d3dx9_36/d3dx9_private.h
+++ b/dlls/d3dx9_36/d3dx9_private.h
@@ -42,6 +42,14 @@ static inline HRESULT d3dx9_validate_filter(uint32_t filter)
     return D3D_OK;
 }

+static inline HRESULT d3dx9_handle_load_filter(DWORD *filter)
+{
+    if (*filter == D3DX_DEFAULT)
+        *filter = D3DX_FILTER_TRIANGLE | D3DX_FILTER_DITHER;
+
+    return d3dx9_validate_filter(*filter);
+}
+
 struct vec4
 {
     float x, y, z, w;
diff --git a/dlls/d3dx9_36/tests/volume.c b/dlls/d3dx9_36/tests/volume.c
index c961120eb0d..68eca7c531b 100644
--- a/dlls/d3dx9_36/tests/volume.c
+++ b/dlls/d3dx9_36/tests/volume.c
@@ -197,8 +197,7 @@ static void test_D3DXLoadVolumeFromMemory(IDirect3DDevice9 *device)

hr = D3DXLoadVolumeFromMemory(volume, NULL, &dst_box, pixels, D3DFMT_A8R8G8B8, 16, 32, NULL, &src_box,
                 test_filter_values[i].filter, 0);
-        todo_wine_if(FAILED(test_filter_values[i].expected_hr)) ok(hr == test_filter_values[i].expected_hr,
-                "Unexpected hr %#lx.\n", hr);
+        ok(hr == test_filter_values[i].expected_hr, "Unexpected hr %#lx.\n", hr);

winetest_pop_context();
     }
@@ -278,8 +277,7 @@ static void test_D3DXLoadVolumeFromFileInMemory(IDirect3DDevice9 *device)

hr = D3DXLoadVolumeFromFileInMemory(volume, NULL, NULL, dds_24bit_8_8, sizeof(dds_24bit_8_8), NULL,
                 test_filter_values[i].filter, 0, NULL);
-        todo_wine_if(FAILED(test_filter_values[i].expected_hr)) ok(hr == test_filter_values[i].expected_hr,
-                "Unexpected hr %#lx.\n", hr);
+        ok(hr == test_filter_values[i].expected_hr, "Unexpected hr %#lx.\n", hr);

winetest_pop_context();
     }
diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c
index 2088b70ed4c..ae14e47b8b6 100644
--- a/dlls/d3dx9_36/volume.c
+++ b/dlls/d3dx9_36/volume.c
@@ -108,8 +108,8 @@ HRESULT WINAPI D3DXLoadVolumeFromMemory(IDirect3DVolume9 *dst_volume,
             || src_box->Front >= src_box->Back)
         return E_FAIL;

-    if (filter == D3DX_DEFAULT)
-        filter = D3DX_FILTER_TRIANGLE | D3DX_FILTER_DITHER;
+    if (FAILED(hr = d3dx9_handle_load_filter(&filter)))
+        return hr;

src_format_desc = get_format_info(src_format);
     if (src_format_desc->type == FORMAT_UNKNOWN)
@@ -180,6 +180,9 @@ HRESULT WINAPI D3DXLoadVolumeFromFileInMemory(IDirect3DVolume9 *dst_volume, cons
     if (!dst_volume || !src_data || !src_data_size)
         return D3DERR_INVALIDCALL;

+    if (FAILED(hr = d3dx9_handle_load_filter(&filter)))
+        return hr;
+
     hr = d3dx_image_init(src_data, src_data_size, &image, 0, 0);
     if (FAILED(hr))
         return D3DXERR_INVALIDDATA;
@@ -231,6 +234,9 @@ HRESULT WINAPI D3DXLoadVolumeFromVolume(IDirect3DVolume9 *dst_volume, const PALE

if (!dst_volume || !src_volume) return D3DERR_INVALIDCALL;

+    if (FAILED(hr = d3dx9_handle_load_filter(&filter)))
+        return hr;
+
     IDirect3DVolume9_GetDesc(src_volume, &desc);

if (!src_box)