system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 10:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

d3dx9_36: Detect and display message for all not yet supported file formats.

Browse source
This commit is contained in:
Christian Costa 2012-02-10 14:18:39 +01:00 committed by Alexandre Julliard
parent a6e3984c1a
commit 39598b9c1e
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
dlls/d3dx9_36/surface.c
View file

@ -62,8 +62,6 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D
TRACE("(%p, %d, %p)\n", data, datasize, info); TRACE("(%p, %d, %p)\n", data, datasize, info);
/* TODO: Add support for (or at least detect) DDS, PPM and DIB */
if (!data || !datasize) if (!data || !datasize)
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
@ -82,6 +80,19 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D
IWICImagingFactory_Release(factory); 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)) { if (SUCCEEDED(hr)) {
GUID container_format; GUID container_format;
UINT frame_count; UINT frame_count;
@ -161,8 +172,7 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D
CoUninitialize(); CoUninitialize();
if (FAILED(hr)) { if (FAILED(hr)) {
/* Missing formats are not detected yet and will fail silently without the FIXME */ TRACE("Invalid or unsupported image file\n");
FIXME("Invalid or unsupported image file\n");
return D3DXERR_INVALIDDATA; return D3DXERR_INVALIDDATA;
} }