From: Connor McAdams cmcadams@codeweavers.com
Signed-off-by: Connor McAdams cmcadams@codeweavers.com --- dlls/d3dx9_36/tests/texture.c | 4 ++-- dlls/d3dx9_36/texture.c | 27 ++++++++++++++++++++++----- 2 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index e4a491c0a74..ba4d39fe9a7 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -2422,10 +2422,10 @@ static void test_D3DXCreateCubeTextureFromFileInMemory(IDirect3DDevice9 *device) ok(hr == D3DERR_INVALIDCALL, "D3DXCreateCubeTextureFromFileInMemory returned %#lx, expected %#lx\n", hr, D3DERR_INVALIDCALL);
hr = D3DXCreateCubeTextureFromFileInMemory(device, dds_24bit, sizeof(dds_24bit), &cube_texture); - todo_wine ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); + ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr);
hr = D3DXCreateCubeTextureFromFileInMemory(device, bmp_32bpp_4_4_argb, sizeof(bmp_32bpp_4_4_argb), &cube_texture); - todo_wine ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); + ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr);
hr = D3DXCreateCubeTextureFromFileInMemory(device, dds_cube_map, sizeof(dds_cube_map), &cube_texture); if (SUCCEEDED(hr)) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index e59a1c19943..ea8536c3720 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1380,7 +1380,8 @@ HRESULT WINAPI D3DXCreateCubeTextureFromFileInMemoryEx(IDirect3DDevice9 *device, { BOOL dynamic_texture, format_specified = FALSE; IDirect3DCubeTexture9 *tex, *staging_tex; - uint32_t loaded_miplevels; + uint32_t loaded_miplevels, skip_levels; + struct d3dx_image image; D3DXIMAGE_INFO img_info; D3DCAPS9 caps; HRESULT hr; @@ -1395,15 +1396,29 @@ HRESULT WINAPI D3DXCreateCubeTextureFromFileInMemoryEx(IDirect3DDevice9 *device, return D3DERR_INVALIDCALL;
staging_tex = tex = *cube_texture = NULL; - hr = D3DXGetImageInfoFromFileInMemory(src_data, src_data_size, &img_info); + skip_levels = mip_filter != D3DX_DEFAULT ? mip_filter >> D3DX_SKIP_DDS_MIP_LEVELS_SHIFT : 0; + skip_levels &= D3DX_SKIP_DDS_MIP_LEVELS_MASK; + if (skip_levels) + FIXME("Skipping mip levels is currently unsupported for cube textures.\n"); + hr = d3dx_image_init(src_data, src_data_size, &image, 0, 0); if (FAILED(hr)) + { + FIXME("Unrecognized file format, returning failure.\n"); return hr; + }
- if (img_info.ImageFileFormat != D3DXIFF_DDS) - return D3DXERR_INVALIDDATA; + d3dximage_info_from_d3dx_image(&img_info, &image); + if (img_info.ResourceType != D3DRTYPE_CUBETEXTURE) + { + hr = E_FAIL; + goto err; + }
if (img_info.Width != img_info.Height) - return D3DXERR_INVALIDDATA; + { + hr = D3DXERR_INVALIDDATA; + goto err; + }
/* Handle default values. */ if (!size || size == D3DX_DEFAULT_NONPOW2 || size == D3DX_FROM_FILE || size == D3DX_DEFAULT) @@ -1479,12 +1494,14 @@ HRESULT WINAPI D3DXCreateCubeTextureFromFileInMemoryEx(IDirect3DDevice9 *device, *cube_texture = tex; }
+ d3dx_image_cleanup(&image); if (src_info) *src_info = img_info;
return hr;
err: + d3dx_image_cleanup(&image); if (tex) IDirect3DCubeTexture9_Release(tex);