From 39598b9c1e5b2bea4f248c3de6984cce4ee7ea07 Mon Sep 17 00:00:00 2001 From: Christian Costa Date: Fri, 10 Feb 2012 14:18:39 +0100 Subject: [PATCH] d3dx9_36: Detect and display message for all not yet supported file formats. --- dlls/d3dx9_36/surface.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 8049efc1d3f..ca1699b9708 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -62,8 +62,6 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D TRACE("(%p, %d, %p)\n", data, datasize, info); - /* TODO: Add support for (or at least detect) DDS, PPM and DIB */ - if (!data || !datasize) return D3DERR_INVALIDCALL; @@ -82,6 +80,19 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D IWICImagingFactory_Release(factory); } + if (FAILED(hr)) { + if ((datasize >= 4) && !strncmp(data, "DDS ", 4)) + FIXME("File type DDS is not supported yet\n"); + else if ((datasize >= 2) && (!strncmp(data, "P3", 2) || !strncmp(data, "P6", 2))) + FIXME("File type PPM is not supported yet\n"); + else if ((datasize >= 2) && !strncmp(data, "BM", 2)) + FIXME("File type DIB is not supported yet\n"); + else if ((datasize >= 10) && !strncmp(data, "#?RADIANCE", 10)) + FIXME("File type HDR is not supported yet\n"); + else if ((datasize >= 2) && (!strncmp(data, "PF", 2) || !strncmp(data, "Pf", 2))) + FIXME("File type PFM is not supported yet\n"); + } + if (SUCCEEDED(hr)) { GUID container_format; UINT frame_count; @@ -161,8 +172,7 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D CoUninitialize(); if (FAILED(hr)) { - /* Missing formats are not detected yet and will fail silently without the FIXME */ - FIXME("Invalid or unsupported image file\n"); + TRACE("Invalid or unsupported image file\n"); return D3DXERR_INVALIDDATA; }