From 3bd87d261ffbc400e9bf07dbae108d21797b2b3c Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Tue, 24 Aug 2010 14:29:38 -0500 Subject: [PATCH 7/7] d3dx9_36: Check for the TGA container format. --- dlls/d3dx9_36/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 199209f..cc36376 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -93,6 +93,9 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D } else if(IsEqualGUID(&container_format, &GUID_ContainerFormatJpeg)) { TRACE("File type is JPG\n"); info->ImageFileFormat = D3DXIFF_JPG; + } else if(IsEqualGUID(&container_format, &GUID_WineContainerFormatTga)) { + TRACE("File type is TGA\n"); + info->ImageFileFormat = D3DXIFF_TGA; } else { WARN("Unsupported image file format %s\n", debugstr_guid(&container_format)); hr = D3DXERR_INVALIDDATA; -- 1.7.0.4